arrest 0.0.20 → 0.0.21

data/lib/arrest/abstract_resource.rb

@@ -35,11 +35,6 @@ module Arrest
       def build(hash)
         resource = self.new(hash, true)
 
-        # traverse fields for subresources and fill them in
-        self.all_fields.find_all{|f| f.is_a?(HasManySubResourceAttribute)}.each do |attr|
-          ids = AbstractResource::source.get_one("#{resource.resource_location}/#{attr.sub_resource_field_name}")
-          resource.send("#{attr.name}=", body_root(ids))
-        end
         resource
       end
 
@@ -80,13 +75,8 @@ module Arrest
         add_attribute(hm_attr)
 
         send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
-          if @has_many_collections == nil
-            @has_many_collections = {}
-          end
-          if @has_many_collections[method_name] == nil
-            @has_many_collections[method_name] = HasManyCollection.new(self, hm_attr)
-          end
-
+          @has_many_collections ||= {}
+          @has_many_collections[method_name] ||= HasManyCollection.new(self, hm_attr)
           @has_many_collections[method_name]
         end
       end

data/lib/arrest/http_source.rb

@@ -33,6 +33,10 @@ module Arrest
       response.body
     end
 
+    def get_many_other_ids(path)
+      get_one(path)
+    end
+
     def get_many(sub, filter={})
       response = self.connection().get do |req|
         req.url(sub, filter)

data/lib/arrest/mem_source.rb

@@ -97,6 +97,23 @@ module Arrest
       []
     end
 
+    def get_many_other_ids(path)
+      matcher = /^.+\/([^\/]+)\/([^\/]+)_ids$/.match(path)
+      return [] unless matcher
+      object_id = matcher[1]
+      relation = matcher[2] + 's'
+      if (object_id && relation && @@edge_matrix[object_id])
+        id_list = []
+        @@edge_matrix[object_id].each do |edge|
+          if (edge.name.to_s == relation)
+            id_list << edge.id
+          end
+        end
+      end
+
+      wrap id_list, id_list.length
+    end
+
     def get_many(sub, filters = {})
       Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
@@ -236,9 +253,32 @@ module Arrest
     end
 
     def put_sub_resource(rest_resource, sub_url, ids)
+=begin
+      matcher = /^.+\/([^\/]+)\/([^\/]+)_ids$/.match(resource_path)
+      return [] unless matcher
+      object_id = matcher[1]
+      relation = matcher[2] + 's'
       location = "#{rest_resource.resource_location}/#{sub_url}"
       body = ids.to_json
-      @@collections[location] = body
+
+      @@edge_matrix[object_id] ||= []
+
+      alread_included = @@edge_matrix[object_id].find_all do |e|
+        e.name.to_s == sub_url && ids.include?(e.id)
+      end
+
+      @@edge_matrix[object_id].delete_if do |e| 
+        e.name.to_s == sub_url && !ids.include?(e.id)
+      end
+
+      need_to_create = ids - alread_included
+      need_to_create.each do |id|
+        @@edge_matrix[object_id] << Edge.new(foreign_key, url_part, id, true)
+      end
+
+
+=end
+      true
     end
 
     def put(rest_resource)

data/lib/arrest/root_resource.rb

@@ -54,7 +54,13 @@ module Arrest
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}/#{id}"
           raise Errors::DocumentNotFoundError.new
         end
-        self.build body.merge({:id => id})
+        resource = self.build body.merge({:id => id})
+        # traverse fields for subresources and fill them in
+        self.all_fields.find_all{|f| f.is_a?(HasManySubResourceAttribute)}.each do |attr|
+          ids = AbstractResource::source.get_many_other_ids("#{resource.resource_location}/#{attr.sub_resource_field_name}")
+          resource.send("#{attr.name}=", body_root(ids))
+        end
+        resource
       end
 
       def filter name, &aproc

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165537620 !ruby/object:Gem::Requirement
+  requirement: &2162871400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165537620
+  version_requirements: *2162871400
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2165536020 !ruby/object:Gem::Requirement
+  requirement: &2162870800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2165536020
+  version_requirements: *2162870800
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2165535100 !ruby/object:Gem::Requirement
+  requirement: &2162870200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2165535100
+  version_requirements: *2162870200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165534560 !ruby/object:Gem::Requirement
+  requirement: &2162869240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165534560
+  version_requirements: *2162869240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165534160 !ruby/object:Gem::Requirement
+  requirement: &2162867920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165534160
+  version_requirements: *2162867920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2165533580 !ruby/object:Gem::Requirement
+  requirement: &2162855360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165533580
+  version_requirements: *2162855360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165532960 !ruby/object:Gem::Requirement
+  requirement: &2162854620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2165532960
+  version_requirements: *2162854620
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2165532320 !ruby/object:Gem::Requirement
+  requirement: &2162853620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165532320
+  version_requirements: *2162853620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2165531160 !ruby/object:Gem::Requirement
+  requirement: &2162852820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165531160
+  version_requirements: *2162852820
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2165530080 !ruby/object:Gem::Requirement
+  requirement: &2162852180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165530080
+  version_requirements: *2162852180
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com