arrest 0.0.67 → 0.0.68

data/lib/arrest.rb

@@ -9,8 +9,6 @@ require "arrest/attributes/attribute"
 require "arrest/attributes/nested_attribute"
 require "arrest/attributes/nested_collection"
 require "arrest/attributes/belongs_to_attribute"
-require "arrest/attributes/has_many_attribute"
-require "arrest/attributes/has_many_sub_resource_attribute"
 require "arrest/attributes/polymorphic_attribute"
 require "arrest/attributes/converter"
 require "arrest/class_utils.rb"
@@ -21,6 +19,7 @@ require "arrest/helper/filter"
 require "arrest/helper/child_collection"
 require "arrest/helper/ordered_collection"
 require "arrest/helper/has_many_collection"
+require "arrest/helper/ids_collection"
 require "arrest/helper/has_many"
 require "arrest/helper/has_view"
 require "arrest/exceptions"

data/lib/arrest/abstract_resource.rb

@@ -70,7 +70,6 @@ module Arrest
     extend ActiveModel::Naming
     include ActiveModel::Validations
     include ActiveModel::Conversion
-    include ActiveModel::Dirty
     include ActiveModel::Validations::Callbacks
     extend ActiveModel::Callbacks
     extend ActiveModel::Translation
@@ -113,14 +112,6 @@ module Arrest
 
       def build(context, hash)
         resource = self.new(context, 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_many_other_ids(context, "#{resource.resource_location}/#{attr.sub_resource_field_name}")
-          resource.send("#{attr.name}=", body_root(ids))
-        end
-        resource.clear_dirtiness()
-
         resource
       end
 
@@ -226,30 +217,13 @@ module Arrest
       initialize_has_attributes(hash, from_json)
     end
 
-    def clear_dirtiness
-      @changed_attributes.clear if @changed_attributes
-    end
-
     def save
       if Source.skip_validations || self.valid?
         req_type = new_record? ? :post : :put
-        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|
-            if !attr.sub_resource_read_only? && self.send("#{attr.name}_changed?") # check whether this 'subresource' attribute has been touched
-              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)
-              return false if !result
-            end
-          end
-          clear_dirtiness() # unset the dirtiness after saving (only used for HasManySubResourceAttributes), see ActiveModel::Dirty
-          return true
-        end
+        !!AbstractResource::source.send(req_type, @context, self)
+      else
+        false
       end
-      false
     end
 
     def save!
@@ -259,6 +233,7 @@ module Arrest
     def reload
       @child_collections = {}
       @views = {}
+      @belongs_tos = {}
       hash = internal_reload
       self.attributes= hash
     end

data/lib/arrest/attributes/belongs_to.rb

@@ -45,20 +45,22 @@ module Arrest
 
         send :define_method, name do
           val = self.send(field_name)
-          if val == nil || val == ""
+          if val.blank?
             return nil
           end
 
-          begin
-            if polymorphic
-              clazz = self.class.json_type_to_class(val.type)
-              clazz.find(self.context, val.id)
-            else
-              Arrest::Source.mod.const_get(class_name).find(self.context, val)
+          @belongs_tos ||= {}
+          @belongs_tos[name] ||=
+            begin
+              if polymorphic
+                clazz = self.class.json_type_to_class(val.type)
+                clazz.find(self.context, val.id)
+              else
+                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}"
             end
-          rescue Errors::DocumentNotFoundError => e
-            raise Errors::DocumentNotFoundError, "Couldnt find a #{class_name} with id #{val}"
-          end
 
         end
       end

data/lib/arrest/attributes/has_attributes.rb

@@ -136,24 +136,10 @@ module Arrest
       def add_attribute(attribute)
         @fields ||= []
         # define setter for attribute value
-        if (attribute.is_a?(HasManySubResourceAttribute))
-          send :define_method, "#{attribute.name}=" do |v|
-            raise ArgumentError, 'Argument is not of Array type' unless v.is_a?(Array)
-            Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
-
-            # inform ActiveModel::Dirty about dirtiness of this attribute
-            self.send("#{attribute.name}_will_change!") unless v == self.attribute_values[attribute.name]
-
-            self.attribute_values[attribute.name] = v
-          end
-        else
-          send :define_method, "#{attribute.name}=" do |v|
-            converted_v = convert(attribute, v)
-            Arrest::debug "setter #{self.class.name} #{attribute.name} = #{converted_v}"
-            self.attribute_values[attribute.name] = converted_v
-            #Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
-            #self.attribute_values[attribute.name] = v
-          end
+        send :define_method, "#{attribute.name}=" do |v|
+          converted_v = convert(attribute, v)
+          Arrest::debug "setter #{self.class.name} #{attribute.name} = #{converted_v}"
+          self.attribute_values[attribute.name] = converted_v
         end
 
         # define getter for attribute value

data/lib/arrest/helper/has_many.rb

@@ -7,54 +7,37 @@ module Arrest
     end
 
     module ClassMethods
-      def has_many(*args)
-        method_name, options = args
-        ids_field_name = (StringUtils.singular(method_name.to_s) + '_ids').to_sym
-        method_name = method_name.to_sym
-        clazz_name = StringUtils.singular(method_name.to_s)
-        foreign_key = clazz_name + "_id"
-        sub_resource = false
+      def has_many(*args)                                                                 # has_many :my_teams, :class_name => :Team
+        method_name, options = args                                                       # my_teams
+        ids_method_name = (StringUtils.singular(method_name.to_s) + '_ids').to_sym        # my_team_ids
+        method_name = method_name.to_sym                                                  # :my_teams
+
+        clazz_name = StringUtils.singular(method_name.to_s)                               # my_team
+
+        ids_method_url_part = "/" + ids_method_name.to_s                                  # /my_team_ids
+        method_url_part = "/" + method_name.to_s                                          # /my_teams
+
         read_only = false
-        url_part = "/" + method_name.to_s
         if options
-          clazz_name = options[:class_name].to_s unless options[:class_name] == nil
-          foreign_key = "#{StringUtils.underscore(clazz_name)}_id"
-          foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil
-          sub_resource = !!options[:sub_resource]
-          read_only = options[:read_only]
-          url_part = "/" + options[:url_part].to_s unless options[:url_part] == nil
+          clazz_name = options[:class_name].to_s unless options[:class_name] == nil       # :Team
+          foreign_key = "#{StringUtils.underscore(clazz_name)}_id"                        # team_id
+          foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil    # team_id
+          ids_method_url_part += "/" + options[:url_part].to_s unless options[:url_part] == nil # /my_team_ids + /my-url-part
+          method_url_part     += "/" + options[:url_part].to_s unless options[:url_part] == nil # /my_teams + /my-url-part
+          read_only = !!options[:read_only] unless options[:read_only] == nil
         end
 
-        hm_attr = create_has_many_attribute(sub_resource, # e.g. 'team_ids' attribute for 'has_many :teams'
-                                            ids_field_name,
-                                            method_name,
-                                            clazz_name,
-                                            url_part,
-                                            foreign_key,
-                                            read_only)
-        add_attribute(hm_attr)
-        send :define_method, method_name do |filter = {}|# e.g. define 'teams' method for notation 'has_many :teams'
-          HasManyCollection.new(self, self.context, clazz_name, self.resource_location + url_part.to_s, filter)
-        end
-      end
 
-      def create_has_many_attribute(sub_resource, ids_field_name, method_name,
-                                    clazz_name, url_part, foreign_key, read_only)
-        if sub_resource
-          define_attribute_methods [ids_field_name]
-          return HasManySubResourceAttribute.new(ids_field_name,
-                                                 method_name,
-                                                 clazz_name,
-                                                 url_part,
-                                                 foreign_key,
-                                                 read_only)
+        if read_only
+          send(:define_method, ids_method_name) do |filter = {}|
+            IdsCollection.new(self, self.resource_location + ids_method_url_part)
+          end
         else
-          return HasManyAttribute.new(ids_field_name,
-                                      method_name,
-                                      clazz_name,
-                                      url_part,
-                                      foreign_key,
-                                      read_only)
+          self.attribute ids_method_name.to_sym, Array
+        end
+
+        send(:define_method, method_name) do |filter = {}|
+          HasManyCollection.new(self, self.context, clazz_name, self.resource_location + method_url_part, filter)
         end
       end
     end

data/lib/arrest/helper/ids_collection.rb

@@ -0,0 +1,31 @@
+module Arrest
+  class IdsCollection
+
+    def initialize(parent, ids_url)
+      @collection = nil
+      @parent = parent
+      @url = ids_url
+    end
+
+    def method_missing(*args, &block)
+      collection.send(*args, &block)
+    end
+
+    def inspect
+      collection.inspect
+    end
+
+    private
+
+    def collection
+      unless @collection
+
+        r = @parent.class.source().get_one(@parent.context, "#{@url}")
+        @collection = @parent.class.body_root(r)
+
+      end
+      @collection
+    end
+
+  end
+end

data/lib/arrest/helper/ordered_collection.rb

@@ -19,7 +19,9 @@ module Arrest
       @sort_hash = {}
       @query_params = query_params
 
+      # FIXME (bk, at) : propagate scopes to instances as well
       define_filters
+      define_scopes
     end
 
     def build(attributes = {})
@@ -157,6 +159,18 @@ module Arrest
       end
     end
 
+    def define_scopes
+      return unless resolved_class.scopes
+      resolved_class.scopes.each do |scope|
+        resource_name = scope.options[:resource_name] || scope.name
+        self.instance_eval <<-"end_eval"
+          def #{scope.name} query_params = {}
+            OrderedCollection.new(@context, ClassUtils.simple_name(resolved_class), "#{@base_url}/#{resource_name}", query_params)
+          end
+        end_eval
+      end
+    end
+
   end
 end
 

data/lib/arrest/http_source.rb

@@ -46,6 +46,7 @@ module Arrest
       get_one(context, path)
     end
 
+    # FIXME (bk, at) : seems to be identical to get_one - prepare to refactor
     def get_many(context, sub, filter={})
       headers = nil
       response = self.connection().get do |req|
@@ -57,6 +58,8 @@ module Arrest
       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
       response.body
     end

data/lib/arrest/mem_source.rb

@@ -267,7 +267,7 @@ module Arrest
         e.name.to_s == sub_url && ids.include?(e.id)
       end
 
-      @@edge_matrix[object_id].delete_if do |e| 
+      @@edge_matrix[object_id].delete_if do |e|
         e.name.to_s == sub_url && !ids.include?(e.id)
       end
 

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.67"
+  VERSION = "0.0.68"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.67
+  version: 0.0.68
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000Z
+date: 2012-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24259220 !ruby/object:Gem::Requirement
+  requirement: &25743060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24259220
+  version_requirements: *25743060
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &24258720 !ruby/object:Gem::Requirement
+  requirement: &25742560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *24258720
+  version_requirements: *25742560
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &24258220 !ruby/object:Gem::Requirement
+  requirement: &25742060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *24258220
+  version_requirements: *25742060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24257760 !ruby/object:Gem::Requirement
+  requirement: &25741600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24257760
+  version_requirements: *25741600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24257380 !ruby/object:Gem::Requirement
+  requirement: &25741220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24257380
+  version_requirements: *25741220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24256920 !ruby/object:Gem::Requirement
+  requirement: &25740760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24256920
+  version_requirements: *25740760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24285260 !ruby/object:Gem::Requirement
+  requirement: &25740260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *24285260
+  version_requirements: *25740260
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &24284840 !ruby/object:Gem::Requirement
+  requirement: &25739840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24284840
+  version_requirements: *25739840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24284380 !ruby/object:Gem::Requirement
+  requirement: &25739380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24284380
+  version_requirements: *25739380
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &24283960 !ruby/object:Gem::Requirement
+  requirement: &25738960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24283960
+  version_requirements: *25738960
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -141,8 +141,6 @@ files:
 - lib/arrest/attributes/belongs_to_attribute.rb
 - lib/arrest/attributes/converter.rb
 - lib/arrest/attributes/has_attributes.rb
-- lib/arrest/attributes/has_many_attribute.rb
-- lib/arrest/attributes/has_many_sub_resource_attribute.rb
 - lib/arrest/attributes/nested_attribute.rb
 - lib/arrest/attributes/nested_collection.rb
 - lib/arrest/attributes/polymorphic_attribute.rb
@@ -154,6 +152,7 @@ files:
 - lib/arrest/helper/has_many.rb
 - lib/arrest/helper/has_many_collection.rb
 - lib/arrest/helper/has_view.rb
+- lib/arrest/helper/ids_collection.rb
 - lib/arrest/helper/logger.rb
 - lib/arrest/helper/ordered_collection.rb
 - lib/arrest/http_source.rb

data/lib/arrest/attributes/has_many_attribute.rb

@@ -1,18 +0,0 @@
-module Arrest
-
-  class HasManyAttribute < Attribute
-    attr_reader :method_name, :clazz_name, :url_part, :foreign_key
-    def initialize(ids_field_name,
-                   method_name,
-                   clazz_name,
-                   url_part,
-                   foreign_key,
-                   read_only = false)
-      super(ids_field_name, read_only, Array)
-      @method_name = method_name.to_sym
-      @clazz_name = clazz_name.to_sym
-      @url_part = url_part.to_sym
-      @foreign_key = foreign_key.to_sym
-    end
-  end
-end

data/lib/arrest/attributes/has_many_sub_resource_attribute.rb

@@ -1,31 +0,0 @@
-module Arrest
-  class HasManySubResourceAttribute < HasManyAttribute
-    alias :super_from_hash :from_hash
-
-    def initialize(ids_field_name,
-                   method_name,
-                   clazz_name,
-                   url_part,
-                   foreign_key,
-                   read_only)
-      # the read_only for the super constructor is set to true to avoid sending post request as ids array in JSON
-      # directly instead of modifying the ids via the sub_resource
-      super(ids_field_name, method_name, clazz_name, url_part, foreign_key, true)
-      @sub_resource_read_only = read_only
-    end
-
-    def sub_resource_field_name
-      @name
-    end
-
-    # this read only hinders the additional put to the sub resource on saving the encapsulating object
-    def sub_resource_read_only?
-      @sub_resource_read_only
-    end
-
-    def from_hash(parent, value)
-      return [] if value == nil
-      super_from_hash(parent, value)
-    end
-  end
-end