pump 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ff0f5cef6e535be8d383cbdc0894ad6cad3247
-  data.tar.gz: d7ace652091d3ce66eced7bbcf69438998a4abc6
+  metadata.gz: 180ae744ddb9c6df1c7d7bd415f75dd5b808de18
+  data.tar.gz: 8b3b23f23c25dce465b72bc5eb1c84ec740a9f39
 SHA512:
-  metadata.gz: c35d78070528961c1509f5cd2ea3d9738077b41046240bbc82c7b454561ea51df1a1cc2841f64ef43f22a2e2aabccbf8c212d8f6671b6901b24fb849b89faefd
-  data.tar.gz: d8f8e432d713bf988ecd9484897e24df93b0eab3c40bff501e4fb6ac3b1b5cf1fc22f1f8c707f5f54b0a896a8cba8560697505dbee2f0142892490311846dcee
+  metadata.gz: 7a5e87c4721f61adf2b7fcf606dcff23f02daaa3d8e4c487b761989e6eff4978b429ce2e9451459a9cc98a9145d195e7b820b1d3eb6877f5f1650ec0e152de1d
+  data.tar.gz: d6093a04b4eade920916d7a16b1037e68c56704ac53ee53aed2a9fbe881499fe2e28214abb47b6f63009ea679e82f221fcd7b597842329081a1c18d111d02e1a

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+/Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.4.1

data/.travis.yml

@@ -1,6 +1,6 @@
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.4.1
+  - 2.3.4
 gemfile:
   - gemfiles/activesupport-4
-  - gemfiles/activesupport-3-2
+  - gemfiles/activesupport-5

data/CHANGES.md

@@ -1,6 +1,14 @@
 ### dev
 
-[full changelog](http://github.com/yolk/pump/compare/v0.6.6...master)
+[full changelog](http://github.com/yolk/pump/compare/v0.7.0...master)
+
+### 0.7.0 / 2017-06-26
+
+[full changelog](http://github.com/yolk/valvat/compare/v0.6.6...v0.7.0)
+
+* Fixed Fixnum warning in Ruby 2.4.1
+* Test against ruby 2.3 and 2.4
+* Updated to OJ 3.2
 
 ### 0.6.6 / 2014-07-03
 
@@ -47,4 +55,4 @@
 [full changelog](http://github.com/yolk/valvat/compare/v0.5.1...v0.6.0)
 
 * Added JSON serialization
-* Added simple inheritance for encoders
+* Added simple inheritance for encoders

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})         { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')     { "spec" }
-end
+guard :rspec, cmd: "bundle exec rspec --color" do
+  watch(/^spec\/(.*)_spec.rb/)
+  watch(/^lib\/(.*)\.rb/)          { |m| "spec/#{m[1]}_spec.rb" }
+  watch(/^spec\/spec_helper.rb/)   { "spec" }
+end

data/benchmarks/Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'pump', path: '..'
+gem 'ox'
+gem 'oj'
+gem 'yajl-ruby'
+gem 'activemodel'
+gem 'activemodel-serializers-xml'
+gem 'to_json', github: 'ahacking/to_json'

data/benchmarks/Gemfile.lock

@@ -0,0 +1,59 @@
+GIT
+  remote: https://github.com/ahacking/to_json.git
+  revision: 6fe8a17f9652da0d29c2ef8637630f7c34977e00
+  specs:
+    to_json (0.0.4)
+      oj (>= 2.9.4)
+
+PATH
+  remote: ..
+  specs:
+    pump (0.6.6)
+      activesupport (>= 4.0)
+      oj (>= 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activerecord (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
+      arel (~> 8.0)
+    activesupport (5.1.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.4)
+    minitest (5.10.2)
+    oj (3.2.0)
+    ox (2.5.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    yajl-ruby (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel
+  activemodel-serializers-xml
+  oj
+  ox
+  pump!
+  to_json!
+  yajl-ruby
+
+BUNDLED WITH
+   1.15.1

data/benchmarks/encode.rb

@@ -1,13 +1,15 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
+#!/usr/bin/env ruby
 require 'rubygems'
-require 'benchmark'
+require 'bundler/setup'
 
+require 'benchmark'
+require 'to_json'
 require 'pump'
 require 'ox'
 require 'oj'
 require 'yajl'
 require 'active_model'
+require 'activemodel-serializers-xml'
 
 class Person < Struct.new(:name, :age, :created_at)
   include ActiveModel::Serializers::Xml if defined?(ActiveModel)
@@ -24,6 +26,29 @@ pump_json = Pump::Json.new('person', [
   {:name => :name}
 ])
 
+module ToJsonBench
+
+  class PeopleSerializer
+    include  ::ToJson::Serialize
+
+    def put_person(person)
+      put :name, person.name
+      put :age, person.age
+      put :"created-at", person.created_at.xmlschema
+    end
+
+    def put_people(people)
+      array people do |person|
+        put_person person
+      end
+    end
+
+    def serialize(collection)
+      put_people collection
+    end
+  end
+end
+
 # Not optimized pump
 pump = Pump::Xml.new('person', [
   {:age => :age, :attributes => {:type => 'integer'}},
@@ -92,6 +117,12 @@ Benchmark.bmbm { |x|
     }
   }
 
+  x.report("ToJson") {
+    times.times {
+      ToJsonBench::PeopleSerializer.json!(array)
+    }
+  }
+
   x.report("Pump::Xml#encode") {
     times.times {
       pump.encode(array)

data/gemfiles/activesupport-4

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
-gem "activemodel", "4.0"
+gem "activemodel", "4.2.9"
 gem "oj"
 
-gem 'rspec', '>= 2.14'
-gem 'rake'
+gem 'rspec'
+gem 'rspec-its'
+gem 'rake'

data/gemfiles/activesupport-5

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+
+gem "activemodel", ">=5.0"
+gem "oj"
+
+gem 'rspec'
+gem 'rspec-its'
+gem 'rake'

data/lib/pump/json.rb

@@ -8,9 +8,11 @@ module Pump
     private
 
     OJ_OPTIONS = {
-      :mode => :compat,
+      :mode => :custom,
+      :second_precision => 0,
       :time_format => :xmlschema,
-      :second_precision => 0
+      :create_additions => false,
+      :use_as_json => true
     }
 
     def compile_string
@@ -145,4 +147,4 @@ module Pump
       name.to_s.underscore
     end
   end
-end
+end

data/lib/pump/version.rb

@@ -1,3 +1,3 @@
 module Pump
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

data/lib/pump/xml.rb

@@ -72,7 +72,7 @@ module Pump
     VALID_XML_CHARS = Regexp.new('\A['+
       VALID_CHAR.map { |item|
         case item
-        when Fixnum
+        when 0.class
           [item].pack('U').force_encoding('utf-8')
         when Range
           [item.first, '-'.ord, item.last].pack('UUU').force_encoding('utf-8')
@@ -96,4 +96,4 @@ end
 
 require "pump/xml/tag"
 require "pump/xml/value"
-require "pump/xml/tag_array"
+require "pump/xml/tag_array"

data/pump.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activesupport",           ">=3.2"
-  gem.add_dependency "oj",                      ">=2.0"
-  gem.add_development_dependency "rspec",       ">= 2.12.0"
+  gem.add_dependency "activesupport",           ">= 4.0"
+  gem.add_dependency "oj",                      ">= 3.0"
+  gem.add_development_dependency "rspec",       ">= 3.2"
+  gem.add_development_dependency "rspec-its"
 end

data/spec/pump/array_spec.rb

@@ -40,22 +40,22 @@ end
 
 describe Pump::Array do
   it "should extend ::Array by default with pump_to_xml" do
-    [].respond_to?(:pump_to_xml).should eql(true)
+    expect([].respond_to?(:pump_to_xml)).to eql(true)
   end
 
   it "should extend ::Array by default with pump_to_json" do
-    [].respond_to?(:pump_to_json).should eql(true)
+    expect([].respond_to?(:pump_to_json)).to eql(true)
   end
 
   context "with objects without include" do
     subject{ [ArrayObjectWithoutInclude.new] }
 
     it "should return default to_xml" do
-      subject.pump_to_xml.should eql(subject.to_xml)
+      expect(subject.pump_to_xml).to eql(subject.to_xml)
     end
 
     it "should return default to_json" do
-      subject.pump_to_json.should eql(subject.to_json)
+      expect(subject.pump_to_json).to eql(subject.to_json)
     end
   end
 
@@ -63,11 +63,11 @@ describe Pump::Array do
     subject{ [ArrayObjectWithInclude.new] }
 
     it "should return default to_xml" do
-      subject.pump_to_xml.should eql(subject.to_xml)
+      expect(subject.pump_to_xml).to eql(subject.to_xml)
     end
 
     it "should return default to_json" do
-      subject.pump_to_json.should eql(subject.to_json)
+      expect(subject.pump_to_json).to eql(subject.to_json)
     end
   end
 
@@ -75,31 +75,31 @@ describe Pump::Array do
     subject{ [ArrayObject.new] }
 
     it "should encode with default encoder" do
-      subject.pump_to_xml.should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n  </array-object>\n</array-objects>\n")
+      expect(subject.pump_to_xml).to eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n  </array-object>\n</array-objects>\n")
     end
 
     it "should encode with specified encoder" do
-      subject.pump_to_xml(:set => :with_age).should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n    <age type=\"integer\">27</age>\n  </array-object>\n</array-objects>\n")
+      expect(subject.pump_to_xml(:set => :with_age)).to eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n    <age type=\"integer\">27</age>\n  </array-object>\n</array-objects>\n")
     end
 
     it "should encode with default encoder on unknown set" do
-      subject.pump_to_xml(:set => :bla).should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n  </array-object>\n</array-objects>\n")
+      expect(subject.pump_to_xml(:set => :bla)).to eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<array-objects type=\"array\">\n  <array-object>\n    <name>Tintin</name>\n  </array-object>\n</array-objects>\n")
     end
 
     it "should encode json with default encoder" do
-      subject.pump_to_json.should eql("[{\"array_object\":{\"name\":\"Tintin\"}}]")
+      expect(subject.pump_to_json).to eql("[{\"array_object\":{\"name\":\"Tintin\"}}]")
     end
 
     it "should encode json with specified encoder" do
-      subject.pump_to_json(:set => :with_age).should eql("[{\"array_object\":{\"name\":\"Tintin\",\"age\":27}}]")
+      expect(subject.pump_to_json(:set => :with_age)).to eql("[{\"array_object\":{\"name\":\"Tintin\",\"age\":27}}]")
     end
 
     it "should encode json with default encoder on unknown set" do
-      subject.pump_to_json(:set => :bla).should eql("[{\"array_object\":{\"name\":\"Tintin\"}}]")
+      expect(subject.pump_to_json(:set => :bla)).to eql("[{\"array_object\":{\"name\":\"Tintin\"}}]")
     end
 
     it "should pass down options to encoder" do
-      subject.pump_to_json(:exclude_root_in_json => true).should eql("[{\"name\":\"Tintin\"}]")
+      expect(subject.pump_to_json(:exclude_root_in_json => true)).to eql("[{\"name\":\"Tintin\"}]")
     end
   end
 end

data/spec/pump/collection_spec.rb

@@ -6,7 +6,7 @@ describe Pump::Collection do
   describe ".new" do
     it "should not accept any arguments" do
       subject
-      lambda{ Pump::Collection.new("") }.should raise_error(ArgumentError)
+      expect{ Pump::Collection.new("") }.to raise_error(ArgumentError)
     end
 
     its(:size) { should eql(0) }
@@ -15,43 +15,43 @@ describe Pump::Collection do
   describe "#add" do
     it "should add entry" do
       subject.add(:set_name, :xml, :value)
-      subject.size.should eql(1)
+      expect(subject.size).to eql(1)
     end
 
     it "should allow different formats" do
       subject.add(:set_name, :json, :value)
-      subject.size.should eql(1)
+      expect(subject.size).to eql(1)
     end
 
     it "should default to :default set" do
       subject.add(nil, :xml, :value)
-      subject.get(:default, :xml).should eql(:value)
+      expect(subject.get(:default, :xml)).to eql(:value)
     end
   end
 
   describe "#get" do
     it "should return nil on unknown entry" do
-      subject.get(:set_name, :xml).should eql(nil)
-      subject.get(:default, :xml).should eql(nil)
-      subject.get(nil, :xml).should eql(nil)
-      subject.get(:default, :json).should eql(nil)
+      expect(subject.get(:set_name, :xml)).to eql(nil)
+      expect(subject.get(:default, :xml)).to eql(nil)
+      expect(subject.get(nil, :xml)).to eql(nil)
+      expect(subject.get(:default, :json)).to eql(nil)
     end
 
     context "when entries are added" do
       before{ subject.add(:set_name, :xml, :value); subject.add(:default, :xml, :value2) }
 
       it "should return given value" do
-        subject.get(:set_name, :xml).should eql(:value)
-        subject.get(:default, :xml).should eql(:value2)
+        expect(subject.get(:set_name, :xml)).to eql(:value)
+        expect(subject.get(:default, :xml)).to eql(:value2)
       end
 
       it "should return nil with wrong format" do
-        subject.get(:set_name, :json).should eql(nil)
-        subject.get(:default, :json).should eql(nil)
+        expect(subject.get(:set_name, :json)).to eql(nil)
+        expect(subject.get(:default, :json)).to eql(nil)
       end
 
       it "should default to :default on unknwon set" do
-        subject.get(:unknown, :xml).should eql(:value2)
+        expect(subject.get(:unknown, :xml)).to eql(:value2)
       end
     end
   end

data/spec/pump/dsl_spec.rb

@@ -5,8 +5,8 @@ describe Pump::Dsl do
 
   describe ".new" do
     it "requires one block" do
-      lambda{ Pump::Dsl.new }.should raise_error(ArgumentError)
-      lambda{ subject }.should_not raise_error
+      expect{ Pump::Dsl.new }.to raise_error(ArgumentError)
+      expect{ subject }.not_to raise_error
     end
   end
 

data/spec/pump/encoder_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Pump::Encoder do
   describe ".new" do
     it "requires two parameters or one and a block" do
-      lambda{ Pump::Encoder.new }.should raise_error(ArgumentError)
-      lambda{ Pump::Encoder.new('record') }.should raise_error(ArgumentError)
-      lambda{ Pump::Encoder.new('record', []) }.should_not raise_error
-      lambda{ Pump::Encoder.new('record') {} }.should_not raise_error
+      expect{ Pump::Encoder.new }.to raise_error(ArgumentError)
+      expect{ Pump::Encoder.new('record') }.to raise_error(ArgumentError)
+      expect{ Pump::Encoder.new('record', []) }.not_to raise_error
+      expect{ Pump::Encoder.new('record') {} }.not_to raise_error
     end
 
     describe "with block given" do
@@ -30,7 +30,7 @@ describe Pump::Encoder do
 
         it "leaves base config untouched" do
           subject
-          base.encoder_config.should eql([{:name => :name}, {:role => :role}])
+          expect(base.encoder_config).to eql([{:name => :name}, {:role => :role}])
         end
       end
 
@@ -40,7 +40,7 @@ describe Pump::Encoder do
 
         it "leaves base config untouched" do
           subject
-          base.encoder_config.should eql([{:name => :name}, {:role => :role}])
+          expect(base.encoder_config).to eql([{:name => :name}, {:role => :role}])
         end
       end
 
@@ -50,7 +50,7 @@ describe Pump::Encoder do
 
         it "leaves base config untouched" do
           subject
-          base.encoder_config.should eql([{:name => :name}, {:role => :role}])
+          expect(base.encoder_config).to eql([{:name => :name}, {:role => :role}])
         end
       end
 
@@ -65,7 +65,7 @@ describe Pump::Encoder do
 
         it "leaves base config untouched" do
           subject
-          base.encoder_config.should eql([{:name => :name}, {:role => :role}])
+          expect(base.encoder_config).to eql([{:name => :name}, {:role => :role}])
         end
       end
 
@@ -76,7 +76,7 @@ describe Pump::Encoder do
 
           it "leaves base options untouched" do
             subject
-            base.encoder_options.should eql({:option => true})
+            expect(base.encoder_options).to eql({:option => true})
           end
         end
       end
@@ -88,7 +88,7 @@ describe Pump::Encoder do
 
           it "leaves base options untouched" do
             subject
-            base.encoder_options.should eql({:option => true})
+            expect(base.encoder_options).to eql({:option => true})
           end
         end
       end