arrest 0.0.74 → 0.0.75

data/lib/arrest/abstract_resource.rb

@@ -237,6 +237,8 @@ module Arrest
       @child_collections = {}
       @views = {}
       @belongs_tos = {}
+      @ids_collections = {}
+      @has_many_collections = {}
       hash = internal_reload
       self.attributes= hash
     end

data/lib/arrest/helper/has_view.rb

@@ -19,7 +19,7 @@ module Arrest
           @views ||= {}
           @views[method_name] ||= begin
 
-            r = self.class.source().get_one(self.context, "#{self.resource_path}/#{id}/#{method_name}")
+            r = self.class.source().get(self.context, "#{self.resource_path}/#{id}/#{method_name}")
             r = self.class.body_root(r)
 
             Arrest::Source.mod.const_get(clazz).new(self.context, r)

data/lib/arrest/helper/ids_collection.rb

@@ -20,7 +20,7 @@ module Arrest
     def collection
       unless @collection
 
-        r = @parent.class.source().get_one(@parent.context, "#{@url}")
+        r = @parent.class.source().get(@parent.context, "#{@url}")
         @collection = @parent.class.body_root(r)
 
       end

data/lib/arrest/http_source.rb

@@ -25,11 +25,11 @@ module Arrest
       hds
     end
 
-    def get_one(context, sub, filter={})
+    def get(context, sub, filter={})
       sub = fix_url_encode(sub)
       profiler_status_str = ""
       ::ActiveSupport::Notifications.instrument("http.sgdb",
-                                            :method => :get, :url => sub, :status => profiler_status_str) do
+                                                :method => :get, :url => sub, :status => profiler_status_str) do
         headers = nil
         response = self.connection().get do |req|
           req.url(sub, filter)
@@ -48,31 +48,6 @@ module Arrest
       end
     end
 
-    # FIXME (bk, at) : seems to be identical to get_one - prepare to refactor
-    def get_many(context, sub, filter={})
-      sub = fix_url_encode(sub)
-      profiler_status_str = ""
-      ::ActiveSupport::Notifications.instrument("http.sgdb",
-                                            :method => :get, :url => sub, :status => profiler_status_str) do
-        headers = nil
-        response = self.connection().get do |req|
-          req.url(sub, filter)
-          headers = add_headers(context, req.headers)
-        end
-        rql = RequestLog.new(:get, "#{sub}#{hash_to_query filter}", nil, headers)
-        rsl = ResponseLog.new(response.env[:status], response.body)
-        Arrest::Source.call_logger.log(rql, rsl)
-        if response.env[:status] == 401
-          raise Errors::PermissionDeniedError.new(response.body)
-        elsif response.env[:status] != 200
-          raise Errors::DocumentNotFoundError
-        end
-        profiler_status_str << response.env[:status].to_s
-        response.body
-      end
-    end
-
-
     def delete_all(context, resource_path)
       headers = nil
       response = self.connection().delete do |req|
@@ -107,13 +82,6 @@ module Arrest
       end
     end
 
-    def put_sub_resource(rest_resource, sub_url, ids)
-      location = "#{rest_resource.resource_location}/#{sub_url}"
-      body = ids.to_json
-
-      internal_put(rest_resource, location, body)
-    end
-
     def put(context, rest_resource)
       raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       hash = rest_resource.to_jhash
@@ -125,9 +93,6 @@ module Arrest
       internal_put(rest_resource, rest_resource.resource_location, body)
     end
 
-
-
-
     def internal_put(rest_resource, location, body)
       profiler_status_str = ""
       ::ActiveSupport::Notifications.instrument("http.sgdb",

data/lib/arrest/mem_source.rb

@@ -114,7 +114,7 @@ module Arrest
       wrap id_list, id_list.length
     end
 
-    def get_many(context,sub, filters = {})
+    def get(context,sub, filters = {})
       Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
 
@@ -130,7 +130,7 @@ module Arrest
       wrap collection_json(objects), id_list.length
     end
 
-    def get_one(context, sub, filters = {})
+    def get(context, sub, filters = {})
       Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
       idx = sub.rindex '/'
@@ -252,35 +252,6 @@ module Arrest
       end
     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
-
-      @@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(context, rest_resource)
       raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       old = @@all_objects[rest_resource.id]

data/lib/arrest/rest_child.rb

@@ -23,7 +23,7 @@ module Arrest
       def all_for(parent)
         raise "Parent has no id yet" unless parent.id
         begin
-          body_root(source().get_many(parent.context, self.resource_path_for(parent))).map do |h|
+          body_root(source().get(parent.context, self.resource_path_for(parent))).map do |h|
             self.build(parent, h)
           end
         rescue Arrest::Errors::DocumentNotFoundError
@@ -36,7 +36,7 @@ module Arrest
       end
 
       def find_for(context, parent, id)
-        r = source().get_one(context, "#{self.resource_path_for(parent)}/#{id}")
+        r = source().get(context, "#{self.resource_path_for(parent)}/#{id}")
         body = body_root(r)
         self.build(parent, body)
       end
@@ -62,7 +62,7 @@ module Arrest
         else
           send :define_singleton_method, name do |parent|
             raise "Parent has no id yet" unless parent.id
-            body_root(source().get_many(parent.context, self.scoped_path_for(parent, name))).map do |h|
+            body_root(source().get(parent.context, self.scoped_path_for(parent, name))).map do |h|
               self.build(parent, h)
             end
           end

data/lib/arrest/root_resource.rb

@@ -11,7 +11,7 @@ module Arrest
       # in a hash combined with metadata
       def by_url(context, url)
         begin
-          response = source().get_many(context, url)
+          response = source().get(context, url)
           parsed_hash = JSON.parse(response)
           result_count = parsed_hash['result_count']
           body = body_root(response)
@@ -48,7 +48,7 @@ module Arrest
         end
 
         full_resource_path = "#{self.resource_path}/#{id}"
-        r = source().get_one(context, full_resource_path)
+        r = source().get(context, full_resource_path)
         body = body_root(r)
         if body == nil || body.empty?
           Arrest::logger.info "DocumentNotFoundError for #{full_resource_path}"
@@ -105,7 +105,7 @@ module Arrest
       def stub(context, stub_id)
         n = self.new(context)
         n.initialize_has_attributes({:id => stub_id}) do
-          r = n.class.source().get_one(@context, "#{self.resource_path}/#{stub_id}")
+          r = n.class.source().get(@context, "#{self.resource_path}/#{stub_id}")
           body = n.class.body_root(r)
           n.init_from_hash(body, true)
         end

data/lib/arrest/single_resource.rb

@@ -4,7 +4,7 @@ module Arrest
   class SingleResource < RootResource
     class << self
       def load(context)
-        r = source().get_one(context, "#{self.resource_path}")
+        r = source().get(context, "#{self.resource_path}")
         body = body_root(r)
         if body == nil || body.empty?
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}"

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.74"
+  VERSION = "0.0.75"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.74
+  version: 0.0.75
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000Z
+date: 2012-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21738300 !ruby/object:Gem::Requirement
+  requirement: &24274620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21738300
+  version_requirements: *24274620
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &21737800 !ruby/object:Gem::Requirement
+  requirement: &24274120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *21737800
+  version_requirements: *24274120
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &21737280 !ruby/object:Gem::Requirement
+  requirement: &24273620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *21737280
+  version_requirements: *24273620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21736800 !ruby/object:Gem::Requirement
+  requirement: &24273160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21736800
+  version_requirements: *24273160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21735740 !ruby/object:Gem::Requirement
+  requirement: &24272780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21735740
+  version_requirements: *24272780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21735160 !ruby/object:Gem::Requirement
+  requirement: &24272320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21735160
+  version_requirements: *24272320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21734420 !ruby/object:Gem::Requirement
+  requirement: &24271820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *21734420
+  version_requirements: *24271820
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &21733840 !ruby/object:Gem::Requirement
+  requirement: &24271400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21733840
+  version_requirements: *24271400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &21733380 !ruby/object:Gem::Requirement
+  requirement: &24270940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21733380
+  version_requirements: *24270940
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &21732900 !ruby/object:Gem::Requirement
+  requirement: &24270520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21732900
+  version_requirements: *24270520
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com