arrest 0.0.21 → 0.0.23

data/lib/arrest/abstract_resource.rb

@@ -6,6 +6,45 @@ require 'active_model'
 Scope = Struct.new(:name, :block)
 
 module Arrest
+
+  class RequestContext
+    attr_accessor :header_decorator
+  end
+
+  class ScopedRoot
+    attr_accessor :context
+
+    def initialize(context = Arrest::RequestContext.new())
+      @context = context
+    end
+
+    def self.register_resource(clazz)
+      send :define_method, ClassUtils.simple_name(clazz) do ||
+        proxy = clazz.mk_proxy(self)
+        proxy
+      end
+    end
+
+    def get_context
+      @context
+    end
+  end
+
+  class ResourceProxy
+    def initialize(resource, context_provider)
+      @resource = resource
+      @context_provider = context_provider
+    end
+
+
+    def method_missing(*args, &block)
+      params = [@context_provider.get_context]
+      params += args.drop(1)
+      @resource.send(args.first, *params)
+    end
+
+  end
+
   class AbstractResource
     extend ActiveModel::Naming
     include ActiveModel::Validations
@@ -13,9 +52,19 @@ module Arrest
     include HasAttributes
     attribute :id, String
 
+    attr_accessor :context
+
     class << self
       attr_reader :scopes
 
+      def inherited(child)
+        ScopedRoot::register_resource(child)
+      end
+
+      def mk_proxy(context_provider)
+        ResourceProxy.new(self, context_provider)
+      end
+
       def source
         Arrest::Source::source
       end
@@ -33,8 +82,7 @@ module Arrest
       end
 
       def build(hash)
-        resource = self.new(hash, true)
-
+        resource = self.new(@context, hash, true)
         resource
       end
 
@@ -46,7 +94,7 @@ module Arrest
        if @custom_resource_name
          @custom_resource_name
        else
-         StringUtils.plural self.name.sub(/.*:/,'').downcase
+         StringUtils.plural(self.name.sub(/.*:/,'').downcase)
        end
       end
 
@@ -148,7 +196,8 @@ module Arrest
 
     attr_accessor :id
 
-    def initialize(hash={}, from_json = false)
+    def initialize(context, hash={}, from_json = false)
+      @context = context
       initialize_has_attributes(hash, from_json)
     end
 
@@ -156,14 +205,14 @@ module Arrest
       if Source.skip_validations || self.valid?
         req_type = new_record? ? :post : :put
 
-        success = !!AbstractResource::source.send(req_type, self)
+        success = !!AbstractResource::source.send(req_type, @context, self)
 
         if success
           # check for sub resources in case of n:m relationships
           self.class.all_fields.find_all{|f| f.is_a?(HasManySubResourceAttribute)}.each do |attr|
             ids = self.send(attr.name) # get ids_field e.g. for team has_many :users get 'self.user_ids'
             srifn = attr.sub_resource_field_name
-            result = !!AbstractResource::source.put_sub_resource(self, srifn, ids)
+            result = !!AbstractResource::source.put_sub_resource( self, srifn, ids)
             return false if !result
           end
           return true
@@ -177,7 +226,7 @@ module Arrest
     end
 
     def delete
-      AbstractResource::source().delete self
+      AbstractResource::source().delete(@context, self)
       true
     end
 

data/lib/arrest/attributes/attribute.rb

@@ -8,7 +8,7 @@ module Arrest
       @json_name = Source.json_key_converter.key_to_json(name).to_sym
     end
 
-    def from_hash value
+    def from_hash(parent, value)
       return if value == nil
       converter = CONVERTER[@clazz]
       if converter == nil
@@ -28,4 +28,4 @@ module Arrest
       converter.mk_json value
     end
   end
-end
+end

data/lib/arrest/attributes/belongs_to.rb

@@ -51,9 +51,9 @@ module Arrest
 
           begin
             if polymorphic
-              Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(val.id)
+              Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(self.context, val.id)
             else
-              Arrest::Source.mod.const_get(class_name).find(val)
+              Arrest::Source.mod.const_get(class_name).find(self.context, val)
             end
           rescue Errors::DocumentNotFoundError => e
             raise Errors::DocumentNotFoundError, "Couldnt find a #{class_name} with id #{val}"

data/lib/arrest/attributes/converter.rb

@@ -9,11 +9,11 @@ module Arrest
       super name, read_only, clazz
     end
 
-    def from_hash value
+    def from_hash(parent, value)
       return nil unless value != nil
       raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
       value.map do |v|
-        @clazz.new v
+        @clazz.new(parent, v)
       end
     end
 

data/lib/arrest/attributes/has_attributes.rb

@@ -10,10 +10,12 @@ module Arrest
       else
         @stubbed = false
       end
+      raise "hash expected but got #{hash.class}" unless hash.is_a?(Hash)
       init_from_hash(hash, from_json)
     end
 
     def initialize(hash = {}, from_json = false, &blk)
+      raise "hash expected but got #{hash.class}" unless hash.is_a?(Hash)
       if block_given?
         @stubbed = true
         @load_blk = blk
@@ -27,6 +29,7 @@ module Arrest
     end
 
     def init_from_hash(as_i={}, from_json = false)
+      raise "hash expected but got #{as_i.class}" unless as_i.is_a?(Hash)
       @attribute_values = {} unless @attribute_values != nil
       as = {}
       as_i.each_pair do |k,v|
@@ -39,7 +42,7 @@ module Arrest
           key = field.name
         end
         value = as[key]
-        converted = field.from_hash(value)
+        converted = field.from_hash(self, value)
         self.send(field.name.to_s + '=', converted) unless converted == nil
       end
     end
@@ -51,7 +54,7 @@ module Arrest
         matching_fields = fields.find_all{|f| f.name.to_s == k.to_s}
         field = matching_fields.first
         if field
-          converted = field.from_hash(v)
+          converted = field.from_hash(self, v)
           self.send("#{k}=", converted)
         end
       end

data/lib/arrest/attributes/has_many_sub_resource_attribute.rb

@@ -16,9 +16,9 @@ module Arrest
       @name
     end
 
-    def from_hash(value)
+    def from_hash(parent, value)
       return [] if value == nil
-      super_from_hash(value)
+      super_from_hash(parent, value)
     end
   end
 end

data/lib/arrest/attributes/nested_attribute.rb

@@ -4,9 +4,9 @@ module Arrest
       super name, read_only, clazz
     end
 
-    def from_hash value
+    def from_hash(parent, value)
       return nil unless value != nil
-      @clazz.new value
+      @clazz.new(parent, value)
     end
 
     def to_hash val
@@ -14,4 +14,4 @@ module Arrest
       val.to_hash
     end
   end
-end
+end

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -10,5 +10,10 @@ module Arrest
     def initialize name, read_only
       super name, read_only, Ref
     end
+
+    def from_hash(parent, value)
+      return nil unless value != nil
+      @clazz.new(value)
+    end
   end
-end
+end

data/lib/arrest/helper/has_many_collection.rb

@@ -12,7 +12,7 @@ module Arrest
 
     def build attributes = {}
       extended_attrs = attributes.merge({@foreign_key_name => @parent.id})
-      resolved_class.new extended_attrs
+      resolved_class.new(@parent.context, extended_attrs)
     end
 
     def method_missing(*args, &block)
@@ -28,7 +28,7 @@ module Arrest
     def children
       if @children == nil
         url = @parent.resource_location + '/' + @url_part.to_s
-        @children = resolved_class.by_url(url)
+        @children = resolved_class.by_url(@parent.context, url)
       end
       @children
     end

data/lib/arrest/http_source.rb

@@ -13,16 +13,18 @@ module Arrest
       @base
     end
 
-    def add_headers(headers)
-      Arrest::Source.header_decorator.headers.each_pair do |k,v|
+    def add_headers(context,headers)
+      decorator = context.header_decorator if context
+      decorator ||= Arrest::Source.header_decorator
+      decorator.headers.each_pair do |k,v|
         headers[k.to_s] = v.to_s
       end
     end
 
-    def get_one(sub, filter={})
+    def get_one(context, sub, filter={})
       response = self.connection().get do |req|
         req.url(sub, filter)
-        add_headers(req.headers)
+        add_headers(context, req.headers)
       end
       rql = RequestLog.new(:get, "#{sub}#{hash_to_query filter}", nil)
       rsl = ResponseLog.new(response.env[:status], response.body)
@@ -33,14 +35,14 @@ module Arrest
       response.body
     end
 
-    def get_many_other_ids(path)
-      get_one(path)
+    def get_many_other_ids(context, path)
+      get_one(context, path)
     end
 
-    def get_many(sub, filter={})
+    def get_many(context, sub, filter={})
       response = self.connection().get do |req|
         req.url(sub, filter)
-        add_headers(req.headers)
+        add_headers(context, req.headers)
       end
       rql = RequestLog.new(:get, "#{sub}#{hash_to_query filter}", nil)
       rsl = ResponseLog.new(response.env[:status], response.body)
@@ -49,10 +51,10 @@ module Arrest
     end
 
 
-    def delete_all(resource_path)
+    def delete_all(context, resource_path)
         response = self.connection().delete do |req|
         req.url(resource_path)
-        add_headers(req.headers)
+        add_headers(context, req.headers)
       end
       rql = RequestLog.new(:delete, "#{resource_path}", nil)
       rsl = ResponseLog.new(response.env[:status], response.body)
@@ -61,11 +63,11 @@ module Arrest
       response.env[:status] == 200
     end
 
-    def delete(rest_resource)
+    def delete(context, rest_resource)
       raise "To delete an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       response = self.connection().delete do |req|
         req.url(rest_resource.resource_location)
-        add_headers(req.headers)
+        add_headers(context, req.headers)
       end
       rql = RequestLog.new(:delete, rest_resource.resource_location, nil)
       rsl = ResponseLog.new(response.env[:status], response.body)
@@ -80,7 +82,7 @@ module Arrest
       internal_put(rest_resource, location, body)
     end
 
-    def put(rest_resource)
+    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
       hash.delete(:id)
@@ -90,10 +92,13 @@ module Arrest
       internal_put(rest_resource, rest_resource.resource_location, body)
     end
 
+
+
+
     def internal_put(rest_resource, location, body)
       response = self.connection().put do |req|
         req.url(location)
-        add_headers(req.headers)
+        add_headers(rest_resource.context, req.headers)
         req.body = body
       end
       rql = RequestLog.new(:put, location, body)
@@ -105,7 +110,7 @@ module Arrest
       response.env[:status] == 200
     end
 
-    def post(rest_resource)
+    def post(context, rest_resource)
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)
       raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil
       hash = rest_resource.to_jhash
@@ -117,7 +122,7 @@ module Arrest
       body = hash.to_json
       response = self.connection().post do |req|
         req.url rest_resource.resource_path
-        add_headers req.headers
+        add_headers(context, req.headers)
         req.body = body
       end
       rql = RequestLog.new(:post, rest_resource.resource_path, body)

data/lib/arrest/mem_source.rb

@@ -97,7 +97,7 @@ module Arrest
       []
     end
 
-    def get_many_other_ids(path)
+    def get_many_other_ids(context,path)
       matcher = /^.+\/([^\/]+)\/([^\/]+)_ids$/.match(path)
       return [] unless matcher
       object_id = matcher[1]
@@ -114,7 +114,7 @@ module Arrest
       wrap id_list, id_list.length
     end
 
-    def get_many(sub, filters = {})
+    def get_many(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 sub, filters = {}
+    def get_one(context, sub, filters = {})
       Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
       idx = sub.rindex '/'
@@ -144,7 +144,7 @@ module Arrest
       wrap val.to_jhash.to_json, 1
     end
 
-    def delete_all resource_path
+    def delete_all(context, resource_path)
       id_list = Array.new(@@collections[resource_path] || [])
       id_list.each do |base_id|
         @@collections.each_pair do |k,v|
@@ -175,7 +175,7 @@ module Arrest
     end
 
 
-    def delete(rest_resource)
+    def delete(context, rest_resource)
       raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       @@all_objects.delete(rest_resource.id)
       @@collections.each_pair do |k,v|
@@ -281,7 +281,7 @@ module Arrest
       true
     end
 
-    def put(rest_resource)
+    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]
 
@@ -298,7 +298,7 @@ module Arrest
 
 
 
-    def post(rest_resource)
+    def post(context, rest_resource)
 
       Arrest::debug "post -> #{rest_resource.class.name} #{rest_resource.to_hash} #{rest_resource.class.all_fields.map(&:name)}"
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)

data/lib/arrest/nested_resource.rb

@@ -6,8 +6,15 @@ module Arrest
     include HasAttributes
     include BelongsTo
 
-    def initialize h
+    attr_reader :parent
+
+    def initialize parent, h
+      @parent = parent
       init_from_hash h
     end
+
+    def context
+      parent.context
+    end
   end
 end

data/lib/arrest/rest_child.rb

@@ -1,8 +1,8 @@
 module Arrest
   class RestChild < AbstractResource
     attr_accessor :parent
-    def initialize parent, h
-      super h
+    def initialize context, parent, h
+      super(context,h)
       @parent = parent
     end
 
@@ -17,14 +17,14 @@ module Arrest
       end
 
       def build parent, hash
-        self.new parent, hash
+        self.new(parent.context, parent, hash)
       end
 
 
-      def all_for parent
+      def all_for(parent)
         raise "Parent has no id yet" unless parent.id
         begin
-          body_root(source().get_many self.resource_path_for(parent)).map do |h|
+          body_root(source().get_many(parent.context, self.resource_path_for(parent))).map do |h|
             self.build(parent, h)
           end
         rescue Arrest::Errors::DocumentNotFoundError
@@ -32,14 +32,14 @@ module Arrest
         end
       end
 
-      def find id
+      def find(context, id)
         raise "find cannot be executed for child resources - use find_for with a parent"
       end
 
-      def find_for parent,id
-        r = source().get_one "#{self.resource_path_for(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(body)
       end
 
       def filter name, &aproc
@@ -54,7 +54,7 @@ module Arrest
         end
       end
 
-      def scope name, &block
+      def scope(name, &block)
         super name
         if block_given?
           send :define_singleton_method, name do |parent|
@@ -63,7 +63,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 self.scoped_path_for(parent, name)).map do |h|
+            body_root(source().get_many(parent.context, self.scoped_path_for(parent, name))).map do |h|
               self.build(parent, h)
             end
           end