Skip to content

Commit

Permalink
Check ruby version without rubygems
Browse files Browse the repository at this point in the history
  • Loading branch information
sazor committed Oct 18, 2016
1 parent daf6edf commit c1c9dcc
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ scheme are considered to be bugs.

* [#369](https://github.com/intridea/hashie/pull/369): If a translation for a property exists when using IndifferentAccess and IgnoreUndeclared, use the translation to find the property - [@whitethunder](https://github.com/whitethunder).
* [#376](https://github.com/intridea/hashie/pull/376): Leave string index unchanged if it can't be converted to integer for Array#dig - [@sazor](https://github.com/sazor).
* [#377](https://github.com/intridea/hashie/pull/377): Dont use Rubygems to check ruby version - [@sazor](https://github.com/sazor).

### Security

Expand Down
5 changes: 3 additions & 2 deletions lib/hashie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ module Extensions
autoload :PrettyInspect, 'hashie/extensions/pretty_inspect'
autoload :KeyConversion, 'hashie/extensions/key_conversion'
autoload :MethodAccessWithOverride, 'hashie/extensions/method_access'
autoload :StrictKeyAccess, 'hashie/extensions/strict_key_access'
autoload :RubyVersionCheck, 'hashie/extensions/ruby_version_check'
autoload :StrictKeyAccess, 'hashie/extensions/strict_key_access'
autoload :RubyVersion, 'hashie/extensions/ruby_version'
autoload :RubyVersionCheck, 'hashie/extensions/ruby_version_check'

module Parsers
autoload :YamlErbParser, 'hashie/extensions/parsers/yaml_erb_parser'
Expand Down
60 changes: 60 additions & 0 deletions lib/hashie/extensions/ruby_version.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.
# Portions copyright (c) Engine Yard and Andre Arko
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# 'Software'), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.

module Hashie
module Extensions
class RubyVersion
include Comparable

attr_accessor :segments

def initialize(version)
@segments = split_to_segments(version)
end

def <=>(other)
lhsegments = segments
rhsegments = other.segments

lhsize = lhsegments.size
rhsize = rhsegments.size
limit = (lhsize > rhsize ? lhsize : rhsize) - 1

i = 0

while i <= limit
lhs = lhsegments[i] || 0
rhs = rhsegments[i] || 0
i += 1

next if lhs == rhs
return -1 if lhs.is_a?(String) && rhs.is_a?(Numeric)
return 1 if lhs.is_a?(Numeric) && rhs.is_a?(String)

return lhs <=> rhs
end

0
end

private

def split_to_segments(version)
version.scan(/[0-9]+|[a-z]+/i).map do |segment|
/^\d+$/ =~ segment ? segment.to_i : segment
end.freeze
end
end
end
end
2 changes: 1 addition & 1 deletion lib/hashie/extensions/ruby_version_check.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def self.included(base)

module ClassMethods
def with_minimum_ruby(version)
yield if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(version)
yield if RubyVersion.new(RUBY_VERSION) >= RubyVersion.new(version)
end
end
end
Expand Down
3 changes: 2 additions & 1 deletion spec/support/ruby_version_check.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module RubyVersionCheck
def with_minimum_ruby(version)
yield if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(version)
yield if Hashie::Extensions::RubyVersion.new(RUBY_VERSION) >=
Hashie::Extensions::RubyVersion.new(version)
end
end

0 comments on commit c1c9dcc

Please sign in to comment.