storage_room 0.3.22 → 0.3.23

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.23
+* Support the configuration of a custom connection timeout
+
 == Version 0.3.22
 * Move from Jeweler to Bundler for gem management
 

data/examples/upload_remove_image.rb

@@ -2,13 +2,17 @@
 
 require File.join(File.dirname(__FILE__), 'authentication')
 
-path = ::File.expand_path(File.join(File.dirname(__FILE__) + '..', 'spec', 'fixtures', 'image.png'))
-collection = StorageRoom::Collection.find('4e034b8db65245b72600002b')
+path = ::File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'image.png'))
+
+collection = StorageRoom::Collection.find('4f7c9fa6421aa9e48a000092')
 
 # Upload Image or File
-entry = collection.entry_class.new(:name => "StorageRoom Logo", :image => StorageRoom::Image.new_with_filename(path))
+entry = collection.entry_class.new(:name => "StorageRoom Logo", :file => StorageRoom::Image.new_with_filename(path))
+
+# optionally change the request timeout if you upload big files
+StorageRoom.timeout = 100
 
-if entry.save 
+if entry.save
   puts "Entry saved (#{entry[:@url]})"
   puts "URL of the uploaded image is #{entry.image.url}"
   puts "URL of the automatically generated thumbnail is #{entry.image.url(:thumbnail)}" # Multiple Image Versions can be specified in the interface

data/lib/storage_room/model.rb

@@ -66,7 +66,7 @@ module StorageRoom
       return false unless new_record?
       _run_save_callbacks do
         _run_create_callbacks do
-          httparty = self.class.post(self.class.index_path, :body => to_json, :query => query_parameters)
+          httparty = self.class.post(self.class.index_path, request_options.merge(:body => to_json))
           handle_save_response(httparty)
         end
       end
@@ -77,7 +77,7 @@ module StorageRoom
       return false if new_record?
       _run_save_callbacks do
         _run_update_callbacks do
-          httparty = self.class.put(self[:@url], :body => to_json, :query => query_parameters)
+          httparty = self.class.put(self[:@url], request_options.merge(:body => to_json))
           handle_save_response(httparty)
         end
       end
@@ -88,7 +88,7 @@ module StorageRoom
       return false if new_record?
       
       _run_destroy_callbacks do
-        httparty = self.class.delete(self[:@url], :query => query_parameters)
+        httparty = self.class.delete(self[:@url], request_options)
         self.class.handle_critical_response_errors(httparty)
       end
       
@@ -137,6 +137,10 @@ module StorageRoom
       def query_parameters
         skip_webhooks ? {:skip_webhooks => true} : nil
       end
+      
+      def request_options
+        StorageRoom.request_options.merge(:query => query_parameters)
+      end
 
       
   end

data/lib/storage_room/resource.rb

@@ -29,7 +29,7 @@ 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)
+      httparty = self.class.get(url || self[:@url], StorageRoom.request_options.merge(parameters))
       hash = httparty.parsed_response.first[1]
       reset!
       set_from_response_data(hash)

data/lib/storage_room/version.rb

@@ -1,3 +1,3 @@
 module StorageRoom
-  VERSION = '0.3.22'  
+  VERSION = '0.3.23'
 end

data/lib/storage_room.rb

@@ -68,7 +68,7 @@ module StorageRoom
 
 
   class << self
-    attr_reader :api_key, :user_agent, :account_id, :ssl, :proxy_server, :proxy_port
+    attr_reader :api_key, :user_agent, :account_id, :ssl, :proxy_server, :proxy_port, :timeout
     attr_accessor :debug
     
     # Authenticate once before making any requests with your account id and the application's api key
@@ -95,6 +95,22 @@ module StorageRoom
       @server || 'api.storageroomapp.com'
     end
     
+    # Change the connection timeout
+    def timeout=(timeout) #:nodoc:
+      @timeout = timeout
+    end
+    
+    def timeout #:nodoc:
+      @timeout || 10
+    end
+    
+    # Return the request options used by HTTParty
+    def request_options
+      {
+        :timeout => timeout
+      }
+    end
+    
     # Hash of all mappings from an Entry's @type to a local Ruby class, if a mapping doesn't exist a class name will be created automatically
     def entry_class_mappings
       @entry_class_mappings ||= {}

data/spec/storage_room_spec.rb

@@ -57,6 +57,24 @@ describe StorageRoom do
     end
   end
   
+  describe "#timeout" do    
+    it "return default timeout" do
+      StorageRoom.timeout.should == 10
+    end
+    
+    it "should set variables" do
+      StorageRoom.timeout = 20
+      StorageRoom.timeout.should == 20
+      StorageRoom.timeout = 10
+    end
+  end
+  
+  describe "#request_options" do
+    it "should return a hash" do
+      StorageRoom.request_options[:timeout].should == 10
+    end
+  end
+  
   describe "#ssl" do
     before(:each) do
       StorageRoom.ssl = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storage_room
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70342461718360 !ruby/object:Gem::Requirement
+  requirement: &70271550602000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70342461718360
+  version_requirements: *70271550602000
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70342461717880 !ruby/object:Gem::Requirement
+  requirement: &70271550601480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342461717880
+  version_requirements: *70271550601480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70342461717400 !ruby/object:Gem::Requirement
+  requirement: &70271550600900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342461717400
+  version_requirements: *70271550600900
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70342461716920 !ruby/object:Gem::Requirement
+  requirement: &70271550600240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70342461716920
+  version_requirements: *70271550600240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70342461716440 !ruby/object:Gem::Requirement
+  requirement: &70271550599520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70342461716440
+  version_requirements: *70271550599520
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70342461715960 !ruby/object:Gem::Requirement
+  requirement: &70271550598620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70342461715960
+  version_requirements: *70271550598620
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70342461715480 !ruby/object:Gem::Requirement
+  requirement: &70271550598040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342461715480
+  version_requirements: *70271550598040
 description: StorageRoom is a CMS system for Mobile Applications (iPhone, Android,
   BlackBerry, ...). This library gives you an ActiveModel-like interface to your data.
 email: sascha@thriventures.com
@@ -273,4 +273,3 @@ test_files:
 - spec/storage_room/resource_spec.rb
 - spec/storage_room/webhook_call_spec.rb
 - spec/storage_room_spec.rb
-has_rdoc: