arrest 0.0.85 → 0.0.86

data/lib/arrest.rb

@@ -15,12 +15,12 @@ require "arrest/transport/resource_proxy"
 
 require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
+require "arrest/attributes/converter"
 require "arrest/attributes/attribute"
 require "arrest/attributes/nested_attribute"
 require "arrest/attributes/nested_collection"
 require "arrest/attributes/belongs_to_attribute"
 require "arrest/attributes/polymorphic_attribute"
-require "arrest/attributes/converter"
 require "arrest/handler"
 require "arrest/helper/filter"
 require "arrest/helper/ordered_collection"

data/lib/arrest/abstract_resource.rb

@@ -146,6 +146,7 @@ module Arrest
         req_type = new_record? ? :post : :put
         success = !!AbstractResource::source.send(req_type, @context, self)
         self.context.cache.flush
+        self.reset_dirtiness
         success
       else
         false
@@ -166,6 +167,7 @@ module Arrest
       @belongs_tos = {}
       hash = internal_reload
       self.attributes= hash
+      self.reset_dirtiness
     end
 
     def new_record?

data/lib/arrest/attributes/attribute.rb

@@ -1,11 +1,22 @@
 module Arrest
+
+  module Dirty
+  end
+  Integer.send(:include, Dirty)
+  String.send(:include, Dirty)
+  Float.send(:include, Dirty)
+  Boolean.send(:include, Dirty)
+
+
   class Attribute
-    attr_accessor :name, :actions, :clazz, :json_name
+    attr_accessor :name, :actions, :clazz, :json_name, :dirty
 
-    def initialize name, clazz, actions = nil
+    def initialize(name, clazz, actions = nil)
       @name = name.to_sym
       @actions = actions || [:create, :retrieve, :update, :delete]
       @clazz = clazz
+      @dirty_sensitive = @clazz.ancestors.include?(Dirty)
+      @dirty = false
       @json_name = Source.json_key_converter.key_to_json(name).to_sym
     end
 
@@ -17,6 +28,14 @@ module Arrest
       @actions.include?(:create) || @actions.include?(:update)
     end
 
+    def dirty?
+      if @dirty_sensitive
+        @dirty
+      else
+        true # treat as 'always' dirty
+      end
+    end
+
     def from_hash(parent, value)
       return if value == nil
 

data/lib/arrest/attributes/has_attributes.rb

@@ -48,7 +48,7 @@ module Arrest
 
     def init_from_hash(as_i={}, from_json = false)
       raise "hash expected but got #{as_i.class}" unless as_i.is_a?(Hash)
-      @attribute_values = {} unless @attribute_values != nil
+      @attribute_values ||= {}
       as = {}
       as_i.each_pair do |k,v|
         as[k.to_sym] = v
@@ -68,6 +68,12 @@ module Arrest
       end
     end
 
+    def reset_dirtiness
+      self.class.all_fields.each do |field|
+        field.dirty = false
+      end
+    end
+
     def attributes
       @attribute_values ||= {}
     end
@@ -103,22 +109,31 @@ module Arrest
     def to_hash(show_all_fields = true, json_names = false, action = nil)
       result = {}
 
-      self.class.all_fields.find_all{|a| show_all_fields ||
-                                         !action         ||
-                                         a.actions.include?(action)}.each do |field|
-        if json_names
-          json_name = field.json_name
-        else
-          json_name = field.name
-        end
-        val = self.send(field.name)
-        converted = field.to_hash val
+      self.class.all_fields.each do |field|
 
-        result[json_name] = converted
+       if render_field_to_hash?(field, show_all_fields, action)
+
+          if json_names
+            json_name = field.json_name
+          else
+            json_name = field.name
+          end
+          val = self.send(field.name)
+          converted = field.to_hash val
+
+          result[json_name] = converted
+        end
       end
       result
     end
 
+    # decides whether attribute field will be rendered to hash
+    # either all, or, if an CRUD action given, only those sensitive to this action
+    # and if the action is update only those being dirty
+    def render_field_to_hash?(field, show_all_fields, action)
+      show_all_fields || !action || (field.actions.include?(action) && (action != :update || field.dirty?))
+    end
+
     module HasAttributesClassMethods
       attr_accessor :fields
 
@@ -147,6 +162,9 @@ module Arrest
         send :define_method, "#{attribute.name}=" do |v|
           converted_v = convert(attribute, v)
           Arrest::debug "setter #{self.class.name} #{attribute.name} = #{converted_v}"
+
+          attribute.dirty = true
+
           self.attribute_values[attribute.name] = converted_v
         end
         # define getter for attribute value

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -6,7 +6,11 @@ module Arrest
     attribute :type, String
 
     def self.mk_json(value)
-      {:id => value.id, :type => value.type}.to_json
+      self.to_hash.to_json
+    end
+
+    def self.to_hash
+      {:id => value.id, :type => value.type}
     end
   end
 
@@ -17,7 +21,11 @@ module Arrest
 
     def from_hash(parent, value)
       return nil unless value != nil
-      @clazz.new(value)
+      if value.is_a? Hash
+        @clazz.new(value)
+      else
+        @clazz.new(value.to_hash)
+      end
     end
   end
 end

data/lib/arrest/transport/http_source.rb

@@ -89,16 +89,13 @@ module Arrest
       hash.delete("id")
       body = JSON.generate(hash)
 
-      internal_put(rest_resource, rest_resource.resource_location, body)
-    end
-
-    def internal_put(rest_resource, location, body)
       profiler_status_str = ""
       ::ActiveSupport::Notifications.instrument("http.sgdb",
                                                 :method => :delete,
                                                 :url => rest_resource.resource_location,
                                                 :status => profiler_status_str) do
         headers = nil
+        location = rest_resource.resource_location
         response = self.connection().put do |req|
           req.url(location)
           headers = add_headers(rest_resource.context, req.headers)

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.85"
+  VERSION = "0.0.86"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.85
+  version: 0.0.86
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000Z
+date: 2012-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &16575080 !ruby/object:Gem::Requirement
+  requirement: &21101800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16575080
+  version_requirements: *21101800
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &16574420 !ruby/object:Gem::Requirement
+  requirement: &21097480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *16574420
+  version_requirements: *21097480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &16573380 !ruby/object:Gem::Requirement
+  requirement: &21096980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *16573380
+  version_requirements: *21096980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16572780 !ruby/object:Gem::Requirement
+  requirement: &21096520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16572780
+  version_requirements: *21096520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16572200 !ruby/object:Gem::Requirement
+  requirement: &21096140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16572200
+  version_requirements: *21096140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16571520 !ruby/object:Gem::Requirement
+  requirement: &21095680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16571520
+  version_requirements: *21095680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16570820 !ruby/object:Gem::Requirement
+  requirement: &21095180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *16570820
+  version_requirements: *21095180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &16570400 !ruby/object:Gem::Requirement
+  requirement: &21094760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16570400
+  version_requirements: *21094760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16569940 !ruby/object:Gem::Requirement
+  requirement: &21094240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16569940
+  version_requirements: *21094240
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &16569480 !ruby/object:Gem::Requirement
+  requirement: &21093800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16569480
+  version_requirements: *21093800
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com