arrest 0.0.83.crud → 0.0.83

data/lib/arrest/abstract_resource.rb

@@ -88,7 +88,7 @@ module Arrest
       def read_only_attributes(args)
         args.each_pair do |name, clazz|
           self.send :attr_accessor,name
-          add_attribute(Attribute.new(name, clazz, [:retrieve]))
+          add_attribute(Attribute.new(name, true, clazz))
         end
       end
 

data/lib/arrest/attributes/attribute.rb

@@ -1,22 +1,13 @@
 module Arrest
   class Attribute
-    attr_accessor :name, :actions, :clazz, :json_name
-
-    def initialize name, clazz, actions = nil
+    attr_accessor :name, :read_only, :clazz, :json_name
+    def initialize name, read_only, clazz
       @name = name.to_sym
-      @actions = actions || [:create, :retrieve, :update, :delete]
+      @read_only = read_only
       @clazz = clazz
       @json_name = Source.json_key_converter.key_to_json(name).to_sym
     end
 
-    def read_only?
-      @actions == [:retrieve]
-    end
-
-    def mutable?
-      @actions.include?(:create) || @actions.include?(:update)
-    end
-
     def from_hash(parent, value)
       return if value == nil
 

data/lib/arrest/attributes/belongs_to.rb

@@ -17,11 +17,11 @@ module Arrest
         end
       end
 
-      def create_and_add_attribute(field_name, polymorphic, actions, foreign_key, class_name)
+      def create_and_add_attribute(field_name, polymorphic, read_only, foreign_key, class_name)
         if polymorphic
-          add_attribute(PolymorphicAttribute.new(field_name.to_sym, actions))
+          add_attribute(PolymorphicAttribute.new(field_name.to_sym, read_only))
         else
-          add_attribute(BelongsToAttribute.new(field_name.to_sym, actions, String, foreign_key, class_name))
+          add_attribute(BelongsToAttribute.new(field_name.to_sym, read_only, String, foreign_key, class_name))
         end
       end
 
@@ -32,9 +32,8 @@ module Arrest
         foreign_key = "#{StringUtils.underscore(ClassUtils.simple_name(self))}_id"
         params = args[1] unless args.length < 2
 
-        actions = [:create, :retrieve, :update, :delete]
         if params
-          actions = params[:actions] if params[:actions]
+          read_only =  params[:read_only] == true
           polymorphic = !!params[:polymorphic]
           class_name = params[:class_name].to_s unless params[:class_name] == nil
           foreign_key = params[:foreign_key].to_s unless params[:foreign_key] == nil
@@ -42,7 +41,7 @@ module Arrest
 
         field_name = create_field_name(name, params, polymorphic)
 
-        create_and_add_attribute(field_name, polymorphic, actions, foreign_key, class_name)
+        create_and_add_attribute(field_name, polymorphic, read_only, foreign_key, class_name)
 
         send :define_method, name do
           val = self.send(field_name)

data/lib/arrest/attributes/belongs_to_attribute.rb

@@ -1,8 +1,8 @@
 module Arrest
   class BelongsToAttribute < Attribute
     attr_accessor :foreign_key
-    def initialize(name, actions, field_class, foreign_key, target_class_name)
-      super(name, field_class, actions)
+    def initialize(name, read_only, field_class, foreign_key, target_class_name)
+      super(name, read_only, field_class)
       @foreign_key = foreign_key
       @target_class_name = target_class_name
     end

data/lib/arrest/attributes/has_attributes.rb

@@ -61,9 +61,6 @@ module Arrest
         end
         value = as[key]
         converted = field.from_hash(self, value)
-
-        @attribute_values[field.name.to_sym] = converted
-
         self.send(field.name.to_s + '=', converted) unless converted == nil
       end
     end
@@ -96,16 +93,13 @@ module Arrest
     end
 
 
-    def to_jhash(action)
-      to_hash(false, true, action)
+    def to_jhash
+      to_hash(false, true)
     end
 
-    def to_hash(show_all_fields = true, json_names = false, action = nil)
+    def to_hash(show_all_fields = true, json_names = false)
       result = {}
-
-      self.class.all_fields.find_all{|a| show_all_fields ||
-                                         !action         ||
-                                         a.actions.include?(action)}.each do |field|
+      self.class.all_fields.find_all{|a| show_all_fields || !a.read_only}.each do |field|
         if json_names
           json_name = field.json_name
         else
@@ -113,8 +107,9 @@ module Arrest
         end
         val = self.send(field.name)
         converted = field.to_hash val
-
-        result[json_name] = converted
+        if converted != nil
+          result[json_name] = converted
+        end
       end
       result
     end
@@ -127,12 +122,8 @@ module Arrest
       end
 
       def attribute(name, clazz, attribs = {})
-        if !!attribs[:read_only] && !attribs[:actions]
-          actions = [:retrieve]
-        else
-          actions = attribs[:actions]
-        end
-        add_attribute Attribute.new(name, clazz, actions)
+        read_only = !!attribs[:read_only]
+        add_attribute Attribute.new(name, read_only, clazz)
       end
 
       def attributes(args)
@@ -149,6 +140,7 @@ module Arrest
           Arrest::debug "setter #{self.class.name} #{attribute.name} = #{converted_v}"
           self.attribute_values[attribute.name] = converted_v
         end
+
         # define getter for attribute value
         send :define_method, "#{attribute.name}" do
           Arrest::debug "getter #{self.class.name} #{attribute.name}"
@@ -164,11 +156,13 @@ module Arrest
       end
 
       def nested name, clazz, options = {}
-        add_attribute NestedAttribute.new(name, clazz, options[:actions])
+        read_only = !!options[:read_only]
+        add_attribute NestedAttribute.new(name, read_only, clazz)
       end
 
       def nested_array name, clazz, options = {}
-        add_attribute Arrest::NestedCollection.new(name, clazz, options[:actions])
+        read_only = !!options[:read_only]
+        add_attribute Arrest::NestedCollection.new(name, read_only, clazz)
       end
     end
 

data/lib/arrest/attributes/nested_attribute.rb

@@ -1,7 +1,7 @@
 module Arrest
     class NestedAttribute < Attribute
-    def initialize name, clazz, options
-      super name, clazz, options
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
     end
 
     def from_hash(parent, value)

data/lib/arrest/attributes/nested_collection.rb

@@ -1,8 +1,8 @@
 module Arrest
 
   class NestedCollection < Attribute
-    def initialize name, clazz, options
-      super name, clazz, options
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
     end
 
     def from_hash(parent, value)

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -4,15 +4,15 @@ module Arrest
 
     attribute :id, String
     attribute :type, String
-
+    
     def self.mk_json(value)
       {:id => value.id, :type => value.type}.to_json
     end
   end
 
   class PolymorphicAttribute < NestedAttribute
-    def initialize name, actions
-      super name, Ref, actions
+    def initialize name, read_only
+      super name, read_only, Ref
     end
 
     def from_hash(parent, value)

data/lib/arrest/helper/ordered_collection.rb

@@ -132,7 +132,6 @@ module Arrest
         url = build_url(@base_url, params)
 
         response = resolved_class.by_url(@context, url)
-
         @total_count = response[:result_count]
 
         @collection = response[:collection]

data/lib/arrest/root_resource.rb

@@ -130,7 +130,7 @@ module Arrest
     protected
     def internal_reload
       context.cache.remove(self.id)
-      self.class.find(self.context, self.id).to_hash(false, false, :retrieve)
+      self.class.find(self.context, self.id).to_hash
     end
   end
 end

data/lib/arrest/transport/http_source.rb

@@ -84,7 +84,8 @@ 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(:update)
+      hash = rest_resource.to_jhash
+      insert_nulls!(rest_resource,hash)
       hash.delete(:id)
       hash.delete("id")
       body = JSON.generate(hash)
@@ -95,9 +96,7 @@ module Arrest
     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
+                                            :method => :delete, :url => rest_resource.resource_location, :status => profiler_status_str) do
         headers = nil
         response = self.connection().put do |req|
           req.url(location)
@@ -115,18 +114,27 @@ module Arrest
       end
     end
 
+    def insert_nulls!(rest_resource, hash)
+      rest_resource.class.all_fields.each do |field|
+        changed = (!rest_resource.respond_to?("#{field.name}_changed?" || rest_resource.send("#{field}_changed?")))
+        if !field.read_only && hash[field.json_name] == nil && changed
+          hash[field.json_name] = Null.singleton
+        end
+      end
+    end
+
     def post(context, rest_resource)
       profiler_status_str = ""
       ::ActiveSupport::Notifications.instrument("http.sgdb",
-                                                :method => :post,
-                                                :url => rest_resource.resource_path,
-                                                :status => profiler_status_str) do
+                                            :method => :post, :url => rest_resource.resource_path, :status => profiler_status_str) do
         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
-        hash = rest_resource.to_jhash(:create)
+        hash = rest_resource.to_jhash
         hash.delete(:id)
         hash.delete('id')
 
+        insert_nulls!(rest_resource,hash)
+
         body = JSON.generate(hash)
         headers = nil
         response = self.connection().post do |req|

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.83.crud"
+  VERSION = "0.0.83"
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.83.crud
-  prerelease: 7
+  version: 0.0.83
+  prerelease: 
 platform: ruby
 authors:
 - Axel Tetzlaff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000Z
+date: 2012-08-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &26670600 !ruby/object:Gem::Requirement
+  requirement: &23245620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26670600
+  version_requirements: *23245620
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &26670100 !ruby/object:Gem::Requirement
+  requirement: &23244860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *26670100
+  version_requirements: *23244860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &26669600 !ruby/object:Gem::Requirement
+  requirement: &23244120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *26669600
+  version_requirements: *23244120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26669140 !ruby/object:Gem::Requirement
+  requirement: &23243420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26669140
+  version_requirements: *23243420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26668720 !ruby/object:Gem::Requirement
+  requirement: &23242840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26668720
+  version_requirements: *23242840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &26668240 !ruby/object:Gem::Requirement
+  requirement: &23239740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26668240
+  version_requirements: *23239740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26667540 !ruby/object:Gem::Requirement
+  requirement: &23239240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *26667540
+  version_requirements: *23239240
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &26667000 !ruby/object:Gem::Requirement
+  requirement: &23238820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26667000
+  version_requirements: *23238820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &26666380 !ruby/object:Gem::Requirement
+  requirement: &23238360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26666380
+  version_requirements: *23238360
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &26665680 !ruby/object:Gem::Requirement
+  requirement: &23237940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26665680
+  version_requirements: *23237940
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -188,9 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: arrest
 rubygems_version: 1.8.10