acts_as_metadata 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    acts_as_metadata (0.3.5)
+    acts_as_metadata (0.3.8)
       rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    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)
@@ -39,40 +39,40 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.7)
+    mime-types (1.21)
+    multi_json (1.6.1)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    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.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
+    rake (10.0.3)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -82,18 +82,18 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
+    thor (0.17.0)
+    tilt (1.3.5)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/lib/metadata/acts_as_metadata.rb

@@ -19,16 +19,17 @@ module ActsAsMetadata
         metadata_types.each do |type_name|
           type = MetadataType.type(type_name, metadata_scope)
           value = get_metadata(type.tag)
-          values = type.values.map {|v| v.is_a?(Array) ? v[1] : v } rescue []
-          errors.add(type.tag, I18n.t('acts_as_metadata.errors.blank')) if type.mandatory && value.blank?
+          values = type.values.map {|v| v.is_a?(Array) ? v[1].to_s : v.to_s } rescue []
           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)
             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)
+            errors.add(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
@@ -113,7 +114,7 @@ module ActsAsMetadata
       
       def get_metadata(name)
         load_metadata unless metadata_cache.is_a?(Hash)
-				metadata_cache[name]
+				metadata_cache[name].nil? ? MetadataType.type(name, metadata_scope).default : metadata_cache[name]
       end
       
       def set_metadata(name, value)
@@ -121,6 +122,8 @@ module ActsAsMetadata
         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)
       end
 
       def save_metadata

data/lib/metadata/metadata_type.rb

@@ -40,8 +40,10 @@ class MetadataType < ActiveRecord::Base
   end
 
   def type_cast(value)
+    return value.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?
+    return value unless value.is_a?(String) || value.nil?
+
     case datatype
     when 'date' 
       ActiveRecord::ConnectionAdapters::Column.string_to_date value
@@ -78,6 +80,10 @@ class MetadataType < ActiveRecord::Base
     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

data/lib/metadata/version.rb

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

data/spec/acts_as_metadata_spec.rb

@@ -90,6 +90,21 @@ describe ActsAsMetadata do
     mymodel.metadata.count.should == 3
   end
 
+  it 'always returns array for multiple type' do
+    MetadataType.destroy_all
+    mt = MetadataType.default
+    mt.tag = :samplearray
+    mt.name = "Sample Array"
+    mt.multiple = true
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.samplearray = 'aaa'
+    mymodel.save
+    mymodel.errors.count.should == 0
+    mymodel.metadata.count.should == 1
+    mymodel.samplearray.should == ['aaa']
+  end
+
   it 'loads multiple metadata correctly' do
     mymodel = MyModel.new
     mymodel.samplearray = ['aaa', 'bbb', 'ccc']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails