acts_as_metadata 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,80 +1,78 @@
 PATH
   remote: .
   specs:
-    acts_as_metadata (0.0.2)
+    acts_as_metadata (0.1.0)
       rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
+      mail (~> 2.4.4)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    arel (3.0.2)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    json (1.6.1)
-    mail (2.3.0)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
+    mime-types (1.19)
+    multi_json (1.3.7)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.11)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.1)
+    rdoc (3.12)
       json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -84,17 +82,18 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sprockets (2.0.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -102,4 +101,4 @@ PLATFORMS
 DEPENDENCIES
   acts_as_metadata!
   rspec (>= 2.0.0)
-  sqlite3
+  sqlite3 (>= 1.3.5)

data/README.md

@@ -0,0 +1,61 @@
+# ActsAsMetadata
+
+Dynamicly add unlimited number of indexed, searchable, validatable, strongly typed fields to your ActiveRecord models.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'acts_as_metadata'
+
+And then execute:
+
+    $ bundle
+
+Or install it manually:
+
+    $ gem install acts_as_metadata
+
+## Usage
+
+Generate migration that creates metadata tables: 
+
+    $ rails g metadata:migration
+
+Add acts_as_metadata to your model:
+
+    class MyModel < ActiveRecord::Base
+      acts_as_metadata
+    end
+
+and create metadata_cache column to speed up metadata extraction:
+
+    rails g migration AddMetadataCacheToMyModels metadata_cache:text
+
+Create metadata types in your database:
+
+    mt = MetadataType.create! :tag => :sample, :name => "Sample", :datatype => :string
+
+Its ready to use:
+
+    m = MyModel.new
+    m.sample = 'some string'
+    m.save!
+
+Add some validations or default value if you need:
+
+    mt.default   = 'some default string' 
+    mt.mandatory = true                   # presence validation
+    mt.format    = "[a-z]*"               # regexp validation
+    mt.values    = ['aaa', 'bbb', 'ccc']  # inclusion validation
+    mt.save!
+
+There are more usage examples in spec directory.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/acts_as_metadata.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency('rails', '>= 3.0.0' )
   s.add_development_dependency("rspec", ">= 2.0.0")
-  s.add_development_dependency("sqlite3")
+  s.add_development_dependency("sqlite3", '>= 1.3.5')
 end

data/lib/metadata/acts_as_metadata.rb

@@ -21,8 +21,15 @@ module ActsAsMetadata
           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?
-          errors.add(type.tag, I18n.t('acts_as_metadata.errors.format')) if !type.format.blank? && !value.blank? && value.to_s !~ Regexp.new("^#{type.format}$")
-          errors.add(type.tag, I18n.t('acts_as_metadata.errors.values')) if !values.blank? && !value.blank? && !values.include?(value)
+          if value.is_a? Array
+            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.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)
+          end
         end unless @skip_metadata_validation
       end
 
@@ -120,13 +127,28 @@ module ActsAsMetadata
         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)
-          self.metadata.build(:metadata_type => type_name, :value => value) unless value.nil?
+          if value.is_a? Array
+            value.each {|v| self.metadata.build(:metadata_type => type_name, :value => v) unless v.nil? }
+          else
+            self.metadata.build(:metadata_type => type_name, :value => value) unless value.nil?
+          end
         end
       end
 
 			def load_metadata
-				self.metadata_cache = Hash[self.metadata.all.map { |m| [m.metadata_type, m.value] }]
-			end          
+        hash = {}
+				metadata.each do |m|
+          if hash[m.metadata_type].nil?
+            hash[m.metadata_type] = m.value
+          elsif hash[m.metadata_type].is_a? Array
+             hash[m.metadata_type] << m.value
+          else
+             hash[m.metadata_type] = [hash[m.metadata_type], m.value]
+          end
+        end
+        self.metadata_cache = {}
+        metadata_types.each {|type_name| set_metadata type_name, hash[type_name] }
+      end
     end
   end
 end

data/lib/metadata/version.rb

@@ -1,3 +1,3 @@
 module ActsAsMetadata
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/acts_as_metadata_spec.rb

@@ -36,7 +36,7 @@ describe ActsAsMetadata do
     Metadata::Metadata.all.count.should == 0
   end
 
-  it 'check presence validation' do
+  it 'checks presence validation' do
     mt = MetadataType.first
     mt.mandatory = true
     mt.default = nil
@@ -49,10 +49,10 @@ describe ActsAsMetadata do
     mymodel.errors.count.should == 0
   end
 
-  it 'check format validation' do
+  it 'checks format validation' do
     mt = MetadataType.first
     mt.mandatory = false
-    mt.format = '[a-z]'
+    mt.format = '[a-z]*'
     mt.save!
     mymodel = MyModel.new
     mymodel.sample = '12323'
@@ -63,7 +63,7 @@ describe ActsAsMetadata do
     mymodel.errors.count.should == 0
   end
 
-  it 'check values validation' do
+  it 'checks values validation' do
     mt = MetadataType.first
     mt.values = ['aaa', 'bbb']
     mt.save!
@@ -75,4 +75,68 @@ describe ActsAsMetadata do
     mymodel.save
     mymodel.errors.count.should == 0
   end
+
+  it 'creates multiple metadata items for array metadata' do
+    MetadataType.destroy_all
+    mt = MetadataType.default
+    mt.tag = :samplearray
+    mt.name = "Sample Array"
+    mt.datatype = :array
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 0
+    mymodel.metadata.count.should == 3
+  end
+
+  it 'loads array metadata correctly' do
+    mymodel = MyModel.new
+    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 0
+    mymodel.metadata_cache = nil
+    mymodel.samplearray.count.should == 3
+  end
+
+  it 'checks presence validation for array metadata' do
+    mt = MetadataType.first
+    mt.mandatory = true
+    mt.default = nil
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.save
+    mymodel.errors.include?(:samplearray).should == true
+    mymodel.samplearray = ['abc']
+    mymodel.save
+    mymodel.errors.count.should == 0
+  end
+
+  it 'checks format validation for array metadata' do
+    mt = MetadataType.first
+    mt.mandatory = false
+    mt.format = '[a-z]*'
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.samplearray = ['123', '456', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 2
+    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 0
+  end
+  
+  it 'checks values validation for array metadata' do
+    mt = MetadataType.first
+    mt.mandatory = false
+    mt.values = ['aaa', 'bbb', 'ccc']
+    mt.save!
+    mymodel = MyModel.new
+    mymodel.samplearray = ['ddd', 'eee', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 2
+    mymodel.samplearray = ['aaa', 'bbb', 'ccc']
+    mymodel.save
+    mymodel.errors.count.should == 0
+  end  
 end

data/spec/spec_helper.rb

@@ -32,6 +32,7 @@ ActiveRecord::Base.connection.create_table(:metadata) do |t|
   t.integer  "model_id"
   t.string   "model_type"
   t.text     "value"
+  t.string   "search_value"
   t.datetime "deleted_at"
   t.datetime "created_at"
   t.datetime "updated_at"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.5
 description: This gem allows to add additional database-stored fields to your models
 email:
 - grophen@gmail.com
@@ -69,8 +69,8 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
-- Readme
 - acts_as_metadata.gemspec
 - lib/acts_as_metadata.rb
 - lib/generators/metadata/migration/migration_generator.rb

data/Readme

@@ -1,11 +0,0 @@
-ActsAsMetadata
-==============
-
-User-generated metadata fields for your Rails models.
-
-Usage
------
-
-    class MyModel < ActiveRecord::Base
-      acts_as_metadata
-    end