amfetamine 0.2.6 → 0.2.7

data/lib/amfetamine/relationship.rb

@@ -83,14 +83,7 @@ module Amfetamine
 
     # Delegates the all method to child class with a nested path set
     def all(opts={})
-      force = opts.delete(:force)
-      request = lambda { on_class.all({ :nested_path => rest_path }.merge(opts)) }
-
-      @children = if force
-                    request.call
-                  else
-                    @children || request.call
-                  end
+      on_class.all({ :nested_path => rest_path }.merge(opts))
     end
 
     # Delegates the find method to child class with a nested path set

data/lib/amfetamine/version.rb

@@ -1,3 +1,3 @@
 module Amfetamine
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/amfetamine/relationships_spec.rb

@@ -34,6 +34,16 @@ describe Amfetamine::Relationships do
     before(:each) do
       dummy.children << child
       child.instance_variable_set(:@notsaved, false)
+
+      Child.stub_responses! do |allow|
+        allow.get(path:"/dummies/#{dummy.id}/children") { [child] }
+        allow.get(path:"/dummies/#{dummy.id}/children/#{child.id}") { child }
+        allow.post {}
+      end
+
+      Dummy.stub_responses! do |allow|
+        allow.get { dummy }
+      end
     end
 
     it "should create a relationship if parent id is passed in params" do
@@ -43,8 +53,6 @@ describe Amfetamine::Relationships do
 
     it "should be possible list all children" do
       dummy.children.should include(child)
-      Dummy.cache.flush
-      dummy.children.should include(child)
     end
 
     it "should be possible to get all children if not in memory" do
@@ -62,17 +70,8 @@ describe Amfetamine::Relationships do
     end
 
     it "should be possible to get a single child if not in memory" do
-      child.attributes[:dummy_id] = dummy.id # Lets fake we saved it.
-      Dummy.cache.flush
-      new_dummy = nil
-      stub_single_response(dummy) do
-        new_dummy = Dummy.find(dummy.id)
-      end
-
-      new_child = nil
-      stub_nested_single_response(dummy,child) do
-        new_child = new_dummy.children.find(child.id)
-      end
+      new_dummy = Dummy.find(dummy.id)
+      new_child = new_dummy.children.find(child.id)
 
       new_child.should == child
     end
@@ -86,17 +85,18 @@ describe Amfetamine::Relationships do
     end
 
     it "should create a new child if asked" do
-      new_child = nil
-      stub_post_response(child) do
-        new_child = dummy.create_child
-      end
-      puts new_child.inspect
+      Child.prevent_external_connections! do |allow|
+        allow.post(:code => 201) { child }
+        allow.get { [child] }
 
-      new_child.should_not be_new
-      new_child.should be_cached
-      dummy.children.should include(new_child)
-      Dummy.cache.flush
-      dummy.children.should include(new_child)
+        new_child = dummy.create_child(child.attributes)
+        new_child.should_not be_new
+        new_child.should be_cached
+
+        dummy.children.should include(new_child)
+        Dummy.cache.flush
+        dummy.children.should include(new_child)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amfetamine
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70274617798920 !ruby/object:Gem::Requirement
+  requirement: &70146243904100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617798920
+  version_requirements: *70146243904100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70274617798500 !ruby/object:Gem::Requirement
+  requirement: &70146243903420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617798500
+  version_requirements: *70146243903420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70274617798080 !ruby/object:Gem::Requirement
+  requirement: &70146243902840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617798080
+  version_requirements: *70146243902840
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70274617797660 !ruby/object:Gem::Requirement
+  requirement: &70146243902160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617797660
+  version_requirements: *70146243902160
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70274617797220 !ruby/object:Gem::Requirement
+  requirement: &70146243901740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617797220
+  version_requirements: *70146243901740
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70274617796780 !ruby/object:Gem::Requirement
+  requirement: &70146243901320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617796780
+  version_requirements: *70146243901320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70274617796360 !ruby/object:Gem::Requirement
+  requirement: &70146243900880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617796360
+  version_requirements: *70146243900880
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &70274617795940 !ruby/object:Gem::Requirement
+  requirement: &70146243900460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274617795940
+  version_requirements: *70146243900460
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70274617795480 !ruby/object:Gem::Requirement
+  requirement: &70146243900040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274617795480
+  version_requirements: *70146243900040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70274617795040 !ruby/object:Gem::Requirement
+  requirement: &70146243899620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274617795040
+  version_requirements: *70146243899620
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70274617794500 !ruby/object:Gem::Requirement
+  requirement: &70146243899200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274617794500
+  version_requirements: *70146243899200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70274617793960 !ruby/object:Gem::Requirement
+  requirement: &70146243915160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274617793960
+  version_requirements: *70146243915160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70274617825920 !ruby/object:Gem::Requirement
+  requirement: &70146243914740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274617825920
+  version_requirements: *70146243914740
 description: Wraps REST to objects, provides caching and makes your app go Bzzz!
 email:
 - timon@exvo.com