storage_room 0.3.10 → 0.3.11

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.11
+* Fixed another cyclic dependency bug
+
 == Version 0.3.10
 * Fixed cyclic dependency when preloading associated Collections 
 * Added create, update, save and destroy callbacks to Models

data/README.rdoc

@@ -37,6 +37,12 @@ This is a walkthrough with all steps you need to setup a devise entry, including
 
 You can find the documentation at http://rdoc.info/github/thriventures/storage_room_gem.
 
+== Long Running Processes
+
+The gem caches responses from the API. If you have a long-running process such as a server or worker you probably want fresh data and you should clear the cache before each request:
+
+  StorageRoom::IdentityMap.clear
+
 == More Examples
 
 See the examples folder.

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/storage_room/accessors.rb

@@ -146,6 +146,11 @@ module StorageRoom
     end
     
     module ClassMethods 
+      # Is the passed hash of response data a real object or only an association with a URL but no actual data
+      def response_data_is_association?(hash)
+        hash.size == 2 && hash.include?('@type') && hash.include?('url')
+      end
+      
       # Load an object with the specified URL from the API
       def load(url, parameters = {})
         return nil if url.blank?

data/lib/storage_room/identity_map.rb

@@ -37,10 +37,14 @@ module StorageRoom
       def new_from_response_data(response_data)        
         url = response_data['@url'] || response_data['url']
         object = url ? identity_map[url] : nil
-
+                
         if object.present? && identity_map_on?
-          StorageRoom.log("Loaded #{object} (#{url}) from identity map (new_from_response_data)")
-          object.set_from_response_data(response_data) 
+          if object.loaded? && response_data_is_association?(response_data)
+            StorageRoom.log("Loaded #{object} (#{url}) from identity map (new_from_response_data)")
+          else
+            StorageRoom.log("Loaded #{object} (#{url}) from identity map and updated attributes (new_from_response_data)")
+            object.set_from_response_data(response_data) 
+          end
         else
           object = super
           if identity_map_on? && url.present? && object.is_a?(Model)

data/lib/storage_room/resource.rb

@@ -4,8 +4,6 @@ module StorageRoom
     include HTTParty
     extend Plugins
 
-    
-    
     include Accessors
     
     plugin IdentityMap

data/spec/storage_room/accessors_spec.rb

@@ -11,7 +11,7 @@ end
 
 describe StorageRoom::TestAccessors do
   context "Class" do
-    describe "new_from_json_file" do
+    describe "#new_from_json_file" do
       it "should open file" do
         path = fixture_path('export_collection.json')
         object = StorageRoom::Resource.new_from_json_file(path)
@@ -19,6 +19,22 @@ describe StorageRoom::TestAccessors do
       end
     end
     
+    describe "#response_data_is_association?" do
+      it "should return true" do
+        hash = {'@type' => 'Tour', 'url' => 'URL'}
+        StorageRoom::Resource.response_data_is_association?(hash).should be_true
+      end
+      
+      it "should return false for too many keys" do
+        hash = {'@type' => 'Tour', 'url' => 'URL', 'more' => 3}
+        StorageRoom::Resource.response_data_is_association?(hash).should be_false
+      end
+      
+      it "should return false for wrong keys" do
+        hash = {'@type' => 'Tour', 'more' => 3}
+        StorageRoom::Resource.response_data_is_association?(hash).should be_false
+      end
+    end
   end
   
   

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{storage_room}
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = %q{2011-08-03}
+  s.date = %q{2011-08-04}
   s.description = %q{StorageRoom is a CMS system for Mobile Applications (iPhone, Android, BlackBerry, ...). This library gives you an ActiveModel-like interface to your data.}
   s.email = %q{sascha@thriventures.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Sascha Konietzke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +02:00
+date: 2011-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency