betty_resource 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cfa318752fd70e7e5dca53b694b05ed3b0c69e3
-  data.tar.gz: f0a203d324f8d3b7900b7432c8d766446e84e4e0
+  metadata.gz: 6f15b419fed1cc1e6cf1e61ee2bf9c0bdf1b0aa7
+  data.tar.gz: 20b4093a0fc07e120aaf822b45503208c38b2d5d
 SHA512:
-  metadata.gz: 3cc1dd827a3f618b113cc77ad2740db50dc82474d7be02852507d41a414697fd02891ed329d631447e3ef33f929bf7916475da3cb633bfea04a2cc07d541ad11
-  data.tar.gz: 8cebce3fed61a1facf9b0fe3a70f5b59fd75606a0b05fd3b7de9f455a1078bc0db43b1240b3475389c2f24b84d6d5d35d5bad7fca9cc7cc324309dd1c908fc92
+  metadata.gz: 15f3e06f1630cbf1ccb386566ba208d3608f349bcb29191735c9e7461e0ea0d22a54a9ef41be3d290c0cb1f3cfb26b9a430b7929c7b8275361c2bcf3082e9ce9
+  data.tar.gz: 24db37a18113f1dd2aedf90865b9925a5340a3bd1c194e516594d51d929e0e5d051d6c8ec5dc054f1732d58397a3ad959bf5c5631fe56a3bd2b34b440a23d1a8

data/lib/betty_resource/model.rb

@@ -19,11 +19,6 @@ module BettyResource
       properties.find { |p|p.name == name.to_s }
     end
 
-    def typecast(key, value)
-      property = self.property(key)
-      property ? property.typecast(value) : value
-    end
-
     def attributes
       properties.map(&:name)
     end

data/lib/betty_resource/model/property.rb

@@ -26,7 +26,7 @@ module BettyResource
         false
       end
 
-      def typecast(value)
+      def typecast(record, value)
         value
       end
 

data/lib/betty_resource/model/property/types/belongs_to.rb

@@ -5,7 +5,7 @@ module BettyResource
         module BelongsTo
           include Association
 
-          def typecast(value)
+          def typecast(record, value)
             if id = (value && value['id'])
               target_model.get(id)
             end

data/lib/betty_resource/model/property/types/has_many.rb

@@ -9,13 +9,13 @@ module BettyResource
             true
           end
 
-          def typecast(value)
+          def typecast(record, value)
             filter = {
               'operator' => 'and',
               'conditions' => [
                 'path' => [inverse_property.id, model.property(:id).id],
                 'predicate' => 'eq',
-                'criteria' => 1
+                'criteria' => record.id
               ]
             }
 

data/lib/betty_resource/model/record.rb

@@ -1,5 +1,23 @@
+module DirtyAttributes
+  module InstanceMethods
+    def initialize(record)
+      @attributes = DirtyHashy.new({}, true, self.class.attributes, record).tap do |hashy|
+        dirty_map! hashy
+        clean_up!
+      end
+    end
+  end
+end
+
 class DirtyHashy < HashWithIndifferentAccess
 
+  alias :org_initialize :initialize
+
+  def initialize(constructor = {}, map_methods = false, restricted_keys = nil, record)
+    @record = record
+    org_initialize(constructor = {}, map_methods = false, restricted_keys = nil)
+  end
+
   alias_method :regular_reader, :[]
   def [](key, mapped = false)
     typecasted(key) || set_typecasted(key, regular_reader(key, mapped))
@@ -12,7 +30,7 @@ class DirtyHashy < HashWithIndifferentAccess
   end
 
   def set_typecasted(key, value)
-    value = @model.typecast(key, value) if @model
+    value = @record.typecast(key, value) if @record
     instance_variable_set("@typecasted_#{key}", value)
   end
 
@@ -31,11 +49,16 @@ module BettyResource
         model
       end
 
+      def typecast(key, value)
+        property = self.class.property(key)
+        property ? property.typecast(self, value) : value
+      end
+
       def initialize(model, attributes = {})
         @model = model
         @id = attributes.delete(:id) || attributes.delete('id')
         @errors = {}
-        super()
+        super(self)
         self.attributes = Hash[model.attributes.map { |x| [x, nil] }].merge attributes
         self.attributes.instance_variable_set(:@model, model)
       end

data/lib/betty_resource/version.rb

@@ -1,7 +1,7 @@
 module BettyResource
   MAJOR = 0
   MINOR = 0
-  TINY  = 14
+  TINY  = 15
 
   VERSION = [MAJOR, MINOR, TINY].join('.')
 end

data/test/unit/model/test_record.rb

@@ -144,6 +144,9 @@ module Unit
         it 'should be able to fetch a has-many value' do
           group = BettyResource::Group.get(1)
           assert_equal %w(Chris Daniel), group.relations.map(&:first_name).sort
+
+          group = BettyResource::Group.get(3)
+          assert_equal %w(), group.relations.map(&:first_name).sort
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: betty_resource
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Chiel Wester
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty