acts_as_metadata 0.3.9 → 0.4.1

data/Gemfile.lock

@@ -1,79 +1,67 @@
 PATH
   remote: .
   specs:
-    acts_as_metadata (0.3.8)
+    acts_as_metadata (0.3.9)
       rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.4)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    multi_json (1.6.1)
+    mime-types (1.23)
+    minitest (4.7.5)
+    multi_json (1.7.7)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -82,15 +70,21 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sprockets (2.2.2)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     sqlite3 (1.3.6)
-    thor (0.17.0)
-    tilt (1.3.5)
-    treetop (1.4.12)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)

data/lib/metadata/acts_as_metadata.rb

@@ -1,18 +1,18 @@
 module ActsAsMetadata
-  def acts_as_metadata(options={})
+  def acts_as_metadata options={}
     if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
       scope = "#{options[:scope]}_id".to_sym
     else
 		  scope = nil
 		end
 		
-		MetadataType.class_variable_set("@@metadata_scope", scope)
-		class_variable_set("@@metadata_scope", scope)
+		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"
-      before_create :create_accessors_and_save_metadata
-      before_update :create_accessors_and_save_metadata
+      has_many :metadata, :as => :model, :dependent => :destroy, :class_name => "Metadata::Metadata", autosave: true
+      after_initialize :create_accessors
+      before_save :save_metadata
       validate :metadata_constraints
 
       def metadata_constraints
@@ -23,13 +23,13 @@ module ActsAsMetadata
           if value.is_a? Array
             errors.add(type.tag, I18n.t('acts_as_metadata.errors.blank')) if type.mandatory && (value.blank? || value.map(&:blank?).reduce(:&))
             value.each_with_index do |v, i|
-              errors.add("#{type.tag}_#{i}", I18n.t('acts_as_metadata.errors.format')) if values.blank? && type.format.present? && v.present? && v.to_s !~ Regexp.new("^#{type.format}$")
-              errors.add("#{type.tag}_#{i}", I18n.t('acts_as_metadata.errors.values')) if values.present? && v.present? && !values.include?(v)
+              errors.add("m_#{type.tag}_#{i}", I18n.t('acts_as_metadata.errors.format')) if values.blank? && type.format.present? && v.present? && v.to_s !~ Regexp.new("^#{type.format}$")
+              errors.add("m_#{type.tag}_#{i}", I18n.t('acts_as_metadata.errors.values')) if values.present? && v.present? && !values.include?(v)
             end
           else
-            errors.add(type.tag, I18n.t('acts_as_metadata.errors.blank')) if type.mandatory && value.blank?
-            errors.add(type.tag, I18n.t('acts_as_metadata.errors.format')) if values.blank? && type.format.present? && value.present? && value.to_s !~ Regexp.new("^#{type.format}$")
-            errors.add(type.tag, I18n.t('acts_as_metadata.errors.values')) if values.present? && value.present? && !values.include?(value.to_s)
+            errors.add("m_#{type.tag}", I18n.t('acts_as_metadata.errors.blank')) if type.mandatory && value.blank?
+            errors.add("m_#{type.tag}", I18n.t('acts_as_metadata.errors.format')) if values.blank? && type.format.present? && value.present? && value.to_s !~ Regexp.new("^#{type.format}$")
+            errors.add("m_#{type.tag}", I18n.t('acts_as_metadata.errors.values')) if values.present? && value.present? && !values.include?(value.to_s)
           end
         end unless @skip_metadata_validation
       end
@@ -39,22 +39,8 @@ module ActsAsMetadata
       end
 
       
-      def mass_assignment_authorizer(role = :default)
-        super + metadata_types
-      end
-      
-      def initialize(args=nil, options = {})
-        scope = self.class.class_variable_get('@@metadata_scope') ? args[self.class.class_variable_get('@@metadata_scope')] : nil rescue nil
-        types = MetadataType.model_types(model_name, scope)
-        types.each do |type|
-          create_accessor type
-        end
-        super
-      end
-
-      def update_attributes(attributes)
-        create_accessors
-        super
+      def mass_assignment_authorizer role = :default
+        super + metadata_types.map {|t| "m_#{t}"}
       end
       
       def create_accessors
@@ -64,76 +50,54 @@ module ActsAsMetadata
       end
 
       def create_accessor type
-        class_eval "attr_accessor :#{type}"
-        class_eval "def #{type}; get_metadata('#{type}'); end"
-        class_eval "def #{type}=(value); set_metadata('#{type}', value); end"
+        class_eval "attr_accessor :m_#{type}"
+        class_eval "def m_#{type}; get_metadata('#{type}'); end"
+        class_eval "def m_#{type}=(value); set_metadata('#{type}', value); end"
       end
-
-      def create_accessors_and_save_metadata
-        create_accessors
-        save_metadata
-      end
-      
-      def method_missing(meth, *args, &block)
-        begin
-          super
-        rescue NoMethodError
-          name = meth.to_s
-    	    if name =~ /^(.+)=$/
-    	      name = name[0..-2]
-    	      if metadata_types.include?(name)
-    	        set_metadata(name, args.first)
-    	      else
-    	        raise
-    	      end
-    	    else
-    	      if metadata_types.include?(name)
-    	        get_metadata(name)
-    	      else
-    	        raise
-    	      end
-    	    end
-    	  end
-  	  end
   	  
       def metadata_scope
-        self.class.class_variable_get('@@metadata_scope') ? self.send(self.class.class_variable_get('@@metadata_scope')) : nil
+        self.class.class_variable_get('@@metadata_scope') ? send(self.class.class_variable_get('@@metadata_scope')) : nil
       end
   	  
   	  def model_name
   	    self.class.name.underscore.to_sym
   	  end
       
+      def metadata_type name
+        MetadataType.type name, metadata_scope
+      end
+
       def metadata_types
-        MetadataType.model_types(model_name, metadata_scope)
+        MetadataType.model_types model_name, metadata_scope
       end
 
-			def self.metadata_types(scope=nil)
-				MetadataType.model_types(self.name.underscore.to_sym, scope)
+			def self.metadata_types scope=nil
+				MetadataType.model_types name.underscore.to_sym, scope
 			end
       
-      def get_metadata(name)
-        load_metadata unless metadata_cache.is_a?(Hash)
-				metadata_cache[name].nil? ? MetadataType.type(name, metadata_scope).default : metadata_cache[name]
+      def get_metadata name
+        load_metadata unless metadata_cache.is_a? Hash
+        type = metadata_type name
+				metadata_cache[name].blank? ? type.type_cast(type.default) : metadata_cache[name]
       end
       
-      def set_metadata(name, value)
-        type = MetadataType.type(name, metadata_scope)
+      def set_metadata name, value
+        type = metadata_type name
         raise NoMethodError if type.nil?
-        load_metadata unless metadata_cache.is_a?(Hash)
-        self.metadata_cache[name] = type.type_cast(value) || type.type_cast(type.default)
-        self.metadata_cache[name] = [self.metadata_cache[name]].compact if type.multiple && !self.metadata_cache[name].is_a?(Array)
-        self.metadata_cache[name] = self.metadata_cache[name].first if !type.multiple && self.metadata_cache[name].is_a?(Array)
+        load_metadata unless metadata_cache.is_a? Hash
+        metadata_cache[name] = type.type_cast(value)
+        metadata_cache[name] = [metadata_cache[name]].compact if type.multiple && !metadata_cache[name].is_a?(Array)
+        metadata_cache[name] = type.type_cast(metadata_cache[name].first) if !type.multiple && metadata_cache[name].is_a?(Array)
       end
 
       def save_metadata
-        Metadata::Metadata.delete_all(:model_type => self.class.name, :model_id => self.id) unless self.id.blank?
-        self.metadata_types.each do |type_name|
-          value = self.get_metadata(type_name)
+        metadata.map &:mark_for_destruction
+        metadata_types.each do |type_name|
+          value = get_metadata(type_name)
           if value.is_a? Array
-            value.each {|v| self.metadata.build(:metadata_type => type_name, :value => v) unless v.nil? }
+            value.each {|v| metadata.build(metadata_type: type_name, value: v) unless v.nil? }
           else
-            self.metadata.build(:metadata_type => type_name, :value => value) unless value.nil?
+            metadata.build(metadata_type: type_name, value: value) unless value.nil?
           end
         end
       end

data/lib/metadata/metadata.rb

@@ -1,22 +1,6 @@
 module Metadata
   class Metadata < ActiveRecord::Base
-    default_scope :conditions => {:deleted_at => nil}, :order => 'created_at DESC'
     before_save :set_search_value
-
-    def undelete
-      self.deleted_at=nil
-      self.save
-		end
-      
-    def destroy(real = false)
-      if real
-        Metadata.unscoped.delete_all(:id => self.id)
-      else
-        self.run_callbacks(:destroy)
-        self.update_attribute(:deleted_at, Time.now.utc)
-      end
-    end
-
   protected
     def set_search_value
       self.search_value = value.to_s[0,255] rescue nil

data/lib/metadata/metadata_type.rb

@@ -15,15 +15,8 @@ class MetadataType < ActiveRecord::Base
   after_create :set_default_values
   after_update :refresh_metadata
   before_destroy :refresh_metadata
-	attr_accessor :models_json, :values_json, :default_json
-  attr_accessible  :tag, :name, :description, :models, :mandatory, 
-    :default, :format, :datatype, :values, :multiple,
-    :models_json, :values_json, :default_json
-  validates :tag, :presence => true, :format => {:with => /^[a-z]+[a-z0-9_]*$/},
-    :exclusion => { :in => %w(format errors callback action categorie accept attributes host key layout notify open render save template type id parent_id lft rgt test select),
-     :message => "this name is reserved"}
+  validates :tag, :presence => true, :format => {:with => /[a-z]+[a-z0-9_]*/}
   validates :datatype, :presence => true
-  default_scope :conditions => {:deleted_at => nil}, :order => 'created_at DESC'
       
   def self.default
     self.new({
@@ -40,7 +33,7 @@ class MetadataType < ActiveRecord::Base
   end
 
   def type_cast(value)
-    return value.map {|x| type_cast x } if value.is_a? Array
+    return value.delete_if(&:blank?).map {|x| type_cast x } if value.is_a? Array
     return nil if value.nil? && datatype != 'boolean'
     return value unless value.is_a?(String) || value.nil?
 
@@ -58,40 +51,15 @@ class MetadataType < ActiveRecord::Base
     end rescue nil
   end
  
-	def models_json
-		self.models ? self.models.to_json : [].to_json
-	end
-
-	def models_json=(value)
-		self.models = JSON.parse(value) rescue []
-	end 
-
   def values= value
     value =  value.invert.to_a if value.is_a?(Hash)
     super
   end
 
-	def values_json
-    self.values ? self.values.to_a.to_json : [].to_json
-  end
-
-  def values_json=(value)
-    self.values = JSON.parse(value) rescue []
-    values.each {|v| v.is_a?(Array) ? v.each(&:strip!) : v.strip! } if values.is_a? Array
-  end
-
   def default
     type_cast(attributes['default'])
   end
 
-	def default_json
-    self.default.to_json
-  end
-
-  def default_json=(value)
-    self.default = JSON.parse(value) rescue value[/"(.*)"/, 1]
-  end
-
   def self.scheme_data(scope=nil)
     Rails.cache.fetch("metadata_scheme_#{@@metadata_scope}#{scope}_data", :expires_in => 60.minutes) do
 		  uncached do

data/lib/metadata/version.rb

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

data/spec/acts_as_metadata_spec.rb

@@ -12,23 +12,23 @@ describe ActsAsMetadata do
   
   it 'has default metadata value' do
     mymodel = MyModel.create
-    mymodel.sample.should == 'default'
+    mymodel.m_sample.should == 'default'
   end
 
   it 'set metadata value' do
     mymodel = MyModel.new
-    mymodel.sample = 'test'
+    mymodel.m_sample = 'test'
     mymodel.save!
     mymodel = MyModel.last
-    mymodel.sample.should == 'test'
+    mymodel.m_sample.should == 'test'
   end
   
   it 'updates metadata value' do
     mymodel = MyModel.last
-    mymodel.sample = 'test2'
+    mymodel.m_sample = 'test2'
     mymodel.save!
     mymodel = MyModel.last
-    mymodel.sample.should == 'test2'
+    mymodel.m_sample.should == 'test2'
   end
   
   it 'detete metadata when model deleted' do
@@ -43,8 +43,8 @@ describe ActsAsMetadata do
     mt.save!
     mymodel = MyModel.new
     mymodel.save
-    mymodel.errors.include?(:sample).should == true
-    mymodel.sample = 'wqwewew'
+    mymodel.errors.include?(:m_sample).should == true
+    mymodel.m_sample = 'wqwewew'
     mymodel.save
     mymodel.errors.count.should == 0
   end
@@ -55,10 +55,10 @@ describe ActsAsMetadata do
     mt.format = '[a-z]*'
     mt.save!
     mymodel = MyModel.new
-    mymodel.sample = '12323'
+    mymodel.m_sample = '12323'
     mymodel.save
-    mymodel.errors.include?(:sample).should == true
-    mymodel.sample = 'wqwewew'
+    mymodel.errors.include?(:m_sample).should == true
+    mymodel.m_sample = 'wqwewew'
     mymodel.save
     mymodel.errors.count.should == 0
   end
@@ -68,10 +68,10 @@ describe ActsAsMetadata do
     mt.values = ['aaa', 'bbb']
     mt.save!
     mymodel = MyModel.new
-    mymodel.sample = 'ccc'
+    mymodel.m_sample = 'ccc'
     mymodel.save
-    mymodel.errors.include?(:sample).should == true
-    mymodel.sample = 'bbb'
+    mymodel.errors.include?(:m_sample).should == true
+    mymodel.m_sample = 'bbb'
     mymodel.save
     mymodel.errors.count.should == 0
   end
@@ -84,7 +84,7 @@ describe ActsAsMetadata do
     mt.multiple = true
     mt.save!
     mymodel = MyModel.new
-    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.m_samplearray = ['aaa', 'bbb', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 0
     mymodel.metadata.count.should == 3
@@ -98,20 +98,20 @@ describe ActsAsMetadata do
     mt.multiple = true
     mt.save!
     mymodel = MyModel.new
-    mymodel.samplearray = 'aaa'
+    mymodel.m_samplearray = 'aaa'
     mymodel.save
     mymodel.errors.count.should == 0
     mymodel.metadata.count.should == 1
-    mymodel.samplearray.should == ['aaa']
+    mymodel.m_samplearray.should == ['aaa']
   end
 
   it 'loads multiple metadata correctly' do
     mymodel = MyModel.new
-    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.m_samplearray = ['aaa', 'bbb', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 0
     mymodel.metadata_cache = nil
-    mymodel.samplearray.count.should == 3
+    mymodel.m_samplearray.count.should == 3
   end
 
   it 'checks presence validation for multiple metadata' do
@@ -121,8 +121,8 @@ describe ActsAsMetadata do
     mt.save!
     mymodel = MyModel.new
     mymodel.save
-    mymodel.errors.include?(:samplearray).should == true
-    mymodel.samplearray = ['abc']
+    mymodel.errors.include?(:m_samplearray).should == true
+    mymodel.m_samplearray = ['abc']
     mymodel.save
     mymodel.errors.count.should == 0
   end
@@ -133,10 +133,10 @@ describe ActsAsMetadata do
     mt.format = '[a-z]*'
     mt.save!
     mymodel = MyModel.new
-    mymodel.samplearray = ['123', '456', 'ccc']
+    mymodel.m_samplearray = ['123', '456', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 2
-    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.m_samplearray = ['aaa', 'bbb', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 0
   end
@@ -147,11 +147,22 @@ describe ActsAsMetadata do
     mt.values = ['aaa', 'bbb', 'ccc']
     mt.save!
     mymodel = MyModel.new
-    mymodel.samplearray = ['ddd', 'eee', 'ccc']
+    mymodel.m_samplearray = ['ddd', 'eee', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 2
-    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.m_samplearray = ['aaa', 'bbb', 'ccc']
     mymodel.save
     mymodel.errors.count.should == 0
   end  
+
+  it 'removes blank values from multiple metadata' do
+    mt = MetadataType.first
+    mt.mandatory = false
+    mt.values = nil
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.m_samplearray = ['aaa', 'bbb', '']
+    mymodel.save
+    mymodel.m_samplearray.count.should == 2
+  end
 end

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ ActiveRecord::Base.establish_connection(
 	:database => "#{root}/db/acts_as_metadata.db"
 )
 ActionController::Base.cache_store = ActiveSupport::Cache::MemoryStore.new
-RAILS_CACHE = ActionController::Base.cache_store
+Rails.cache = ActionController::Base.cache_store
 
 RSpec.configure do |config|
   # some (optional) config here
@@ -20,7 +20,6 @@ ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'my_models'")
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'metadata'")
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'metadata_types'")
 ActiveRecord::Base.connection.create_table(:my_models) do |t|
-  t.integer :id
   t.string :name
   t.text :description
   t.text :metadata_cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: acts_as_metadata
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Additional on-demand fields for ActiveRecord models