oare 0.1.3 → 0.1.4

data/lib/active_resource_override/base.rb

@@ -2,21 +2,106 @@ module Oare
   module Resource
 
     def self.included(base)
+      base.instance_eval <<-RUBY
+
+        alias_method :original_save, :save
+        undef_method :save
+        define_method :save do |options = {}, query_options = nil|
+          begin
+            perform_validation = case options
+              when Hash
+                options.delete(:validate) != false
+              when NilClass
+                true
+              else
+                options
+              end
+
+            # clear the remote validations so they don't interfere with the local
+            # ones. Otherwise we get an endless loop and can never change the
+            # fields so as to make the resource valid
+            @remote_errors = nil
+            if perform_validation && valid? || !perform_validation
+              save_without_validation(options, query_options)
+              true
+            else
+              false
+            end
+          rescue ActiveResource::ResourceInvalid => error
+            # cache the remote errors because every call to <tt>valid?</tt> clears
+            # all errors. We must keep a copy to add these back after local
+            # validations
+            @remote_errors = error
+            load_remote_errors(@remote_errors, true)
+            false
+          end
+        end
+
+        alias_method :original_save_without_validation, :save_without_validation
+        undef_method :save_without_validation
+        define_method :save_without_validation do |path_options = {}, query_options = nil|
+          new? ? create(path_options, query_options) : update(path_options, query_options)
+        end
+
+        alias_method :original_create, :create
+        undef_method :create
+        define_method :create do |path_options = {}, query_options = nil|
+          connection.post(create_path(path_options, query_options), encode, self.class.headers).tap do |response|
+            self.id = id_from_response(response)
+            load_attributes_from_response(response)
+          end
+        end
+
+        alias_method :original_update, :update
+        undef_method :update
+        define_method :update do |path_options = {}, query_options = nil|
+          connection.put(update_path(path_options, query_options), encode, self.class.headers).tap do |response|
+            load_attributes_from_response(response)
+          end
+        end
+      RUBY
+
       base.send(:include, InstanceMethods)
       base.extend(ClassMethods)
       base.set_default_values
     end
 
     module InstanceMethods
+      attr_accessor :nested_attributes_values
+
       def initialize(attributes = {})
+        @nested_attributes_values ||= {}
         self.class.instance_variable_get(:@nested_attributes).each do |key, value|
-          collection = attributes.delete(key)
+          @nested_attributes_values[key] = collection = attributes.delete(key)
           next unless collection
-          attributes[value] = collection.map {|i, a| a}
+
+          collection.each do |index, associate_attributes|
+            nested_model = value.to_s
+            collection   = []
+            collection[index.to_i] = nested_model.singularize.camelize.constantize.new(associate_attributes)
+            instance_variable_set("@#{nested_model}", collection)
+          end
         end
         super
       end
-    end
+
+      def create_path(options = {}, query_options = {})
+        self.class.create_path(prefix_options.merge(options), query_options)
+      end
+
+      def update_path(options = {}, query_options = {})
+        self.class.update_path(to_param, prefix_options.merge(options), query_options)
+      end
+
+      def encode(options={})
+        if new?
+          keys = nested_attributes_values.keys
+          super(options.merge(:methods => keys))
+        else
+          super
+        end
+      end
+    end # Instance Methods
 
     module ClassMethods
       attr_accessor :access_token
@@ -25,7 +110,7 @@ module Oare
 
       def set_default_values
         self.nested_attributes ||= {}
-        self.associations ||= []
+        self.associations      ||= []
       end
 
       def has_many(association_id, options = {})
@@ -33,14 +118,19 @@ module Oare
         associations << class_name.constantize
 
         define_method(association_id) do |*args|
+          current_value = instance_variable_get("@#{association_id}".to_sym)
+          return current_value if current_value
+
           resource = find_or_create_resource_for_collection(class_name)
-          if self.new_record? then [resource.new]
-          else
+          value = if self.new_record? then [resource.new]
+            else
             # TODO:
             # Request for users of account
             # Use an instance variable version of the access token
             #
-          end
+            end
+          instance_variable_set(
+            "@#{association_id}".to_sym, value)
         end
       end
 
@@ -49,6 +139,10 @@ module Oare
         define_method("#{association_id}_attributes=") do |*args|
           # TODO
         end
+
+        define_method("#{association_id}_attributes") do
+          nested_attributes_values["#{association_id}_attributes"]
+        end
       end
 
       def access_token=(token)
@@ -69,7 +163,22 @@ module Oare
         @connection.timeout = timeout if timeout
         @connection
       end
-    end
+
+      def create_path(path_options = {}, query_options = nil)
+        path = path_options.delete(:path)
+        prefix_options = path_options
+        return collection_path(prefix_options, query_options) unless path
+        "/#{path}.#{format.extension}#{query_string(query_options)}"
+      end
+
+      def update_path(id, path_options = {}, query_options = nil)
+        path = path_options.delete(:path)
+        prefix_options = path_options
+        return collection_path(id, prefix_options, query_options) unless path
+        "/#{path}/#{URI.escape id.to_s}.#{format.extension}#{query_string(query_options)}"
+      end
+
+    end # Class Methods
   end # Oare Resource
 
   module Gateway

data/oare.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   ## Basic Information
   #
   s.name     = 'oare'
-  s.version  = '0.1.3'
+  s.version  = '0.1.4'
   s.platform = Gem::Platform::RUBY
   s.required_ruby_version     = '~> 1.9'
   s.required_rubygems_version = '>= 1.3.6'

metadata

@@ -2,7 +2,7 @@
 name: oare
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nelvin Driz
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 +08:00
+date: 2011-05-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency