custom_fields 2.0.0.rc2 → 2.0.0.rc3

data/config/locales/en.yml

@@ -7,5 +7,6 @@ en:
       boolean: Checkbox
       date: Date
       file: File
-      has_one: Has one
-      has_many: Has many
+      belongs_to: Belongs to
+      has_many: Has many
+      many_to_many: Many To Many

data/config/locales/fr.yml

@@ -7,6 +7,9 @@ fr:
       boolean: Case à cocher
       date: Date
       file: Fichier
+      belongs_to: Appartient à
+      has_many: A plusieurs
+      many_to_many: A plusieurs et appartient à
     text_formatting:
       none: Aucun
       html: HTML

data/lib/custom_fields/field.rb

@@ -6,7 +6,7 @@ module CustomFields
     include ::Mongoid::Timestamps
 
     ## types ##
-    %w(default string text date boolean file select).each do |type|
+    %w(default string text date boolean file select relationship_default belongs_to has_many many_to_many).each do |type|
       include "CustomFields::Types::#{type.classify}::Field".constantize
     end
 

data/lib/custom_fields/target.rb

@@ -7,7 +7,7 @@ module CustomFields
     included do
 
       ## types ##
-      %w(default string text date boolean file select).each do |type|
+      %w(default string text date boolean file select belongs_to has_many many_to_many).each do |type|
         include "CustomFields::Types::#{type.classify}::Target".constantize
       end
 
@@ -34,8 +34,11 @@ module CustomFields
       # @return [ Class] the anonymous custom klass
       #
       def build_klass_with_custom_fields(recipe)
-        # puts "CREATING new '#{name}' / #{recipe.inspect}" # DEBUG
-        Class.new(self).tap do |klass|
+        name = recipe['name']
+
+        # puts "CREATING #{name}, #{recipe.inspect}" # DEBUG
+
+        parent.const_set(name, Class.new(self)).tap do |klass|
           klass.cattr_accessor :version
 
           klass.version = recipe['version']
@@ -71,8 +74,6 @@ module CustomFields
           parent.send(:remove_const, name) if klass
 
           klass = build_klass_with_custom_fields(recipe)
-
-          parent.const_set(name, klass)
         end
 
         klass

data/lib/custom_fields/types/belongs_to.rb

@@ -0,0 +1,65 @@
+module CustomFields
+
+  module Types
+
+    module BelongsTo
+
+      module Field
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def belongs_to_to_recipe
+            { 'class_name' => self.class_name }
+          end
+
+          def belongs_to_is_relationship?
+            self.type == 'belongs_to'
+          end
+
+        end
+
+      end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Adds a belongs_to relationship between 2 models
+          #
+          # @param [ Class ] klass The class to modify
+          # @param [ Hash ] rule It contains the name of the field and if it is required or not
+          #
+          def apply_belongs_to_custom_field(klass, rule)
+            # puts "#{klass.inspect}.belongs_to #{rule['name'].inspect}, :class_name => #{rule['class_name'].inspect}" # DEBUG
+
+            position_name = "position_in_#{rule['name'].underscore}"
+
+            # puts "#{klass.inspect}.field :#{position_name}" # DEBUG
+
+            klass.field position_name, :type => Integer, :default => 0
+
+            klass.belongs_to rule['name'].to_sym, :class_name => rule['class_name']
+
+            if rule['required']
+              klass.validates_presence_of rule['name'].to_sym
+            end
+
+            klass.before_create do |object|
+              position = (object.class.max(position_name.to_sym) || 0) + 1
+              object.send(:"#{position_name}=", position)
+            end
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/types/has_many.rb

@@ -0,0 +1,58 @@
+module CustomFields
+
+  module Types
+
+    module HasMany
+
+      module Field
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def has_many_to_recipe
+            { 'class_name' => self.class_name, 'inverse_of' => self.inverse_of }
+          end
+
+          def has_many_to_is_relationship?
+            self.type == 'has_many'
+          end
+
+        end
+
+      end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Adds a has_many relationship between 2 mongoid models
+          #
+          # @param [ Class ] klass The class to modify
+          # @param [ Hash ] rule It contains the name of the relation and if it is required or not
+          #
+          def apply_has_many_custom_field(klass, rule)
+            # puts "#{klass.inspect}.has_many #{rule['name'].inspect}, :class_name => #{rule['class_name'].inspect}, :inverse_of => #{rule['inverse_of']}" # DEBUG
+
+            position_name = "position_in_#{rule['inverse_of']}"
+
+            klass.has_many rule['name'], :class_name => rule['class_name'], :inverse_of => rule['inverse_of'], :order => position_name.to_sym.asc
+
+            klass.accepts_nested_attributes_for rule['name'], :allow_destroy => true
+
+            if rule['required']
+              klass.validates_length_of rule['name'], :minimum => 1
+            end
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/types/many_to_many.rb

@@ -0,0 +1,54 @@
+module CustomFields
+
+  module Types
+
+    module ManyToMany
+
+      module Field
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          def many_to_many_to_recipe
+            { 'class_name' => self.class_name, 'inverse_of' => self.inverse_of }
+          end
+
+          def many_to_many_is_relationship?
+            self.type == 'many_to_many'
+          end
+
+        end
+
+      end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Adds a many_to_many relationship between 2 mongoid models
+          #
+          # @param [ Class ] klass The class to modify
+          # @param [ Hash ] rule It contains the name of the relation and if it is required or not
+          #
+          def apply_many_to_many_custom_field(klass, rule)
+            # puts "#{klass.inspect}.many_to_many #{rule['name'].inspect}, :class_name => #{rule['class_name'].inspect}" # DEBUG
+
+            klass.has_and_belongs_to_many rule['name'], :class_name => rule['class_name'], :inverse_of => rule['inverse_of']
+
+            if rule['required']
+              klass.validates_length_of rule['name'], :minimum => 1
+            end
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/types/relationship_default.rb

@@ -0,0 +1,43 @@
+module CustomFields
+
+  module Types
+
+    module RelationshipDefault
+
+      module Field
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          field :class_name
+          field :inverse_of
+
+          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?"
+            self.respond_to?(method_name) && self.send(method_name)
+          end
+
+          protected
+
+          def ensure_class_name_security
+            true
+            # FIXME: to be overridden in the target application
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end
+
+
+
+

data/lib/custom_fields/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module CustomFields #:nodoc
 
-  VERSION = '2.0.0.rc2'
+  VERSION = '2.0.0.rc3'
 
 end

data/lib/custom_fields.rb

@@ -34,6 +34,10 @@ require 'custom_fields/types/date'
 require 'custom_fields/types/boolean'
 require 'custom_fields/types/file'
 require 'custom_fields/types/select'
+require 'custom_fields/types/relationship_default'
+require 'custom_fields/types/belongs_to'
+require 'custom_fields/types/has_many'
+require 'custom_fields/types/many_to_many'
 require 'custom_fields/field'
 require 'custom_fields/source'
 require 'custom_fields/target'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2157006780 !ruby/object:Gem::Requirement
+  requirement: &2157026880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157006780
+  version_requirements: *2157026880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2157019860 !ruby/object:Gem::Requirement
+  requirement: &2157025140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157019860
+  version_requirements: *2157025140
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2157016280 !ruby/object:Gem::Requirement
+  requirement: &2157024340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157016280
+  version_requirements: *2157024340
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157013880 !ruby/object:Gem::Requirement
+  requirement: &2157023280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2157013880
+  version_requirements: *2157023280
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &2157012260 !ruby/object:Gem::Requirement
+  requirement: &2157022720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157012260
+  version_requirements: *2157022720
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157048080 !ruby/object:Gem::Requirement
+  requirement: &2157038420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157048080
+  version_requirements: *2157038420
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2157046440 !ruby/object:Gem::Requirement
+  requirement: &2157037860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157046440
+  version_requirements: *2157037860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157043280 !ruby/object:Gem::Requirement
+  requirement: &2157037360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2157043280
+  version_requirements: *2157037360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157051560 !ruby/object:Gem::Requirement
+  requirement: &2157036760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2157051560
+  version_requirements: *2157036760
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2157070900 !ruby/object:Gem::Requirement
+  requirement: &2157036200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2157070900
+  version_requirements: *2157036200
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2157069160 !ruby/object:Gem::Requirement
+  requirement: &2157035680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 4.2.8
   type: :development
   prerelease: false
-  version_requirements: *2157069160
+  version_requirements: *2157035680
 description: Manage custom fields to a mongoid document or a collection. This module
   is one of the core features we implemented in our custom cms named Locomotive.
 email:
@@ -156,10 +156,14 @@ files:
 - lib/custom_fields/field.rb
 - lib/custom_fields/source.rb
 - lib/custom_fields/target.rb
+- lib/custom_fields/types/belongs_to.rb
 - lib/custom_fields/types/boolean.rb
 - lib/custom_fields/types/date.rb
 - lib/custom_fields/types/default.rb
 - lib/custom_fields/types/file.rb
+- lib/custom_fields/types/has_many.rb
+- lib/custom_fields/types/many_to_many.rb
+- lib/custom_fields/types/relationship_default.rb
 - lib/custom_fields/types/select.rb
 - lib/custom_fields/types/string.rb
 - lib/custom_fields/types/text.rb
@@ -183,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2817461240862898588
+      hash: -2284291224344609482
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: