pump 0.5.1 → 0.6.0

data/spec/pump/object_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-class ObjectWithoutInclude
-
-end
+class ObjectWithoutInclude;end
 
 class ObjectWithInclude
   include Pump::Object
@@ -10,6 +8,10 @@ class ObjectWithInclude
   def to_xml(options={})
     "<to_xml />"
   end
+
+  def to_json(options={})
+    "{to_json}"
+  end
 end
 
 class ObjectWithIncludeAndPumps
@@ -45,6 +47,32 @@ class ObjectWithIncludeAndMultiplePumps
   end
 end
 
+class ObjectWithIncludeAndMultiplePumpsWithInheritance
+  include Pump::Object
+
+  add_pump :my_object do
+    string  "name"
+    string "role"
+  end
+
+  add_pump :my_object, :restricted, :base => :default do
+    integer  "age"
+    string "role", :static_value => "basic_role"
+  end
+
+  def name
+    "MyName"
+  end
+
+  def role
+    "my_role"
+  end
+
+  def age
+    72
+  end
+end
+
 describe Pump::Object do
   it "should not extend all objects by default" do
     ObjectWithoutInclude.respond_to?(:pumps).should eql(false)
@@ -62,9 +90,17 @@ describe Pump::Object do
       subject.new.respond_to?(:pump_to_xml).should eql(true)
     end
 
+    it "should add pump_to_json instance method" do
+      subject.new.respond_to?(:pump_to_json).should eql(true)
+    end
+
     it "should fall back to original to_xml on pump_to_xml" do
       subject.new.pump_to_xml.should eql("<to_xml />")
     end
+
+    it "should fall back to original to_json on pump_to_xml" do
+      subject.new.pump_to_json.should eql("{to_json}")
+    end
   end
 
   context "when included with one encoder added" do
@@ -77,6 +113,14 @@ describe Pump::Object do
     it "should return xml on pump_to_xml" do
       subject.new.pump_to_xml.should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<my_object>\n  <name>MyName</name>\n</my_object>\n")
     end
+
+    it "should return json on pump_to_json" do
+      subject.new.pump_to_json.should eql("{\"my_object\":{\"name\":\"MyName\"}}")
+    end
+
+    it "should pass down options to encoder" do
+      subject.new.pump_to_json(:exclude_root_in_json => true).should eql("{\"name\":\"MyName\"}")
+    end
   end
 
   context "when included with multiple encoders added" do
@@ -98,5 +142,40 @@ describe Pump::Object do
       subject.new.pump_to_xml(:set => :unknown).should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<my_object>\n  <name>MyName</name>\n</my_object>\n")
     end
 
+    it "should return default json on pump_to_json" do
+      subject.new.pump_to_json.should eql("{\"my_object\":{\"name\":\"MyName\"}}")
+    end
+
+    it "should return special json on set option" do
+      subject.new.pump_to_json(:set => :sometimes).should eql("{\"my_object\":{\"name\":\"MyName\",\"age\":72}}")
+    end
+
+    it "should return default json on pump_to_json with unknown set option" do
+      subject.new.pump_to_json(:set => :unknown).should eql("{\"my_object\":{\"name\":\"MyName\"}}")
+    end
+  end
+
+  context "when included with multiple encoders added with inheritance" do
+    subject { ObjectWithIncludeAndMultiplePumpsWithInheritance }
+
+    it "should add pumps" do
+      subject.pumps.size.should eql(2)
+    end
+
+    it "should return default xml on pump_to_xml" do
+      subject.new.pump_to_xml.should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<my_object>\n  <name>MyName</name>\n  <role>my_role</role>\n</my_object>\n")
+    end
+
+    it "should return default json on pump_to_json" do
+      subject.new.pump_to_json.should eql("{\"my_object\":{\"name\":\"MyName\",\"role\":\"my_role\"}}")
+    end
+
+    it "should return special inherited xml on pump_to_xml(:set => :restricted)" do
+      subject.new.pump_to_xml(:set => :restricted).should eql("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<my_object>\n  <name>MyName</name>\n  <role>basic_role</role>\n  <age type=\"integer\">72</age>\n</my_object>\n")
+    end
+
+    it "should return special inherited json on pump_to_json(:set => :restricted)" do
+      subject.new.pump_to_json(:set => :restricted).should eql("{\"my_object\":{\"name\":\"MyName\",\"role\":\"basic_role\",\"age\":72}}")
+    end
   end
 end

data/spec/pump/xml_spec.rb

@@ -1,25 +1,6 @@
 require 'spec_helper'
 
 describe Pump::Xml do
-  describe ".new" do
-    it "requires two parameters or one and a block" do
-      lambda{ Pump::Xml.new }.should raise_error(ArgumentError)
-      lambda{ Pump::Xml.new('record') }.should raise_error(ArgumentError)
-      lambda{ Pump::Xml.new('record', []) }.should_not raise_error
-      lambda{ Pump::Xml.new('record') {} }.should_not raise_error
-    end
-
-    describe "with block given" do
-      subject do
-        Pump::Xml.new('human', :instruct => false) do
-          tag :name
-        end.encode(Struct.new(:name).new('Artur'))
-      end
-
-      its(:encode) { should eql("<human>\n  <name>Artur</name>\n</human>\n")}
-    end
-  end
-
   describe "#encode" do
     let(:person) { Struct.new(:name, :age, :last_name).new('Benny', 9, 'Hellman') }
     let(:xml) { Pump::Xml.new('person', [{:name => :name}]) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pump
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sebastian Munz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +66,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.2
-description: Fast but inflexible XML encoding for ruby objects.
+description: Fast but inflexible XML and JSON encoding for ruby objects.
 email:
 - sebastian@yo.lk
 executables: []
@@ -76,10 +90,12 @@ files:
 - lib/pump.rb
 - lib/pump/array.rb
 - lib/pump/collection.rb
+- lib/pump/dsl.rb
+- lib/pump/encoder.rb
+- lib/pump/json.rb
 - lib/pump/object.rb
 - lib/pump/version.rb
 - lib/pump/xml.rb
-- lib/pump/xml/dsl.rb
 - lib/pump/xml/node.rb
 - lib/pump/xml/tag.rb
 - lib/pump/xml/tag_array.rb
@@ -87,8 +103,10 @@ files:
 - pump.gemspec
 - spec/pump/array_spec.rb
 - spec/pump/collection_spec.rb
+- spec/pump/dsl_spec.rb
+- spec/pump/encoder_spec.rb
+- spec/pump/json_spec.rb
 - spec/pump/object_spec.rb
-- spec/pump/xml/dsl_spec.rb
 - spec/pump/xml/tag_array_spec.rb
 - spec/pump/xml/tag_spec.rb
 - spec/pump/xml/value_spec.rb
@@ -117,12 +135,14 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: Fast but inflexible XML encoding for ruby objects.
+summary: Fast but inflexible XML and JSON encoding for ruby objects.
 test_files:
 - spec/pump/array_spec.rb
 - spec/pump/collection_spec.rb
+- spec/pump/dsl_spec.rb
+- spec/pump/encoder_spec.rb
+- spec/pump/json_spec.rb
 - spec/pump/object_spec.rb
-- spec/pump/xml/dsl_spec.rb
 - spec/pump/xml/tag_array_spec.rb
 - spec/pump/xml/tag_spec.rb
 - spec/pump/xml/value_spec.rb

data/lib/pump/xml/dsl.rb

@@ -1,59 +0,0 @@
-module Pump
-  class Xml
-    class Dsl
-      def initialize(&blk)
-        raise ArgumentError unless block_given?
-        instance_eval(&blk)
-      end
-
-      def config
-        @config ||= []
-      end
-
-      private
-
-      def tag(name, options={}, &blk)
-        method = if block_given?
-          self.class.new(&blk).config
-        else
-          options.delete(:from) || (name.to_s =~ /-/ ? name.to_s.gsub('-', '_').to_sym : name)
-        end
-        config << ({ name => method }).merge(options)
-      end
-      alias_method :string, :tag
-
-      def integer(name, options={})
-        with_type('integer', name, options)
-      end
-
-      def float(name, options={})
-        with_type('float', name, options)
-      end
-
-      def boolean(name, options={})
-        with_type('boolean', name, options)
-      end
-
-      def date(name, options={})
-        with_type('date', name, options)
-      end
-
-      def datetime(name, options={})
-        options[:typecast] = :xmlschema unless options.has_key?(:typecast)
-        with_type('datetime', name, options)
-      end
-      alias_method :time, :datetime
-
-      def with_type(type, name, options)
-        (options[:attributes] ||= {}).merge!({:type => type})
-        options[:xmlsafe] = true unless options.has_key?(:xmlsafe)
-        tag(name, options)
-      end
-
-      def array(name, options={}, &blk)
-        options[:array] = self.class.new(&blk).config
-        tag(name, options)
-      end
-    end
-  end
-end