ixtlan-babel 0.3.1 → 0.3.2

data/lib/ixtlan/babel/factory.rb

@@ -22,14 +22,14 @@ module Ixtlan
   module Babel
     class Factory
 
-      NANOSECONDS_IN_DAY = Rational(1, 86400*10**9)
+      NANOSECONDS_IN_DAY = 86400*10**6
 
       TIME_TO_S = Proc.new do |t|
         t.strftime('%Y-%m-%dT%H:%M:%S.') + ("%06d" % t.usec) + t.strftime('%z')
       end
 
       DATE_TIME_TO_S = Proc.new do |dt|
-        dt.strftime('%Y-%m-%dT%H:%M:%S.') + ("%06d" % (dt.sec_fraction / NANOSECONDS_IN_DAY / 1000)) + dt.strftime('%z')
+        dt.strftime('%Y-%m-%dT%H:%M:%S.') + ("%06d" % (dt.sec_fraction * NANOSECONDS_IN_DAY ) ) + dt.strftime('%z')
       end
       
       DEFAULT_MAP = {
@@ -89,4 +89,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/babel/hash_filter.rb

@@ -37,7 +37,7 @@ module Ixtlan
           if item.is_a?( Array ) || item.is_a?( Hash )
             filter_data( item, options )
           else
-            item
+            serialize( item )
           end
         end
       end
@@ -59,4 +59,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/babel/model_filter.rb

@@ -39,7 +39,7 @@ module Ixtlan
           if i.respond_to? :attributes
             filter_data(i, block.call(i), options, &block)
           else
-            i
+            serialize( i )
           end
         end
       end
@@ -70,4 +70,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/babel/params_filter.rb

@@ -59,14 +59,21 @@ module Ixtlan
         @context_or_options = context_or_options
         self
       end
+
       def filter_it( data )
         filter.options = self.class.config.single_options( @context_or_options )
+        data = data.dup
         data = data[ filter.options[ :root ] ] if filter.options[ :root ]
         keeps = {}
         ( filter.options[ :keep ] || [] ).each do |k|
-          keeps[ k.to_s ] = data[ k.to_s ] || data[ k.to_sym ]
+          keep = data[ k.to_s ] || data[ k.to_sym ]
+          keeps[ k.to_s ] = data.delete( k.to_s ) || data.delete( k.to_sym ) unless keep.is_a? Hash
+        end
+        filtered_data = filter.filter( data )
+        ( filter.options[ :keep ] || [] ).each do |k|
+          keeps[ k.to_s ] = filtered_data.delete( k.to_s ) || filtered_data.delete( k.to_sym ) unless keeps.member?( k.to_s )
         end
-        [ filter.filter( data ), keeps ]
+        [ filtered_data, keeps ]
       end
 
       def new( data )
@@ -74,4 +81,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/spec/#model_filter_spec.rb#

@@ -0,0 +1,211 @@
+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

data/spec/hash_filter_spec.rb

@@ -97,4 +97,11 @@ describe Ixtlan::Babel::HashFilter do
     result = deserializer.from_json(json, :include => { 'address' => {}, 'phone_numbers' => { :include => ['area']}})
     result.must_equal data
   end
+
+  it 'should convert elements from arrays wth custom serializer' do
+    serializer.add_custom_serializers( "Symbol" => Proc.new {|v| v.to_s.capitalize } )
+    data['children_names'] = [:adi, :aromal, :shreedev]
+    d = serializer.to_hash(:include => [ :children_names ])
+    d[ "children_names"].must_equal( ["Adi", "Aromal", "Shreedev"] )
+  end
 end

data/spec/model_filter_spec.rb

@@ -28,6 +28,7 @@ class Person
   attribute :name, String
   attribute :address, Address
   attribute :phone_numbers, Array[PhoneNumber]
+  attribute :children_names, Array[Symbol]
 end
 
 describe Ixtlan::Babel::ModelFilter do
@@ -40,7 +41,8 @@ describe Ixtlan::Babel::ModelFilter do
         :prefix => 12, 
         :number => '123',
         :area => Area.new( :code => '001', :iso => 'us' )
-      )]
+      )],
+      :children_names => [:adi, :aromal, :shreedev]
     )
   end
 
@@ -199,4 +201,10 @@ describe Ixtlan::Babel::ModelFilter do
     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

data/spec/params_filter_spec.rb

@@ -41,7 +41,7 @@ describe Ixtlan::Babel::ParamsFilter do
 
   it 'should filter a hash with keep' do
     json = filter.use( :keep => ['id'] ).filter_it( data )
-    json[0].must_equal Hash[ 'id' => data['id'], 'name' => data['name'] ]
+    json[0].must_equal Hash[ 'name' => data['name'] ]
     json[1].must_equal Hash[ 'id' => data['id'] ]
   end
 

metadata

@@ -2,14 +2,14 @@
 name: ixtlan-babel
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -127,6 +127,7 @@ 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