api_resource 0.4.2 → 0.4.3

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -0,0 +1,5 @@
+--color
+--format nested
+--backtrace
+--fail-fast
+-X

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/api_resource.gemspec

@@ -5,25 +5,94 @@
 
 Gem::Specification.new do |s|
   s.name = "api_resource"
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ethan Langevin", "Dan Langevin"]
-  s.date = "2012-11-27"
+  s.authors = ["Ethan Langevin"]
+  s.date = "2012-12-03"
   s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
-  s.email = "dan.langevin@lifebooker.com"
+  s.email = "ejl6266@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.homepage = "http://github.com/LifebookerInc/api_resource"
+  s.files = [
+    ".document",
+    ".rspec",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "api_resource.gemspec",
+    "lib/api_resource.rb",
+    "lib/api_resource/association_activation.rb",
+    "lib/api_resource/associations.rb",
+    "lib/api_resource/associations/association_proxy.rb",
+    "lib/api_resource/associations/belongs_to_remote_object_proxy.rb",
+    "lib/api_resource/associations/dynamic_resource_scope.rb",
+    "lib/api_resource/associations/generic_scope.rb",
+    "lib/api_resource/associations/has_many_remote_object_proxy.rb",
+    "lib/api_resource/associations/has_many_through_remote_object_proxy.rb",
+    "lib/api_resource/associations/has_one_remote_object_proxy.rb",
+    "lib/api_resource/associations/multi_argument_resource_scope.rb",
+    "lib/api_resource/associations/multi_object_proxy.rb",
+    "lib/api_resource/associations/related_object_hash.rb",
+    "lib/api_resource/associations/relation_scope.rb",
+    "lib/api_resource/associations/resource_scope.rb",
+    "lib/api_resource/associations/scope.rb",
+    "lib/api_resource/associations/single_object_proxy.rb",
+    "lib/api_resource/attributes.rb",
+    "lib/api_resource/base.rb",
+    "lib/api_resource/callbacks.rb",
+    "lib/api_resource/connection.rb",
+    "lib/api_resource/core_extensions.rb",
+    "lib/api_resource/custom_methods.rb",
+    "lib/api_resource/decorators.rb",
+    "lib/api_resource/decorators/caching_decorator.rb",
+    "lib/api_resource/exceptions.rb",
+    "lib/api_resource/formats.rb",
+    "lib/api_resource/formats/json_format.rb",
+    "lib/api_resource/formats/xml_format.rb",
+    "lib/api_resource/local.rb",
+    "lib/api_resource/log_subscriber.rb",
+    "lib/api_resource/mocks.rb",
+    "lib/api_resource/model_errors.rb",
+    "lib/api_resource/observing.rb",
+    "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",
+    "spec/lib/callbacks_spec.rb",
+    "spec/lib/connection_spec.rb",
+    "spec/lib/local_spec.rb",
+    "spec/lib/mocks_spec.rb",
+    "spec/lib/model_errors_spec.rb",
+    "spec/lib/prefixes_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/mocks/association_mocks.rb",
+    "spec/support/mocks/error_resource_mocks.rb",
+    "spec/support/mocks/prefix_model_mocks.rb",
+    "spec/support/mocks/test_resource_mocks.rb",
+    "spec/support/requests/association_requests.rb",
+    "spec/support/requests/error_resource_requests.rb",
+    "spec/support/requests/prefix_model_requests.rb",
+    "spec/support/requests/test_resource_requests.rb",
+    "spec/support/test_resource.rb",
+    "spec/tmp/DIR"
+  ]
+  s.homepage = "http://github.com/ejlangev/resource"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
 
-  s.files = Dir.glob("**/*")
-
   if s.respond_to? :specification_version then
     s.specification_version = 3
 

data/lib/api_resource/associations/association_proxy.rb

@@ -17,8 +17,13 @@ module ApiResource
         self.times_loaded = 0
         self.owner = owner
         self.klass = klass_name.to_s.classify.constantize
+        # make sure we have the remote definition
+        self.klass.load_class_data
         self.load(contents)
         self.loaded = {}.with_indifferent_access
+
+      #debugger
+
         if self.class.include_class_scopes
           self.scopes = self.scopes.reverse_merge(self.klass.scopes)
         end

data/lib/api_resource/base.rb

@@ -114,20 +114,29 @@ module ApiResource
       # load our resource definition to make sure we know what this class
       # responds to
       def respond_to?(*args)
-        unless self.instance_variable_defined?(:@class_data)
-          self.instance_variable_set(:@class_data, true)
-          self.set_class_attributes_upon_load
-        end
+        self.load_class_data
         super
       end
       
-      def reload_class_attributes
+      def load_class_data
+        unless instance_variable_defined?(:@class_data)
+          @class_data = true
+          self.set_class_attributes_upon_load
+        end
+        true
+      end
+
+      def reload_class_data
         # clear the public_attribute_names, protected_attribute_names
-        remove_instance_variable(:@class_data) if instance_variable_defined?(:@class_data)
-        self.clear_attributes
-        self.clear_related_objects
-        self.set_class_attributes_upon_load
+        if instance_variable_defined?(:@class_data)
+          remove_instance_variable(:@class_data)
+          self.clear_attributes
+          self.clear_related_objects
+        end
+        self.load_class_data
       end
+      # backwards compatibility
+      alias_method :reload_class_attributes, :reload_class_data
       
       def token_with_new_token_set=(new_token)
         self.token_without_new_token_set = new_token
@@ -154,7 +163,7 @@ module ApiResource
         
         # reset class attributes and try to reload them if the site changed
         unless self.site.to_s == old_site
-          self.reload_class_attributes
+          self.reload_class_data
         end
         
         return site
@@ -435,10 +444,7 @@ module ApiResource
     
     def initialize(attributes = {})
       # if we initialize this class, load the attributes
-      unless self.class.instance_variable_defined?(:@class_data)
-        self.class.set_class_attributes_upon_load
-        self.class.instance_variable_set(:@class_data, true)
-      end
+      self.class.load_class_data
       # Now we can make a call to setup the inheriting klass with its attributes
       load(attributes)
     end

data/spec/lib/associations_spec.rb

@@ -17,7 +17,9 @@ describe "Associations" do
         belongs_to :belongs_to_object
         has_one :has_one_object
       end
-      AllAssociations.association_names.sort.should eql [:has_many_objects, :belongs_to_object, :has_one_object].sort
+      AllAssociations.association_names.sort.should eql(
+        [:has_many_objects, :belongs_to_object, :has_one_object].sort
+      )
       AllAssociations.new.association_names.sort.should eql [:has_many_objects, :belongs_to_object, :has_one_object].sort
     end
 
@@ -466,6 +468,16 @@ describe "Associations" do
       ap.first.name.should eql old_name
     end
 
+    it "should propagate the scopes from the associated class" do
+
+      ap = Associations::MultiObjectProxy.new(
+        "TestResource", {:service_uri => "/multi_object_association"}
+      )
+      ap.scopes.should eql(TestResource.scopes)
+      true
+    end
+
+
     context "Multi Object" do
 
       it "should be able to load 'all'" do
@@ -571,6 +583,8 @@ describe "Associations" do
           result.should be_a TestResource
         end
       end
+
+
     end
 
     context "Assigning Data" do

data/spec/lib/base_spec.rb

@@ -6,7 +6,7 @@ include ApiResource
 describe "Base" do
   
   after(:all) do
-    TestResource.reload_class_attributes
+    TestResource.reload_class_data
   end
   
   describe "Loading data from a hash" do
@@ -128,7 +128,7 @@ describe "Base" do
   describe "Serialization" do
     
     before(:all) do
-      TestResource.reload_class_attributes
+      TestResource.reload_class_data
       TestResource.has_many :has_many_objects
       TestResource.define_attributes :attr1, :attr2
       TestResource.include_root_in_json = true
@@ -193,7 +193,7 @@ describe "Base" do
           TestResource.has_many(:has_many_objects)
         end
         after(:all) do
-          TestResource.reload_class_attributes
+          TestResource.reload_class_data
         end
         
         it "should include the id of nested objects in the serialization" do
@@ -229,7 +229,7 @@ describe "Base" do
   describe "Finding Data" do
     
     before(:all) do
-      TestResource.reload_class_attributes
+      TestResource.reload_class_data
     end
     
     it "should be able to find all" do
@@ -262,7 +262,7 @@ describe "Base" do
     
     before(:all) do
       TestResource.include_root_in_json = true
-      TestResource.reload_class_attributes
+      TestResource.reload_class_data
     end
     
     context "Creating new records" do
@@ -367,7 +367,7 @@ describe "Base" do
     
     context "Updating old records" do
       before(:all) do
-        TestResource.reload_class_attributes
+        TestResource.reload_class_data
         TestResource.has_many :has_many_objects
         RestClient::Payload.stubs(:has_file? => false)
       end
@@ -623,7 +623,10 @@ describe "Base" do
       end
       
       it "should find with expires_in and cache" do
-        ApiResource.cache.expects(:fetch).with(anything, :expires_in => 10.0).returns({:id => 2, :name => "d"})
+        ApiResource.cache.expects(:fetch)
+          .with(anything, :expires_in => 10.0)
+          .returns({:id => 2, :name => "d"})
+          
         res = TestResource.find("adfa", :expires_in => 10)
         
         ApiResource::Base.ttl.should eql(1)

data/spec/lib/mocks_spec.rb

@@ -3,7 +3,7 @@ require 'json'
 
 include ApiResource
 
-describe Mocks, :focus do
+describe Mocks do
   
   # we set up the mocks in spec helper, so we can just assert this
   it "should hijack the connection" do

data/spec/spec_helper.rb

@@ -43,6 +43,9 @@ Spork.prefork do
 
   RSpec.configure do |config|
     config.mock_with :mocha
+    config.treat_symbols_as_metadata_keys_with_true_values = true
+    config.filter_run :focus => true
+    config.run_all_when_everything_filtered = true
   end
 
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
 - Ethan Langevin
-- Dan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -414,68 +413,27 @@ dependencies:
         version: '0'
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
-email: dan.langevin@lifebooker.com
+email: ejl6266@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- api_resource.gemspec
-- coverage/assets/0.5.3/app.js
-- coverage/assets/0.5.3/fancybox/blank.gif
-- coverage/assets/0.5.3/fancybox/fancy_close.png
-- coverage/assets/0.5.3/fancybox/fancy_loading.png
-- coverage/assets/0.5.3/fancybox/fancy_nav_left.png
-- coverage/assets/0.5.3/fancybox/fancy_nav_right.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_e.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_n.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_ne.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_nw.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_s.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_se.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_sw.png
-- coverage/assets/0.5.3/fancybox/fancy_shadow_w.png
-- coverage/assets/0.5.3/fancybox/fancy_title_left.png
-- coverage/assets/0.5.3/fancybox/fancy_title_main.png
-- coverage/assets/0.5.3/fancybox/fancy_title_over.png
-- coverage/assets/0.5.3/fancybox/fancy_title_right.png
-- coverage/assets/0.5.3/fancybox/fancybox-x.png
-- coverage/assets/0.5.3/fancybox/fancybox-y.png
-- coverage/assets/0.5.3/fancybox/fancybox.png
-- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.css
-- coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.pack.js
-- coverage/assets/0.5.3/favicon_green.png
-- coverage/assets/0.5.3/favicon_red.png
-- coverage/assets/0.5.3/favicon_yellow.png
-- coverage/assets/0.5.3/highlight.css
-- coverage/assets/0.5.3/highlight.pack.js
-- coverage/assets/0.5.3/jquery-1.6.2.min.js
-- coverage/assets/0.5.3/jquery.dataTables.min.js
-- coverage/assets/0.5.3/jquery.timeago.js
-- coverage/assets/0.5.3/jquery.url.js
-- coverage/assets/0.5.3/loading.gif
-- coverage/assets/0.5.3/magnify.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- coverage/assets/0.5.3/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_222222_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_2e83ff_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_454545_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_888888_256x240.png
-- coverage/assets/0.5.3/smoothness/images/ui-icons_cd0a0a_256x240.png
-- coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
-- coverage/assets/0.5.3/stylesheet.css
-- coverage/index.html
+- .document
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- LICENSE.txt
+- README.rdoc
+- Rakefile
+- VERSION
+- api_resource.gemspec
+- lib/api_resource.rb
 - lib/api_resource/association_activation.rb
+- lib/api_resource/associations.rb
 - lib/api_resource/associations/association_proxy.rb
 - lib/api_resource/associations/belongs_to_remote_object_proxy.rb
 - lib/api_resource/associations/dynamic_resource_scope.rb
@@ -490,19 +448,18 @@ files:
 - lib/api_resource/associations/resource_scope.rb
 - lib/api_resource/associations/scope.rb
 - lib/api_resource/associations/single_object_proxy.rb
-- lib/api_resource/associations.rb
 - lib/api_resource/attributes.rb
 - lib/api_resource/base.rb
 - lib/api_resource/callbacks.rb
 - lib/api_resource/connection.rb
 - lib/api_resource/core_extensions.rb
 - lib/api_resource/custom_methods.rb
-- lib/api_resource/decorators/caching_decorator.rb
 - lib/api_resource/decorators.rb
+- lib/api_resource/decorators/caching_decorator.rb
 - lib/api_resource/exceptions.rb
+- lib/api_resource/formats.rb
 - lib/api_resource/formats/json_format.rb
 - lib/api_resource/formats/xml_format.rb
-- lib/api_resource/formats.rb
 - lib/api_resource/local.rb
 - lib/api_resource/log_subscriber.rb
 - lib/api_resource/mocks.rb
@@ -510,11 +467,7 @@ files:
 - lib/api_resource/observing.rb
 - lib/api_resource/railtie.rb
 - lib/api_resource/scopes.rb
-- lib/api_resource.rb
-- LICENSE.txt
 - nohup.out
-- Rakefile
-- README.rdoc
 - spec/lib/api_resource_spec.rb
 - spec/lib/associations_spec.rb
 - spec/lib/attributes_spec.rb
@@ -535,10 +488,8 @@ files:
 - spec/support/requests/prefix_model_requests.rb
 - spec/support/requests/test_resource_requests.rb
 - spec/support/test_resource.rb
-- spec/tmp/api_resource_test_db.sqlite
 - spec/tmp/DIR
-- VERSION
-homepage: http://github.com/LifebookerInc/api_resource
+homepage: http://github.com/ejlangev/resource
 licenses:
 - MIT
 post_install_message: 
@@ -551,6 +502,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1111483963078583304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -565,4 +519,3 @@ specification_version: 3
 summary: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 test_files: []
-has_rdoc: