storage_room 0.3.16 → 0.3.17

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.17
+* Fix ActiveSupport::Concern deprecation warnings for InstanceMethods
+
 == Version 0.3.16
 * Fix identity map problem on Windows (require 'set')
 

data/TODO

@@ -1,3 +1,5 @@
+- example with images
+- add url to inspect for images
 
 
 

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/lib/storage_room/accessors.rb

@@ -9,172 +9,39 @@ module StorageRoom
       self.send(:define_model_callbacks, :initialize_from_response_data)
     end
     
-    module InstanceMethods
-      # Optionally pass attributes to set up the object
-      def initialize(hash={})     
-        self.attributes = hash
-      end
-            
-      # 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 ||= {}
-        hash = {}
-
-        self.attributes.each do |name, value|
-          hash[name] = if value.is_a?(::Array)
-            value.map {|x| x.respond_to?(:to_hash) ? call_method_with_optional_parameters(x, :to_hash, :nested => true) : x}
-          elsif value.respond_to?(:to_hash)
-            call_method_with_optional_parameters(value, :to_hash, :nested => true)
-          elsif value.respond_to?(:as_json)
-            value.as_json(:nested => true)
-          else
-            value
-          end
-        end
-        
-        hash
-      end
-                
-      def inspect # :nodoc:
-        body = attributes.map{|k, v| "#{k}: #{attribute_for_inspect(v)}"}.join(', ')
-        "#<#{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
-      
-      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.method(method_name).arity == -1
-              object.send(method_name, parameters)
-            else
-              object.send(method_name)
-            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
-            self.class.attribute_options_including_superclasses.each do |name, options|
-              value = if options[:type] == :key
-                self[name].blank? ? options[:default] : self[name]
-              elsif options[:type] == :one
-                hash = self[name.to_s]
-                hash && hash['@type'] ? self.class.new_from_response_data(hash) : nil
-              elsif options[:type] == :many
-                response_data[name] && response_data[name].map{|hash| self.class.new_from_response_data(hash)} || []
-              else
-                raise "Invalid type: #{options[:type]}"
-              end
-
-              send("#{name}=", value)
-            end
-          end
-        end
-        
-        def ensure_loaded # :nodoc:
-          if loaded?
-            yield if block_given?
-          else
-            raise StorageRoom::ResourceNotLoadedError
-          end
-        end
-        
-        def attribute_for_inspect(value) # :nodoc:
-          if value.is_a?(String) && value.length > 50
-            "#{value[0..50]}...".inspect
-          elsif value.is_a?(Date) || value.is_a?(Time)
-            %("#{value.iso8601}")
-          else
-            value.inspect
-          end
-        end
-    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?
-        
+
         StorageRoom.log("Loading #{url}")
         httparty = get(url, parameters)
-      
+
         handle_critical_response_errors(httparty)
         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.first[1])
       end
-      
+
       # Creates a new object of the correct class and initializes it from the response data
       def new_from_response_data(response_data)
         object = StorageRoom.class_for_name(response_data['@type']).new.set_from_response_data(response_data)
-        
+
         if object.is_a?(Entry) && !object.loaded? && !object.proxy?
           StorageRoom.log("Return  #{response_data['url']} proxied")
           Proxy.new(object)
@@ -182,13 +49,13 @@ module StorageRoom
           object
         end
       end
-      
+
       # Defines a basic key for a Resource
       def key(name, options = {})
         options.merge!(:type => :key, :default => nil)
         define_attribute_methods(name, options)
       end
-      
+
       # Defines a to-one association for a Resource (embedded or association)
       def one(name, options = {})
         options.merge!(:type => :one, :default => nil)
@@ -200,32 +67,168 @@ module StorageRoom
         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:       
         define_method name do
           attributes[name] || options[:default]
         end
-        
+
         define_method "#{name}=" do |object|
           attributes[name] = object
         end
-        
+
         self.attribute_options[name] = options
       end
-            
+
       def attribute_options
         @attribute_options ||= {}
       end
-      
+
       def attribute_options_including_superclasses        
         hash = attribute_options.dup
         hash.merge!(superclass.attribute_options_including_superclasses) if superclass.respond_to?(:attribute_options_including_superclasses)
-        
+
         hash
       end
+    end# ==========
+    # = Banner =
+    # ==========
+    
+
+    # Optionally pass attributes to set up the object
+    def initialize(hash={})     
+      self.attributes = hash
+    end
+          
+    # 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 ||= {}
+      hash = {}
+
+      self.attributes.each do |name, value|
+        hash[name] = if value.is_a?(::Array)
+          value.map {|x| x.respond_to?(:to_hash) ? call_method_with_optional_parameters(x, :to_hash, :nested => true) : x}
+        elsif value.respond_to?(:to_hash)
+          call_method_with_optional_parameters(value, :to_hash, :nested => true)
+        elsif value.respond_to?(:as_json)
+          value.as_json(:nested => true)
+        else
+          value
+        end
+      end
+      
+      hash
     end
+              
+    def inspect # :nodoc:
+      body = attributes.map{|k, v| "#{k}: #{attribute_for_inspect(v)}"}.join(', ')
+      "#<#{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
+    
+    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.method(method_name).arity == -1
+            object.send(method_name, parameters)
+          else
+            object.send(method_name)
+          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
+          self.class.attribute_options_including_superclasses.each do |name, options|
+            value = if options[:type] == :key
+              self[name].blank? ? options[:default] : self[name]
+            elsif options[:type] == :one
+              hash = self[name.to_s]
+              hash && hash['@type'] ? self.class.new_from_response_data(hash) : nil
+            elsif options[:type] == :many
+              response_data[name] && response_data[name].map{|hash| self.class.new_from_response_data(hash)} || []
+            else
+              raise "Invalid type: #{options[:type]}"
+            end
+
+            send("#{name}=", value)
+          end
+        end
+      end
+      
+      def ensure_loaded # :nodoc:
+        if loaded?
+          yield if block_given?
+        else
+          raise StorageRoom::ResourceNotLoadedError
+        end
+      end
+      
+      def attribute_for_inspect(value) # :nodoc:
+        if value.is_a?(String) && value.length > 50
+          "#{value[0..50]}...".inspect
+        elsif value.is_a?(Date) || value.is_a?(Time)
+          %("#{value.iso8601}")
+        else
+          value.inspect
+        end
+      end
   end
   
+  
+    
+  
 end

data/lib/storage_room/identity_map.rb

@@ -93,29 +93,29 @@ module StorageRoom
       
     end
     
-    module InstanceMethods
-      def identity_map
-        self.class.identity_map
-      end
-      
-      def in_identity_map?
-        return false if self[:@url].blank?
-        identity_map.include?(self[:@url])
-      end
-      
-      def create(*args)
-        if result = super
-          identity_map[self[:@url]] = self if self.class.identity_map_on?
-        end
-        result
+
+    def identity_map
+      self.class.identity_map
+    end
+    
+    def in_identity_map?
+      return false if self[:@url].blank?
+      identity_map.include?(self[:@url])
+    end
+    
+    def create(*args)
+      if result = super
+        identity_map[self[:@url]] = self if self.class.identity_map_on?
       end
-      
-      def destroy 
-         identity_map.delete(self[:@url]) if self.class.identity_map_on?
-         super
-       end
-      
+      result
     end
+    
+    def destroy 
+     identity_map.delete(self[:@url]) if self.class.identity_map_on?
+     super
+    end
+    
+
   end
 end
 

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "storage_room"
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = "2011-11-21"
+  s.date = "2012-01-25"
   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.email = "sascha@thriventures.com"
   s.extra_rdoc_files = [

metadata

@@ -1,94 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: storage_room
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.17
   prerelease: 
-  version: 0.3.16
 platform: ruby
-authors: 
+authors:
 - Sascha Konietzke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70350538804900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70350538804900
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70350538804400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70350538804400
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70350538803920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70350538803920
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70350538803400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70350538803400
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70350538802880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70350538802880
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70350538802400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-description: StorageRoom is a CMS system for Mobile Applications (iPhone, Android, BlackBerry, ...). This library gives you an ActiveModel-like interface to your data.
+  prerelease: false
+  version_requirements: *70350538802400
+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
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
+files:
 - History.txt
 - LICENSE
 - README.rdoc
@@ -195,30 +193,26 @@ files:
 - tasks/storage_room.rake
 homepage: http://github.com/thriventures/storage_room_gem
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: StorageRoom API Wrapper (ActiveModel style)
 test_files: []
-