motion-resource 0.0.1 → 0.0.2

data/lib/motion-resource/associations.rb

@@ -24,17 +24,21 @@ module MotionResource
           if block.nil?
             instance_variable_get("@#{name}") || []
           else
-            cached = instance_variable_get("@#{name}")
-            block.call(cached) and return if cached
+            if cached = instance_variable_get("@#{name}")
+              cached_response = instance_variable_get("@#{name}_response")
+              MotionResource::Base.request_block_call(block, cached, cached_response)
+              return
+            end
             
-            Object.const_get(name.to_s.classify).find_all(params.call(self)) do |results|
+            Object.const_get(name.to_s.classify).find_all(params.call(self)) do |results, response|
               if results && results.first && results.first.respond_to?("#{backwards_association}=")
                 results.each do |result|
                   result.send("#{backwards_association}=", self)
                 end
               end
               instance_variable_set("@#{name}", results)
-              block.call(results)
+              instance_variable_set("@#{name}_response", response)
+              MotionResource::Base.request_block_call(block, results, response)
             end
           end
         end
@@ -59,12 +63,16 @@ module MotionResource
           if block.nil?
             instance_variable_get("@#{name}")
           else
-            cached = instance_variable_get("@#{name}")
-            block.call(cached) and return if cached
-          
-            Object.const_get(name.to_s.classify).find(self.send("#{name}_id"), params.call(self)) do |result|
+            if cached = instance_variable_get("@#{name}")
+              cached_response = instance_variable_get("@#{name}_response")
+              MotionResource::Base.request_block_call(block, cached, cached_response)
+              return
+            end
+            
+            Object.const_get(name.to_s.classify).find(self.send("#{name}_id"), params.call(self)) do |result, response|
               instance_variable_set("@#{name}", result)
-              block.call(result)
+              instance_variable_set("@#{name}_response", response)
+              MotionResource::Base.request_block_call(block, result, response)
             end
           end
         end

data/lib/motion-resource/base.rb

@@ -2,6 +2,14 @@ module MotionResource
   class Base
     attr_accessor :id
     
+    def self.subclasses
+      @subclasses ||= []
+    end
+    
+    def self.inherited(subclass)
+      self.subclasses << subclass
+    end
+    
     def initialize(params = {})
       @new_record = true
       update_attributes(params)
@@ -13,6 +21,7 @@ module MotionResource
     
     class << self
       def instantiate(json)
+        json = json.symbolize_keys
         raise ArgumentError, "No :id parameter given for #{self.name}.instantiate" unless json[:id]
         
         klass = if json[:type]

data/lib/motion-resource/crud.rb

@@ -6,7 +6,7 @@ module MotionResource
     
     def update(&block)
       self.class.put(member_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
-        block.call json.blank? ? nil : self.class.instantiate(json) if block
+        self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
       end
     end
   
@@ -14,19 +14,19 @@ module MotionResource
       # weird heisenbug: Specs crash without that line :(
       dummy = self
       self.class.post(collection_url, :payload => { self.class.name.underscore => attributes }) do |response, json|
-        block.call json.blank? ? nil : self.class.instantiate(json) if block
+        self.class.request_block_call(block, json.blank? ? self : self.class.instantiate(json), response) if block
       end
     end
   
     def destroy(&block)
       self.class.delete(member_url) do |response, json|
-        block.call json.blank? ? nil : self.class.instantiate(json) if block
+        self.class.request_block_call(block, json.blank? ? nil : self.class.instantiate(json), response) if block
       end
     end
     
     def reload(&block)
       self.class.get(member_url) do |response, json|
-        block.call json.blank? ? nil : self.class.instantiate(json) if block
+        self.class.request_block_call(block, json.blank? ? nil : self.class.instantiate(json), response) if block
       end
     end
   end

data/lib/motion-resource/find.rb

@@ -47,8 +47,7 @@ module MotionResource
           end
         end
       end
-    
-    private
+      
       def request_block_call(block, default_arg, extra_arg)
         if block
           if block.arity == 1

data/lib/motion-resource/logger.rb

@@ -0,0 +1,6 @@
+module MotionResource
+  class Base
+    class_inheritable_accessor :logger
+    self.logger = MotionSupport::NullLogger.new
+  end
+end

data/lib/motion-resource/requests.rb

@@ -46,9 +46,11 @@ module MotionResource
         if self.default_url_options
           options.merge!(self.default_url_options)
         end
+        logger.log "#{method.upcase} #{complete_url(url)}"
         BubbleWrap::HTTP.send(method, complete_url(url), options) do |response|
           if response.ok?
             body = response.body.to_str.strip rescue nil
+            logger.log "response: #{body}"
             if body.blank?
               block.call(response, {})
             else

data/lib/motion-resource/spec_helpers.rb

@@ -0,0 +1,16 @@
+module MotionResource
+  module SpecHelpers
+    def self.extended(base)
+      base.after do
+        forget_instances_of(MotionResource::Base)
+      end
+    end
+    
+    def forget_instances_of(klass)
+      klass.identity_map.clear
+      klass.subclasses.each do |subklass|
+        forget_instances_of(subklass)
+      end
+    end
+  end
+end

data/lib/motion-resource/version.rb

@@ -1,3 +1,3 @@
 module MotionResource
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/motion-resource/associations/belongs_to_spec.rb

@@ -59,6 +59,15 @@ describe "belongs_to" do
       end
     end
     
+    it "should give cached HTTP response immediately if exist when called with a block" do
+      @comment = Comment.new
+      @comment.post = Post.new
+      @comment.instance_variable_set(:@post_response, "Test response")
+      @comment.post do |result, response|
+        response.should == "Test response"
+      end
+    end
+    
     it "should cache resource after fetching" do
       @comment = Comment.new(:post_id => 1)
       @comment.post do |result|
@@ -70,6 +79,18 @@ describe "belongs_to" do
         @comment.post.should == @result
       end
     end
+  
+    it "should give HTTP response to block" do
+      @comment = Comment.new(:post_id => 1)
+      @comment.post do |results, response|
+        @response = response
+        resume
+      end
+      
+      wait_max 1.0 do
+        @response.should.be.ok
+      end
+    end
   end
   
   describe "writer" do

data/spec/motion-resource/associations/has_many_spec.rb

@@ -60,6 +60,15 @@ describe "has_many" do
       end
     end
     
+    it "should give cached HTTP response immediately if exist when called with a block" do
+      @post = Post.new
+      @post.comments = [Comment.new]
+      @post.instance_variable_set(:@comments_response, "Test response")
+      @post.comments do |results, response|
+        response.should == "Test response"
+      end
+    end
+    
     it "should assign backward associations when fetching resources" do
       @post = Post.new
       @post.comments do |results|
@@ -83,6 +92,18 @@ describe "has_many" do
         @post.comments.should == @results
       end
     end
+  
+    it "should give HTTP response to block" do
+      @post = Post.new
+      @post.comments do |results, response|
+        @response = response
+        resume
+      end
+      
+      wait_max 1.0 do
+        @response.should.be.ok
+      end
+    end
   end
   
   describe "writer" do

data/spec/motion-resource/associations/scope_spec.rb

@@ -1,13 +1,15 @@
 describe "scope" do
   extend WebStub::SpecHelpers
   
+  before do
+    stub_request(:get, "http://example.com/comments/recent.json").to_return(json: [{ id: 1, text: 'Whats up?' }])
+  end
+  
   it "should define a custom url" do
     Comment.should.respond_to :recent_url
   end
   
   it "should fetch collection" do
-    stub_request(:get, "http://example.com/comments/recent.json").to_return(json: [{ id: 1, text: 'Whats up?' }])
-    
     Comment.recent do |results|
       @results = results
       resume
@@ -18,4 +20,15 @@ describe "scope" do
       @results.first.text.should == 'Whats up?'
     end
   end
+  
+  it "should give HTTP response to block" do
+    Comment.recent do |results, response|
+      @response = response
+      resume
+    end
+      
+    wait_max 1.0 do
+      @response.should.be.ok
+    end
+  end
 end

data/spec/motion-resource/base_spec.rb

@@ -51,4 +51,12 @@ describe "base" do
       shape1.contents.should == 'something'
     end
   end
+  
+  describe "subclasses" do
+    it "should keep track of subclasses" do
+      MotionResource::Base.subclasses.should.include(Shape)
+      Shape.subclasses.should.include(Rectangle)
+      MotionResource::Base.subclasses.should.not.include(Rectangle)
+    end
+  end
 end

data/spec/motion-resource/crud_spec.rb

@@ -30,14 +30,39 @@ describe "crud" do
   
     it "should create without json in response" do
       stub_request(:post, "http://example.com/comments.json").to_return(body: "")
-      comment = Comment.new
-      comment.create do |result|
+      @comment = Comment.new
+      @comment.create do |result|
         @result = result
         resume
       end
     
       wait_max 1.0 do
-        @result.should.be.nil
+        @result.should == @comment
+      end
+    end
+  
+    it "should create with empty json response" do
+      stub_request(:post, "http://example.com/comments.json").to_return(json: {})
+      @comment = Comment.new
+      @comment.create do |result|
+        @result = result
+        resume
+      end
+    
+      wait_max 1.0 do
+        @result.should == @comment
+      end
+    end
+  
+    it "should give HTTP response to block" do
+      stub_request(:post, "http://example.com/comments.json").to_return(json: {}, status_code: 404)
+      Comment.new.create do |result, response|
+        @response = response
+        resume
+      end
+    
+      wait_max 1.0 do
+        @response.should.not.be.ok
       end
     end
   end
@@ -71,14 +96,39 @@ describe "crud" do
   
     it "should update without json in response" do
       stub_request(:put, "http://example.com/comments/10.json").to_return(body: "")
-      comment = Comment.instantiate(:id => 10)
-      comment.update do |result|
+      @comment = Comment.instantiate(:id => 10)
+      @comment.update do |result|
         @result = result
         resume
       end
     
       wait_max 1.0 do
-        @result.should.be.nil
+        @result.should.be == @comment
+      end
+    end
+  
+    it "should update with empty json response" do
+      stub_request(:put, "http://example.com/comments/10.json").to_return(json: {})
+      @comment = Comment.instantiate(:id => 10)
+      @comment.update do |result|
+        @result = result
+        resume
+      end
+    
+      wait_max 1.0 do
+        @result.should.be == @comment
+      end
+    end
+  
+    it "should give HTTP response to block" do
+      stub_request(:put, "http://example.com/comments/10.json").to_return(json: {}, status_code: 404)
+      Comment.instantiate(:id => 10).update do |result, response|
+        @response = response
+        resume
+      end
+    
+      wait_max 1.0 do
+        @response.should.not.be.ok
       end
     end
   end
@@ -109,6 +159,18 @@ describe "crud" do
         @result.should.be.nil
       end
     end
+  
+    it "should give HTTP response to block" do
+      stub_request(:delete, "http://example.com/comments/10.json").to_return(json: {}, status_code: 404)
+      Comment.instantiate(:id => 10).destroy do |result, response|
+        @response = response
+        resume
+      end
+    
+      wait_max 1.0 do
+        @response.should.not.be.ok
+      end
+    end
   end
 
   describe "reload" do
@@ -137,5 +199,17 @@ describe "crud" do
         @result.should.be.nil
       end
     end
+  
+    it "should give HTTP response to block" do
+      stub_request(:get, "http://example.com/comments/10.json").to_return(json: {}, status_code: 404)
+      Comment.instantiate(:id => 10).reload do |result, response|
+        @response = response
+        resume
+      end
+    
+      wait_max 1.0 do
+        @response.should.not.be.ok
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: motion-resource
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Thomas Kadauke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-29 00:00:00 Z
+date: 2012-12-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bubble-wrap
@@ -75,7 +75,9 @@ files:
 - lib/motion-resource/base.rb
 - lib/motion-resource/crud.rb
 - lib/motion-resource/find.rb
+- lib/motion-resource/logger.rb
 - lib/motion-resource/requests.rb
+- lib/motion-resource/spec_helpers.rb
 - lib/motion-resource/string.rb
 - lib/motion-resource/urls.rb
 - lib/motion-resource/version.rb
@@ -105,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1460069226748132029
+      hash: -3639208948173529629
       segments: 
       - 0
       version: "0"
@@ -114,14 +116,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1460069226748132029
+      hash: -3639208948173529629
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Access RESTful resources from your iOS app