storage_room 0.3.13 → 0.3.14

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.14
+* Fix deprecation warnings (class_inheritable_accessor)
+
 == Version 0.3.13
 * Added entry_type to Collection
 

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.3.14

data/examples/authentication.rb

@@ -5,5 +5,6 @@ APPLICATION_API_KEY = 'DZHpRbsJ7VgFXhybKWmT' # your application's API key with r
 
 StorageRoom.authenticate(ACCOUNT_ID, APPLICATION_API_KEY)
 
+# Optionally set the server to a custom domain
 # StorageRoom.server = "api.lvh.me:3000"
 StorageRoom.server = "api.storageroomapp.com"

data/lib/storage_room/accessors.rb

@@ -7,9 +7,6 @@ module StorageRoom
     included do
       self.send(:extend, ::ActiveModel::Callbacks)
       self.send(:define_model_callbacks, :initialize_from_response_data)
-      
-      self.class_inheritable_accessor :attribute_options
-      self.attribute_options ||= {}
     end
     
     module InstanceMethods
@@ -109,7 +106,7 @@ module StorageRoom
         # 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.each do |name, options|
+            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
@@ -216,6 +213,17 @@ module StorageRoom
         
         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
     
   end

data/lib/storage_room/models/entry.rb

@@ -1,6 +1,6 @@
 module StorageRoom
   class Entry < Model
-    class_inheritable_accessor :collection
+    class_attribute :collection
     
     before_initialize_from_response_data :load_associated_collections
     

data/spec/storage_room/accessors_spec.rb

@@ -7,6 +7,19 @@ module StorageRoom
     key :test
     key :test2
   end
+  
+  class TestAccessors2 < TestAccessors
+    key :test3
+  end
+  
+  class TestAccessors3 < TestAccessors
+    key :test4
+    key :test5
+  end
+  
+  class TestAccessors4 < TestAccessors3
+    key :test6
+  end
 end
 
 describe StorageRoom::TestAccessors do
@@ -35,6 +48,49 @@ describe StorageRoom::TestAccessors do
         StorageRoom::Resource.response_data_is_association?(hash).should be_false
       end
     end
+    
+    describe "Inheritance" do
+      it "should have correct attribute_options hash" do
+        StorageRoom::TestAccessors.attribute_options.should have(2).items
+        StorageRoom::TestAccessors.attribute_options[:test].should be_present
+        StorageRoom::TestAccessors.attribute_options[:test2].should be_present
+        
+        StorageRoom::TestAccessors.attribute_options_including_superclasses.should have(2).items
+        StorageRoom::TestAccessors.attribute_options_including_superclasses[:test].should be_present
+        StorageRoom::TestAccessors.attribute_options_including_superclasses[:test2].should be_present
+
+        #
+        StorageRoom::TestAccessors2.attribute_options.should have(1).item
+        StorageRoom::TestAccessors2.attribute_options[:test3].should be_present
+
+        StorageRoom::TestAccessors2.attribute_options_including_superclasses.should have(3).items
+        StorageRoom::TestAccessors2.attribute_options_including_superclasses[:test].should be_present
+        StorageRoom::TestAccessors2.attribute_options_including_superclasses[:test2].should be_present
+        StorageRoom::TestAccessors2.attribute_options_including_superclasses[:test3].should be_present
+        
+        #
+        StorageRoom::TestAccessors3.attribute_options.should have(2).item
+        StorageRoom::TestAccessors3.attribute_options[:test4].should be_present
+        StorageRoom::TestAccessors3.attribute_options[:test5].should be_present
+        
+        StorageRoom::TestAccessors3.attribute_options_including_superclasses.should have(4).items
+        StorageRoom::TestAccessors3.attribute_options_including_superclasses[:test].should be_present
+        StorageRoom::TestAccessors3.attribute_options_including_superclasses[:test2].should be_present
+        StorageRoom::TestAccessors3.attribute_options_including_superclasses[:test4].should be_present
+        StorageRoom::TestAccessors3.attribute_options_including_superclasses[:test5].should be_present
+        
+        #
+        StorageRoom::TestAccessors4.attribute_options.should have(1).item
+        StorageRoom::TestAccessors4.attribute_options[:test6].should be_present
+        
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses.should have(5).items
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses[:test].should be_present
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses[:test2].should be_present
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses[:test4].should be_present
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses[:test5].should be_present
+        StorageRoom::TestAccessors4.attribute_options_including_superclasses[:test6].should be_present
+      end
+    end
   end
   
   

data/spec/storage_room/embeddeds/field_spec.rb

@@ -7,7 +7,7 @@ describe StorageRoom::Field do
   
   context "Configuration" do
     it "should have keys" do
-      keys = StorageRoom::Field.attribute_options.keys
+      keys = StorageRoom::Field.attribute_options_including_superclasses.keys
       
       [:name, :identifier, :interface, :hint, :input_type, :required, :unique, :maximum_length, :minimum_length, :minimum_number, :maximum_number, :minimum_size, :maximum_size].each do |key|
         keys.should include(key)

data/spec/storage_room/embeddeds/fields/association_field_spec.rb

@@ -7,7 +7,7 @@ describe StorageRoom::AssociationField do
   
   context "Configuration" do
     it "should have keys" do
-      keys = StorageRoom::AssociationField.attribute_options.keys
+      keys = StorageRoom::AssociationField.attribute_options_including_superclasses.keys
       
       [:collection_url].each do |key|
         keys.should include(key)

data/spec/storage_room/embeddeds/fields/atomic_field_spec.rb

@@ -7,7 +7,7 @@ describe StorageRoom::AtomicField do
   
   context "Configuration" do
     it "should have keys" do
-      keys = StorageRoom::AtomicField.attribute_options.keys
+      keys = StorageRoom::AtomicField.attribute_options_including_superclasses.keys
       
       [:default_value, :choices, :include_blank_choice].each do |key|
         keys.should include(key)

data/spec/storage_room/embeddeds/location_spec.rb

@@ -7,7 +7,7 @@ describe StorageRoom::Location do
   
   context "Configuration" do
     it "should have keys" do
-      keys = StorageRoom::Location.attribute_options.keys
+      keys = StorageRoom::Location.attribute_options_including_superclasses.keys
       
       [:lat, :lng].each do |key|
         keys.should include(key)

data/spec/storage_room/models/entry_spec.rb

@@ -1,5 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
+class TestEntry2 < StorageRoom::Entry
+  self.collection = 1
+end
+
+class TestEntry3 < StorageRoom::Entry
+  self.collection = 2
+end
+
 describe StorageRoom::Entry do
   before(:each) do
     @string_field = StorageRoom::StringField.new(:name => 'Name', :identifier => 'name')
@@ -35,6 +43,14 @@ describe StorageRoom::Entry do
         end
       end
       
+      describe "#collection" do
+        it "should return correct collection for subclasses" do
+          @collection.entry_class.collection.should == @collection
+          TestEntry2.collection.should == 1
+          TestEntry3.collection.should == 2
+        end
+      end
+      
       # describe "#search" do
       #   it "should load" do
       #     pending

data/storage_room.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{storage_room}
-  s.version = "0.3.13"
+  s.name = "storage_room"
+  s.version = "0.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = %q{2011-08-15}
-  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.date = "2011-11-21"
+  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 = [
     "LICENSE",
     "README.rdoc",
@@ -123,13 +123,12 @@ Gem::Specification.new do |s|
     "storage_room.gemspec",
     "tasks/storage_room.rake"
   ]
-  s.homepage = %q{http://github.com/thriventures/storage_room_gem}
+  s.homepage = "http://github.com/thriventures/storage_room_gem"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{StorageRoom API Wrapper (ActiveModel style)}
+  s.rubygems_version = "1.8.10"
+  s.summary = "StorageRoom API Wrapper (ActiveModel style)"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: storage_room
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 13
-  version: 0.3.13
+  prerelease: 
+  version: 0.3.14
 platform: ruby
 authors: 
 - Sascha Konietzke
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +02:00
-default_executable: 
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -40,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -53,10 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 1
         version: 0.6.1
   type: :runtime
   version_requirements: *id003
@@ -68,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id004
@@ -83,10 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id005
@@ -98,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
@@ -218,7 +193,6 @@ files:
 - spec/storage_room_spec.rb
 - storage_room.gemspec
 - tasks/storage_room.rake
-has_rdoc: true
 homepage: http://github.com/thriventures/storage_room_gem
 licenses: []
 
@@ -232,21 +206,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: StorageRoom API Wrapper (ActiveModel style)