api_resource 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eecd2283b1df3b5e9cbbebdeded82ac62eadaf57
-  data.tar.gz: b12734c1fb1b5dcabe606f704d9b7d6ab9628ba0
+  metadata.gz: b18f870fcfb29b4ffb83c8c580b12c55c81462e0
+  data.tar.gz: 2667fb9ea45c86ef67f5d10ddf4d8b850db3e83f
 SHA512:
-  metadata.gz: 369173ff08a0384adc0b89891033668c84a66c3a1f2a92c822fb84b33e98eb968474239881cbb54f12f73b68dbafb0e9c00031a1bfe10a9b9820740a128143b2
-  data.tar.gz: 0d454b872616d96c7aa3952cfbbccffdc96f0df84b97d2d03ef4e7fc5126d499de774bac08e2d2f8adfadf207744f2885fd47d04f9b06b4c26e33319b94af38a
+  metadata.gz: 4d100621cbaad1f11eef96fe05ae963f83ed5a51a392d1bc483d1adedf53a1a881d736f5cf1c1b73063e7e2f3d4a6b44be89b56a16cafa1ccb959fb80923802e
+  data.tar.gz: d9ebcf5a2777642ef95d308e1737ebd1700513cbf7ff8c522b2b7991127f7448e2e97183b3744566d044a1efe33f02b58bcd464cbbaab20d64276e9b210872c2

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    api_resource (0.6.17)
+    api_resource (0.6.18)
+      activemodel
       colorize
       differ
+      httpclient
       json
       log4r
       rails
-      rest-client
 
 GEM
   remote: https://rubygems.org/
@@ -83,6 +84,7 @@ GEM
       colorize
       i18n
     hike (1.2.3)
+    httpclient (2.3.4.1)
     i18n (0.6.1)
     journey (1.0.4)
     json (1.8.1)
@@ -130,8 +132,6 @@ GEM
     rb-fsevent (0.9.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -154,7 +154,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
     thor (0.16.0)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -182,8 +181,5 @@ DEPENDENCIES
   mocha (= 0.12.7)
   rake
   rb-fsevent
-  rspec
   simplecov
-  spork
-  sqlite3
   yarjuf

data/Guardfile

@@ -12,22 +12,10 @@ guard 'rspec', :version => 2, :cli => "--color --format nested --drb", :all_on_s
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^lib/api_resource/(.+)\.rb$})  {|m| "spec/lib/#{m[1]}_spec.rb"}
   watch('spec/spec_helper.rb')  { "spec/" }
-
-  # Rails example
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec/" }
-  watch('spec/spec_helper.rb')                        { "spec/" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end
 
-guard 'spork' do
-  watch('api_resource.gemspec')
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb') { :rspec }
-end
+#guard 'spork' do
+#  watch('api_resource.gemspec')
+#  watch('Gemfile.lock')
+#  watch('spec/spec_helper.rb') { :rspec }
+#end

data/api_resource.gemspec

@@ -17,9 +17,7 @@ Gem::Specification.new do |gem|
 
   # Development Dependencies
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "spork" 
-  gem.add_development_dependency "yarjuf" 
+  gem.add_development_dependency "yarjuf"
   # this latest version of mocha is not compatible with the rails
   # 3.2.9
   gem.add_development_dependency "mocha", ["=0.12.7"]
@@ -32,14 +30,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "flog"
   gem.add_development_dependency "hash_dealer"
   gem.add_development_dependency "rb-fsevent"
-  gem.add_development_dependency "byebug"
   gem.add_development_dependency "simplecov"
-  # stuff that seems like crap
-  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency 'byebug'
 
+  gem.add_dependency "httpclient"
   gem.add_dependency "rails"
+  gem.add_dependency 'activemodel'
   gem.add_dependency "json"
-  gem.add_dependency "rest-client"
   gem.add_dependency "log4r"
   gem.add_dependency "differ"
   gem.add_dependency "colorize"

data/lib/api_resource.rb

@@ -14,9 +14,9 @@ require 'differ'
 require 'colorize'
 
 module ApiResource
-  
+
   extend ActiveSupport::Autoload
-  
+
   autoload :Associations
   autoload :AssociationActivation
   autoload :Attributes
@@ -34,53 +34,54 @@ module ApiResource
   autoload :ModelErrors
   autoload :Observing
   autoload :Scopes
+  autoload :Serializer
   autoload :Typecast
   autoload :Validations
-  
+
   require 'api_resource/railtie'
-  
+
   mattr_writer :logger
   mattr_accessor :raise_missing_definition_error; self.raise_missing_definition_error = false
 
   DEFAULT_TIMEOUT = 10 # seconds
-  
+
   # Load a fix for inflections for words ending in ess
   ActiveSupport::Inflector.inflections do |inflect|
     inflect.singular(/ess$/i, 'ess')
   end
-  
+
   def self.load_mocks_and_factories
     require 'hash_dealer'
     Mocks.clear_endpoints
     Mocks.init
-    
-    Dir["#{File.dirname(__FILE__)}/../spec/support/requests/*.rb"].each {|f| 
+
+    Dir["#{File.dirname(__FILE__)}/../spec/support/requests/*.rb"].each {|f|
       require f
     }
-    Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f| 
+    Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f|
       require f
     }
   end
 
   class << self
-    
-    delegate :site, :site=, :format, :format=, 
-      :token, :token=, :timeout, 
-      :open_timeout, 
+
+    delegate :site, :site=, :format, :format=,
+      :token, :token=, :timeout,
+      :open_timeout,
       :reset_connection, :ttl, :ttl=,
       :to => "ApiResource::Base"
-    
+
   end
 
   def self.cache(reset = false)
     @cache = nil if reset
     @cache ||= begin
         defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
-      rescue 
+      rescue
         ActiveSupport::Cache::MemoryStore.new
     end
   end
-  
+
   # set the timeout val and reset the connection
   def self.timeout=(val)
     ApiResource::Base.timeout = val
@@ -116,7 +117,7 @@ module ApiResource
       self.ttl = old_ttl
     end
   end
-  
+
   # logger
   def self.logger
     return @logger if @logger
@@ -125,11 +126,11 @@ module ApiResource
     @logger.level = Log4r::INFO
     @logger
   end
-  
+
   # Use this method to enable logging in the future
   # def self.logging(val = nil)
   #   return (@@logging || false) unless val
   #   return @@logging = val
   # end
-  
+
 end

data/lib/api_resource/associations.rb

@@ -2,7 +2,7 @@ require 'active_support'
 require 'active_support/string_inquirer'
 
 module ApiResource
-  
+
   module Associations
 
     #TODO: many of these methods should also force loading of the resource definition
@@ -20,10 +20,10 @@ module ApiResource
     autoload :SingleObjectProxy
 
     included do
-      
+
       unless self.ancestors.include?(ApiResource::AssociationActivation)
         raise Exception.new(
-          "Can't include Associations without AssociationActivation" 
+          "Can't include Associations without AssociationActivation"
         )
       end
 
@@ -42,7 +42,7 @@ module ApiResource
       extend InheritedMethod
 
       self.define_association_methods
-      
+
     end
 
     # module methods to include the proper associations in various libraries - this is usually loaded in Railties
@@ -50,8 +50,8 @@ module ApiResource
       ActiveRecord::Base.class_eval do
         include ApiResource::AssociationActivation
         self.activate_associations(
-          :has_many_remote => :has_many_remote, 
-          :belongs_to_remote => :belongs_to_remote, 
+          :has_many_remote => :has_many_remote,
+          :belongs_to_remote => :belongs_to_remote,
           :has_one_remote => :has_one_remote,
         )
       end
@@ -71,7 +71,7 @@ module ApiResource
     end
 
     module ClassMethods
-      
+
       # Define the methods for creating and testing for associations, unfortunately
       # scopes are different enough to require different methods :(
       def define_association_methods
@@ -82,7 +82,7 @@ module ApiResource
               options = options.with_indifferent_access
               # Raise an error if we have multiple args and options
               raise "Invalid arguments to #{assoc}" unless options.blank? || args.length == 1
-              args.each do |arg| 
+              args.each do |arg|
                 klass_name = (options[:class_name] ? options[:class_name].to_s.classify : arg.to_s.classify)
                 # add this to any descendants - the other methods etc are handled by inheritance
                 ([self] + self.descendants).each do |klass|
@@ -93,15 +93,15 @@ module ApiResource
                 define_association_as_attribute(:#{assoc}, arg, options)
               end
             end
-          
+
             def #{assoc}?(name)
               return self.related_objects[:#{assoc}][name.to_s.pluralize.to_sym].present? || self.related_objects[:#{assoc}][name.to_s.singularize.to_sym].present?
             end
-          
+
             def #{assoc}_class_name(name)
               raise "No such" + :#{assoc}.to_s + " association on #{name}" unless self.#{assoc}?(name)
               return self.find_namespaced_class_name(self.related_objects[:#{assoc}][name.to_sym])
-            end            
+            end
 
           EOE
           # For convenience we will define the methods for testing for the existence of an association
@@ -117,14 +117,14 @@ module ApiResource
           EOE
         end
       end
-      
+
       def association?(assoc)
         self.related_objects.any? do |key, value|
           next if key.to_s == "scopes"
           value.detect { |k,v| k.to_sym == assoc.to_sym }
         end
       end
-      
+
       def association_names
         # structure is {:has_many => {"myname" => "ClassName"}}
         self.related_objects.clone.delete_if{|k,v| k.to_s == "scopes"}.collect{|k,v| v.keys.collect(&:to_sym)}.flatten
@@ -133,7 +133,7 @@ module ApiResource
       def association_class(assoc)
         self.association_class_name(assoc).constantize
       end
-      
+
       def association_class_name(assoc)
         raise ArgumentError, "#{assoc} is not a valid association of #{self}" unless self.association?(assoc)
         result = self.related_objects.detect do |key,value|
@@ -144,7 +144,7 @@ module ApiResource
 
       # TODO: add a special foreign_key option to associations
       def association_foreign_key_field(assoc, type = nil)
-        
+
         if type.nil? && has_many?(assoc)
           type = :has_many
         else
@@ -160,7 +160,7 @@ module ApiResource
 
         str.to_sym
       end
-      
+
       protected
 
         def clear_related_objects
@@ -184,6 +184,22 @@ module ApiResource
           self.related_objects[:scopes] = self.related_objects[:scopes].clone
         end
 
+        #
+        # Wrapper method to define all associations from the
+        # resource definition
+        #
+        # @return [Boolean] true
+        def define_all_associations
+          if self.resource_definition["associations"]
+            self.resource_definition["associations"].each_pair do |key, hash|
+              hash.each_pair do |assoc_name, assoc_options|
+                self.send(key, assoc_name, assoc_options)
+              end
+            end
+          end
+          true
+        end
+
         def define_association_as_attribute(assoc_type, assoc_name, opts)
           opts.stringify_keys!
 
@@ -198,7 +214,7 @@ module ApiResource
             define_attribute_method(assoc_name)
             define_attribute_method(id_method_name)
           end
-          
+
           # a module to contain our generated methods
           cattr_accessor :api_resource_generated_methods
           self.api_resource_generated_methods = Module.new
@@ -216,7 +232,7 @@ module ApiResource
           )
           klass.define_association_as_attribute(self, assoc_name, opts)
         end
-        
+
         def find_namespaced_class_name(klass)
           # return the name if it is itself namespaced
           return klass if klass =~ /::/
@@ -233,13 +249,13 @@ module ApiResource
 
           return klass
         end
-      
+
     end
-    
+
     def association?(assoc)
       self.class.association?(assoc)
     end
-    
+
     def association_class(assoc)
       self.class.association_class(assoc)
     end
@@ -247,12 +263,12 @@ module ApiResource
     def association_class_name(assoc)
       self.class.association_class_name(assoc)
     end
-    
+
     # list of all association names
     def association_names
       self.class.association_names
     end
 
   end
-  
+
 end

data/lib/api_resource/associations/association_proxy.rb

@@ -1,22 +1,22 @@
 module ApiResource
-  
+
   module Associations
-   
+
     class AssociationProxy
 
 
       class_attribute :remote_path_element
-      self.remote_path_element = :service_uri 
+      self.remote_path_element = :service_uri
 
       attr_accessor :remote_path
       attr_reader :owner, :klass, :finder_opts
 
       # TODO: add the other load forcing methods here for collections
-      delegate :[], :[]=, :<<, :first, :second, :last, :blank?, :nil?, 
-        :include?, :push, :pop, :+, :concat, :flatten, :flatten!, :compact, 
-        :compact!, :empty?, :fetch, :map, :reject, :reject!, :reverse, 
-        :select, :select!, :size, :sort, :sort!, :uniq, :uniq!, :to_a, 
-        :sample, :slice, :slice!, :count, :present?, 
+      delegate :[], :[]=, :<<, :first, :second, :last, :blank?, :nil?,
+        :include?, :push, :pop, :+, :concat, :flatten, :flatten!, :compact,
+        :compact!, :empty?, :fetch, :map, :reject, :reject!, :reverse,
+        :select, :select!, :size, :sort, :sort!, :uniq, :uniq!, :to_a,
+        :sample, :slice, :slice!, :count, :present?,
         :to => :internal_object
 
       # define association methods on the class
@@ -27,7 +27,7 @@ module ApiResource
 
         # pass this along
         opts[:name] = assoc_name
-        
+
         klass.api_resource_generated_methods.module_eval <<-EOE, __FILE__, __LINE__ + 1
           def #{assoc_name}
             @attributes_cache[:#{assoc_name}] ||= begin
@@ -60,7 +60,8 @@ module ApiResource
               #{id_method_name}_will_change!
             end
             @attributes_cache[:#{id_method_name}] = val
-            write_attribute(:#{id_method_name}, val)
+            # write_attribute(:#{id_method_name}, val)
+            @attributes[:#{id_method_name}] = val
           end
 
         EOE
@@ -76,7 +77,7 @@ module ApiResource
       public
 
       def initialize(klass, owner, options = {})
-        
+
         # the base class for our scope, e.g. ApiResource::SomeClass
         @klass = klass.is_a?(String) ? klass.constantize : klass
 
@@ -150,7 +151,7 @@ module ApiResource
         end
 
     end
-    
+
   end
-  
+
 end