Merge pull request Empact#56 from romuloceccon/support-ruby-2.4

Support Ruby 2.4

Author: Empact

Gemfile

@@ -1,12 +1,13 @@
 source "http://rubygems.org"
 
-gem 'activesupport', '>= 2.3.0'
+gem 'activesupport', '~> 3.1'
 gem 'nokogiri', '>= 1.3.3'
 
 group :development, :test do
-  gem 'rake'
+  gem 'rake', '~> 0.9'
   gem 'jeweler'
-  gem "rspec", '>= 2.0.0'
-  gem "sqlite3-ruby", '>= 1.2.4'
-  gem "activerecord", '>= 2.2.2'
+  gem 'test-unit'
+  gem 'rspec', '~> 2.8.0'
+  gem 'sqlite3', '>= 1.2.4'
+  gem 'activerecord', '~> 3.1'
 end

Gemfile.lock

@@ -1,29 +1,66 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
+    activesupport (3.2.22.5)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    addressable (2.4.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.6)
+    highline (1.7.8)
+    i18n (0.8.6)
+    jeweler (2.3.7)
+      builder
+      bundler (>= 1)
       git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    rake (0.9.2.2)
+      rdoc
+      semver2
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.2.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    power_assert (1.0.2)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (0.9.6)
+    rdoc (5.1.0)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -32,19 +69,25 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    tzinfo (0.3.31)
+    semver2 (3.4.2)
+    sqlite3 (1.3.13)
+    test-unit (3.2.5)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (0.3.53)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.2.2)
-  activesupport (>= 2.3.0)
+  activerecord (~> 3.1)
+  activesupport (~> 3.1)
   jeweler
   nokogiri (>= 1.3.3)
-  rake
-  rspec (>= 2.0.0)
-  sqlite3-ruby (>= 1.2.4)
+  rake (~> 0.9)
+  rspec (~> 2.8.0)
+  sqlite3 (>= 1.2.4)
+  test-unit
+
+BUNDLED WITH
+   1.15.2

lib/roxml.rb

@@ -260,7 +260,7 @@ def roxml_naming_convention # :nodoc:
       #
       #  xml_reader(:count) {|val| Integer(val) unless val.empty? }
       #
-      # Such block shorthands for Integer, Float, Fixnum, BigDecimal, Date, Time, and DateTime
+      # Such block shorthands for Integer, Float, BigDecimal, Date, Time, and DateTime
       # are currently available, but only for non-Hash declarations.
       #
       # To reference many elements, put the desired type in a literal array. e.g.:

lib/roxml/definition.rb

@@ -140,24 +140,19 @@ def self.fetch_bool(value, default)
         default
       end
     end
-    
+
     CORE_BLOCK_SHORTHANDS = {
       # Core Shorthands
       Integer  => lambda do |val|
         all(val) do |v|
-          Integer(v) unless v.blank?
+          v.to_i unless v.blank?
         end
       end,
       Float    => lambda do |val|
         all(val) do |v|
           Float(v) unless v.blank?
         end
       end,
-      Fixnum   => lambda do |val|
-        all(val) do |v|
-          v.to_i unless v.blank?
-        end
-      end,
       Time     => lambda do |val|
         all(val) {|v| Time.parse(v) unless v.blank? }
       end,

spec/definition_spec.rb

@@ -232,13 +232,14 @@ def self.from_xml(val)
         it "should translate text to integers" do
           @definition.blocks.first['3'].should == 3
           @definition.blocks.first['792'].should == 792
+          @definition.blocks.first['08'].should == 8
+          @definition.blocks.first['279.23'].should == 279
         end
 
-        it "should raise on non-integer values" do
-          proc { @definition.blocks.first['08'] }.should raise_error(ArgumentError)
-          proc { @definition.blocks.first['793.12'] }.should raise_error(ArgumentError)
-          proc { @definition.blocks.first['junk 11'] }.should raise_error(ArgumentError)
-          proc { @definition.blocks.first['11sttf'] }.should raise_error(ArgumentError)
+        it "should extract whatever is possible and fall back to 0" do
+          @definition.blocks.first['junk 11'].should eql(0)
+          @definition.blocks.first['.?sttf'].should eql(0)
+          @definition.blocks.first['11sttf'].should eql(11)
         end
 
         context "when passed an array" do
@@ -284,41 +285,17 @@ def self.from_xml(val)
           @definition.blocks.first['0.3'].should == BigDecimal.new("0.3")
         end
 
-        it "should extract what it can, and fall back to 0" do
-          @definition.blocks.first['junk 11'].should eql(BigDecimal.new("0"))
-          @definition.blocks.first['11sttf'].should eql(BigDecimal.new("11.0"))
-        end
-
-        context "when passed an array" do
-          it "should translate the array elements to integer" do
-            @definition.blocks.first.call(["12.1", "328.2"]).should == [BigDecimal.new("12.1"), BigDecimal.new("328.2")]
-          end
-        end
-      end
-
-      describe "Fixnum" do
-        before do
-          @definition = ROXML::Definition.new(:fixnumvalue, :as => Fixnum)
-        end
-
-        it_should_behave_like "block shorthand type declaration"
-
-        it "should translate text to integers" do
-          @definition.blocks.first['3'].should == 3
-          @definition.blocks.first['792'].should == 792
-          @definition.blocks.first['08'].should == 8
-          @definition.blocks.first['279.23'].should == 279
+        it "should raise on non-decimal values" do
+          proc { @definition.blocks.first['junk 11'] }.should raise_error(ArgumentError)
         end
 
-        it "should extract whatever is possible and fall back to 0" do
-          @definition.blocks.first['junk 11'].should eql(0)
-          @definition.blocks.first['.?sttf'].should eql(0)
-          @definition.blocks.first['11sttf'].should eql(11)
+        it "should extract what it can" do
+          @definition.blocks.first['11sttf'].should eql(BigDecimal.new("11.0"))
         end
 
         context "when passed an array" do
           it "should translate the array elements to integer" do
-            @definition.blocks.first.call(["792", "12", "328"]).should == [792, 12, 328]
+            @definition.blocks.first.call(["12.1", "328.2"]).should == [BigDecimal.new("12.1"), BigDecimal.new("328.2")]
           end
         end
       end

spec/roxml_spec.rb

@@ -139,19 +139,6 @@ class BookWithOctalPages
       @expected_pages = 239
     end
 
-    describe "with :as block shorthand" do
-      class BookWithOctalPagesBlockShorthand
-        include ROXML
-
-        xml_accessor :pages, :as => Integer, :required => true
-      end
-
-      it "should apply filtering on input" do
-        book = BookWithOctalPagesBlockShorthand.from_xml(@book_with_octal_pages_xml)
-        book.pages.should == @expected_pages
-      end
-    end
-
     describe "with #from_xml defined on the object" do
       class BookWithOctalPagesType
         include ROXML

test/fixtures/book_with_octal_pages.xml

@@ -1,4 +1,3 @@
 <bookwithoctalpages>
-  <pages_with_to_xml_proc>0357</pages_with_to_xml_proc>
-  <pages_with_type>0357</pages_with_type>
-</bookwithoctalpages>
+  <pages>0357</pages>
+</bookwithoctalpages>

test/unit/definition_test.rb

@@ -44,7 +44,7 @@ def test_required_conflicts_with_else
 
   def test_hash_of_attrs
     opts = ROXML::Definition.new(:attributes, :as => {:key => '@name', :value => '@value'})
-    assert_hash(opts, :attr => 'name', :attr => 'value')
+    assert_hash(opts, :attr => 'value')
   end
 
   def test_hash_with_attr_key_and_text_val
@@ -56,7 +56,7 @@ def test_hash_with_attr_key_and_text_val
   def test_hash_with_string_class_for_type
     opts = ROXML::Definition.new(:attributes, :as => {:key => 'name',
                                          :value => 'value'})
-    assert_hash(opts, :text => 'name', :text => 'value')
+    assert_hash(opts, :text => 'value')
   end
 
   def test_hash_with_attr_key_and_content_val
@@ -68,7 +68,7 @@ def test_hash_with_attr_key_and_content_val
   def test_hash_with_options
     opts = ROXML::Definition.new(:definitions, :as => {:key => '@dt', :value => '@dd'},
                            :in => :definitions, :from => 'definition')
-    assert_hash(opts, :attr => 'dt', :attr => 'dd')
+    assert_hash(opts, :attr => 'dd')
     assert_equal 'definition', opts.hash.wrapper
   end
 
@@ -117,9 +117,7 @@ def test_block_shorthand_supports_bool
   def test_block_shorthand_supports_integer
     assert_equal nil, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call(" ")
     assert_equal 792, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792")
-    assert_raise ArgumentError do
-      ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792.13")
-    end
+    assert_equal 792, ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call("792.13")
     assert_equal [792, 12, 328], ROXML::Definition.new(:floatvalue, :as => Integer).blocks.first.call(["792", "12", "328"])
   end
 

test/unit/to_xml_test.rb

@@ -72,8 +72,7 @@ def to_xml
 class BookWithOctalPages
   include ROXML
 
-  xml_accessor :pages_with_to_xml_proc, :as => Integer, :to_xml => proc {|val| sprintf("%#o", val) }, :required => true
-  xml_accessor :pages_with_type, :as => OctalInteger, :required => true
+  xml_accessor :pages, :as => OctalInteger, :required => true
 end
 
 class TestToXmlWithOverriddenOutput < ActiveSupport::TestCase