arrest 0.0.35 → 0.0.36

data/lib/arrest/abstract_resource.rb

@@ -197,13 +197,8 @@ module Arrest
         end
 
         send :define_method, method_name do
-          if @child_collections == nil
-            @child_collections = {}
-          end
-          if @child_collections[method_name] == nil
-            @child_collections[method_name]  = ChildCollection.new(self, (StringUtils.classify (StringUtils.singular clazz_name)))
-          end
-
+          @child_collections ||= {}
+          @child_collections[method_name] ||= ChildCollection.new(self, (StringUtils.classify (StringUtils.singular clazz_name)))
           @child_collections[method_name]
         end
       end
@@ -213,7 +208,6 @@ module Arrest
         class_eval "def #{method_name}; self.parent; end"
       end
 
-
       def scope(name, options = {}, &block)
         if @scopes == nil
           @scopes = []
@@ -284,7 +278,9 @@ module Arrest
 
     def reload
       @has_many_collections = {}
-      internal_reload
+      @child_collections = {}
+      hash = internal_reload
+      self.attributes= hash
     end
 
     def new_record?

data/lib/arrest/attributes/has_attributes.rb

@@ -188,11 +188,5 @@ module Arrest
       @stubbed
     end
 
-    protected
-    def internal_reload
-      hash = self.class.find(self.context, self.id).to_hash
-      self.attributes= hash
-    end
-
   end
 end

data/lib/arrest/rest_child.rb

@@ -16,11 +16,10 @@ module Arrest
         (resource_path_for parent) + '/' + scope_name.to_s
       end
 
-      def build parent, hash
+      def build(parent, hash)
         self.new(parent.context, parent, hash)
       end
 
-
       def all_for(parent)
         raise "Parent has no id yet" unless parent.id
         begin
@@ -36,10 +35,10 @@ module Arrest
         raise "find cannot be executed for child resources - use find_for with a parent"
       end
 
-      def find_for(context, parent,id)
+      def find_for(context, parent, id)
         r = source().get_one(context, "#{self.resource_path_for(parent)}/#{id}")
         body = body_root(r)
-        self.build(body)
+        self.build(parent, body)
       end
 
       def filter name, &aproc
@@ -58,7 +57,7 @@ module Arrest
         super name
         if block_given?
           send :define_singleton_method, name do |parent|
-            self.all_for(parent).select &block 
+            self.all_for(parent).select &block
           end
         else
           send :define_singleton_method, name do |parent|
@@ -87,7 +86,12 @@ module Arrest
       raise "stubbing for child resource isnt supported yet"
     end
 
-
+    protected
+    def internal_reload
+      @parent.reload
+      self.class.find_for(self.context, self.parent, self.id).to_hash
+    end
   end
 end
 
+

data/lib/arrest/root_resource.rb

@@ -111,7 +111,6 @@ module Arrest
         n
       end
 
-
       def delete_all(context)
         source().delete_all(context, self.resource_path)
       end
@@ -125,6 +124,10 @@ module Arrest
       self.class.resource_path + '/' + self.id.to_s
     end
 
+    protected
+    def internal_reload
+      self.class.find(self.context, self.id).to_hash
+    end
   end
 end
 

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.35"
+  VERSION = "0.0.36"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17815000 !ruby/object:Gem::Requirement
+  requirement: &22880140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17815000
+  version_requirements: *22880140
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &17814280 !ruby/object:Gem::Requirement
+  requirement: &22879620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *17814280
+  version_requirements: *22879620
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &17813440 !ruby/object:Gem::Requirement
+  requirement: &22878840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *17813440
+  version_requirements: *22878840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17812760 !ruby/object:Gem::Requirement
+  requirement: &22878180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *17812760
+  version_requirements: *22878180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17812180 !ruby/object:Gem::Requirement
+  requirement: &22877620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17812180
+  version_requirements: *22877620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17811700 !ruby/object:Gem::Requirement
+  requirement: &22877160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17811700
+  version_requirements: *22877160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17811180 !ruby/object:Gem::Requirement
+  requirement: &22876660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *17811180
+  version_requirements: *22876660
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &17810700 !ruby/object:Gem::Requirement
+  requirement: &22876200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17810700
+  version_requirements: *22876200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17810220 !ruby/object:Gem::Requirement
+  requirement: &22875660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17810220
+  version_requirements: *22875660
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &17809620 !ruby/object:Gem::Requirement
+  requirement: &22875120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17809620
+  version_requirements: *22875120
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com