storage_room 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,6 @@
+=== Version 0.3.1
+* Support for ArrayField and JsonField
+
 === Version 0.3.0
 * Complete refactoring of internals. 
   * Added support for associations

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/examples/create_entry.rb

@@ -8,7 +8,7 @@ guidebook_collection = StorageRoom::Collection.find('4dda7761b65245fde100005d')
 category_collection  = StorageRoom::Collection.find('4dda7761b65245fde100001a')
 
 category = category_collection.entries.resources.first # find the first category
-guidebook = guidebook_collection.entry_class.new(:title => 'Bar', :price => 2.23, :category => category)
+guidebook = guidebook_collection.entry_class.new(:title => 'Bar', :price => 2.23, :category => category, :tags => ['tag1', 'tag2'])
 
 if guidebook.save # save the guidebook with the associated category
   puts "Guidebook Entry saved (#{guidebook[:@url]})"

data/lib/storage_room/accessors.rb

@@ -57,9 +57,9 @@ module StorageRoom
 
         self.attributes.each do |name, value|
           hash[name] = if value.is_a?(::Array)
-            value.map{|x| x.respond_to?(:to_hash) ? x.to_hash(:nested => true) : x }
+            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)
-            value.to_hash(:nested => true)
+            call_method_with_optional_parameters(value, :to_hash, :nested => true)
           elsif value.respond_to?(:as_json)
             value.as_json(:nested => true)
           else
@@ -69,7 +69,7 @@ module StorageRoom
         
         hash
       end
-          
+                
       def inspect # :nodoc:
         body = attributes.map{|k, v| "#{k}: #{attribute_for_inspect(v)}"}.join(', ')
         "#<#{self.class} #{body}>"        
@@ -92,6 +92,17 @@ module StorageRoom
       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:
           self.class.attribute_options.each do |name, options|
@@ -114,7 +125,7 @@ module StorageRoom
           if loaded?
             yield if block_given?
           else
-            raise StorageRoom::ResourceNotLoaded
+            raise StorageRoom::ResourceNotLoadedError
           end
         end
         

data/lib/storage_room/embeddeds/fields/atomic/array_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class ArrayField < AtomicField
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/atomic/json_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class JsonField < AtomicField
+    
+  end
+end

data/lib/storage_room/model.rb

@@ -21,15 +21,15 @@ module StorageRoom
       
       #       
       def index_path # :nodoc:
-        raise StorageRoom::AbstractMethod.new
+        raise StorageRoom::AbstractMethodError.new
       end
       
       def show_path(id) # :nodoc:
-        raise StorageRoom::AbstractMethod.new
+        raise StorageRoom::AbstractMethodError.new
       end
       
       def json_name  # :nodoc:
-        raise StorageRoom::AbstractMethod.new
+        raise StorageRoom::AbstractMethodError.new
       end
     end
     
@@ -110,7 +110,10 @@ module StorageRoom
         
         if httparty.response.code == '200' || httparty.response.code == '201'
           self.set_from_response_data(httparty.parsed_response.first[1])
+          @errors = []
           true
+        elsif httparty.response.code == '409' # optimistic locking
+          raise OptimisticLockingError.new("The Model has been updated by somebody else")
         else
           @errors = httparty.parsed_response['error']['message']
           false

data/lib/storage_room/resource.rb

@@ -15,9 +15,9 @@ module StorageRoom
       # Handle known server errors
       def handle_critical_response_errors(httparty) # :nodoc:
         case httparty.response.code
-          when '200', '201', '422' then true
+          when '200', '201', '409', '422' then true
           else
-            raise StorageRoom::RequestFailed.new("Invalid HTTP Response: #{httparty.response.code}")
+            raise StorageRoom::RequestFailedError.new("Invalid HTTP Response: #{httparty.response.code}")
         end
       end
       

data/lib/storage_room.rb

@@ -10,10 +10,11 @@ require 'storage_room/extensions/const_defined'
 require 'storage_room/plugins'
 
 module StorageRoom  
-  class AbstractMethod      < RuntimeError; end
-  class RequestFailed       < RuntimeError; end
-  class ResourceNotLoaded   < RuntimeError; end
-  class ClassNotFound       < RuntimeError; end
+  class AbstractMethodError      < RuntimeError; end
+  class RequestFailedError       < RuntimeError; end
+  class ResourceNotLoadedError   < RuntimeError; end
+  class ClassNotFoundError       < RuntimeError; end
+  class OptimisticLockingError   < RuntimeError; end
   
   autoload :Plugins,                  'storage_room/plugins'
   autoload :Accessors,                'storage_room/accessors'
@@ -38,7 +39,9 @@ module StorageRoom
   autoload :FloatField,               'storage_room/embeddeds/fields/atomic/float_field'  
   autoload :DateField,                'storage_room/embeddeds/fields/atomic/date_field'  
   autoload :BooleanField,             'storage_room/embeddeds/fields/atomic/boolean_field'  
-  
+  autoload :ArrayField,               'storage_room/embeddeds/fields/atomic/array_field'
+  autoload :JsonField,                'storage_room/embeddeds/fields/atomic/json_field'
+    
   autoload :CompoundField,            'storage_room/embeddeds/fields/compound_field'  
   autoload :AttachmentField,          'storage_room/embeddeds/fields/compound/attachment_field'
   autoload :FileField,                'storage_room/embeddeds/fields/compound/file_field'
@@ -112,13 +115,18 @@ module StorageRoom
     # Return a Ruby class for a StorageRoom type
     def class_for_name(name)     
       name_with_mapping = entry_class_for_name(name)
+      
+      begin
+        if StorageRoom.is_constant_defined?(name)
+          return "StorageRoom::#{name}".constantize
+        end
+      rescue NameError # could contain spaces etc.
+      end
         
-      if StorageRoom.is_constant_defined?(name)
-        "StorageRoom::#{name}".constantize
-      elsif Object.is_constant_defined?(name_with_mapping)
+      if Object.is_constant_defined?(name_with_mapping)
         name_with_mapping.constantize
       else
-        raise ClassNotFound.new("Unknown class: #{name}")
+        raise ClassNotFoundError.new("Unknown class: #{name}")
       end
     end
     

data/spec/storage_room/embeddeds/fields/atomic/array_field_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe StorageRoom::ArrayField do
+  
+end

data/spec/storage_room/embeddeds/fields/atomic/json_field_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe StorageRoom::JsonField do
+  
+end

data/spec/storage_room/model_spec.rb

@@ -29,7 +29,7 @@ describe StorageRoom::Model do
         it "should raise" do
           lambda {
             StorageRoom::Model.show_path(1)
-          }.should raise_error(StorageRoom::AbstractMethod)
+          }.should raise_error(StorageRoom::AbstractMethodError)
         end
       end
       
@@ -37,7 +37,7 @@ describe StorageRoom::Model do
         it "should raise" do
           lambda {
             StorageRoom::Model.index_path
-          }.should raise_error(StorageRoom::AbstractMethod)
+          }.should raise_error(StorageRoom::AbstractMethodError)
         end
       end
       
@@ -45,7 +45,7 @@ describe StorageRoom::Model do
         it "should raise" do
           lambda {
             StorageRoom::Model.json_name
-          }.should raise_error(StorageRoom::AbstractMethod)
+          }.should raise_error(StorageRoom::AbstractMethodError)
         end
       end
       

data/spec/storage_room/models/collection_spec.rb

@@ -41,7 +41,7 @@ describe StorageRoom::Collection do
       end
       
       it "should have an error if not loaded" do
-        lambda { @collection2.entries }.should raise_error(StorageRoom::ResourceNotLoaded)
+        lambda { @collection2.entries }.should raise_error(StorageRoom::ResourceNotLoadedError)
       end
     end
     
@@ -51,7 +51,7 @@ describe StorageRoom::Collection do
       end
       
       it "should have an error if not loaded" do
-        lambda { @collection2.entry_class_name }.should raise_error(StorageRoom::ResourceNotLoaded)
+        lambda { @collection2.entry_class_name }.should raise_error(StorageRoom::ResourceNotLoadedError)
       end
     end
     
@@ -61,7 +61,7 @@ describe StorageRoom::Collection do
       end
       
       it "should have an error if not loaded" do
-        lambda { @collection2.entry_class }.should raise_error(StorageRoom::ResourceNotLoaded)
+        lambda { @collection2.entry_class }.should raise_error(StorageRoom::ResourceNotLoadedError)
       end
     end
     
@@ -75,7 +75,7 @@ describe StorageRoom::Collection do
       end
 
       it "should have an error if not loaded" do
-        lambda { @collection2.field('name') }.should raise_error(StorageRoom::ResourceNotLoaded)
+        lambda { @collection2.field('name') }.should raise_error(StorageRoom::ResourceNotLoadedError)
       end
     end
   end

data/spec/storage_room/resource_spec.rb

@@ -44,7 +44,7 @@ describe StorageRoom::Resource do
           
           lambda {
             StorageRoom::Array.load('/collections')
-          }.should raise_error(StorageRoom::RequestFailed)
+          }.should raise_error(StorageRoom::RequestFailedError)
           
         end
       end
@@ -73,7 +73,7 @@ describe StorageRoom::Resource do
         it "should raise error" do
           lambda {
             StorageRoom::Resource.handle_critical_response_errors(mock_httparty(500))
-          }.should raise_error(StorageRoom::RequestFailed)
+          }.should raise_error(StorageRoom::RequestFailedError)
         end
       end
             

data/spec/storage_room_spec.rb

@@ -127,7 +127,7 @@ describe StorageRoom do
     it "should raise an error for unknown classes" do
       lambda {
         StorageRoom.class_for_name("Unknown")
-      }.should raise_error(StorageRoom::ClassNotFound)
+      }.should raise_error(StorageRoom::ClassNotFoundError)
       
     end
   end

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{storage_room}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = %q{2011-06-20}
+  s.date = %q{2011-06-22}
   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 = [
@@ -41,10 +41,12 @@ Gem::Specification.new do |s|
     "lib/storage_room/embeddeds/fields/association_field.rb",
     "lib/storage_room/embeddeds/fields/associations/many_association_field.rb",
     "lib/storage_room/embeddeds/fields/associations/one_association_field.rb",
+    "lib/storage_room/embeddeds/fields/atomic/array_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/boolean_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/date_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/float_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/integer_field.rb",
+    "lib/storage_room/embeddeds/fields/atomic/json_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/string_field.rb",
     "lib/storage_room/embeddeds/fields/atomic/time_field.rb",
     "lib/storage_room/embeddeds/fields/atomic_field.rb",
@@ -75,10 +77,12 @@ Gem::Specification.new do |s|
     "spec/storage_room/embeddeds/fields/association_field_spec.rb",
     "spec/storage_room/embeddeds/fields/associations/many_association_field_spec.rb",
     "spec/storage_room/embeddeds/fields/associations/one_association_field_spec.rb",
+    "spec/storage_room/embeddeds/fields/atomic/array_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/boolean_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/date_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/float_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/integer_field_spec.rb",
+    "spec/storage_room/embeddeds/fields/atomic/json_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/string_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic/time_field_spec.rb",
     "spec/storage_room/embeddeds/fields/atomic_field_spec.rb",

data/tasks/storage_room.rake

@@ -1,3 +1,3 @@
-task :console2 do
+task :development do
   sh("irb -I lib -r console.rb")
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sascha Konietzke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -03:00
+date: 2011-06-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,10 +109,12 @@ files:
 - lib/storage_room/embeddeds/fields/association_field.rb
 - lib/storage_room/embeddeds/fields/associations/many_association_field.rb
 - lib/storage_room/embeddeds/fields/associations/one_association_field.rb
+- lib/storage_room/embeddeds/fields/atomic/array_field.rb
 - lib/storage_room/embeddeds/fields/atomic/boolean_field.rb
 - lib/storage_room/embeddeds/fields/atomic/date_field.rb
 - lib/storage_room/embeddeds/fields/atomic/float_field.rb
 - lib/storage_room/embeddeds/fields/atomic/integer_field.rb
+- lib/storage_room/embeddeds/fields/atomic/json_field.rb
 - lib/storage_room/embeddeds/fields/atomic/string_field.rb
 - lib/storage_room/embeddeds/fields/atomic/time_field.rb
 - lib/storage_room/embeddeds/fields/atomic_field.rb
@@ -143,10 +145,12 @@ files:
 - spec/storage_room/embeddeds/fields/association_field_spec.rb
 - spec/storage_room/embeddeds/fields/associations/many_association_field_spec.rb
 - spec/storage_room/embeddeds/fields/associations/one_association_field_spec.rb
+- spec/storage_room/embeddeds/fields/atomic/array_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/boolean_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/date_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/float_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/integer_field_spec.rb
+- spec/storage_room/embeddeds/fields/atomic/json_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/string_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic/time_field_spec.rb
 - spec/storage_room/embeddeds/fields/atomic_field_spec.rb