custom_fields 2.1.0 → 2.2.0

data/lib/custom_fields/types/relationship_default.rb

@@ -14,8 +14,8 @@ module CustomFields
           field :inverse_of
           field :order_by
 
-          validates_presence_of :class_name,                  :if => :is_relationship?
-          validate              :ensure_class_name_security,  :if => :is_relationship?
+          validates_presence_of :class_name,                  if: :is_relationship?
+          validate              :ensure_class_name_security,  if: :is_relationship?
 
           def is_relationship?
             method_name = :"#{self.type}_is_relationship?"

data/lib/custom_fields/types/select.rb

@@ -8,15 +8,15 @@ module CustomFields
 
         include Mongoid::Document
 
-        field :name,      :localize => true
-        field :position,  :type => Integer, :default => 0
+        field :name,      localize: true
+        field :position,  type: ::Integer, default: 0
 
-        embedded_in :custom_field, :inverse_of => :select_options
+        embedded_in :custom_field, inverse_of: :select_options
 
         validates_presence_of :name
 
         def as_json(options = nil)
-          super :methods => %w(_id name position)
+          super methods: %w(_id name position)
         end
 
       end
@@ -27,11 +27,11 @@ module CustomFields
 
         included do
 
-          embeds_many :select_options, :class_name => 'CustomFields::Types::Select::Option'
+          embeds_many :select_options, class_name: 'CustomFields::Types::Select::Option'
 
           validates_associated :select_options
 
-          accepts_nested_attributes_for :select_options, :allow_destroy => true
+          accepts_nested_attributes_for :select_options, allow_destroy: true
 
         end
 
@@ -67,7 +67,7 @@ module CustomFields
           def apply_select_custom_field(klass, rule)
             name, base_collection_name = rule['name'], "#{rule['name']}_options".to_sym
 
-            klass.field :"#{name}_id", :type => BSON::ObjectId, :localize => rule['localized'] || false
+            klass.field :"#{name}_id", type: Moped::BSON::ObjectId, localize: rule['localized'] || false
 
             klass.cattr_accessor "_raw_#{base_collection_name}"
             klass.send :"_raw_#{base_collection_name}=", rule['select_options'].sort { |a, b| a['position'] <=> b['position'] }
@@ -129,22 +129,25 @@ module CustomFields
 
           # Returns a list of documents groupes by select values defined in the custom fields recipe
           #
-          # @param [ Class ] klass The class to modify
+          # @param  [ Class ] klass The class to modify
           # @return [ Array ] An array of hashes (keys: select option and related documents)
           #
           def group_by_select_option(name, order_by = nil)
-            groups = self.only(:"#{name}_id").group
+            name_id = "#{name}_id"
+            groups = self.each.group_by{|x| x.send(name_id)}.map do |(k, v)|
+              {name_id => k, "group" => v}
+            end
 
             _select_options(name).map do |option|
-              group = groups.detect { |g| g["#{name}_id"].to_s == option['_id'].to_s }
+              group = groups.detect { |g| g[name_id].to_s == option['_id'].to_s }
               list  = group ? group['group'] : []
 
               groups.delete(group) if group
 
-              { :name => option['name'], :entries => self._order_select_entries(list, order_by) }.with_indifferent_access
+              { name: option['name'], entries: self._order_select_entries(list, order_by) }.with_indifferent_access
             end.tap do |array|
               if not groups.empty? # orphan entries ?
-                empty = { :name => nil, :entries => [] }.with_indifferent_access
+                empty = { name: nil, entries: [] }.with_indifferent_access
                 groups.each do |group|
                   empty[:entries] += group['group']
                 end
@@ -211,4 +214,4 @@ module CustomFields
 
   end
 
-end
+end

data/lib/custom_fields/types/tags.rb

@@ -0,0 +1,35 @@
+module CustomFields
+  module Types
+    module Tags
+      module Field; end
+      
+      module Target
+        extend ActiveSupport::Concern
+        
+        module ClassMethods
+
+          def apply_tags_custom_field(klass, rule)
+            klass.field rule['name'], localize: rule['localized'] || false, type: Array
+            
+            klass.class_eval do
+              define_method("#{rule['name']}=") do |val|
+                #FIXME I would use is_a?(), but it doesn't work in my machine!
+                val = val.split(/ *, */) if val.class.to_s == "String" 
+                super(val)
+              end
+            end
+          end
+          
+          def tags_attribute_get(instance, name)
+            self.default_attribute_get(instance, name)
+          end
+
+          def tags_attribute_set(instance, name, attributes)
+            self.default_attribute_set(instance, name, attributes)
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/custom_fields/types/text.rb

@@ -10,7 +10,7 @@ module CustomFields
 
         included do
 
-          field :text_formatting, :default => 'html'
+          field :text_formatting, default: 'html'
 
         end
 

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 
 end

metadata

@@ -1,203 +1,187 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
+  version: 2.2.0
   prerelease: 
-  version: 2.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.12
   name: mongoid
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.12
-- !ruby/object:Gem::Dependency
+        version: 3.1.3
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.1.3
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
-- !ruby/object:Gem::Dependency
+        version: 3.2.13
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
-- !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-  name: yard
+        version: 0.6.0
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-- !ruby/object:Gem::Dependency
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-  name: bson
-  prerelease: false
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: money
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  type: :development
+        version: '5.0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-  name: mongo
-  prerelease: false
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
+        version: 0.7.3
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-  name: bson_ext
-  prerelease: false
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
+        version: 0.9.12
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.12
-  name: mocha
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
-- !ruby/object:Gem::Dependency
+        version: '2.6'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  name: rspec
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
+        version: 0.6.1
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.1
-  name: simplecov
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
-- !ruby/object:Gem::Dependency
+        version: 0.9.1
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.7
-  name: database_cleaner
-  prerelease: false
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.8
-  name: RedCloth
+  type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,7 +197,6 @@ extra_rdoc_files:
 - MIT-LICENSE
 - README.textile
 files:
-- init.rb
 - MIT-LICENSE
 - README.textile
 - lib/custom_fields/extensions/active_support.rb
@@ -221,7 +204,7 @@ files:
 - lib/custom_fields/extensions/mongoid/document.rb
 - lib/custom_fields/extensions/mongoid/factory.rb
 - lib/custom_fields/extensions/mongoid/fields/i18n.rb
-- lib/custom_fields/extensions/mongoid/fields/internal/localized.rb
+- lib/custom_fields/extensions/mongoid/fields/localized.rb
 - lib/custom_fields/extensions/mongoid/fields.rb
 - lib/custom_fields/extensions/mongoid/relations/referenced/in.rb
 - lib/custom_fields/extensions/mongoid/relations/referenced/many.rb
@@ -233,12 +216,17 @@ files:
 - lib/custom_fields/types/boolean.rb
 - lib/custom_fields/types/date.rb
 - lib/custom_fields/types/default.rb
+- lib/custom_fields/types/email.rb
 - lib/custom_fields/types/file.rb
+- lib/custom_fields/types/float.rb
 - lib/custom_fields/types/has_many.rb
+- lib/custom_fields/types/integer.rb
 - lib/custom_fields/types/many_to_many.rb
+- lib/custom_fields/types/money.rb
 - lib/custom_fields/types/relationship_default.rb
 - lib/custom_fields/types/select.rb
 - lib/custom_fields/types/string.rb
+- lib/custom_fields/types/tags.rb
 - lib/custom_fields/types/text.rb
 - lib/custom_fields/version.rb
 - lib/custom_fields.rb
@@ -246,6 +234,7 @@ files:
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/pt-BR.yml
+- config/locales/ru.yml
 homepage: http://github.com/locomotivecms/custom_fields
 licenses: []
 post_install_message: 
@@ -257,10 +246,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -3490434094111046422
-      version: '0'
+      hash: 633775837337620959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: