arrest 0.0.83.1 → 0.0.84

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, true, clazz))
+          add_attribute(Attribute.new(name, clazz, [:retrieve]))
         end
       end
 

data/lib/arrest/attributes/attribute.rb

@@ -1,13 +1,22 @@
 module Arrest
   class Attribute
-    attr_accessor :name, :read_only, :clazz, :json_name
-    def initialize name, read_only, clazz
+    attr_accessor :name, :actions, :clazz, :json_name
+
+    def initialize name, clazz, actions = nil
       @name = name.to_sym
-      @read_only = read_only
+      @actions = actions || [:create, :retrieve, :update, :delete]
       @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, read_only, foreign_key, class_name)
+      def create_and_add_attribute(field_name, polymorphic, actions, foreign_key, class_name)
         if polymorphic
-          add_attribute(PolymorphicAttribute.new(field_name.to_sym, read_only))
+          add_attribute(PolymorphicAttribute.new(field_name.to_sym, actions))
         else
-          add_attribute(BelongsToAttribute.new(field_name.to_sym, read_only, String, foreign_key, class_name))
+          add_attribute(BelongsToAttribute.new(field_name.to_sym, actions, String, foreign_key, class_name))
         end
       end
 
@@ -32,8 +32,9 @@ 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
-          read_only =  params[:read_only] == true
+          actions = params[:actions] if params[:actions]
           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
@@ -41,7 +42,7 @@ module Arrest
 
         field_name = create_field_name(name, params, polymorphic)
 
-        create_and_add_attribute(field_name, polymorphic, read_only, foreign_key, class_name)
+        create_and_add_attribute(field_name, polymorphic, actions, 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, read_only, field_class, foreign_key, target_class_name)
-      super(name, read_only, field_class)
+    def initialize(name, actions, field_class, foreign_key, target_class_name)
+      super(name, field_class, actions)
       @foreign_key = foreign_key
       @target_class_name = target_class_name
     end

data/lib/arrest/attributes/has_attributes.rb

@@ -61,6 +61,9 @@ 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
@@ -93,13 +96,16 @@ module Arrest
     end
 
 
-    def to_jhash
-      to_hash(false, true)
+    def to_jhash(action)
+      to_hash(false, true, action)
     end
 
-    def to_hash(show_all_fields = true, json_names = false)
+    def to_hash(show_all_fields = true, json_names = false, action = nil)
       result = {}
-      self.class.all_fields.find_all{|a| show_all_fields || !a.read_only}.each do |field|
+
+      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
@@ -107,9 +113,8 @@ module Arrest
         end
         val = self.send(field.name)
         converted = field.to_hash val
-        if converted != nil
-          result[json_name] = converted
-        end
+
+        result[json_name] = converted
       end
       result
     end
@@ -122,8 +127,12 @@ module Arrest
       end
 
       def attribute(name, clazz, attribs = {})
-        read_only = !!attribs[:read_only]
-        add_attribute Attribute.new(name, read_only, clazz)
+        if !!attribs[:read_only] && !attribs[:actions]
+          actions = [:retrieve]
+        else
+          actions = attribs[:actions]
+        end
+        add_attribute Attribute.new(name, clazz, actions)
       end
 
       def attributes(args)
@@ -140,7 +149,6 @@ 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}"
@@ -156,13 +164,11 @@ module Arrest
       end
 
       def nested name, clazz, options = {}
-        read_only = !!options[:read_only]
-        add_attribute NestedAttribute.new(name, read_only, clazz)
+        add_attribute NestedAttribute.new(name, clazz, options[:actions])
       end
 
       def nested_array name, clazz, options = {}
-        read_only = !!options[:read_only]
-        add_attribute Arrest::NestedCollection.new(name, read_only, clazz)
+        add_attribute Arrest::NestedCollection.new(name, clazz, options[:actions])
       end
     end
 

data/lib/arrest/attributes/nested_attribute.rb

@@ -1,7 +1,7 @@
 module Arrest
     class NestedAttribute < Attribute
-    def initialize name, read_only, clazz
-      super name, read_only, clazz
+    def initialize name, clazz, options
+      super name, clazz, options
     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, read_only, clazz
-      super name, read_only, clazz
+    def initialize name, clazz, options
+      super name, clazz, options
     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, read_only
-      super name, read_only, Ref
+    def initialize name, actions
+      super name, Ref, actions
     end
 
     def from_hash(parent, value)

data/lib/arrest/helper/has_many.rb

@@ -17,17 +17,23 @@ module Arrest
         ids_method_url_part = "/" + ids_method_name.to_s                                  # /my_team_ids
         method_url_part = "/" + method_name.to_s                                          # /my_teams
 
+        read_only = false
         if options
           clazz_name = options[:class_name].to_s unless options[:class_name] == nil       # :Team
           foreign_key = "#{StringUtils.underscore(clazz_name)}_id"                        # team_id
           foreign_key = options[:foreign_key].to_s unless options[:foreign_key] == nil    # team_id
           ids_method_url_part = "/" + options[:url_part].to_s unless options[:url_part] == nil # /my_url_part_ids
           method_url_part     = "/" + options[:url_part].to_s unless options[:url_part] == nil # /my_url_part
+          read_only = !!options[:read_only] unless options[:read_only] == nil
         end
 
 
-        send(:define_method, ids_method_name) do |filter = {}|
-          IdsCollection.new(self, self.resource_location + ids_method_url_part)
+        if read_only
+          send(:define_method, ids_method_name) do |filter = {}|
+            IdsCollection.new(self, self.resource_location + ids_method_url_part)
+          end
+        else
+          self.attribute ids_method_name.to_sym, Array
         end
 
         send(:define_method, method_name) do |filter = {}|

data/lib/arrest/helper/ordered_collection.rb

@@ -132,6 +132,7 @@ 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
+      self.class.find(self.context, self.id).to_hash(false, false, :retrieve)
     end
   end
 end

data/lib/arrest/transport/http_source.rb

@@ -84,8 +84,7 @@ 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 = rest_resource.to_jhash(:update)
       hash.delete(:id)
       hash.delete("id")
       body = JSON.generate(hash)
@@ -96,7 +95,9 @@ 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)
@@ -114,27 +115,18 @@ 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
+        hash = rest_resource.to_jhash(:create)
         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.1"
+  VERSION = "0.0.84"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.83.1
+  version: 0.0.84
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000Z
+date: 2012-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13116780 !ruby/object:Gem::Requirement
+  requirement: &23482040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13116780
+  version_requirements: *23482040
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &13116240 !ruby/object:Gem::Requirement
+  requirement: &23480980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *13116240
+  version_requirements: *23480980
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &13115540 !ruby/object:Gem::Requirement
+  requirement: &23480480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *13115540
+  version_requirements: *23480480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13114940 !ruby/object:Gem::Requirement
+  requirement: &23479940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13114940
+  version_requirements: *23479940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13114260 !ruby/object:Gem::Requirement
+  requirement: &23479360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13114260
+  version_requirements: *23479360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13112180 !ruby/object:Gem::Requirement
+  requirement: &23468200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13112180
+  version_requirements: *23468200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13111400 !ruby/object:Gem::Requirement
+  requirement: &23467700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *13111400
+  version_requirements: *23467700
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &13110740 !ruby/object:Gem::Requirement
+  requirement: &23467280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13110740
+  version_requirements: *23467280
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13110220 !ruby/object:Gem::Requirement
+  requirement: &23466820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13110220
+  version_requirements: *23466820
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &13109800 !ruby/object:Gem::Requirement
+  requirement: &23466400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13109800
+  version_requirements: *23466400
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com