api_resource 0.2.11 → 0.3.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'rails', '3.0.9'
+gem 'rails', '~> 3'
 gem 'hash_dealer'
 gem 'rest-client'
 gem 'log4r'
@@ -10,6 +10,12 @@ gem 'differ'
 gem 'colorize'
 gem 'json', :require => 'json/ext'
 
+group :development, :staging  do
+  gem 'pry'
+  gem 'pry-doc'
+  gem 'pry-nav'
+end
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -25,6 +31,6 @@ group :development do
   gem 'mocha'
   gem "bundler"
   gem "jeweler", "~> 1.6.4"
-  gem 'activerecord', '3.0.9'
+  gem 'activerecord', '~> 3'
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -1,50 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    builder (2.1.2)
+    arel (3.0.2)
+    builder (3.0.0)
+    coderay (1.0.6)
     colorize (0.5.8)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     differ (0.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (2.3.2)
-      activesupport
+    erubis (2.7.0)
+    factory_girl (2.6.1)
+      activesupport (>= 2.3.9)
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.11)
     git (1.2.5)
     growl (1.0.3)
-    guard (0.10.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.6.0)
@@ -53,45 +53,59 @@ GEM
       activesupport
       colorize
       i18n
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.4)
+    journey (1.0.4)
+    json (1.7.3)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     log4r (1.1.10)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.0)
+    method_source (0.7.1)
+    mime-types (1.19)
+    mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.2.5)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    pry (0.9.9.6)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    pry-doc (0.4.2)
+      pry (>= 0.9.0)
+      yard (~> 0.8.1)
+    pry-nav (0.2.1)
+      pry (~> 0.9.9)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -120,22 +134,29 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    slop (2.4.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.0.9)
+  activerecord (~> 3)
   bundler
   colorize
   differ
@@ -149,7 +170,10 @@ DEPENDENCIES
   json
   log4r
   mocha
-  rails (= 3.0.9)
+  pry
+  pry-doc
+  pry-nav
+  rails (~> 3)
   rest-client
   rspec
   rspec-rails

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.3.0

data/api_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "api_resource"
-  s.version = "0.2.11"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Langevin"]
-  s.date = "2012-06-21"
+  s.date = "2012-06-23"
   s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
   s.email = "ejl6266@gmail.com"
   s.extra_rdoc_files = [
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
     "lib/api_resource/railtie.rb",
     "lib/api_resource/scopes.rb",
     "nohup.out",
+    "spec/lib/api_resource_spec.rb",
     "spec/lib/associations_spec.rb",
     "spec/lib/attributes_spec.rb",
     "spec/lib/base_spec.rb",
@@ -80,20 +81,23 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ejlangev/resource"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.11"
   s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["= 3.0.9"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3"])
       s.add_runtime_dependency(%q<hash_dealer>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0"])
       s.add_runtime_dependency(%q<colorize>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<pry-doc>, [">= 0"])
+      s.add_development_dependency(%q<pry-nav>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<growl>, [">= 0"])
@@ -106,16 +110,19 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<activerecord>, ["= 3.0.9"])
+      s.add_development_dependency(%q<activerecord>, ["~> 3"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["= 3.0.9"])
+      s.add_dependency(%q<rails>, ["~> 3"])
       s.add_dependency(%q<hash_dealer>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0"])
       s.add_dependency(%q<colorize>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<pry-doc>, [">= 0"])
+      s.add_dependency(%q<pry-nav>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<growl>, [">= 0"])
@@ -128,17 +135,20 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<activerecord>, ["= 3.0.9"])
+      s.add_dependency(%q<activerecord>, ["~> 3"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["= 3.0.9"])
+    s.add_dependency(%q<rails>, ["~> 3"])
     s.add_dependency(%q<hash_dealer>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0"])
     s.add_dependency(%q<colorize>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<pry-doc>, [">= 0"])
+    s.add_dependency(%q<pry-nav>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<growl>, [">= 0"])
@@ -151,7 +161,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<activerecord>, ["= 3.0.9"])
+    s.add_dependency(%q<activerecord>, ["~> 3"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

data/lib/api_resource.rb

@@ -1,9 +1,10 @@
 require 'active_support'
 require 'active_support/inflector'
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext'
+#require 'active_support/core_ext/hash'
+#require 'active_support/core_ext/object'
+#require 'active_support/core_ext/class/attribute_accessors'
+#require 'active_support/core_ext/class/inheritable_attributes'
 require 'api_resource/core_extensions'
 
 require 'active_model'
@@ -52,30 +53,31 @@ module ApiResource
     Mocks.clear_endpoints
     Mocks.init
     
-    Dir["#{File.dirname(__FILE__)}/../spec/support/requests/*.rb"].each {|f| require f}
-    Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f| require f}
+    Dir["#{File.dirname(__FILE__)}/../spec/support/requests/*.rb"].each {|f| 
+      require f
+    }
+    Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f| 
+      require f
+    }
   end
-  
+
   class << self
-    [:site, :site=, :format, :format=, :token, :token=, :timeout, :open_timeout, :reset_connection].each do |m|
-      define_method(m) do |*args|
-        ApiResource::Base.send(m, *args)
-      end
-    end
+    
+    delegate :site, :site=, :format, :format=, 
+      :token, :token=, :timeout, 
+      :open_timeout, 
+      :reset_connection, :ttl, :ttl=,
+      :to => ApiResource::Base
+    
   end
-  
-  # Run a block with a given token - useful for AroundFilters
-  def self.with_token(new_token, &block)
-    old_token = self.token
-    begin
-      self.token = new_token
-      yield
-    ensure
-      self.token = old_token
+
+  def self.cache(reset = false)
+    @cache = nil if reset
+    @cache ||= begin
+      defined?(Rails) ? Rails.cache : ActiveSupport::Cache::MemoryStore.new
     end
   end
   
-
   # set the timeout val and reset the connection
   def self.timeout=(val)
     ApiResource::Base.timeout = val
@@ -89,8 +91,28 @@ module ApiResource
     self.reset_connection
     val
   end
-  
   self.timeout = self.open_timeout = DEFAULT_TIMEOUT
+
+  # Run a block with a given token - useful for AroundFilters
+  def self.with_token(new_token, &block)
+    old_token = self.token
+    begin
+      self.token = new_token
+      yield
+    ensure
+      self.token = old_token
+    end
+  end
+
+  def with_ttl(new_ttl, &block)
+    old_ttl = self.ttl
+    begin
+      self.ttl = new_ttl
+      yield
+    ensure
+      self.ttl = old_ttl
+    end
+  end
   
   # logger
   def self.logger
@@ -107,4 +129,4 @@ module ApiResource
   #   return @@logging = val
   # end
   
-end
+end

data/lib/api_resource/associations.rb

@@ -20,8 +20,8 @@ module ApiResource
     included do
       
       raise "Cannot include Associations without first including AssociationActivation" unless self.ancestors.include?(ApiResource::AssociationActivation)
-      class_inheritable_accessor :related_objects
-      
+      class_attribute :related_objects
+            
       # Hash to hold onto the definitions of the related objects
       self.related_objects = RelatedObjectHash.new
       self.association_types.keys.each do |type|
@@ -57,7 +57,8 @@ module ApiResource
                 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|
-                  klass.related_objects[:#{assoc}][arg.to_sym] = klass_name
+                  #We need to merge upon itself to generate a new object since the children all share their related objects with each other
+                  klass.related_objects = klass.related_objects.merge(:#{assoc} => klass.related_objects[:#{assoc}].merge(arg.to_sym => klass_name))
                 end
                 # We need to define reader and writer methods here
                 define_association_as_attribute(:#{assoc}, arg)
@@ -154,19 +155,17 @@ module ApiResource
       
     end
     
-    module InstanceMethods
-      def association?(assoc)
-        self.class.association?(assoc)
-      end
-      
-      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
+    def association?(assoc)
+      self.class.association?(assoc)
+    end
+    
+    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