acts_as_metadata 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts_as_metadata (0.3.9)
+    acts_as_metadata (0.4.1)
       rails (>= 3.0.0)
 
 GEM
@@ -41,9 +41,9 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
+    mime-types (1.24)
     minitest (4.7.5)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -84,7 +84,7 @@ GEM
     thread_safe (0.1.2)
       atomic
     tilt (1.4.1)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)

data/README.md

@@ -39,7 +39,7 @@ Create metadata types in your database:
 Its ready to use:
 
     m = MyModel.new
-    m.sample = 'some string'
+    m.m_sample = 'some string'
     m.save!
 
 Add some validations or default value if you need:

data/lib/metadata/acts_as_metadata.rb

@@ -1,13 +1,11 @@
 module ActsAsMetadata
   def acts_as_metadata options={}
     if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
-      scope = "#{options[:scope]}_id".to_sym
+      @metadata_scope = "#{options[:scope]}_id".to_sym
     else
-		  scope = nil
+		  @metadata_scope = nil
 		end
-		
-		MetadataType.class_variable_set "@@metadata_scope", scope
-		class_variable_set "@@metadata_scope", scope
+	  	
 		class_eval do
       serialize :metadata_cache
       has_many :metadata, :as => :model, :dependent => :destroy, :class_name => "Metadata::Metadata", autosave: true
@@ -17,7 +15,7 @@ module ActsAsMetadata
 
       def metadata_constraints
         metadata_types.each do |type_name|
-          type = MetadataType.type(type_name, metadata_scope)
+          type = metadata_type type_name
           value = get_metadata(type.tag)
           values = type.values.map {|v| v.is_a?(Array) ? v[1].to_s : v.to_s } rescue []
           if value.is_a? Array
@@ -37,7 +35,6 @@ module ActsAsMetadata
       def skip_metadata_validation!
         @skip_metadata_validation = true
       end
-
       
       def mass_assignment_authorizer role = :default
         super + metadata_types.map {|t| "m_#{t}"}
@@ -56,25 +53,54 @@ module ActsAsMetadata
       end
   	  
       def metadata_scope
-        self.class.class_variable_get('@@metadata_scope') ? send(self.class.class_variable_get('@@metadata_scope')) : nil
+        self.class.metadata_scope
+      end
+  	  
+      def self.metadata_scope
+        @metadata_scope
       end
   	  
-  	  def model_name
-  	    self.class.name.underscore.to_sym
-  	  end
-      
       def metadata_type name
-        MetadataType.type name, metadata_scope
+        self.class.metadata_scheme(metadata_scope)[name]
       end
 
       def metadata_types
-        MetadataType.model_types model_name, metadata_scope
+        self.class.metadata_types metadata_scope
       end
 
 			def self.metadata_types scope=nil
-				MetadataType.model_types name.underscore.to_sym, scope
+        model = name.underscore.to_sym
+        types = Rails.cache.fetch("metadata_scheme_#{metadata_scope}#{scope}_modeltypes", expires_in: 60.minutes) do
+           res = { :any => [] }
+           metadata_scheme(scope).each do |tag, type|
+             type.models.each do |model| 
+               res[model] = [] if res[model].blank?
+               res[model] << tag
+             end if type.models
+           end
+           res
+        end
+        types[model] ? (types[model] | types[:any]).uniq : types[:any]
 			end
+       
+      def self.metadata_scheme_data(scope=nil)
+        Rails.cache.fetch("metadata_scheme_#{metadata_scope}#{scope}_data", expires_in: 60.minutes) do
+          uncached do
+            scope.blank? ? MetadataType.all : MetadataType.where(metadata_scope => scope)
+          end
+        end
+      end
       
+      def self.metadata_scheme(scope=nil)
+        Rails.cache.fetch("metadata_scheme_#{metadata_scope}#{scope}_types", expires_in: 60.minutes) do
+          res = {}
+          metadata_scheme_data(scope).each do |type|
+            res[type.tag] = type
+          end
+          res
+        end
+      end
+
       def get_metadata name
         load_metadata unless metadata_cache.is_a? Hash
         type = metadata_type name

data/lib/metadata/metadata_type.rb

@@ -12,7 +12,8 @@ class MetadataType < ActiveRecord::Base
   serialize :default
   serialize :values
   serialize :models
-  after_create :set_default_values
+  before_save :set_correct_values
+  after_create :refresh_metadata
   after_update :refresh_metadata
   before_destroy :refresh_metadata
   validates :tag, :presence => true, :format => {:with => /[a-z]+[a-z0-9_]*/}
@@ -52,78 +53,33 @@ class MetadataType < ActiveRecord::Base
   end
  
   def values= value
-    value =  value.invert.to_a if value.is_a?(Hash)
+    value = value.invert.to_a if value.is_a?(Hash)
     super
   end
-
-  def default
-    type_cast(attributes['default'])
-  end
-
-  def self.scheme_data(scope=nil)
-    Rails.cache.fetch("metadata_scheme_#{@@metadata_scope}#{scope}_data", :expires_in => 60.minutes) do
-		  uncached do
-        scheme_data = scope.blank? ? self.all : self.where(@@metadata_scope => scope).all
-        if scheme_data.count > 0
-          scheme_data
-        else
-          []
-        end
-      end
-		end
-  end
-  
-  def self.scheme(scope=nil)
-    Rails.cache.fetch("metadata_scheme_#{@@metadata_scope}#{scope}_types", :expires_in => 60.minutes) do
-      res = {}
-      self.scheme_data(scope).each do |type|
-        res[type.tag] = type
-      end
-      res
-    end
-  end
-  
-  def self.model_types(model, scope=nil)
-    types = Rails.cache.fetch("metadata_scheme_#{@@metadata_scope}#{scope}_modeltypes", :expires_in => 60.minutes) do
-       res = { :any => [] }
-       self.scheme(scope).each do |tag, type|
-         type.models.each do |model| 
-      	   res[model] = [] if res[model].blank?
-      	   res[model] << tag
-     	   end if type.models
-     	 end
-     	 res
-    end
-    types[model] ? (types[model] | types[:any]).uniq : types[:any]
-  end
-  
-  def self.type(name, scope=nil)
-    self.scheme(scope)[name]
-  end
- 
-  def self.drop_cache(scope=nil)
-    Rails.cache.delete("metadata_scheme_#{@@metadata_scope}#{scope}_data")
-    Rails.cache.delete("metadata_scheme_#{@@metadata_scope}#{scope}_types")
-    Rails.cache.delete("metadata_scheme_#{@@metadata_scope}#{scope}_modeltypes")
-  end
  
 private 
-  def set_default_values
-		self.models = [] if self.models.nil?
-		self.values = [] if self.values.nil?
-		self.save
-		if @@metadata_scope
-		  MetadataType.drop_cache(self.send(@@metadata_scope))
-		else
-		  MetadataType.drop_cache
-		end  
-	end 
+  def drop_metadata_scheme_cache scope_column=nil, scope_value=nil
+    Rails.cache.delete("metadata_scheme_#{scope_column}#{scope_value}_data")
+    Rails.cache.delete("metadata_scheme_#{scope_column}#{scope_value}_types")
+    Rails.cache.delete("metadata_scheme_#{scope_column}#{scope_value}_modeltypes")
+  end
+
+  def set_correct_values
+		self.models = (models || []).map(&:to_sym).uniq.keep_if {|model| Kernel.const_defined?(model.capitalize) || model == :any }
+		self.values = (values || []).uniq
+    self.default = type_cast default
+  end 
 
   def refresh_metadata
-    if @@metadata_scope
-      MetadataType.drop_cache(self.send(@@metadata_scope))
-    else
-      MetadataType.drop_cache
+    drop_metadata_scheme_cache
+    model_classes = models.include?(:any) ? ObjectSpace.each_object(Class).select {|klass| klass < ActiveRecord::Base } : models.map {|model| Kernel.const_get model }
+    scope_columns = []
+    model_classes.each do |model|
+      model
+      scope_columns << model.metadata_scope if model.respond_to? :metadata_scope
+    end
+    scope_columns.uniq.compact.each do |scope_column|
+      drop_metadata_scheme_cache scope_column, send(scope_column)
     end
   end
 end

data/lib/metadata/version.rb

@@ -1,3 +1,3 @@
 module ActsAsMetadata
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/acts_as_metadata_spec.rb

@@ -7,7 +7,8 @@ end
 describe ActsAsMetadata do
   it 'creates metadata_type' do
     MetadataType.default.save!
-    MetadataType.scheme_data.count.should == 1
+    MyModel.metadata_scheme_data.count.should == 1
+    MyModel.new.metadata_types.count.should == 1
   end
   
   it 'has default metadata value' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_metadata
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails