arrest 0.0.19 → 0.0.20

data/lib/arrest.rb

@@ -7,10 +7,10 @@ require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
 require "arrest/attributes/attribute"
 require "arrest/attributes/nested_attribute"
-require "arrest/attributes/polymorphic_attribute"
 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"
 require "arrest/string_utils.rb"

data/lib/arrest/abstract_resource.rb

@@ -20,11 +20,11 @@ module Arrest
         Arrest::Source::source
       end
 
-      def body_root response
+      def body_root(response)
         if response == nil
           raise Errors::DocumentNotFoundError
         end
-        all = JSON.parse response
+        all = JSON.parse(response)
         body = all["result"]
         if body == nil
           raise Errors::DocumentNotFoundError
@@ -32,11 +32,18 @@ module Arrest
         body
       end
 
-      def build hash
-        self.new hash, true
+      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
 
-      def custom_resource_name new_name
+      def custom_resource_name(new_name)
         @custom_resource_name = new_name
       end
 
@@ -64,7 +71,7 @@ module Arrest
 
         url_part = method_name.to_s
 
-        hm_attr = create_has_many_attribute(sub_resource,
+        hm_attr = create_has_many_attribute(sub_resource, # e.g. 'team_ids' attribute for 'has_many :teams'
                                             ids_field_name,
                                             method_name,
                                             clazz_name,
@@ -72,7 +79,7 @@ module Arrest
                                             foreign_key)
         add_attribute(hm_attr)
 
-        send :define_method, method_name do
+        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
@@ -112,6 +119,7 @@ module Arrest
             clazz_name = clazz.to_s
           end
         end
+
         send :define_method, method_name do
           if @child_collections == nil
             @child_collections = {}
@@ -130,7 +138,7 @@ module Arrest
       end
 
 
-      def scope name, &block
+      def scope(name, &block)
         if @scopes == nil
           @scopes = []
         end
@@ -150,8 +158,8 @@ module Arrest
 
     attr_accessor :id
 
-    def initialize  hash={}, from_json = false
-      initialize_has_attributes hash, from_json
+    def initialize(hash={}, from_json = false)
+      initialize_has_attributes(hash, from_json)
     end
 
     def save
@@ -160,9 +168,10 @@ module Arrest
 
         success = !!AbstractResource::source.send(req_type, self)
 
-        if success # check for special sub resources
+        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)
+            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
@@ -181,7 +190,7 @@ module Arrest
       AbstractResource::source().delete self
       true
     end
-    #
+
     # convenience method printing curl command
     def curl
       hs = ""

data/lib/arrest/attributes/attribute.rb

@@ -27,5 +27,5 @@ module Arrest
       end
       converter.mk_json value
     end
-  end  
+  end
 end

data/lib/arrest/attributes/belongs_to.rb

@@ -16,7 +16,7 @@ module Arrest
           "#{name}_id"
         end
       end
-      
+
       def create_and_add_attribute(field_name, polymorphic, read_only, foreign_key, class_name)
         if polymorphic
           add_attribute(PolymorphicAttribute.new(field_name.to_sym, read_only))
@@ -24,14 +24,14 @@ module Arrest
           add_attribute(BelongsToAttribute.new(field_name.to_sym, read_only, String, foreign_key, class_name))
         end
       end
-      
+
       def belongs_to(*args)
         arg = args[0]
         name = arg.to_s.downcase
         class_name = StringUtils.classify(name)
         foreign_key = "#{StringUtils.underscore(ClassUtils.simple_name(self))}_id"
         params = args[1] unless args.length < 2
-        
+
         if params
           read_only =  params[:read_only] == true
           polymorphic = params[:polymorphic] unless params[:polymorphic] == nil
@@ -42,13 +42,13 @@ module Arrest
         field_name = create_field_name(name, params, polymorphic)
 
         create_and_add_attribute(field_name, polymorphic, read_only, foreign_key, class_name)
-        
+
         send :define_method, name do
           val = self.send(field_name)
           if val == nil || val == ""
             return nil
-          end 
-          
+          end
+
           begin
             if polymorphic
               Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(val.id)
@@ -58,7 +58,7 @@ module Arrest
           rescue Errors::DocumentNotFoundError => e
             raise Errors::DocumentNotFoundError, "Couldnt find a #{class_name} with id #{val}"
           end
-          
+
         end
       end
     end

data/lib/arrest/attributes/has_attributes.rb

@@ -3,22 +3,22 @@ module Arrest
   module HasAttributes
     attr_accessor :attribute_values
 
-    def initialize_has_attributes hash, from_json = false, &blk
+    def initialize_has_attributes(hash, from_json = false, &blk)
       if block_given?
         @stubbed = true
         @load_blk = blk
       else
         @stubbed = false
       end
-      init_from_hash hash, from_json
+      init_from_hash(hash, from_json)
     end
 
-    def initialize hash = {}, from_json = false, &blk
+    def initialize(hash = {}, from_json = false, &blk)
       if block_given?
         @stubbed = true
         @load_blk = blk
       else
-        init_from_hash hash, from_json
+        init_from_hash(hash, from_json)
       end
     end
 
@@ -26,7 +26,7 @@ module Arrest
       base.extend HasAttributesMethods
     end
 
-    def init_from_hash as_i={}, from_json = false
+    def init_from_hash(as_i={}, from_json = false)
       @attribute_values = {} unless @attribute_values != nil
       as = {}
       as_i.each_pair do |k,v|
@@ -38,12 +38,26 @@ module Arrest
         else
           key = field.name
         end
-        value = as[key] 
+        value = as[key]
         converted = field.from_hash(value)
         self.send(field.name.to_s + '=', converted) unless converted == nil
       end
     end
 
+    def update_attributes attribute_hash
+      fields = self.class.all_fields
+      field_names = fields.map(&:name)
+      attribute_hash.each_pair do |k,v|
+        matching_fields = fields.find_all{|f| f.name.to_s == k.to_s}
+        field = matching_fields.first
+        if field
+          converted = field.from_hash(v)
+          self.send("#{k}=", converted)
+        end
+      end
+      self.save
+    end
+
     def load_from_stub
       @load_blk.call
       @stubbed = false
@@ -79,7 +93,7 @@ module Arrest
         @fields = []
       end
 
-      def attribute name, clazz, attribs = {} 
+      def attribute(name, clazz, attribs = {})
         read_only = !!attribs[:read_only]
         add_attribute Attribute.new(name, read_only, clazz)
       end
@@ -90,16 +104,22 @@ module Arrest
         end
       end
 
-      def add_attribute attribute
-        if @fields == nil
-          @fields = []
-        end
-        send :define_method, "#{attribute.name}=" do |v|
-          Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
-          self.attribute_values[attribute.name] = v
+      def add_attribute(attribute)
+        @fields ||= []
+        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}"
+            self.attribute_values[attribute.name] = v
+          end
+        else
+          send :define_method, "#{attribute.name}=" do |v|
+            Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
+            self.attribute_values[attribute.name] = v
+          end
         end
         send :define_method, "#{attribute.name}" do
-          Arrest::debug "getter #{self.class.name} #{attribute.name}" 
+          Arrest::debug "getter #{self.class.name} #{attribute.name}"
           self.load_from_stub if @stubbed
           self.attribute_values[attribute.name]
         end

data/lib/arrest/attributes/has_many_sub_resource_attribute.rb

@@ -1,5 +1,7 @@
 module Arrest
   class HasManySubResourceAttribute < HasManyAttribute
+    alias :super_from_hash :from_hash
+
     def initialize(ids_field_name,
                    method_name,
                    clazz_name,
@@ -13,5 +15,10 @@ module Arrest
     def sub_resource_field_name
       @name
     end
+
+    def from_hash(value)
+      return [] if value == nil
+      super_from_hash(value)
+    end
   end
 end

data/lib/arrest/handler.rb

@@ -7,7 +7,7 @@ module Arrest
   CallLog = Struct.new(:request, :response)
 
   # The classes in this module supply default behaviour
-  # for certain processing steps in the consumttion ot the 
+  # for certain processing steps in the consumption ot the
   # rest api
   module Handlers
 
@@ -21,7 +21,23 @@ module Arrest
 
     # a converter to transform between the name of the field in
     # the json object and the name of the field in ruby code.
-    # Default behaviour is that for an underscored name in ruby
+    # Default behaviour is the identity, i.e. the very same string in
+    # JSON as in RUBY
+    class IdentityJSONKeyConverter
+      class << self
+        def key_from_json name
+          name.to_s
+        end
+
+        def key_to_json name
+          name.to_s
+        end
+      end
+    end
+
+    # a converter to transform between the name of the field in
+    # the json object and the name of the field in ruby code.
+    # Special behaviour is that for an underscored name in ruby
     # a camel cased version in json expected:
     #     ruby    ->     json
     #   started_at    startedAt

data/lib/arrest/helper/has_many_collection.rb

@@ -1,12 +1,13 @@
 module Arrest
   class HasManyCollection #< BasicObject
-    def initialize parent, has_many_attribute
+    def initialize(parent, has_many_attribute)
       @parent = parent
       @clazz_name = (StringUtils.classify(has_many_attribute.clazz_name.to_s))
       @url_part = has_many_attribute.url_part
       @children = nil
       @foreign_key_name = (StringUtils.underscore(@parent.class.name).gsub(/^.*\//, '') + '_id').to_sym
       define_filters
+      @attribute = has_many_attribute
     end
 
     def build attributes = {}

data/lib/arrest/http_source.rb

@@ -70,8 +70,7 @@ module Arrest
     end
 
     def put_sub_resource(rest_resource, sub_url, ids)
-      location = rest_resource.resource_location + "/#{sub_url}"
-      #body = {sub_url => ids}.to_json
+      location = "#{rest_resource.resource_location}/#{sub_url}"
       body = ids.to_json
 
       internal_put(rest_resource, location, body)

data/lib/arrest/mem_source.rb

@@ -1,20 +1,20 @@
 module Arrest
-  
+
   Edge = Struct.new(:foreign_key, :name, :id, :tail)
-  
+
   class MemSource
 
     attr_accessor :data
-    
+
 
     @@all_objects = {} # holds all objects of all types,
                        # each having a unique id
 
     @@collections = {} # maps urls to collections of ids of objects
-    
-    # For every has_many relation 
+
+    # For every has_many relation
     @@edge_matrix = {} # matrix of edges based on node ids for has_many and belongs_to relations
-    
+
     @@data = {}
 
     def objects
@@ -32,7 +32,7 @@ module Arrest
     def edge_matrix
       @@edge_matrix
     end
-    
+
     def edge_count
       @@edge_matrix.values.inject(0){|sum, edges| sum + edges.length }
     end
@@ -40,7 +40,7 @@ module Arrest
     def node_count
       @@edge_matrix.length
     end
-    
+
     def initialize
       @@all_objects = {} # holds all objects of all types,
 
@@ -100,7 +100,7 @@ module Arrest
     def get_many(sub, filters = {})
       Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
-      
+
       id_list = parse_for_has_many_relations(sub)
       if id_list.empty?
         id_list = @@collections[sub] || []
@@ -126,7 +126,7 @@ module Arrest
       end
       wrap val.to_jhash.to_json, 1
     end
-    
+
     def delete_all resource_path
       id_list = Array.new(@@collections[resource_path] || [])
       id_list.each do |base_id|
@@ -137,7 +137,7 @@ module Arrest
         remove_edges(@@edge_matrix, base_id)
       end
     end
-    
+
     def collection_json values
       single_jsons = values.map do |v|
         v.to_jhash.to_json
@@ -173,12 +173,12 @@ module Arrest
         out_edges = edge_matrix[id].find_all{|edge| edge.tail}
         in_edges_to_delete = out_edges.map do |out_edge|
           foreign_edges = edge_matrix[out_edge.id] # the edge set of the foreign node that this node points to
-          has_many_back_edges = foreign_edges.find_all do |for_edge| 
+          has_many_back_edges = foreign_edges.find_all do |for_edge|
             for_edge.id == id && for_edge.foreign_key == out_edge.foreign_key
           end
           [has_many_back_edges.first, out_edge.id] # first element may be nil
         end
-        
+
         in_edges_to_delete.each do |tupel|
           if tupel[0]
             edge_matrix[tupel[1]].delete_if{|e| e.id == tupel[0].id && e.foreign_key == tupel[0].foreign_key}
@@ -200,7 +200,7 @@ module Arrest
 
     def identify_and_store_edges(edge_matrix, rest_resource)
       from_id = rest_resource.id
-      
+
       rest_resource.class.all_fields.each do |attr|
         if attr.is_a?(Arrest::HasManyAttribute)
           to_ids = rest_resource.send(attr.name) # -> foo_ids
@@ -225,7 +225,7 @@ module Arrest
             return if hm_candidates.empty?
             has_many_node = hm_candidates.first
             url_part = has_many_node.url_part
-  
+
             edge_matrix[from_id] ||= Set.new()
             edge_matrix[from_id].add(Edge.new(foreign_key, url_part, to_id, true))
             edge_matrix[to_id] ||= Set.new()
@@ -235,13 +235,18 @@ module Arrest
       end
     end
 
+    def put_sub_resource(rest_resource, sub_url, ids)
+      location = "#{rest_resource.resource_location}/#{sub_url}"
+      body = ids.to_json
+      @@collections[location] = body
+    end
 
     def put(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]
-      
+
       remove_outgoing_edges(@@edge_matrix, old.id)
-      
+
       rest_resource.class.all_fields.each do |f|
         old.send("#{f.name}=", rest_resource.send(f.name))
       end
@@ -252,8 +257,9 @@ module Arrest
     end
 
 
+
     def post(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=)
       raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil

data/lib/arrest/root_resource.rb

@@ -7,7 +7,7 @@ module Arrest
         "#{self.resource_name}"
       end
 
-      def by_url url
+      def by_url(url)
         begin
           body = body_root(source().get_many(url))
         rescue Arrest::Errors::DocumentNotFoundError
@@ -20,9 +20,9 @@ module Arrest
         end
       end
 
-      def all filter={}
+      def all(filter={})
         begin
-          body = body_root(source().get_many self.resource_path, filter)
+          body = body_root(source().get_many(self.resource_path, filter))
         rescue Arrest::Errors::DocumentNotFoundError
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path} gracefully returning []"
           return []
@@ -40,10 +40,10 @@ module Arrest
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}"
           raise Errors::DocumentNotFoundError.new
         end
-        self.build body
+        self.build(body)
       end
 
-      def find id
+      def find(id)
         if id == nil || "" == id
           Arrest::logger.info "DocumentNotFoundError: no id given"
           raise Errors::DocumentNotFoundError.new
@@ -97,7 +97,7 @@ module Arrest
         super(name)
         if block_given?
           send :define_singleton_method, name do
-            self.all.select &block 
+            self.all.select &block
           end
         else
           send :define_singleton_method, name do
@@ -122,8 +122,8 @@ module Arrest
         end
         n
       end
-      
-      
+
+
       def delete_all
         source().delete_all(self.resource_path)
       end
@@ -134,7 +134,7 @@ module Arrest
     end
 
     def resource_location
-      self.class.resource_path + '/' + self.id.to_s 
+      self.class.resource_path + '/' + self.id.to_s
     end
 
   end

data/lib/arrest/source.rb

@@ -53,7 +53,7 @@ module Arrest
   Source.mod = nil
   Source.header_decorator = Handlers::HeaderDecorator
   Source.debug = false
-  Source.json_key_converter = Handlers::KeyConverter
+  Source.json_key_converter = Handlers::IdentityJSONKeyConverter
   Source.error_handler = Handlers::ErrorHandler
   Source.call_logger = Handlers::CallLogger
   Source.skip_validations = false

data/lib/arrest/version.rb

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

data/test/models.rb

@@ -18,7 +18,7 @@ class Animal < Arrest::RestChild
   attribute :kind, String
   attribute :age, Integer
   attribute :male, Boolean
-  
+
   parent :zoo
 
   scope :server_males_only
@@ -34,7 +34,7 @@ end
 class SpecialZoo < Zoo
   custom_resource_name :zoo3000
   read_only_attributes({ :ro2 => String})
-  attributes({ 
+  attributes({
     :is_magic => Boolean,
     :opened_at => Time
   })
@@ -113,8 +113,8 @@ class Comment < Arrest::RootResource
                                              :comb => "CommentableB" }
 end
 class ExtendedComment < Comment
-  belongs_to :other_commentable, 
-             :field_name => "special_commentable_ref", 
+  belongs_to :other_commentable,
+             :field_name => "special_commentable_ref",
              :polymorphic => { :comc => :CommentableC }
 end
 
@@ -122,7 +122,7 @@ class DeleteMeAll < Arrest::RootResource
 end
 
 class Foo < Arrest::RootResource
-  has_many :bars#, :class_name => :Bar, :foreign_key => defaults to bar_id 
+  has_many :bars#, :class_name => :Bar, :foreign_key => defaults to bar_id
   has_many :other_bars, :class_name => :Bar, :foreign_key => :common_key
 end
 class Bar < Arrest::RootResource
@@ -130,3 +130,7 @@ class Bar < Arrest::RootResource
   belongs_to :foo# foreign key defaults to class name, {:foreign_key => bar_id}
   belongs_to :other_foo, {:class_name => Foo, :foreign_key => :common_key}#, :foreign_key => :other_foo_key
 end
+
+class BarWithHasManySubResource < Arrest::RootResource
+  has_many :foos, :sub_resource => true
+end

data/test/nested_resource.rb

@@ -18,7 +18,7 @@ class NestedResourcesTest < Test::Unit::TestCase
     input = {
       :parent_name => 'parent',
       :bool => false,
-      :nested_object => { 
+      :nested_object => {
         :name => 'iamnested',
         :underscore_name => 'foo',
         :bool => true
@@ -37,7 +37,7 @@ class NestedResourcesTest < Test::Unit::TestCase
     input = {
       :parent_name => 'parent',
       :bool => false,
-      :nested_object => { 
+      :nested_object => {
         :name => 'iamnested',
         :underscore_name => 'foo',
         :bool => true
@@ -55,13 +55,13 @@ class NestedResourcesTest < Test::Unit::TestCase
       :parent_name => 'parent',
       :bool => false,
       :nested_objects => [
-        { 
+        {
         :name => 'iamnested_one',
         :bool => true
-        },{ 
+        },{
         :name => 'iamnested_two',
         :bool => false
-        } 
+        }
       ]
     }
 
@@ -71,14 +71,14 @@ class NestedResourcesTest < Test::Unit::TestCase
 
   end
 
-  def test_belongd_to_to_hash
+  def test_belongs_to_to_hash
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
 
     input = {
       :parent_name => 'parent',
       :bool => false,
-      :nested_object => { 
+      :nested_object => {
         :name => 'iamnested',
         :bool => true,
         :zoo_id => new_zoo.id
@@ -105,7 +105,7 @@ class NestedResourcesTest < Test::Unit::TestCase
     assert_not_nil c.id, "Persisted object should have id"
     assert_equal  "Foo", c.zoo_thing.name
     assert_equal  "Foo", c.zoo.name
-    
+
 
     assert_not_nil c.id, "Persisted zoo should have id"
     c_reloaded = CustomNamedBelongsTo.all.first

data/test/unit.rb

@@ -22,7 +22,7 @@ class FirstTest < Test::Unit::TestCase
     #assert_not_empty Arrest::RootResource.all_fields.select {|f| f.name == :id}, "RootResource should inherit id from AbstractResource"
     #assert_not_empty Zoo.all_fields.select {|f| f.name == :id}, "Zoo should inherit id field from RootResource"
   end
-  
+
   def test_create
     zoo_count_before = Zoo.all.length
     new_zoo = Zoo.new({:name => "Foo"})
@@ -85,7 +85,7 @@ class FirstTest < Test::Unit::TestCase
 
     zoo_reloaded = Zoo.find(new_zoo.id)
     assert_equal new_zoo.name, zoo_reloaded.name
-    
+
     zoo_reloaded.delete
     assert_equal zoo_count_before, Zoo.all.length
   end
@@ -115,7 +115,7 @@ class FirstTest < Test::Unit::TestCase
 
     assert_equal new_zoo_name, zoo_reloaded.name
   end
-  
+
   def test_child
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
@@ -139,7 +139,7 @@ class FirstTest < Test::Unit::TestCase
     assert_equal 1, zoo_reloaded.animals.length
     assert_equal Animal, zoo_reloaded.animals.first.class
     assert_equal 42, zoo_reloaded.animals.first.age
-    
+
     animal_reloaded = zoo_reloaded.animals.first
 
     assert_equal new_zoo.id, animal_reloaded.zoo.id
@@ -203,18 +203,18 @@ class FirstTest < Test::Unit::TestCase
   def test_read_only_attributes
     now = Time.now
     zoo = SpecialZoo.new({
-      :name => "Zoo", 
-      :ro1 => "one", 
-      :ro2 => "two", 
+      :name => "Zoo",
+      :ro1 => "one",
+      :ro2 => "two",
       :is_magic => true,
       :opened_at => now
     })
-    
+
     assert_equal "Zoo", zoo.name
     assert_equal "one", zoo.ro1
     assert_equal "two", zoo.ro2
     assert_equal true, zoo.is_magic
-     
+
     hash = zoo.to_jhash
 
     assert_nil hash[:ro1]
@@ -227,7 +227,7 @@ class FirstTest < Test::Unit::TestCase
   def test_stub_delayed_load
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
-    
+
     assert_not_nil new_zoo.id
 
     stubbed = Zoo.stub(new_zoo.id)
@@ -241,14 +241,14 @@ class FirstTest < Test::Unit::TestCase
   def test_stub_not_load_for_child_access
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
-    
+
     assert_not_nil new_zoo.id
     # this is where the magic hapens
     stubbed = Zoo.stub(new_zoo.id)
 
     new_animal = Animal.new new_zoo, {:kind => "foo", :age => 42}
     new_animal.save
-    
+
     assert stubbed.stubbed?, "Zoo should be a stub, so not loaded yet"
 
     animals = stubbed.animals
@@ -265,11 +265,11 @@ class FirstTest < Test::Unit::TestCase
   def test_root_scope
     assert_not_nil Zoo.server_scope
   end
-  
+
   def test_child_scope
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
-    
+
     assert_not_nil new_zoo.id
 
     assert_not_nil new_zoo.animals.server_males_only
@@ -319,9 +319,9 @@ class FirstTest < Test::Unit::TestCase
     p1 = ParentFilter.new({:afield => "ParentFoo"})
     p1.save
 
-    c1 = ChildFilter.new(p1, :bfield => "Foo") 
+    c1 = ChildFilter.new(p1, :bfield => "Foo")
     c1.save
-    c2 = ChildFilter.new(p1, :bfield => "Bar") 
+    c2 = ChildFilter.new(p1, :bfield => "Bar")
     c2.save
 
     reloaded_parent = ParentFilter.find(p1.id)
@@ -398,55 +398,55 @@ class FirstTest < Test::Unit::TestCase
     t = TimeClass.new(:time => now)
     assert_equal expected, t.to_jhash[:time], "This is the expected default format"
   end
-  
+
   def test_polymorphic_belongs_to
     coma = CommentableA.new()
     coma.save
     comb = CommentableB.new()
     comb.save
-    
+
     c = Comment.new(:commentable_ref => { :id => coma.id, :type => "coma"})
     result = c.commentable
     assert_equal coma.id, c.commentable_ref.id
     assert_equal result.class, CommentableA
-    
+
     c2 = Comment.new(:commentable_ref => { :id => comb.id, :type => "comb"})
     result2 = c2.commentable
     assert_equal comb.id, c2.commentable_ref.id
     assert_equal result2.class, CommentableB
   end
-  
+
   def test_polymorphic_belongs_to_extended
     coma = CommentableA.new()
     coma.save
     comc = CommentableC.new()
     comc.save
-    
-    c = ExtendedComment.new({ :special_commentable_ref => { :id => comc.id, :type => "comc"}, 
+
+    c = ExtendedComment.new({ :special_commentable_ref => { :id => comc.id, :type => "comc"},
                               :commentable_ref => { :id => coma.id, :type => "coma" }})
     assert_equal c.commentable.class, CommentableA
     assert_equal c.other_commentable.class, CommentableC
-    
+
     c.save
     c_reloaded = ExtendedComment.find(c.id)
     assert_equal comc.id, c_reloaded.special_commentable_ref.id
     assert_equal CommentableC, c_reloaded.other_commentable.class
     assert_equal CommentableA, c_reloaded.commentable.class
   end
-  
+
   def test_delete_all_root_resources
     d1 = DeleteMeAll.new()
     d1.save
     d2 = DeleteMeAll.new()
     d2.save
-    
+
     d1_rel = DeleteMeAll.find(d1.id)
     assert_not_nil d1_rel
     d2_rel = DeleteMeAll.find(d2.id)
     assert_not_nil d2_rel
     all = DeleteMeAll.all
     assert_equal 2, all.length
-    
+
     DeleteMeAll.delete_all
     all = DeleteMeAll.all
     assert_equal [], all
@@ -460,7 +460,7 @@ class FirstTest < Test::Unit::TestCase
     b1.save
     assert_equal 2, Arrest::Source.source.edge_count
     assert_equal 2, Arrest::Source.source.node_count
-    
+
     f2 = Foo.new()
     f2.save
     assert_equal 2, Arrest::Source.source.edge_count
@@ -470,7 +470,7 @@ class FirstTest < Test::Unit::TestCase
     assert_equal 2, Arrest::Source.source.edge_count
     assert_equal 3, Arrest::Source.source.node_count
   end
-  
+
   def test_has_many_matrix_in_mem_source
     f1 = Foo.new()
     f1.save
@@ -481,33 +481,33 @@ class FirstTest < Test::Unit::TestCase
 
     b1 = Bar.new({:foo_ids => [f1.id, f2.id], :foo_id => f3.id})
     b1.save
-    
+
     assert_equal 2, b1.foos.length
-    
+
     b2 = Bar.new({:foo_ids => [f2.id, f3.id], :foo_id =>f1.id})
     b2.save
-    
+
     f1.delete
-    
+
     b1_rel = Bar.find(b1.id)
     assert_equal 1, b1_rel.foos.length
     assert_equal f2.id, b1_rel.foos.first.id
-    
-    
+
+
     f2.bar_ids=[b1.id]
     f2.other_bar_ids=[b2.id]
     f2.save
     f2_rel = Foo.find(f2.id)
     assert_equal 1, f2_rel.bars.length
     assert_equal 1, f2_rel.other_bars.length
-    
+
     b2.delete
-    
+
     f2_rel = Foo.find(f2.id)
     assert_equal 1, f2_rel.bars.length
     assert_equal 0, f2_rel.other_bars.length
     assert_equal b1.id, f2_rel.bars.first.id
-    
+
   end
 
   def test_has_many_with_belongs_to
@@ -522,24 +522,23 @@ class FirstTest < Test::Unit::TestCase
     b1.save
     b2 = Bar.new({:other_foo_id => f2.id, :foo_id => f1.id})
     b2.save
-    
+
     f1_rel = Foo.find(f1.id)
     f2_rel = Foo.find(f2.id)
     f3_rel = Foo.find(f3.id)
-    
+
     assert_equal 1, f1_rel.bars.length
     assert_equal b1.id, f1_rel.other_bars.first.id
     assert_equal b1.id, f3_rel.bars.first.id
 
     assert_equal b2.id, f1_rel.bars.first.id
     assert_equal b2.id, f2_rel.other_bars.first.id
-    
+
     #test update
     b1.foo_id = f2.id
     b1.save
-    
-    
-    
+
+
     f3_rel = Foo.find(f3.id)
     assert f3_rel.bars.empty?
     f2_rel = Foo.find(f2.id)
@@ -574,8 +573,8 @@ class FirstTest < Test::Unit::TestCase
 
     assert_not_equal zoo1,zoo2, 'objects with different ids should not be equal'
 
-    assert_equal zoo1, zoo1, 'An object should be euqual to itself'
-    
+    assert_equal zoo1, zoo1, 'An object should be equal to itself'
+
     assert_not_equal zoo1, nil, 'Anactual object should not equal nil'
 
     zoo1_reloaded = Zoo.find(zoo1.id)
@@ -587,9 +586,30 @@ class FirstTest < Test::Unit::TestCase
     foo.id = zoo1.id
 
     assert_not_equal zoo1, foo, "Objects of different classes should not be euqal, even if they have the same id"
-    
+
     zoo1_reloaded.name = 'zoooooo'
     assert_equal zoo1, zoo1_reloaded, "Objects of the same class with the same id should be equal even if they differ in attributes (same as in rails)"
   end
+
+  def test_has_many_sub_resource_attr_setter
+    b = BarWithHasManySubResource.new()
+    b.save
+
+    assert_raise ArgumentError do
+      b.foo_ids = nil
+    end
+
+    assert_raise ArgumentError do
+      b.foo_ids = "Tralala"
+    end
+
+    b.foo_ids = []
+  end
+
+  def test_update_attribute
+    zoo1 = Zoo.new(:name => 'zoo1')
+    zoo1.update_attributes({:name => "updated"})
+    assert_equal "updated", zoo1.name
+  end
 end
 

metadata

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