arrest 0.0.24 → 0.0.25

data/lib/arrest/abstract_resource.rb

@@ -42,7 +42,7 @@ module Arrest
       params += args.drop(1)
       @resource.send(args.first, *params)
     end
-    
+
     def load(*args)
       ext = [@context_provider.get_context] + args
       @resource.load(*ext)
@@ -55,7 +55,7 @@ module Arrest
     include ActiveModel::Validations
     include ActiveModel::Conversion
     include HasAttributes
-    attribute :id, String
+    attribute :id, String, {:read_only => true}
 
     attr_accessor :context
 
@@ -110,11 +110,13 @@ module Arrest
         clazz_name = StringUtils.singular(method_name.to_s)
         foreign_key = clazz_name + "_id"
         sub_resource = false
+        read_only = false
         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]
         end
 
         url_part = method_name.to_s
@@ -124,7 +126,8 @@ module Arrest
                                             method_name,
                                             clazz_name,
                                             url_part,
-                                            foreign_key)
+                                            foreign_key,
+                                            read_only)
         add_attribute(hm_attr)
 
         send :define_method, method_name do # e.g. define 'teams' method for notation 'has_many :teams'
@@ -135,7 +138,7 @@ module Arrest
       end
 
       def create_has_many_attribute(sub_resource, ids_field_name, method_name,
-                                    clazz_name, url_part, foreign_key)
+                                    clazz_name, url_part, foreign_key, read_only)
         if sub_resource
           HasManySubResourceAttribute.new(ids_field_name,
                                           method_name,
@@ -147,7 +150,8 @@ module Arrest
                                method_name,
                                clazz_name,
                                url_part,
-                               foreign_key)
+                               foreign_key,
+                               read_only)
         end
       end
 
@@ -217,7 +221,7 @@ module Arrest
           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

data/lib/arrest/attributes/has_attributes.rb

@@ -1,5 +1,19 @@
 require "arrest/source"
 module Arrest
+
+
+  class Null
+    @@NULL = Null.new()
+
+    def self.singleton
+      @@NULL
+    end
+
+    def to_json(*a)
+      'null'
+    end
+  end
+
   module HasAttributes
     attr_accessor :attribute_values
 
@@ -47,7 +61,7 @@ module Arrest
       end
     end
 
-    def update_attributes attribute_hash
+    def attributes=(attribute_hash = {})
       fields = self.class.all_fields
       field_names = fields.map(&:name)
       attribute_hash.each_pair do |k,v|
@@ -58,9 +72,18 @@ module Arrest
           self.send("#{k}=", converted)
         end
       end
+    end
+
+    def update_attributes(attribute_hash = {})
+      self.attributes= attribute_hash
       self.save
     end
 
+    def reload
+      hash = self.class.find(self.context, self.id).to_hash
+      self.attributes= hash
+    end
+
     def load_from_stub
       @load_blk.call
       @stubbed = false
@@ -140,12 +163,14 @@ module Arrest
         res
       end
 
-      def nested name, clazz
-        add_attribute NestedAttribute.new(name, false, clazz)
+      def nested name, clazz, options = {}
+        read_only = !!options[:read_only]
+        add_attribute NestedAttribute.new(name, read_only, clazz)
       end
 
-      def nested_array name, clazz
-        add_attribute NestedCollection.new(name, false, clazz)
+      def nested_array name, clazz, options = {}
+        read_only = !!options[:read_only]
+        add_attribute NestedCollection.new(name, read_only, clazz)
       end
     end
 

data/lib/arrest/attributes/has_many_sub_resource_attribute.rb

@@ -7,8 +7,8 @@ module Arrest
                    clazz_name,
                    url_part,
                    foreign_key)
-      # the read_only is set to sub_resource to avoid sending post request as ids array
-      # directly instead of sending the ids to the sub_resource
+      # the read_only 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)
     end
 

data/lib/arrest/handler.rb

@@ -2,7 +2,7 @@ require 'arrest/string_utils'
 
 module Arrest
 
-  RequestLog = Struct.new(:method, :url, :body)
+  RequestLog = Struct.new(:method, :url, :body, :headers)
   ResponseLog = Struct.new(:status, :body)
   CallLog = Struct.new(:request, :response)
 

data/lib/arrest/http_source.rb

@@ -5,6 +5,8 @@ module Arrest
 
   class HttpSource
 
+    attr_reader :base
+    
     def initialize base
       @base = base
     end
@@ -16,17 +18,20 @@ module Arrest
     def add_headers(context,headers)
       decorator = context.header_decorator if context
       decorator ||= Arrest::Source.header_decorator
-      decorator.headers.each_pair do |k,v|
+      hds = decorator.headers
+      hds.each_pair do |k,v|
         headers[k.to_s] = v.to_s
       end
+      hds
     end
 
     def get_one(context, sub, filter={})
+      headers = nil
       response = self.connection().get do |req|
         req.url(sub, filter)
-        add_headers(context, req.headers)
+        headers = add_headers(context, req.headers)
       end
-      rql = RequestLog.new(:get, "#{sub}#{hash_to_query filter}", nil)
+      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] != 200
@@ -40,11 +45,12 @@ module Arrest
     end
 
     def get_many(context, sub, filter={})
+      headers = nil
       response = self.connection().get do |req|
         req.url(sub, filter)
-        add_headers(context, req.headers)
+        headers = add_headers(context, req.headers)
       end
-      rql = RequestLog.new(:get, "#{sub}#{hash_to_query filter}", nil)
+      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)
       response.body
@@ -52,11 +58,12 @@ module Arrest
 
 
     def delete_all(context, resource_path)
-        response = self.connection().delete do |req|
+      headers = nil
+      response = self.connection().delete do |req|
         req.url(resource_path)
-        add_headers(context, req.headers)
+        headers = add_headers(context, req.headers)
       end
-      rql = RequestLog.new(:delete, "#{resource_path}", nil)
+      rql = RequestLog.new(:delete, "#{resource_path}", nil, headers)
       rsl = ResponseLog.new(response.env[:status], response.body)
       Arrest::Source.call_logger.log(rql, rsl)
 
@@ -65,11 +72,12 @@ module Arrest
 
     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
+      headers = nil
       response = self.connection().delete do |req|
         req.url(rest_resource.resource_location)
-        add_headers(context, req.headers)
+        headers = add_headers(context, req.headers)
       end
-      rql = RequestLog.new(:delete, rest_resource.resource_location, nil)
+      rql = RequestLog.new(:delete, rest_resource.resource_location, nil, headers)
       rsl = ResponseLog.new(response.env[:status], response.body)
       Arrest::Source.call_logger.log(rql, rsl)
       response.env[:status] == 200
@@ -87,7 +95,8 @@ module Arrest
       hash = rest_resource.to_jhash
       hash.delete(:id)
       hash.delete("id")
-      body = hash.to_json
+      insert_nulls!(rest_resource,hash)
+      body = JSON.generate(hash)
 
       internal_put(rest_resource, rest_resource.resource_location, body)
     end
@@ -96,12 +105,13 @@ module Arrest
 
 
     def internal_put(rest_resource, location, body)
+      headers = nil
       response = self.connection().put do |req|
         req.url(location)
-        add_headers(rest_resource.context, req.headers)
+        headers = add_headers(rest_resource.context, req.headers)
         req.body = body
       end
-      rql = RequestLog.new(:put, location, body)
+      rql = RequestLog.new(:put, location, body, headers)
       rsl = ResponseLog.new(response.env[:status], response.body)
       Arrest::Source.call_logger.log(rql, rsl)
       if response.env[:status] != 200
@@ -110,6 +120,14 @@ module Arrest
       response.env[:status] == 200
     end
 
+    def insert_nulls!(rest_resource, hash)
+      rest_resource.class.all_fields.each do |field|
+        if !field.read_only && hash[field.json_name] == nil
+          hash[field.json_name] = Null.singleton
+        end
+      end
+    end
+
     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
@@ -117,15 +135,16 @@ module Arrest
       hash.delete(:id)
       hash.delete('id')
 
-      hash.delete_if{|k,v| v == nil}
+      insert_nulls!(rest_resource,hash)
 
-      body = hash.to_json
+      body = JSON.generate(hash)
+      headers = nil
       response = self.connection().post do |req|
         req.url rest_resource.resource_path
-        add_headers(context, req.headers)
+        headers = add_headers(context, req.headers)
         req.body = body
       end
-      rql = RequestLog.new(:post, rest_resource.resource_path, body)
+      rql = RequestLog.new(:post, rest_resource.resource_path, body, headers)
       rsl = ResponseLog.new(response.env[:status], response.body)
       Arrest::Source.call_logger.log(rql, rsl)
       if (response.env[:status] == 201)
@@ -169,8 +188,16 @@ module Arrest
         err = Arrest::Source.error_handler.convert(body,status)
         if err.is_a?(String)
           rest_resource.errors.add(:base, err)
-        else # is_a?(Array)
-          err.map{|k,v| rest_resource.errors.add(k,v)}
+        else
+          err.map do |k,v|
+            if v.is_a?(String)
+              rest_resource.errors.add(k,v)
+            else
+              v.map do |msg|
+                rest_resource.errors.add(k,msg)
+              end
+            end
+          end
         end
       end
 

data/lib/arrest/root_resource.rb

@@ -29,7 +29,9 @@ module Arrest
         end
         body ||= []
         body.map do |h|
-          self.build h
+          obj = self.build h
+          obj.context = context
+          obj
         end
       end
 
@@ -40,7 +42,9 @@ module Arrest
           Arrest::logger.info "DocumentNotFoundError for #{self.resource_path}"
           raise Errors::DocumentNotFoundError.new
         end
-        self.build(body)
+        res = self.build(body)
+        res.context = context
+        res
       end
 
       def find(context, id)
@@ -73,7 +77,7 @@ module Arrest
             collection = args[0]
             call_args = args.drop(1)
             collection.select do |instance|
-              instance.instance_exec(call_args, &aproc)
+              instance.instance_exec(*call_args, &aproc)
             end
           end
           send :define_singleton_method, name do |context, args = nil|

data/lib/arrest/version.rb

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

data/test/unit.rb

@@ -610,8 +610,41 @@ class FirstTest < Test::Unit::TestCase
 
   def test_update_attribute
     zoo1 = @scope.Zoo.new(:name => 'zoo1')
+    assert zoo1.save
     zoo1.update_attributes({:name => "updated"})
     assert_equal "updated", zoo1.name
+
+    zoo_reloaded = @scope.Zoo.find(zoo1.id)
+    assert_equal "updated", zoo_reloaded.name
+
+  end
+
+  def test_reload
+    zoo1 = @scope.Zoo.new(:name => 'zoo1')
+    assert zoo1.save
+
+    zoo2 = @scope.Zoo.find(zoo1.id)
+    assert zoo2.save
+
+    zoo1.name = "updated"
+    assert zoo1.save
+
+    assert_not_equal zoo1.name, zoo2.name
+
+    zoo2.reload
+
+    assert_equal zoo1.name, zoo2.name
+  end
+
+  def test_unset_porperty
+    # just taking a class that has a not mandatory attribute
+    zo = @scope.ZooOwner.new({ :name => 'meeeee' })
+    assert zo.save
+
+    zo.name = nil
+    assert zo.save
+
+    assert_nil zo.name, "Name should be unset"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21754080 !ruby/object:Gem::Requirement
+  requirement: &2165743640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21754080
+  version_requirements: *2165743640
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &21753220 !ruby/object:Gem::Requirement
+  requirement: &2165742880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *21753220
+  version_requirements: *2165742880
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &21752320 !ruby/object:Gem::Requirement
+  requirement: &2165742160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *21752320
+  version_requirements: *2165742160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21751740 !ruby/object:Gem::Requirement
+  requirement: &2165741420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21751740
+  version_requirements: *2165741420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21008800 !ruby/object:Gem::Requirement
+  requirement: &2165740740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21008800
+  version_requirements: *2165740740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21007480 !ruby/object:Gem::Requirement
+  requirement: &2165739820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21007480
+  version_requirements: *2165739820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21004600 !ruby/object:Gem::Requirement
+  requirement: &2165737740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *21004600
+  version_requirements: *2165737740
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &21003160 !ruby/object:Gem::Requirement
+  requirement: &2165725320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21003160
+  version_requirements: *2165725320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &21002300 !ruby/object:Gem::Requirement
+  requirement: &2165723960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21002300
+  version_requirements: *2165723960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20992400 !ruby/object:Gem::Requirement
+  requirement: &2165723360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20992400
+  version_requirements: *2165723360
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -193,4 +193,13 @@ 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
+- test/context.rb
+- test/has_attributed.rb
+- test/models.rb
+- test/nested_resource.rb
+- test/unit.rb
+- test/validations.rb