logical_model 0.5.13 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.6.0

data/lib/logical_model/associations/belongs_to.rb

@@ -14,6 +14,9 @@ class LogicalModel
           attr_accessor "#{key}_id"
           attr_class = get_attr_class(key, options)
 
+          @belongs_to_keys ||= {}
+          @belongs_to_keys.merge!({key => attr_class})
+
           define_method("#{key}=") do |param|
             if param.is_a?(Hash)
               param.stringify_keys!
@@ -51,6 +54,30 @@ class LogicalModel
           end
         end
 
+        def belongs_to_keys
+          # This hack was needed to consider the case where the belongs_to was set on a parent class, for example:
+          #
+          # class ContactAttribute < LogicalModel
+          #   ...
+          #   belongs_to :contact
+          # end
+          #
+          # class Telephone < ContactAttribute
+          #   ...
+          # end
+          #
+          # It returns the parent's class variable if present.  
+          result = nil
+          if !@belongs_to_keys.nil?
+            result = @belongs_to_keys
+          elsif self.superclass.respond_to? :belongs_to_keys
+            result = self.superclass.belongs_to_keys
+          else
+            result = nil
+          end
+          result
+        end
+
         private
 
         def get_attr_class(key, options)

data/lib/logical_model/associations/has_many_keys.rb

@@ -66,6 +66,8 @@ class LogicalModel
                 # in this case we recieved instanciated objects
                 collection << attr_params
               else
+                clazz_name = attr_params['_type']
+                attr_class = clazz_name.constantize unless clazz_name.blank?
                 # in this case we recieved object attributes, we instanciate here
                 collection << attr_class.new(attr_params)
               end
@@ -75,13 +77,16 @@ class LogicalModel
 
           # Initialize instance of associated object
           define_method "new_#{StringHelper.singularize(association.to_s)}" do |attr_params|
-            clazz = attr_class
+            run_callbacks :new_nested do
+              clazz_name = attr_params['_type']
+              clazz = clazz_name.blank? ? attr_class  : clazz_name.constantize
 
-            return unless clazz
+              return unless clazz
 
-            temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
-            eval(association.to_s) << temp_object
-            temp_object
+              temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
+              eval(association.to_s) << temp_object
+              temp_object
+            end
           end
 
           # this method loads the contact attributes from the html form (using nested resources conventions)

data/lib/logical_model/cache.rb

@@ -2,9 +2,11 @@ class LogicalModel
   module Cache
 
     def self.included(base)
-      base.send(:extend, ClassMethods)
+      base.extend ClassMethods
       base.send(:include, InstanceMethods)
       base.send(:after_initialize, :initialize_loaded_at)
+      base.send(:define_model_callbacks, :new_nested)
+      base.send(:after_new_nested, :delete_cached)
     end
 
     module InstanceMethods
@@ -19,9 +21,7 @@ class LogicalModel
       end
 
       def _save_with_cache
-        model_name = self.class.to_s.pluralize.underscore
-        self.class.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/#{self.id}-.*"
-        self.class.cache_store.delete_matched(/#{model_name}\/#{self.id}-.*/)
+        delete_cached
         _save_without_cache
       end
       alias_method_chain :_save, :cache
@@ -31,9 +31,7 @@ class LogicalModel
       end
 
       def _update_with_cache(params={})
-        model_name = self.class.to_s.pluralize.underscore
-        self.class.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/#{self.id}-.*"
-        self.class.cache_store.delete_matched(/#{model_name}\/#{self.id}-.*/)
+        delete_cached
         _update_without_cache params
       end
       alias_method_chain :_update, :cache
@@ -43,12 +41,27 @@ class LogicalModel
       end
 
       def _destroy_with_cache(params={})
+        delete_cached
+        _destroy_without_cache
+      end
+      alias_method_chain :_destroy, :cache
+
+      def delete_cached
         model_name = self.class.to_s.pluralize.underscore
         self.class.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/#{self.id}-.*"
+        # Delete cached models
         self.class.cache_store.delete_matched(/#{model_name}\/#{self.id}-.*/)
-        _destroy_without_cache
+        
+        if self.class.respond_to?(:belongs_to_keys) && !self.class.belongs_to_keys.blank?
+          # If it belongs to another model (or models)
+          self.class.belongs_to_keys.each do |association_name, association_class|
+            model_name = association_class.to_s.pluralize.underscore
+            self.class.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/#{self.send("#{association_name}_id")}-.*"
+            # Delete cached models
+            self.class.cache_store.delete_matched(/#{model_name}\/#{self.send("#{association_name}_id")}-.*/)
+          end
+        end
       end
-      alias_method_chain :_destroy, :cache      
     end
 
     module ClassMethods
@@ -111,6 +124,7 @@ class LogicalModel
         model_name = self.to_s.pluralize.underscore
         self.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/#{id}-.*"
         self.cache_store.delete_matched(/#{model_name}\/#{id}-.*/)
+        #TODO: also delete cache for parent (belongs_to)
         delete_without_cache(id, params)
       end
       alias_method_chain :delete, :cache
@@ -123,10 +137,10 @@ class LogicalModel
         model_name = self.to_s.pluralize.underscore
         self.logger.debug "LogicalModel Log CACHE: Delete cache for #{model_name}\/(#{ids.join('|')})-.*"
         self.cache_store.delete_matched(/#{model_name}\/(#{ids.join('|')})-.*/)
+        #TODO: also delete cache for parent (belongs_to)
         delete_multiple_without_cache(ids, params)
       end
       alias_method_chain :delete_multiple, :cache
     end
-
   end
 end

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.5.13"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2014-06-13"
+  s.date = "2014-06-25"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [

data/spec/lib/logical_model/cache_spec.rb

@@ -1,17 +1,19 @@
 require './lib/logical_model'
 
 describe LogicalModel::Cache do
+  class Example < LogicalModel
+      
+    attribute :id
+    attribute :name
+    
+    self.hydra = Typhoeus::Hydra.new
+
+    self.enable_delete_multiple = true
+  end
+
   describe "when included" do
     before do
-      class Example < LogicalModel
-        
-        attribute :id
-        attribute :name
-        
-        self.hydra = Typhoeus::Hydra.new
-
-        self.enable_delete_multiple = true
-      end
+      
     end
 
     it "adds expires_in class method" do
@@ -133,4 +135,59 @@ describe LogicalModel::Cache do
       end
     end
   end
+
+  describe "when using has_many & belongs_to" do
+
+    class SecondaryExample < LogicalModel
+      attribute :id
+
+      self.hydra = Typhoeus::Hydra.new
+
+      self.enable_delete_multiple = true
+
+      belongs_to :example
+    end
+
+    class SecondaryExampleChild < SecondaryExample
+      attribute :name
+    end
+
+    before do
+      Example.has_many_keys = [:secondary_examples]
+    end
+
+    it "should set belongs_to_keys" do
+      SecondaryExampleChild.belongs_to_keys.should_not be_blank
+    end
+
+    describe "save" do
+      before do
+        Example.stub_chain(:cache_store, :read).and_return(Example.new)
+        SecondaryExampleChild.stub_chain(:cache_store, :read).and_return(SecondaryExampleChild.new(:example_id => 123))
+        Example.stub_chain(:cache_store, :delete_matched).and_return(nil)
+        SecondaryExampleChild.stub_chain(:cache_store, :delete_matched).and_return(nil)
+        SecondaryExampleChild.async_find("id") {|r| @result = r}
+      end
+
+      it "should clear cache" do
+        SecondaryExampleChild.cache_store.should_receive(:delete_matched).with(/examples\/123-.*/)
+        @result.save
+      end
+    end
+
+    describe "adding a new model to has_many" do
+      before do
+        Example.stub_chain(:cache_store, :read).and_return(Example.new(:id => 123))
+        SecondaryExampleChild.stub_chain(:cache_store, :read).and_return(SecondaryExampleChild.new(:example_id => 123))
+        Example.stub_chain(:cache_store, :delete_matched).and_return(nil)
+        SecondaryExampleChild.stub_chain(:cache_store, :delete_matched).and_return(nil)
+        Example.async_find("123") {|r| @result = r}
+      end
+
+      it "should clear cache" do
+        Example.cache_store.should_receive(:delete_matched).with(/examples\/123-.*/)
+        @result.new_secondary_example(:example_id => 123)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -393,7 +393,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -822604947
+      hash: -732207341
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: