storage_room 0.3.5 → 0.3.6

data/History.txt

@@ -1,3 +1,7 @@
+== Version 0.3.6
+* Added methods to download files
+* Added example on how to download all files from an Export
+
 == Version 0.3.5
 * Added WebhookDefinition as an array on Collection
 * Added WebhookCall Resource to parse the POST body of StorageRoom Webhooks on a server

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/examples/authentication.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/storage_room'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'storage_room')
 
 ACCOUNT_ID = '4dda7761b65245fde1000051' # your account id
 APPLICATION_API_KEY = 'kCWTmS1wxYnxzJyteuIn' # your application's API key with read/write access

data/examples/backup_uploads_from_export.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby -rubygems
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'storage_room')
+
+collection_path = ::File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'export_collection.json'))
+entry_path      = ::File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'export_entries.json'))
+download_path   = ::File.expand_path(File.join(File.dirname(__FILE__), 'downloads'))
+
+collection = StorageRoom::Resource.new_from_json_file(collection_path)
+entry_class = collection.entry_class
+
+attachment_fields = collection.fields.select{|f| f.is_a?(StorageRoom::AttachmentField)}
+
+puts "Loaded Collection '#{collection.name}' with attachment fields: #{attachment_fields.map(&:name).join(', ')}"
+puts "Downloading into '#{download_path}'"
+
+StorageRoom::Array.new_from_json_file(entry_path).resources.each do |entry|
+  attachment_fields.each do |field|
+    if file = entry.send(field.identifier)  
+      puts "Downloading #{file[:@url]} including all versions"
+      file.download_to_directory(download_path)
+    end
+  end
+end

data/examples/create_entry.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 
 # fetch the collection first

data/examples/destroy_entry.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 collection = StorageRoom::Collection.find('4dda7761b65245fde100005d')
 

data/examples/get_collections.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 collections = StorageRoom::Collection.all
 

data/examples/import_csv.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 require "csv" # faster_csv (ruby 1.9)
 
-lines = CSV.read(File.dirname(__FILE__) + '/guidebooks.csv') # Exported an Excel file as CSV
+lines = CSV.read(File.join(File.dirname(__FILE__), 'guidebooks.csv')) # Exported an Excel file as CSV
 
 lines.slice!(0) # remove header line
 

data/examples/search_entries.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 collection = StorageRoom::Collection.find('4dda7761b65245fde100005d')
 

data/examples/update_entry.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
 collection = StorageRoom::Collection.find('4dda7761b65245fde100005d')
 

data/examples/upload_remove_image.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby -rubygems
 
-require File.dirname(__FILE__) + '/authentication'
+require File.join(File.dirname(__FILE__), 'authentication')
 
-path = ::File.expand_path(File.dirname(__FILE__) + '/../spec/fixtures/image.png')
+path = ::File.expand_path(File.join(File.dirname(__FILE__) + '..', 'spec', 'fixtures', 'image.png'))
 collection = StorageRoom::Collection.find('4e034b8db65245b72600002b')
 
 # Upload Image or File

data/lib/storage_room/accessors.rb

@@ -152,10 +152,16 @@ module StorageRoom
         new_from_response_data(httparty.parsed_response.first[1])
       end
       
+      # Build an object out of a local file
+      def new_from_json_file(path)
+        json = ::File.read(path)
+        new_from_json_string(json)
+      end
+      
       # Build an object out of the POST body
       def new_from_json_string(json_string)
         hash = JSON.parse(json_string)
-        new_from_response_data(hash)
+        new_from_response_data(hash.first[1])
       end
       
       # Creates a new object of the correct class and initializes it from the response data

data/lib/storage_room/embeddeds/fields/compound/file_field.rb

@@ -1,6 +1,6 @@
 module StorageRoom
   
-  class FileField < CompoundField
+  class FileField < AttachmentField
     
   end
 end

data/lib/storage_room/embeddeds/fields/compound/image_field.rb

@@ -1,6 +1,6 @@
 module StorageRoom
   
-  class ImageField < CompoundField
+  class ImageField < AttachmentField
     many :versions
   end
 end

data/lib/storage_room/embeddeds/file.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 
 module StorageRoom
   # Any file
@@ -23,6 +25,34 @@ module StorageRoom
       self.data = ::Base64.encode64(::File.read(path))
     end
     
+    # Returns the file type based on the extension
+    def file_type
+      self[:@url] ? ::File.extname(self[:@url])[1..-1] : nil
+    end
+    
+    # Download the file to the local disk
+    def download_to_directory(path)
+      Dir.mkdir(path) unless ::File.directory?(path)
+      download_file(self[:@url], ::File.join(path, local_filename))
+      true
+    end
+    
+    # The localized filename built out of the URL
+    def local_filename
+      self[:@url] ? localize_filename(self[:@url]) : nil
+    end
+    
+    protected
+      def localize_filename(filename)
+        filename.gsub(/\Ahttps?:\/\//, '').gsub('/', '_')
+      end
+    
+      def download_file(url, path)
+        file = open(path, "wb")
+        file.write(open(url).read)
+        file.close
+      end
+    
 
   end
 end

data/lib/storage_room/embeddeds/image.rb

@@ -24,5 +24,18 @@ module StorageRoom
       self[:@processing]
     end
     
+    def local_filename(name = nil)
+      localize_filename(url(name))
+    end
+    
+    def download_to_directory(path)
+      super
+      
+      version_identifiers.each do |version|
+        download_file(self.url(version), ::File.join(path, local_filename(version)))
+      end
+      true
+    end
+    
   end
 end

data/lib/storage_room/models/entry.rb

@@ -34,6 +34,10 @@ module StorageRoom
     def trashed?
       self[:@trash]
     end
+    
+    def id
+      self[:@url] ? self[:@url].split('/').last : nil
+    end
 
   end
 end

data/lib/storage_room.rb

@@ -105,7 +105,7 @@ module StorageRoom
     end
     
     def version
-      @version ||= ::File.read(::File.expand_path(::File.dirname(__FILE__) + '/../VERSION'))
+      @version ||= ::File.read(::File.expand_path(::File.join(::File.dirname(__FILE__), '..', 'VERSION')))
     end
     
     # Requests are made with SSL

data/spec/fixtures/export_collection.json

@@ -0,0 +1,108 @@
+{
+  "collection": {
+      "@type": "Collection",
+      "@url": "http://api.storageroomapp.com/accounts/4e1e9c234250712eba000052/collections/4e23f1ad42507165a3000002",
+      "@account_url": "http://api.storageroomapp.com/accounts/4e1e9c234250712eba000052",
+      "@entries_url": "http://api.storageroomapp.com/accounts/4e1e9c234250712eba000052/collections/4e23f1ad42507165a3000002/entries",
+      "@version": 1,
+      "@created_at": "2011-07-18T08:41:17Z",
+      "@updated_at": "2011-07-18T08:41:17Z",
+      "name": "Restaurants",
+      "primary_field_identifier": null,
+      "fields": [{
+          "@type": "StringField",
+          "name": "Name",
+          "identifier": "name",
+          "interface": true,
+          "input_type": "text_field",
+          "required": true,
+          "include_blank_choice": false
+      },
+      {
+          "@type": "StringField",
+          "name": "Text",
+          "identifier": "text",
+          "interface": true,
+          "input_type": "text_area",
+          "required": true,
+          "include_blank_choice": false
+      },
+      {
+          "@type": "StringField",
+          "name": "Address",
+          "identifier": "address",
+          "interface": true,
+          "input_type": "text_area",
+          "include_blank_choice": false
+      },
+      {
+          "@type": "StringField",
+          "name": "Website",
+          "identifier": "website",
+          "interface": true,
+          "input_type": "text_field",
+          "include_blank_choice": false
+      },
+      {
+          "@type": "DateField",
+          "name": "Last Visit",
+          "identifier": "last_visit",
+          "interface": true,
+          "input_type": "date_picker",
+          "include_blank_choice": false
+      },
+      {
+          "@type": "LocationField",
+          "name": "Location",
+          "identifier": "location",
+          "interface": true,
+          "input_type": "location",
+          "required": true
+      },
+      {
+          "@type": "IntegerField",
+          "name": "Price Range",
+          "identifier": "price_range",
+          "interface": true,
+          "input_type": "select",
+          "required": true,
+          "include_blank_choice": false,
+          "choices": [1, 2, 3]
+      },
+      {
+          "@type": "IntegerField",
+          "name": "Stars",
+          "identifier": "stars",
+          "interface": true,
+          "input_type": "select",
+          "required": true,
+          "include_blank_choice": false,
+          "choices": [1, 2, 3, 4, 5]
+      },
+      {
+          "@type": "BooleanField",
+          "name": "Vegetarian Menu",
+          "identifier": "vegetarian_menu",
+          "interface": true,
+          "input_type": "radio",
+          "include_blank_choice": false
+      },
+      {
+          "@type": "FileField",
+          "name": "Image",
+          "identifier": "image",
+          "interface": true,
+          "input_type": "file",
+          "hint": "Upload an image"
+      },
+      {
+          "@type": "FileField",
+          "name": "Preview Image",
+          "identifier": "preview_image",
+          "interface": true,
+          "input_type": "file",
+          "hint": "Upload an preview image"
+      }],
+      "webhook_definitions": []
+  }
+}

data/spec/fixtures/export_entries.json

@@ -0,0 +1,307 @@
+{
+    "array": {
+        "@total_resources": 10,
+        "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries",
+        "@type": "Array",
+        "resources": [{
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091aba05617333000014",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:22Z",
+            "@updated_at": "2011-04-01T17:19:22Z",
+            "name": "Peter Luger",
+            "text": "Rated No. 1 New York Steak House for 26 years in a Row.",
+            "address": "178 Broadway\nBrooklyn, N.Y. 11211",
+            "website": "http://www.peterluger.com/",
+            "last_visit": "2011-03-02",
+            "location": {
+                "@type": "Location",
+                "lat": 40.7097,
+                "lng": -73.962
+            },
+            "price_range": 3,
+            "stars": 4,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000014/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000014/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d960917ba05617333000011",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:19Z",
+            "@updated_at": "2011-04-01T17:19:19Z",
+            "name": "M-Steakhouse",
+            "text": "Probably the best beef in Germany.",
+            "address": "Feuerbachstrasse 11a\n60325 Frankfurt am Main\nGermany",
+            "website": "http://www.the-steakhouse.de/steakhouse/main-frames.html",
+            "last_visit": "2011-04-01",
+            "location": {
+                "@type": "Location",
+                "lat": 50.1158,
+                "lng": 8.6631
+            },
+            "price_range": 3,
+            "stars": 4,
+            "vegetarian_menu": true,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d960917ba05617333000011/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d960917ba05617333000011/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d960919ba05617333000012",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:21Z",
+            "@updated_at": "2011-05-05T20:07:18Z",
+            "name": "Banyan Tree Bangkok - Vertigo",
+            "text": "A must-see on every Bangkok travel itinerary, Vertigo is unlike any other bar-restaurant in the world: some 61 floors above the streets of Bangkok, this open-air rooftop lounge gives true meaning to the word 'vertigo' as it grants views that simply take your breath away. Stylish, sophisticated and reaching for the clouds, there is no better place for a romantic t\u00eate-\u00e0-t\u00eate, glamorous cocktail party or fashion launch than this. Indulge in a variety of western-style fresh grilled seafood and premium steaks, champagne and a wide selection of cocktails, wines-by-the-glass and non-alcoholic drinks.",
+            "address": "21/100 South Sathon Road\r\nBangkok, 10120\r\n Thailand",
+            "website": "http://www.banyantree.com/en/bangkok/overview",
+            "last_visit": "2011-03-29",
+            "location": {
+                "@type": "Location",
+                "lat": 13.724,
+                "lng": 100.5411
+            },
+            "price_range": 2,
+            "stars": 3,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d960919ba05617333000012/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d960919ba05617333000012/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091aba05617333000013",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:22Z",
+            "@updated_at": "2011-04-01T17:19:22Z",
+            "name": "Wolfgang's Steakhouse",
+            "text": "Located in the heart of midtown Manhattan, the flagship Park Avenue Wolfgang\u2019s is splendidly situated in the former Vanderbilt Hotel dining room.",
+            "address": "4 Park Avenue\nNew York, NY 10016",
+            "website": "http://www.wolfgangssteakhouse.net/",
+            "last_visit": "2011-03-25",
+            "location": {
+                "@type": "Location",
+                "lat": 40.7465,
+                "lng": -73.682
+            },
+            "price_range": 2,
+            "stars": 2,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000013/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000013/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091aba05617333000015",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:22Z",
+            "@updated_at": "2011-04-01T17:19:22Z",
+            "name": "Pat's King of Steaks",
+            "text": "Creator of the Philly Steak and Cheese Steak",
+            "address": "1237 East Passyunk Avenue\n, Philadelphia, PA",
+            "website": "http://www.patskingofsteaks.com/",
+            "last_visit": "2011-03-29",
+            "location": {
+                "@type": "Location",
+                "lat": 39.933,
+                "lng": -75.159
+            },
+            "price_range": 1,
+            "stars": 3,
+            "vegetarian_menu": true,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000015/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000015/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091bba05617333000016",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:23Z",
+            "@updated_at": "2011-04-01T17:19:23Z",
+            "name": "Shula's",
+            "text": "One of the best Steak Houses in Florida",
+            "address": "7601 Miami Lakes Drive\nMiami Lakes, FL 33014",
+            "website": "http://www.donshula.com/locations.php?sub=4&l=1&restid=7",
+            "last_visit": "2010-12-22",
+            "location": {
+                "@type": "Location",
+                "lat": 25.913,
+                "lng": -80.322
+            },
+            "price_range": 3,
+            "stars": 4,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091bba05617333000016/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091bba05617333000016/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091bba05617333000017",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:23Z",
+            "@updated_at": "2011-04-01T17:19:23Z",
+            "name": "LG's Steak House",
+            "text": "In December of 1997, a second LG's Prime Steakhouse opened in beautiful downtown Palm Springs, California. Located on South Palm Canyon Drive, between the cross streets of Arenas and Barristo, LG's Prime Steakhouse, Palm Springs features a large covered patio for dining and people watching on South Palm Canyon. The d\u00e9cor is eclectic and the restaurant has a private dining room for parties. French doors in the main dining area open onto the patio, which also has an indoor-outdoor bar.",
+            "address": "255 S. Palm Canyon Drive\nPalm Springs, CA 92262",
+            "website": "http://www.lgsprimesteakhouse.com/palmsprings.html",
+            "last_visit": "2010-04-01",
+            "location": {
+                "@type": "Location",
+                "lat": 33.82,
+                "lng": -116.546
+            },
+            "price_range": 3,
+            "stars": 5,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091bba05617333000017/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091bba05617333000017/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091cba05617333000018",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:24Z",
+            "@updated_at": "2011-04-01T17:19:24Z",
+            "name": "Hill Top Steak House",
+            "text": "In 1961 Frank Giuffrida bought a club in Saugus that he converted into a western-style steakhouse. Over the years Frank became known as the \"king of the Hill\" serving over three million customers annually.  Now over 50 million meals later The Hilltop is still known today for it's generous portions at a great value winning numerous awards.",
+            "address": "855 Broadway, Saugus, MA",
+            "website": "http://hilltopsteakhouse.com",
+            "last_visit": "2011-02-06",
+            "location": {
+                "@type": "Location",
+                "lat": 42.474,
+                "lng": -71.023
+            },
+            "price_range": 2,
+            "stars": 1,
+            "vegetarian_menu": true,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba05617333000018/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba05617333000018/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091cba05617333000019",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:24Z",
+            "@updated_at": "2011-04-01T17:19:24Z",
+            "name": "Morton's Steak House",
+            "text": "Located in Toronto's trendy Yorkville at the Park Hyatt Hotel, Morton's the Steakhouse offers a classic dining experience. Welcoming decor, succulent steaks and fresh fish and seafood make Morton's a destination for Torontonians, celebrities and tourists alike. Whether you are looking for the perfect place to unwind with cocktails and Bar Bites or to book a private boardroom for a special occasion, Morton's offers impeccable service and a timeless menu.",
+            "address": "4 Avenue Road at Prince Arthur\nToronto, Canada",
+            "website": "http://www.mortons.com/toronto/",
+            "last_visit": "2010-11-29",
+            "location": {
+                "@type": "Location",
+                "lat": 43.668,
+                "lng": -79.394
+            },
+            "price_range": 3,
+            "stars": 3,
+            "vegetarian_menu": true,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba05617333000019/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba05617333000019/fields/k4d960916ba05617333000010/file.png"
+            }
+        },
+        {
+            "@type": "Restaurant",
+            "@url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091cba0561733300001a",
+            "@collection_url": "http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005",
+            "@version": 1,
+            "@trash": false,
+            "@created_at": "2011-04-01T17:19:24Z",
+            "@updated_at": "2011-04-01T17:19:24Z",
+            "name": "Ruth's Chris Honululu",
+            "text": "Whether it's a romantic steak dinner for two, an important business meeting, or a private party, Ruth's Chris Steak House can accommodate your needs. Our Honolulu steakhouse provides guests with a warm, comfortable atmosphere. The restaurant is also handicap accessible.",
+            "address": "500 Ala Moana Blvd,\nRestaurant Row,\nHonolulu, HI 96813",
+            "website": "http://www.ruthschris.com/Steak-House/6504/Honolulu/Oahu",
+            "last_visit": "2011-01-14",
+            "location": {
+                "@type": "Location",
+                "lat": 21.3,
+                "lng": -157.861
+            },
+            "price_range": 3,
+            "stars": 4,
+            "vegetarian_menu": false,
+            "image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba0561733300001a/fields/k4d960916ba0561733300000f/file.png"
+            },
+            "preview_image": {
+                "@type": "File",
+                "@url": "http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091cba0561733300001a/fields/k4d960916ba05617333000010/file.png"
+            }
+        }]
+    }
+}

data/spec/fixtures/webhook_call.json

@@ -1,18 +1,20 @@
 {
-  "@attempts": 0, 
-  "@created_at": "2011-07-14T18:25:42Z", 
-  "@entry": {
-    "@collection_url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000062", 
-    "@created_at": "2011-07-14T18:15:53Z", 
-    "@type": "Announcement", 
-    "@trash": false,
-    "@updated_at": "2011-07-14T18:25:42Z", 
-    "@url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000062\/entries\/4e1f3259425071435e00004a", 
-    "@version": 2, 
-    "text": "WEBHOOK TEST"
-  }, 
-  "@event": "update", 
-  "@last_attempt_at": null, 
-  "@last_status_code": null, 
-  "@type": "WebhookCall"
+  "webhook_call": {
+    "@attempts": 0, 
+    "@created_at": "2011-07-14T18:25:42Z", 
+    "@entry": {
+      "@collection_url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000062", 
+      "@created_at": "2011-07-14T18:15:53Z", 
+      "@type": "Announcement", 
+      "@trash": false,
+      "@updated_at": "2011-07-14T18:25:42Z", 
+      "@url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000062\/entries\/4e1f3259425071435e00004a", 
+      "@version": 2, 
+      "text": "WEBHOOK TEST"
+    }, 
+    "@event": "update", 
+    "@last_attempt_at": null, 
+    "@last_status_code": null, 
+    "@type": "WebhookCall"
+  }
 }

data/spec/spec_helper.rb

@@ -19,9 +19,12 @@ def stub_url(url)
   "APPLICATION_API_KEY:X@api.storageroomapp.com/accounts/USER_ID#{url}"
 end
 
+def fixture_path(name)
+  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', name))
+end
+
 def fixture_file(name)
-  path = File.expand_path("#{File.dirname(__FILE__)}/fixtures/#{name}")
-  File.read(path)
+  File.read(fixture_path(name))
 end
 
 def mock_httparty(code)

data/spec/storage_room/accessors_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 module StorageRoom
   class TestAccessors
@@ -10,6 +10,17 @@ module StorageRoom
 end
 
 describe StorageRoom::TestAccessors do
+  context "Class" 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)
+        object.should be_an_instance_of(StorageRoom::Collection)
+      end
+    end
+    
+  end
+  
   
   context "Instance" do
     before(:each) do

data/spec/storage_room/array_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 class PointOfInterest < StorageRoom::Model
   key :value

data/spec/storage_room/embedded_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe StorageRoom::Embedded do
   context "Configuration" do

data/spec/storage_room/embeddeds/file_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe StorageRoom::File do
   before(:each) do
     @file = StorageRoom::File.new
-    @name = ::File.expand_path(File.dirname(__FILE__) + '/../../fixtures/image.png')
+    @name = fixture_path('image.png')
   end
   
   context "Class Methods" do
@@ -39,6 +39,29 @@ describe StorageRoom::File do
         end
       end
       
+      describe "#file_type" do
+        it "should return type" do
+          @file.response_data[:@url] = 'http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000014/fields/k4d960916ba0561733300000f/file.png'
+          @file.file_type.should == 'png'
+        end
+        
+        it "should return nil" do
+          @file.file_type.should be_nil
+        end
+      end
+      
+      describe "#local_filename" do
+        it "should return filename" do
+          @file.response_data[:@url] = 'http://files.storageroomapp.com/accounts/4d13574cba05613d25000004/collection/4d960916ba05617333000005/entries/4d96091aba05617333000014/fields/k4d960916ba0561733300000f/file.png'
+          @file.local_filename.should == 'files.storageroomapp.com_accounts_4d13574cba05613d25000004_collection_4d960916ba05617333000005_entries_4d96091aba05617333000014_fields_k4d960916ba0561733300000f_file.png'
+        end
+        
+        it "should return nil" do
+          @file.local_filename.should be_nil
+        end
+        
+      end
+      
     end
   end
 end

data/spec/storage_room/model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 class Contributor < StorageRoom::Entry
   

data/spec/storage_room/models/entry_spec.rb

@@ -55,6 +55,17 @@ describe StorageRoom::Entry do
       end
     end
     
+    describe "#id" do
+      it "should return with url" do
+        @entry.response_data[:@url] = 'http://api.storageroomapp.com/accounts/4d13574cba05613d25000004/collections/4d960916ba05617333000005/entries/4d96091aba05617333000014'
+        @entry.id.should == '4d96091aba05617333000014'
+      end
+      
+      it "should return nil" do
+        @entry.id.should be_nil
+      end
+    end
+    
     describe "#trashed?" do
       it "should return true" do
         @entry.response_data[:@trash] = true

data/spec/storage_room/resource_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe StorageRoom::Resource do
   context "Class" do

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{storage_room}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-07-19}
   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 = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "TODO",
     "VERSION",
     "examples/authentication.rb",
+    "examples/backup_uploads_from_export.rb",
     "examples/create_entry.rb",
     "examples/destroy_entry.rb",
     "examples/get_collections.rb",
@@ -72,6 +73,8 @@ Gem::Specification.new do |s|
     "lib/storage_room/webhook_call.rb",
     "spec/fixtures/collection.json",
     "spec/fixtures/collections.json",
+    "spec/fixtures/export_collection.json",
+    "spec/fixtures/export_entries.json",
     "spec/fixtures/image.png",
     "spec/fixtures/validation_error.json",
     "spec/fixtures/webhook_call.json",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Sascha Konietzke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +02:00
+date: 2011-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - TODO
 - VERSION
 - examples/authentication.rb
+- examples/backup_uploads_from_export.rb
 - examples/create_entry.rb
 - examples/destroy_entry.rb
 - examples/get_collections.rb
@@ -153,6 +154,8 @@ files:
 - lib/storage_room/webhook_call.rb
 - spec/fixtures/collection.json
 - spec/fixtures/collections.json
+- spec/fixtures/export_collection.json
+- spec/fixtures/export_entries.json
 - spec/fixtures/image.png
 - spec/fixtures/validation_error.json
 - spec/fixtures/webhook_call.json