storage_room 0.2.1 → 0.3.0

data/lib/storage_room/array.rb

@@ -1,28 +1,8 @@
 module StorageRoom
   # A container object that contains many models (collections or entries)
-  class Array < Base
-    attr_accessor :resources
-    
-        
-    def initialize(attributes = {})
-      self.resources = []
-      super
-    end
-    
-    # Set the array with the attributes from the API
-    def set_from_api(attributes)
-      super(attributes)
-                  
-      self.resources = attributes['resources'].map{|item| self.class.create_from_api(item)} # transform hashes to real objects
-      attributes.delete('resources')  
-    end
-    
-    # Reset the Array to its default state with all attributes unset
-    def reset!
-      super
-      @resources = []
-    end
-    
+  class Array < Resource
+    many :resources
+            
     # Replaces the objects content with the next page of the array if a next page exists
     def load_next_page!
       if self[:@next_page_url].present?

data/lib/storage_room/embedded.rb

@@ -1,7 +1,7 @@
 module StorageRoom
   # An embedded object that is not only a simple type (like an integer, string)
   class Embedded
-    include Attributes
+    include Accessors
     
   end
 end

data/lib/storage_room/embeddeds/field.rb

@@ -0,0 +1,28 @@
+module StorageRoom
+  
+  class Field < Embedded
+    key :name
+    key :identifier
+
+    key :hint
+
+    key :input_type
+
+    key :required
+    key :unique
+
+    key :maximum_length
+    key :minimum_length
+
+    key :minimum_number
+    key :maximum_number
+
+    key :minimum_size
+    key :maximum_size
+    
+    def add_to_entry_class(klass) # :nodoc:
+      
+    end
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/association_field.rb

@@ -0,0 +1,17 @@
+module StorageRoom
+  
+  class AssociationField < Field
+    key :collection_url
+    
+    def add_to_entry_class(klass) # :nodoc:
+      super
+      
+      collection
+    end
+    
+    # The target collection of the association field
+    def collection
+      @collection ||= Collection.load(self.collection_url)
+    end
+  end
+end

data/lib/storage_room/embeddeds/fields/associations/many_association_field.rb

@@ -0,0 +1,9 @@
+module StorageRoom
+  
+  class ManyAssociationField < AssociationField
+    def add_to_entry_class(klass) # :nodoc:
+      super
+      klass.send(:many, identifier)
+    end
+  end
+end

data/lib/storage_room/embeddeds/fields/associations/one_association_field.rb

@@ -0,0 +1,9 @@
+module StorageRoom
+  
+  class OneAssociationField < AssociationField
+    def add_to_entry_class(klass) # :nodoc:
+      super
+      klass.send(:one, identifier)
+    end
+  end
+end

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

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

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

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

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

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

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

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

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

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

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

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

data/lib/storage_room/embeddeds/fields/atomic_field.rb

@@ -0,0 +1,15 @@
+module StorageRoom
+  
+  class AtomicField < Field
+    key :default_value
+
+    key :choices
+    key :include_blank_choice
+    
+    def add_to_entry_class(klass) # :nodoc:
+      super
+      klass.send(:key, identifier)
+    end
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/compound/attachment_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class AttachmentField < CompoundField
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/compound/file_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class FileField < CompoundField
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/compound/image_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class ImageField < CompoundField
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/compound/location_field.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  
+  class LocationField < CompoundField
+    
+  end
+end

data/lib/storage_room/embeddeds/fields/compound_field.rb

@@ -0,0 +1,10 @@
+module StorageRoom
+  
+  class CompoundField < Field
+    def add_to_entry_class(klass) # :nodoc:
+      super
+      klass.send(:one, identifier)
+    end
+    
+  end
+end

data/lib/storage_room/embeddeds/file.rb

@@ -1,5 +1,5 @@
 module StorageRoom
-  # A file that is embedded in a entry
+  # Any file
   class File < Embedded
     
   end

data/lib/storage_room/embeddeds/image.rb

@@ -0,0 +1,6 @@
+module StorageRoom
+  # An Image with optional thumbnails
+  class Image < Embedded
+    
+  end
+end

data/lib/storage_room/embeddeds/location.rb

@@ -1,6 +1,7 @@
 module StorageRoom
   # A location with coordinates that is embedded in a entry
   class Location < Embedded
-    
+    key :lat
+    key :lng
   end
 end

data/lib/storage_room/extensions/const_defined.rb

@@ -0,0 +1,12 @@
+module ConstDefinedExtension
+  def is_constant_defined?(const)
+    if ::RUBY_VERSION =~ /1.9/
+      const_defined?(const, false)
+    else
+      const_defined?(const)
+    end
+  end
+end
+
+Object.send(:include, ConstDefinedExtension)
+Module.send(:include, ConstDefinedExtension)

data/lib/storage_room/identity_map.rb

@@ -0,0 +1,117 @@
+module StorageRoom
+  # With inspiration from John Nunemaker's MongoMapper
+  module IdentityMap
+    extend ActiveSupport::Concern
+    
+    included do
+      IdentityMap.models << self
+    end
+    
+    def self.models
+      @models ||= Set.new
+    end
+
+    def self.clear
+      models.each { |m| m.identity_map.clear }
+    end
+    
+    module ClassMethods
+      def inherited(descendant)
+        descendant.identity_map = identity_map
+        super
+      end
+      
+      # Load an object from the identity map if the key (URL) exists
+      def load(url, parameters = {})
+        return nil if url.nil?
+        
+        if identity_map_on? && object = identity_map[url]
+          StorageRoom.log("Loaded #{object} from identity map (load)")
+          object
+        else
+          super
+        end
+      end
+
+      # Load an object from the identity map or create it
+      def new_from_response_data(response_data)        
+        url = response_data['@url'] || response_data['url']
+        object = url ? identity_map[url] : nil
+
+        if object.present? && identity_map_on?
+          StorageRoom.log("Loaded #{object} from identity map (new_from_response_data)")
+          object.set_from_response_data(response_data) 
+        else
+          object = super
+          if identity_map_on? && url.present? && object.is_a?(Model)
+            identity_map[url] = object 
+            StorageRoom.log("Storing #{url} in identity map: #{object}")
+          end
+        end
+        
+        object
+      end
+
+      def identity_map
+        @identity_map ||= {}
+      end
+
+      def identity_map=(v)
+        @identity_map = v
+      end
+      
+      def identity_map_status
+        defined?(@identity_map_status) ? @identity_map_status : true
+      end
+
+      def identity_map_on
+        @identity_map_status = true
+      end
+
+      def identity_map_off
+        @identity_map_status = false
+      end
+
+      def identity_map_on?
+        identity_map_status
+      end
+
+      def identity_map_off?
+        !identity_map_on?
+      end
+
+      def without_identity_map(&block)
+        identity_map_off
+        yield
+      ensure
+        identity_map_on
+      end
+      
+    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
+      end
+      
+      def destroy 
+         identity_map.delete(self[:@url]) if self.class.identity_map_on?
+         super
+       end
+      
+    end
+  end
+end
+

data/lib/storage_room/model.rb

@@ -1,6 +1,6 @@
 module StorageRoom
   # Abstract superclass for classes that can persist to the remote servers
-  class Model < Base
+  class Model < Resource    
     class << self
       # Create a new model with the passed attributes
       def create(attributes={})
@@ -35,31 +35,21 @@ module StorageRoom
     
     # Create a new model and set its attributes
     def initialize(attributes={})     
-      @new_record = true
       @errors = []
       
       super
     end
-    
-    # Set the attributes of the model from the API
-    def set_from_api(attributes)
-      super
-      @new_record = false
-      
-      self.attributes
-    end
-    
+        
     # Reset the model to its default state
     def reset!
       super
-      @new_record = true
       @errors = []
       true
     end
     
     # Has this model been saved to the API already?
     def new_record?
-      @new_record ? true : false
+      self['@version'] ? false : true
     end
     
     # Create a new model or update an existing model on the server
@@ -77,7 +67,7 @@ module StorageRoom
     # Update an existing model on the server
     def update
       return false if new_record?
-      httparty = self.class.put(url, :body => to_json)
+      httparty = self.class.put(self[:@url], :body => to_json)
       handle_save_response(httparty)
     end
     
@@ -85,7 +75,7 @@ module StorageRoom
     def destroy
       return false if new_record?
       
-      httparty = self.class.delete(url)
+      httparty = self.class.delete(self[:@url])
       self.class.handle_critical_response_errors(httparty)
       
       true
@@ -96,8 +86,17 @@ module StorageRoom
       self.errors.empty?
     end
     
-    def as_json(args = {}) # :nodoc:
-      {self.class.json_name => self.attributes.reject{|k, v| self.class.meta_data?(k) && k.to_s != '@version'}}
+    # 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}        
+      end
     end
     
     # The validation errors that were returned by the server
@@ -105,22 +104,19 @@ module StorageRoom
       @errors ||= []
     end
     
-    # ===================
-    # = Private Methods =
-    # ===================
-    
-    private
+    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_api(httparty.parsed_response.first[1])
+          self.set_from_response_data(httparty.parsed_response.first[1])
           true
         else
           @errors = httparty.parsed_response['error']['message']
           false
         end
       end
+
       
   end
 end