ixtlan-babel 0.3.2 → 0.3.3

data/lib/ixtlan/babel/context.rb

@@ -47,7 +47,7 @@ module Ixtlan
       end
 
       def include?( key )
-        @include.include? key
+        @include.include?( key ) || @methods.include?( key ) 
       end
 
       def array?
@@ -60,4 +60,4 @@ module Ixtlan
 
     end
   end
-end
+end

data/lib/ixtlan/babel/deserializer.rb

@@ -18,6 +18,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'multi_json'
 module Ixtlan
   module Babel
     class Deserializer
@@ -74,7 +75,7 @@ module Ixtlan
       end
 
       def from_json(json, options = nil)
-        data = JSON.parse(json)
+        data = MultiJson.load(json)
         from_hash(data, options)
       end
       
@@ -84,4 +85,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/babel/serializer.rb

@@ -18,6 +18,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'multi_json'
 require 'ixtlan/babel/hash_filter'
 require 'ixtlan/babel/model_filter'
 require 'ixtlan/babel/filter_config'
@@ -156,4 +157,4 @@ module Ixtlan
       end 
     end
   end
-end
+end

data/spec/model_filter_spec.rb

@@ -85,10 +85,11 @@ describe Ixtlan::Babel::ModelFilter do
     json = serializer.to_json(:except => ['id'])  
     result = deserializer.from_json(json, :except => ['id'])  
     
-    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil]
+    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil, :children_names => []]
 
     # travis sees empty array and locally it is nil :(
     result.phone_numbers ||= []
+    result.children_names ||= []
 
     result.attributes.keys.dup.each do |k|
       result.attributes[ k ].must_equal expected[ k ]
@@ -98,6 +99,7 @@ describe Ixtlan::Babel::ModelFilter do
 
     # travis sees empty array and locally it is nil :(
     result.phone_numbers ||= []
+    result.children_names ||= []
 
     result.attributes.keys.dup.each do |k|
       result.attributes[ k ].must_equal expected[ k ]
@@ -110,8 +112,9 @@ describe Ixtlan::Babel::ModelFilter do
 
     # travis sees empty array and locally it is nil :(
     result.phone_numbers ||= []
+    result.children_names ||= []
 
-    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil]
+    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil, :children_names => []]
     result.attributes.keys.dup.each do |k|
       result.attributes[ k ].must_equal expected[ k ]
     end
@@ -120,6 +123,8 @@ describe Ixtlan::Babel::ModelFilter do
 
     # travis sees empty array and locally it is nil :(
     result.phone_numbers ||= []
+    result.children_names ||= []
+
     result.attributes.keys.dup.each do |k|
       result.attributes[ k ].must_equal expected[ k ]
     end

data/spec/model_filter_with_methods_spec.rb

@@ -61,7 +61,7 @@ describe Ixtlan::Babel::ModelFilter.to_s + ':with_methods' do
 
   it 'should serialize and deserialize with methods' do
     json = serializer.to_json(:include => [:age, :children_names, :children_ages])
-    data = JSON.parse(json)
+    data = MultiJson.load(json)
     data['age'].must_equal 123
     data['children_names'].must_equal ['anna', 'jack', 'rama', 'mia']
     data['children_ages'].must_equal [12, 3, 6, 9]
@@ -86,7 +86,7 @@ describe Ixtlan::Babel::ModelFilter.to_s + ':with_methods' do
 
   it 'should serialize and deserialize a hash with include list' do
     json = serializer.to_json(:include => ['address', 'phone_numbers'])   
-    data = JSON.parse(json)
+    data = MultiJson.load(json)
     data['phone_numbers'][0]['prefix'].must_equal 12
     data['phone_numbers'][0]['number'].must_equal '123'
     result = deserializer.from_json(json, :include => ['address', 'phone_numbers'])

metadata

@@ -2,14 +2,14 @@
 name: ixtlan-babel
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,22 @@ dependencies:
     none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: json
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +143,6 @@ files:
 - spec/hash_filter_spec.rb~
 - spec/spec_helper.rb
 - spec/model_filter_with_methods_spec.rb
-- spec/#model_filter_spec.rb#
 - spec/params_filter_spec.rb~
 - MIT-LICENSE
 - README.md

data/spec/#model_filter_spec.rb#

@@ -1,211 +0,0 @@
-require 'spec_helper'
-require 'virtus'
-require 'ixtlan/babel/deserializer'
-
-class Address
-  include Virtus
-
-  attribute :street, String
-  attribute :zipcode, String
-end
-class Area
-  include Virtus
-
-  attribute :code, String
-  attribute :iso, String  
-end
-class PhoneNumber
-  include Virtus
-
-  attribute :prefix, Integer
-  attribute :number, String
-  attribute :area, Area
-end
-class Person
-  include Virtus
-
-  attribute :id, String
-  attribute :name, String
-  attribute :address, Address
-  attribute :phone_numbers, Array[PhoneNumber]
-  attribute :children_names, Array[Symbol]
-end
-
-describe Ixtlan::Babel::ModelFilter do
-  let( :person ) do
-    Person.new(
-      :id => 987,
-      :name => 'me and the corner',
-      :address => Address.new( :street => 'Foo 12', :zipcode => '12345' ),
-      :phone_numbers => [PhoneNumber.new( 
-        :prefix => 12, 
-        :number => '123',
-        :area => Area.new( :code => '001', :iso => 'us' )
-      )],
-  # #     :children_names => [:adi, :aromal, :shreedev]
-  # #   )
-  # # end
-
-  # # let(:serializer) { Ixtlan::Babel::Serializer.new( person ) }
-  # # let(:deserializer) { Ixtlan::Babel::Deserializer.new( Person ) }
-
-  # # it 'should serialize and deserialize without root' do
-  # #   json = serializer.to_json
-  # #   result = deserializer.from_json(json)
-
-  # #   # travis produces [] and locally there is a nil - filter empty as well :(
-
-    attributes = result.attributes.delete_if { |k,v| v.nil? || v.empty? }
-
-    attributes.must_equal Hash[:id => person['id'], :name => person['name']]
-  end
-
-  it 'should serialize and deserialize with root' do
-    json = serializer.to_json :root => 'my'
-    result = deserializer.from_json(json, :root => 'my')
-
-    # travis produces [] and locally there is a nil - filter empty as well :(
-    attributes = result.attributes.delete_if { |k,v| v.nil? || v.empty? }
-
-    attributes.must_equal Hash[:id => person['id'], :name => person['name']]
-  end  
-
-  it 'should serialize and deserialize a hash with include list' do
-    json = serializer.to_json(:include => ['address', 'phone_numbers']) 
-    result = deserializer.from_json(json, :include => ['address', 'phone_numbers'])
-    result.object_id.wont_equal person.object_id
-    result.address.attributes.must_equal person.address.attributes
-    result.phone_numbers[0].area.must_be_nil
-    person.phone_numbers[0].area = nil
-    result.phone_numbers[0].attributes.must_equal person.phone_numbers[0].attributes
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should serialize and deserialize with except' do
-    json = serializer.to_json(:except => ['id'])  
-    result = deserializer.from_json(json, :except => ['id'])  
-    
-    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil]
-
-    # travis sees empty array and locally it is nil :(
-    result.phone_numbers ||= []
-
-    result.attributes.keys.dup.each do |k|
-      result.attributes[ k ].must_equal expected[ k ]
-    end
-
-    result = deserializer.from_json(json)
-
-    # travis sees empty array and locally it is nil :(
-    result.phone_numbers ||= []
-
-    result.attributes.keys.dup.each do |k|
-      result.attributes[ k ].must_equal expected[ k ]
-    end
-  end
-
-  it 'should serialize and deserialize with only' do
-    json = serializer.to_json(:only => ['name']) 
-    result = deserializer.from_json(json, :only => ['name'])
-
-    # travis sees empty array and locally it is nil :(
-    result.phone_numbers ||= []
-
-    expected = Hash[:name => person['name'], :address=>nil, :phone_numbers=>[], :id => nil]
-    result.attributes.keys.dup.each do |k|
-      result.attributes[ k ].must_equal expected[ k ]
-    end
-
-    result = deserializer.from_json(json)
-
-    # travis sees empty array and locally it is nil :(
-    result.phone_numbers ||= []
-    result.attributes.keys.dup.each do |k|
-      result.attributes[ k ].must_equal expected[ k ]
-    end
-  end
-
-  it 'should serialize and deserialize with nested only' do
-    json = serializer.to_json(:include => { 'address' => {:only => ['street']}})
-    result = deserializer.from_json(json, :include => { 'address' => {:only => ['street']}})
-
-    json['phone_numbers'].must_be_nil
-    json['address']['zipcode'].must_be_nil
-
-    # travis produces [] and locally there is a nil :(
-    (result.phone_numbers || []).must_equal []
-
-    result.address.zipcode.must_be_nil
-
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should serialize and deserialize with nested only (array includes)' do
-    json = serializer.to_json(:include => { 'address' => {:only => ['street']}})
-    result = deserializer.from_json(json, :include => ['address'])
-
-    json['phone_numbers'].must_be_nil
-    json['address']['zipcode'].must_be_nil
-
-    # travis produces [] and locally there is a nil :(
-    (result.phone_numbers || []).must_equal []
-
-    result.address.zipcode.must_be_nil
-
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should serialize and deserialize with nested except' do
-    json = serializer.to_json(:include => { 'address' => {:except => ['zipcode']}})
-    result = deserializer.from_json(json, :include => { 'address' => {:except => ['zipcode']}})
-
-    json['phone_numbers'].must_be_nil
-    json['address']['zipcode'].must_be_nil
-
-    # travis produces [] and locally there is a nil :(
-    (result.phone_numbers || []).must_equal []
-
-    result.address.zipcode.must_be_nil
-
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should serialize and deserialize with nested except (array includes)' do
-    json = serializer.to_json(:include => { 'address' => {:except => ['zipcode']}})
-    result = deserializer.from_json(json, :include => ['address'])
-
-    json['phone_numbers'].must_be_nil
-    json['address']['zipcode'].must_be_nil
-
-    # travis produces [] and locally there is a nil :(
-    (result.phone_numbers || []).must_equal []
-
-    result.address.zipcode.must_be_nil
-
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should serialize and deserialize with nested include' do
-    json = serializer.to_json(:include => { 'address' => {}, 'phone_numbers' => { :include => ['area']}}) 
-    result = deserializer.from_json(json, :include => { 'address' => {}, 'phone_numbers' => { :include => ['area']}})
-
-    result.object_id.wont_equal person.object_id
-    result.address.attributes.must_equal person.address.attributes
-    result.phone_numbers[0].area.attributes.must_equal person.phone_numbers[0].area.attributes
-    result.phone_numbers[0].prefix.must_equal person.phone_numbers[0].prefix
-    result.phone_numbers[0].number.must_equal person.phone_numbers[0].number
-    result.name.must_equal person.name
-    result.id.must_equal person.id
-  end
-
-  it 'should convert elements from arrays wth custom serializer' do
-    serializer.add_custom_serializers( "Symbol" => Proc.new {|v| v.to_s.capitalize } )
-    data = serializer.to_hash(:include => [ :children_names ])
-    data[ "children_names"].must_equal( ["Adi", "Aromal", "Shreedev"] )
-  end
-end