arrest 0.0.25 → 0.0.27

data/lib/arrest/abstract_resource.rb

@@ -19,9 +19,26 @@ module Arrest
     end
 
     def self.register_resource(clazz)
+      @classes ||= []
+      @classes << clazz
       send :define_method, ClassUtils.simple_name(clazz) do ||
         proxy = clazz.mk_proxy(self)
-        proxy
+      proxy
+      end
+    end
+
+    def self.registered_classes
+      @classes ||= []
+      @classes
+    end
+
+    def delete_all
+      self.class.registered_classes.each do |clazz|
+        begin
+          clazz.delete_all(@context)
+        rescue
+          puts "couldnt delete #{clazz.name}s"
+        end
       end
     end
 
@@ -36,7 +53,6 @@ module Arrest
       @context_provider = context_provider
     end
 
-
     def method_missing(*args, &block)
       params = [@context_provider.get_context]
       params += args.drop(1)
@@ -54,8 +70,9 @@ module Arrest
     extend ActiveModel::Naming
     include ActiveModel::Validations
     include ActiveModel::Conversion
+    include ActiveModel::Dirty
     include HasAttributes
-    attribute :id, String, {:read_only => true}
+    attribute :id, String
 
     attr_accessor :context
 
@@ -86,8 +103,16 @@ module Arrest
         body
       end
 
-      def build(hash)
-        resource = self.new(@context, hash, true)
+      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
 
@@ -96,11 +121,11 @@ module Arrest
       end
 
       def resource_name
-       if @custom_resource_name
-         @custom_resource_name
-       else
-         StringUtils.plural(self.name.sub(/.*:/,'').downcase)
-       end
+        if @custom_resource_name
+          @custom_resource_name
+        else
+          StringUtils.plural(self.name.sub(/.*:/,'').downcase)
+        end
       end
 
       def has_many(*args)
@@ -140,18 +165,19 @@ module Arrest
       def create_has_many_attribute(sub_resource, ids_field_name, method_name,
                                     clazz_name, url_part, foreign_key, read_only)
         if sub_resource
-          HasManySubResourceAttribute.new(ids_field_name,
-                                          method_name,
-                                          clazz_name,
-                                          url_part,
-                                          foreign_key)
+          define_attribute_methods [ids_field_name]
+          return HasManySubResourceAttribute.new(ids_field_name,
+                                                 method_name,
+                                                 clazz_name,
+                                                 url_part,
+                                                 foreign_key)
         else
-          HasManyAttribute.new(ids_field_name,
-                               method_name,
-                               clazz_name,
-                               url_part,
-                               foreign_key,
-                               read_only)
+          return HasManyAttribute.new(ids_field_name,
+                                      method_name,
+                                      clazz_name,
+                                      url_part,
+                                      foreign_key,
+                                      read_only)
         end
       end
 
@@ -196,8 +222,21 @@ module Arrest
       def read_only_attributes(args)
         args.each_pair do |name, clazz|
           self.send :attr_accessor,name
-          add_attribute Attribute.new(name, true, clazz)
+          add_attribute(Attribute.new(name, true, clazz))
+        end
+      end
+
+      def filters
+        @filters
+      end
+
+      def all_filters
+        all_filters = @filters
+        all_filters ||= []
+        if superclass.respond_to?('filters') && superclass.filters
+          all_fields += superclass.filters
         end
+        all_filters
       end
     end
 
@@ -210,20 +249,26 @@ 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|
-            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
+            if 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
       end

data/lib/arrest/attributes/has_attributes.rb

@@ -1,4 +1,6 @@
 require "arrest/source"
+require 'active_model'
+
 module Arrest
 
 
@@ -15,6 +17,7 @@ module Arrest
   end
 
   module HasAttributes
+
     attr_accessor :attribute_values
 
     def initialize_has_attributes(hash, from_json = false, &blk)
@@ -38,8 +41,10 @@ module Arrest
       end
     end
 
+    # enables the implicit inclusion of these methods as class methods in the including class
+    # (AbstractResource)
     def self.included(base) # :nodoc:
-      base.extend HasAttributesMethods
+      base.extend HasAttributesClassMethods
     end
 
     def init_from_hash(as_i={}, from_json = false)
@@ -61,6 +66,10 @@ module Arrest
       end
     end
 
+    def attributes
+      self.attribute_values
+    end
+
     def attributes=(attribute_hash = {})
       fields = self.class.all_fields
       field_names = fields.map(&:name)
@@ -111,8 +120,7 @@ module Arrest
       result
     end
 
-    module HasAttributesMethods
-
+    module HasAttributesClassMethods
       attr_accessor :fields
 
       def initialize
@@ -132,10 +140,15 @@ 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
@@ -144,6 +157,8 @@ module Arrest
             self.attribute_values[attribute.name] = v
           end
         end
+
+        # define getter for attribute value
         send :define_method, "#{attribute.name}" do
           Arrest::debug "getter #{self.class.name} #{attribute.name}"
           self.load_from_stub if @stubbed

data/lib/arrest/attributes/has_many_attribute.rb

@@ -1,4 +1,5 @@
 module Arrest
+
   class HasManyAttribute < Attribute
     attr_reader :method_name, :clazz_name, :url_part, :foreign_key
     def initialize(ids_field_name,

data/lib/arrest/helper/child_collection.rb

@@ -7,7 +7,7 @@ module Arrest
     end
 
     def build attributes = {}
-      resolved_class.new @parent, attributes
+      resolved_class.new(@parent.context, @parent, attributes)
     end
 
     def method_missing(*args, &block)
@@ -29,7 +29,7 @@ module Arrest
 
     def children
       if @children == nil
-        @children = resolved_class.all_for @parent
+        @children = resolved_class.all_for(@parent)
       end
       @children
     end

data/lib/arrest/http_source.rb

@@ -6,7 +6,7 @@ module Arrest
   class HttpSource
 
     attr_reader :base
-    
+
     def initialize base
       @base = base
     end
@@ -93,9 +93,9 @@ module Arrest
     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
+      insert_nulls!(rest_resource,hash)
       hash.delete(:id)
       hash.delete("id")
-      insert_nulls!(rest_resource,hash)
       body = JSON.generate(hash)
 
       internal_put(rest_resource, rest_resource.resource_location, body)

data/lib/arrest/root_resource.rb

@@ -16,10 +16,18 @@ module Arrest
         end
         body ||= []
         body.map do |h|
-          self.build h
+          self.build(context, h)
         end
       end
 
+      def first(context, filter={})
+        all(context,filter).first
+      end
+
+      def end(context, filter={})
+        all(context,filter).last
+      end
+
       def all(context, filter={})
         begin
           body = body_root(source().get_many(context, self.resource_path, filter))
@@ -29,9 +37,7 @@ module Arrest
         end
         body ||= []
         body.map do |h|
-          obj = self.build h
-          obj.context = context
-          obj
+          self.build(context, h)
         end
       end
 
@@ -42,9 +48,7 @@ module Arrest
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}"
           raise Errors::DocumentNotFoundError.new
         end
-        res = self.build(body)
-        res.context = context
-        res
+        self.build(context, body)
       end
 
       def find(context, id)
@@ -58,12 +62,7 @@ module Arrest
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}/#{id}"
           raise Errors::DocumentNotFoundError.new
         end
-        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(context, "#{resource.resource_location}/#{attr.sub_resource_field_name}")
-          resource.send("#{attr.name}=", body_root(ids))
-        end
+        resource = self.build(context, body.merge({:id => id}))
         resource
       end
 
@@ -90,18 +89,6 @@ module Arrest
         end
       end
 
-      def filters
-        @filters
-      end
-
-      def all_filters
-        all_filters = @filters
-        all_filters ||= []
-        if superclass.respond_to?('filters') && superclass.filters
-          all_fields += superclass.filters
-        end
-        all_filters
-      end
 
       def scope name, &block
         super(name)
@@ -112,7 +99,7 @@ module Arrest
         else
           send :define_singleton_method, name do |context|
             body_root(source().get_many(context, self.scoped_path(name))).map do |h|
-              self.build(h)
+              self.build(context, h)
             end
           end
         end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.25"
+  VERSION = "0.0.27"
 end

data/test/has_attributed.rb

@@ -64,5 +64,47 @@ class HasAttributesTest < Test::Unit::TestCase
     assert_equal 'foo42', h[:id]
   end
 
+  class GotMe < Arrest::RootResource
+  end
+  # for dirty tracking of attributes we need class to be a resource (which includes ActiveModel::Dirty)
+  class ItHasResource < Arrest::RootResource
+    attribute :name, String
+    has_many :got_mes, :sub_resource => true
+  end
+
+  def test_dirty_attribute
+    Arrest::Source.source = nil
+    Arrest::Source.skip_validations = false
+
+    ih = ItHasResource.new({:name => "Bla"})
+    ih.save
+    assert !ih.got_me_ids_changed?
+    assert !ih.changed?
+
+    ih.got_me_ids = ["huhu"]
+    assert ih.got_me_ids_changed?
+    assert ih.changed?
+    ih.save
+
+    assert !ih.got_me_ids_changed?
+    assert !ih.changed?
+
+    ih.got_me_ids = ["huhu"]
+    assert !ih.got_me_ids_changed?
+    assert !ih.changed?
+  end
+
+  def test_dirty_with_reload
+    Arrest::Source.source = nil
+    Arrest::Source.skip_validations = false
+    @scope = Arrest::ScopedRoot.new
+
+    ih = @scope.ItHasResource.new({:name => "Bla", :got_me_ids => ["BistDuEinRuede?"]})
+    ih.save
+
+    ih.reload
+    assert_equal "Bla", ih.name
+    assert_equal ["BistDuEinRuede?"], ih.got_me_ids
+  end
 end
 

data/test/unit.rb

@@ -27,7 +27,7 @@ class FirstTest < Test::Unit::TestCase
   def test_create
     zoo_count_before = @scope.Zoo.all.length
     new_zoo = @scope.Zoo.new({:name => "Foo"})
-    assert_equal "Foo", new_zoo.name 
+    assert_equal "Foo", new_zoo.name
     assert new_zoo.save, new_zoo.errors.full_messages.to_s
     zoo_count_after = @scope.Zoo.all.length
     assert_not_nil new_zoo.id
@@ -636,7 +636,7 @@ class FirstTest < Test::Unit::TestCase
     assert_equal zoo1.name, zoo2.name
   end
 
-  def test_unset_porperty
+  def test_unset_property
     # just taking a class that has a not mandatory attribute
     zo = @scope.ZooOwner.new({ :name => 'meeeee' })
     assert zo.save
@@ -647,4 +647,3 @@ class FirstTest < Test::Unit::TestCase
     assert_nil zo.name, "Name should be unset"
   end
 end
-

metadata

@@ -1,133 +1,176 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: arrest
-version: !ruby/object:Gem::Version
-  version: 0.0.25
+version: !ruby/object:Gem::Version 
+  hash: 41
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 27
+  version: 0.0.27
 platform: ruby
-authors:
+authors: 
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2165743640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2165743640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: &2165742880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
   type: :runtime
-  prerelease: false
-  version_requirements: *2165742880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &2165742160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2165742160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &2165741420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *2165741420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2165740740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2165740740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &2165739820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2165739820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2165737740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
   type: :development
-  prerelease: false
-  version_requirements: *2165737740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &2165725320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2165725320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &2165723960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2165723960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &2165723360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2165723360
+  version_requirements: *id010
 description: Consume a rest API in a AR like fashion
-email:
+email: 
 - axel.tetzlaff@fortytools.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - Gemfile
@@ -169,31 +212,40 @@ files:
 - test/nested_resource.rb
 - test/unit.rb
 - test/validations.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: arrest
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files:
+test_files: 
 - spec/arrest_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/user.rb