Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure Ruby 2.4 and 2.5 compatibility #314

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ensure Ruby 2.4 and 2.5 compatibility #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b0c5ae
[CI] Test against Ruby 2.4 and 2.5
nicolasleger Feb 19, 2018
bd7be41
Fix Ruby 2.4 and 2.5 compatibility removing slice
Feb 19, 2018
96534f4
Run Bignum check before Fixnum because now Integer since Ruby >= 2.4
Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ rvm:
- 2.1
- 2.2
- 2.3
- 2.4
- 2.5
- jruby-9.1.5.0
before_install:
- gem update --system
Expand Down
4 changes: 2 additions & 2 deletions lib/riak/client/beefcake/ts_cell_codec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ def cell_for(measure)
TsCell.new case measure
when String
{ varchar_value: measure }
when Fixnum
{ sint64_value: measure }
when Bignum
{ sint64_value: check_bignum_range(measure) }
when Fixnum
{ sint64_value: measure }
when Float
{ double_value: measure }
when BigDecimal
Expand Down
6 changes: 4 additions & 2 deletions lib/riak/map_reduce.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,11 @@ def reduce(*params)
# @see Phase#initialize
def link(*params)
options = params.extract_options!
walk_spec_options = options.slice!(:type, :function, :language, :arg) unless params.first
phase_options_keys = [:type, :function, :language, :arg]
walk_spec_options = options.reject { |key| phase_options_keys.include? key } unless params.first
walk_spec = WalkSpec.normalize(params.shift || walk_spec_options).first
@query << Phase.new({:type => :link, :function => walk_spec}.merge(options))
phase_options = walk_spec_options ? options.slice(*phase_options_keys) : options
@query << Phase.new({:type => :link, :function => walk_spec}.merge(phase_options))
self
end

Expand Down