storage_room 0.3.11 → 0.3.12

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.12
+* Reset Resource after reloading
+
 == Version 0.3.11
 * Fixed another cyclic dependency bug
 

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/examples/authentication.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'storage_room')
 
-ACCOUNT_ID = '4e1e9c234250712eba000052' # your account id
-APPLICATION_API_KEY = 'fgK8Di4FYuRKtk2Xd12A' # your application's API key with read/write access
+ACCOUNT_ID = '4d13574cba05613d25000004' # your account id
+APPLICATION_API_KEY = 'DZHpRbsJ7VgFXhybKWmT' # your application's API key with read/write access
 
 StorageRoom.authenticate(ACCOUNT_ID, APPLICATION_API_KEY)
 

data/examples/pagination.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby -rubygems
+
+require File.join(File.dirname(__FILE__), 'authentication')
+
+collection = StorageRoom::Collection.find('4d960916ba05617333000005')
+
+puts "Nested Loops:\n\n"
+
+# Iterate over all pages of entries with nested loops
+collection.entries.each_page do |array|
+  puts "== Page: #{array[:@page]} / #{array[:@pages]}"
+  array.resources.each do |entry|
+    puts "Entry: #{entry.name}"
+  end
+end
+
+puts "Single helper:\n\n"
+
+# Iterate over all entries on all pages with one helper
+collection.entries.each_page_each_resource do |entry|
+  puts "Entry: #{entry.name}"
+end

data/lib/storage_room/array.rb

@@ -32,7 +32,7 @@ module StorageRoom
     end
     
     # Iterate over all resources with pagination
-    def each_page_each_item(args={})
+    def each_page_each_resource(args={})
       self.each_page(args) do |page|
         page.resources.each do |item|
           yield(item)

data/lib/storage_room/resource.rb

@@ -30,7 +30,9 @@ module StorageRoom
     # Reload an object from the API. Optionally pass an URL.
     def reload(url = nil, parameters = {})
       httparty = self.class.get(url || self[:@url], parameters)
-      set_from_response_data(httparty.parsed_response.first[1])
+      hash = httparty.parsed_response.first[1]
+      reset!
+      set_from_response_data(hash)
       true
     end
     

data/spec/storage_room/resource_spec.rb

@@ -76,6 +76,25 @@ describe StorageRoom::Resource do
           }.should raise_error(StorageRoom::RequestFailedError)
         end
       end
+      
+      describe "#reload" do
+        it "should reset attributes before reload" do
+          array = StorageRoom::Array.new
+          array.response_data[:@next_page_url] = '/collections/1/entries?page=2'
+          array.response_data[:@url] = '/collections/1/entries'
+          hash = {:array => {:@url => '/collections/1/entries?page=2', :@previous_page_url => '/collections/1/entries?page=1'}}
+          
+          stub_request(:get, stub_url('/collections/1/entries')).to_return(:body => hash.to_json, :status => 200)
+
+          array[:@next_page_url].should be_present
+          array[:@previous_page_url].should be_nil
+
+          array.reload
+          
+          array[:@next_page_url].should be_nil
+          array[:@previous_page_url].should be_present
+        end
+      end
             
       describe "#meta_data?" do
         it "should detect" do

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{storage_room}
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = %q{2011-08-04}
+  s.date = %q{2011-08-10}
   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 = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "examples/get_collections.rb",
     "examples/guidebooks.csv",
     "examples/import_csv.rb",
+    "examples/pagination.rb",
     "examples/search_entries.rb",
     "examples/update_entry.rb",
     "examples/upload_remove_image.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Sascha Konietzke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 +02:00
+date: 2011-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - examples/get_collections.rb
 - examples/guidebooks.csv
 - examples/import_csv.rb
+- examples/pagination.rb
 - examples/search_entries.rb
 - examples/update_entry.rb
 - examples/upload_remove_image.rb