storage_room 0.3.23 → 0.3.24

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.24
+* Add support for Ruby 2.x
+
 == Version 0.3.23
 * Support the configuration of a custom connection timeout
 
@@ -84,4 +87,4 @@
 
 === Version 0.1.0 
 
-* Initial Version
+* Initial Version

data/lib/storage_room/accessors.rb

@@ -1,15 +1,15 @@
 module StorageRoom
-  
+
   # Module that contains attributes methods shared between StorageRoom::Resource and StorageRoom::Embedded
   module Accessors
     extend ActiveSupport::Concern
-         
+
     included do
       self.send(:extend, ::ActiveModel::Callbacks)
       self.send(:define_model_callbacks, :initialize_from_response_data)
     end
-    
-    module ClassMethods 
+
+    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')
@@ -62,14 +62,14 @@ module StorageRoom
         define_attribute_methods(name, options)
       end
 
-      # Defines a to-many association for a Resource (embedded or association)      
+      # Defines a to-many association for a Resource (embedded or association)
       def many(name, options = {})
         options.merge!(:type => :many, :default => [])
         define_attribute_methods(name, options)
       end
 
       # Creates getter and setter for an attribute
-      def define_attribute_methods(name, options) # :nodoc:       
+      def define_attribute_methods(name, options) # :nodoc:
         define_method name do
           attributes[name] || options[:default]
         end
@@ -85,7 +85,7 @@ module StorageRoom
         @attribute_options ||= {}
       end
 
-      def attribute_options_including_superclasses        
+      def attribute_options_including_superclasses
         hash = attribute_options.dup
         hash.merge!(superclass.attribute_options_including_superclasses) if superclass.respond_to?(:attribute_options_including_superclasses)
 
@@ -94,45 +94,45 @@ module StorageRoom
     end
 
     # Optionally pass attributes to set up the object
-    def initialize(hash={})     
+    def initialize(hash={})
       self.attributes = hash
     end
-          
-    # Shortcut to get an attribute. 
+
+    # Shortcut to get an attribute.
     def [](name)
       self.response_data[name]
     end
-      
+
     # Takes a response data hash, saves it in the record and initializes the class from the response data
     def set_from_response_data(hash)
       self.response_data = hash
       self.initialize_from_response_data
       self
     end
-      
+
     # Return all of the objects attributes
     def response_data
       @_response_data ||= Hash.new.with_indifferent_access
     end
-  
+
     # Set the objects attributes with a hash. Only attributes passed in the hash are changed, existing ones are not overridden.
     def response_data=(hash = {})
       response_data.merge!(hash)
     end
-    
+
     # The attributes as they were defined with key, one, many
     def attributes
       @_attributes ||= Hash.new.with_indifferent_access
     end
-  
+
     def attributes=(args = {})
       attributes.merge!(args)
     end
-    
+
     def as_json(args = {}) # :nodoc:
       to_hash(args)
     end
-    
+
     # ActiveSupport seemed to cause problems when just using as_json, so using to_hash
     def to_hash(args = {}) # :nodoc:
       args ||= {}
@@ -149,46 +149,46 @@ module StorageRoom
           value
         end
       end
-      
+
       hash
     end
-              
+
     def inspect # :nodoc:
       body = attributes.map{|k, v| "#{k}: #{attribute_for_inspect(v)}"}.join(', ')
-      "#<#{self.class} #{body}>"        
+      "#<#{self.class} #{body}>"
     end
-              
+
     # Reset an object to its initial state with all attributes unset
     def reset!
       @_response_data = Hash.new.with_indifferent_access
       @_attributes = Hash.new.with_indifferent_access
       true
     end
-  
+
     # Has a Resource been loaded from the API
     def loaded?
       self.response_data.present?
     end
-    
+
     def proxy? # :nodoc:
       false
     end
-    
+
     # Compare Resources by comparing their attributes
     def eql?(object)
       self.class.equal?(object.class) && attributes == object.attributes
     end
-    
-    alias == eql?  
-    
+
+    alias == eql?
+
     def hash
       self.class.hash ^ self.attributes.hash
     end
-    
+
     protected
       # Helper to not call to_hash with the wrong number of arguments
       def call_method_with_optional_parameters(object, method_name, parameters)
-        if object.respond_to?(method_name) 
+        if object.respond_to?(method_name)
           if object.method(method_name).arity == -1
             object.send(method_name, parameters)
           else
@@ -196,10 +196,10 @@ module StorageRoom
           end
         end
       end
-    
+
       # Iterate over the response data and initialize the attributes
       def initialize_from_response_data # :nodoc:
-        _run_initialize_from_response_data_callbacks do
+        run_callbacks :initialize_from_response_data do
           self.class.attribute_options_including_superclasses.each do |name, options|
             value = if options[:type] == :key
               self[name].blank? ? options[:default] : self[name]
@@ -216,7 +216,7 @@ module StorageRoom
           end
         end
       end
-      
+
       def ensure_loaded # :nodoc:
         if loaded?
           yield if block_given?
@@ -224,7 +224,7 @@ module StorageRoom
           raise StorageRoom::ResourceNotLoadedError
         end
       end
-      
+
       def attribute_for_inspect(value) # :nodoc:
         if value.is_a?(String) && value.length > 50
           "#{value[0..50]}...".inspect
@@ -235,8 +235,8 @@ module StorageRoom
         end
       end
   end
-  
-  
-    
-  
+
+
+
+
 end

data/lib/storage_room/model.rb

@@ -1,10 +1,10 @@
 module StorageRoom
   # Abstract superclass for classes that can persist to the remote servers
-  class Model < Resource  
+  class Model < Resource
     define_model_callbacks :create, :update, :save, :destroy
-    
+
     attr_accessor :skip_webhooks
-      
+
     class << self
       # Create a new model with the passed attributes
       def create(attributes={})
@@ -12,116 +12,116 @@ module StorageRoom
         entry.create
         entry
       end
-      
+
       # Get all models (could be paginated)
       def all
         load(index_path)
       end
-      
+
       # Find a model with the specified id
       def find(id)
         load(show_path(id))
       end
-      
-      #       
+
+      #
       def index_path # :nodoc:
         raise StorageRoom::AbstractMethodError.new
       end
-      
+
       def show_path(id) # :nodoc:
         raise StorageRoom::AbstractMethodError.new
       end
-      
+
       def json_name  # :nodoc:
         raise StorageRoom::AbstractMethodError.new
       end
     end
-    
+
     # Create a new model and set its attributes
-    def initialize(attributes={})     
+    def initialize(attributes={})
       @errors = []
-      
+
       super
     end
-        
+
     # Reset the model to its default state
     def reset!
       super
       @errors = []
       true
     end
-    
+
     # Has this model been saved to the API already?
     def new_record?
       self['@version'] ? false : true
     end
-    
+
     # Create a new model or update an existing model on the server
     def save
       new_record? ? create : update
     end
-    
+
     # Create a new model on the server
     def create
       return false unless new_record?
-      _run_save_callbacks do
-        _run_create_callbacks do
+      run_callbacks :save do
+        run_callbacks :create do
           httparty = self.class.post(self.class.index_path, request_options.merge(:body => to_json))
           handle_save_response(httparty)
         end
       end
     end
-    
+
     # Update an existing model on the server
     def update
       return false if new_record?
-      _run_save_callbacks do
-        _run_update_callbacks do
+      run_callbacks :save do
+        run_callbacks :update do
           httparty = self.class.put(self[:@url], request_options.merge(:body => to_json))
           handle_save_response(httparty)
         end
       end
     end
-    
+
     # Delete an existing model on the server
     def destroy
       return false if new_record?
-      
-      _run_destroy_callbacks do
+
+      run_callbacks :destroy do
         httparty = self.class.delete(self[:@url], request_options)
         self.class.handle_critical_response_errors(httparty)
       end
-      
+
       true
     end
-    
+
     # Is the model valid or were there validation errors on the server?
     def valid?
       self.errors.empty?
     end
-    
+
     # ActiveSupport caused problems when using as_json, so using to_hash
     def to_hash(args = {}) # :nodoc:
       args ||= {}
-      
+
       if args[:nested]
         {'url' => self[:@url] || self[:url]}
       else
         hash = super
         hash.merge!('@version' => self['@version']) unless new_record?
-        {self.class.json_name => hash}        
+        {self.class.json_name => hash}
       end
     end
-    
+
     # The validation errors that were returned by the server
     def errors
       @errors ||= []
     end
-    
+
     protected
       def handle_save_response(httparty) # :nodoc:
         self.class.handle_critical_response_errors(httparty)
-        
+
         if httparty.response.code == '200' || httparty.response.code == '201'
           self.set_from_response_data(httparty.parsed_response.first[1])
           @errors = []
@@ -133,15 +133,15 @@ module StorageRoom
           false
         end
       end
-      
+
       def query_parameters
         skip_webhooks ? {:skip_webhooks => true} : nil
       end
-      
+
       def request_options
         StorageRoom.request_options.merge(:query => query_parameters)
       end
 
-      
+
   end
 end

data/lib/storage_room/version.rb

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

data/storage_room.gemspec

@@ -9,14 +9,15 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ["Sascha Konietzke"]
   s.email = "sascha@thriventures.com"
-  s.homepage = "http://github.com/thriventures/storage_room_gem"  
+  s.homepage = "http://github.com/thriventures/storage_room_gem"
   s.summary = "StorageRoom API Wrapper (ActiveModel style)"
   s.description = "StorageRoom is a CMS system for Mobile Applications (iPhone, Android, BlackBerry, ...). This library gives you an ActiveModel-like interface to your data."
-  
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
   s.add_development_dependency(%q<webmock>, [">= 0"])
+  s.add_runtime_dependency(%q<rake>)
   s.add_runtime_dependency(%q<json>, [">= 0"])
   s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
   s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storage_room
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271550602000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70271550602000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70271550601480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271550601480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70271550600900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271550600900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70271550600240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70271550600240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70271550599520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271550599520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70271550598620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70271550598620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70271550598040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +133,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271550598040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -215,6 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4081310409651511771
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: StorageRoom API Wrapper (ActiveModel style)