remote_model 0.0.2 → 0.0.3

data/lib/remote_model/record.rb

@@ -5,27 +5,40 @@ module RemoteModule
     class << self
       def find(id, params = {}, &block)
         get(member_url.format(params.merge(id: id))) do |response, json|
-          obj = self.new(json)
-          request_block_call(block, obj, response)
+          if response.ok?
+            obj = self.new(json)
+            request_block_call(block, obj, response)
+          else
+            request_block_call(block, nil, response)
+          end
         end
       end
 
       def find_all(params = {}, &block)
         get(collection_url.format(params)) do |response, json|
-          objs = []
-          arr_rep = nil
-          if json.class == Array
-            arr_rep = json
-          elsif json.class == Hash
-            plural_sym = self.pluralize.to_sym
-            if json.has_key? plural_sym
-              arr_rep = json[plural_sym]
+          if response.ok?
+            objs = []
+            arr_rep = nil
+            if json.class == Array
+              arr_rep = json
+            elsif json.class == Hash
+              plural_sym = self.pluralize.to_sym
+              if json.has_key? plural_sym
+                arr_rep = json[plural_sym]
+              end
+            else
+              # the returned data was something else
+              # ie a string, number
+              request_block_call(block, nil, response)
+              return
             end
+            arr_rep.each { |one_obj_hash|
+              objs << self.new(one_obj_hash)
+            }
+            request_block_call(block, objs, response)
+          else
+            request_block_call(block, nil, response)
           end
-          arr_rep.each { |one_obj_hash|
-            objs << self.new(one_obj_hash)
-          }
-          request_block_call(block, objs, response)
         end
       end
 

data/lib/remote_model/version.rb

@@ -1,3 +1,3 @@
 module RemoteModel
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/requests_spec.rb

@@ -1,14 +1,43 @@
+class FailingModel < RemoteModule::RemoteModel
+    def self.root_url
+      # returns a 400 when you don't have a proper token
+      "http://graph.facebook.com/btaylor/friends"
+    end
+
+    collection_url ""
+    member_url "/:id"
+end
+
 describe "The requests stuff" do
   it "should parse json" do
-    ran = false
+    @ran = false
     RemoteModule::RemoteModel.get("http://graph.facebook.com/btaylor") do |response, json|
       json.class.should == Hash
       response.ok?.should == true
-      ran = true
+      @ran = true
     end
     # really stupid, haven't made an async request example...
     wait 5.0 do
-      ran.should == true
+      @ran.should == true
+    end
+  end
+
+  it "should return nil upon bad requests" do
+    @ran_find_all = false
+    @ran_find = false
+    FailingModel.find_all do |results, response|
+      results.should == nil
+      @ran_find_all = true
+    end
+
+    FailingModel.find("1") do |result, response|
+      result.should == nil
+      @ran_find = true
+    end
+
+    wait 5.0 do
+      @ran_find_all.should == true
+      @ran_find.should == true
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: remote_model
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Clay Allsopp
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-08 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bubble-wrap
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1050755329021550183
+      hash: -4143463869793250810
       segments: 
       - 0
       version: "0"
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1050755329021550183
+      hash: -4143463869793250810
       segments: 
       - 0
       version: "0"