custom_fields 2.2.3 → 2.3.0

data/config/locales/de.yml

@@ -12,4 +12,4 @@ de:
       file: Datei
       belongs_to: gehört zu
       has_many: Hat viele
-      many_to_many: Hat und gehört zu vielen
+      many_to_many: Hat und gehört zu vielen

data/lib/custom_fields.rb

@@ -39,6 +39,7 @@ end
      types/text
      types/email
      types/date
+     types/date_time
      types/boolean
      types/file
      types/select

data/lib/custom_fields/field.rb

@@ -5,8 +5,8 @@ module CustomFields
     include ::Mongoid::Document
     include ::Mongoid::Timestamps
 
-    AVAILABLE_TYPES = %w(default string text email date boolean file select float integer money
-       tags relationship_default belongs_to has_many many_to_many)
+    AVAILABLE_TYPES = %w(default string text email date date_time boolean file select float integer
+       money tags relationship_default belongs_to has_many many_to_many)
 
     ## types ##
     AVAILABLE_TYPES.each do |type|

data/lib/custom_fields/target.rb

@@ -7,7 +7,7 @@ module CustomFields
     included do
 
       ## types ##
-      %w(default string text email date boolean file select float integer money
+      %w(default string text email date date_time boolean file select float integer money
          belongs_to has_many many_to_many tags).each do |type|
         include "CustomFields::Types::#{type.camelize}::Target".constantize
       end

data/lib/custom_fields/target_helpers.rb

@@ -36,10 +36,10 @@ module CustomFields
     def custom_fields_safe_setters
       self.custom_fields_recipe['rules'].map do |rule|
         case rule['type'].to_sym
-        when :date, :money            then "formatted_#{rule['name']}"
-        when :file                    then [rule['name'], "remove_#{rule['name']}"]
-        when :select, :belongs_to     then ["#{rule['name']}_id", "position_in_#{rule['name']}"]
-        when :has_many, :many_to_many then nil
+        when :date, :date_time, :money  then "formatted_#{rule['name']}"
+        when :file                      then [rule['name'], "remove_#{rule['name']}"]
+        when :select, :belongs_to       then ["#{rule['name']}_id", "position_in_#{rule['name']}"]
+        when :has_many, :many_to_many   then nil
         else
           rule['name']
         end
@@ -164,10 +164,10 @@ module CustomFields
     #
     def custom_fields_getters_for(name, type)
       case type.to_sym
-      when :select       then [name, "#{name}_id"]
-      when :date, :money then "formatted_#{name}"
-      when :file         then "#{name}_url"
-      when :belongs_to   then "#{name}_id"
+      when :select                    then [name, "#{name}_id"]
+      when :date, :date_time, :money  then "formatted_#{name}"
+      when :file                      then "#{name}_url"
+      when :belongs_to                then "#{name}_id"
       else
         name
       end

data/lib/custom_fields/types/date.rb

@@ -68,7 +68,7 @@ module CustomFields
 
         def _set_formatted_date(name, value)
           if value.is_a?(::String) && !value.blank?
-            date = ::Date._strptime(value, I18n.t('date.formats.default'))
+            date = ::Date._strptime(value, self._formatted_date_format)
 
             if date
               value = ::Date.new(date[:year], date[:mon], date[:mday])
@@ -81,7 +81,11 @@ module CustomFields
         end
 
         def _get_formatted_date(name)
-          self.send(name.to_sym).strftime(I18n.t('date.formats.default')) rescue nil
+          self.send(name.to_sym).strftime(self._formatted_date_format) rescue nil
+        end
+
+        def _formatted_date_format
+          I18n.t('date.formats.default')
         end
 
       end

data/lib/custom_fields/types/date_time.rb

@@ -0,0 +1,97 @@
+module CustomFields
+
+  module Types
+
+    module DateTime
+
+      module Field; end
+
+      module Target
+
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+
+          # Adds a date_time field
+          #
+          # @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_date_time_custom_field(klass, rule)
+            name = rule['name']
+
+            klass.field name, type: ::DateTime, localize: rule['localized'] || false
+
+            # other methods
+            klass.send(:define_method, :"formatted_#{name}") { _get_formatted_date_time(name) }
+            klass.send(:define_method, :"formatted_#{name}=") { |value| _set_formatted_date_time(name, value) }
+
+            if rule['required']
+              klass.validates_presence_of name, :"formatted_#{name}"
+            end
+          end
+
+          # Build a hash storing the formatted value for
+          # a date_time custom field of an instance.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the date_time custom field
+          #
+          # @return [ Hash ] field name => formatted date_time
+          #
+          def date_time_attribute_get(instance, name)
+            if value = instance.send(:"formatted_#{name}")
+              { name => value, "formatted_#{name}" => value }
+            else
+              {}
+            end
+          end
+
+          # Set the value for the instance and the date_time field specified by
+          # the 2 params.
+          #
+          # @param [ Object ] instance An instance of the class enhanced by the custom_fields
+          # @param [ String ] name The name of the date_time custom field
+          # @param [ Hash ] attributes The attributes used to fetch the values
+          #
+          def date_time_attribute_set(instance, name, attributes)
+            return unless attributes.key?(name) || attributes.key?("formatted_#{name}")
+
+            value = attributes[name] || attributes["formatted_#{name}"]
+
+            instance.send(:"formatted_#{name}=", value)
+          end
+
+        end
+
+        protected
+
+        def _set_formatted_date_time(name, value)
+          if value.is_a?(::String) && !value.blank?
+            date_time = ::DateTime._strptime(value, self._formatted_date_time_format)
+
+            if date_time
+              value = ::Time.zone.local(date_time[:year], date_time[:mon], date_time[:mday], date_time[:hour], date_time[:min], date_time[:sec] || 0)#, date_time[:zone] || "")
+            else
+              value = ::Time.zone.parse(value) rescue nil
+            end
+          end
+
+          self.send(:"#{name}=", value)
+        end
+
+        def _get_formatted_date_time(name)
+          self.send(name.to_sym).strftime(self._formatted_date_time_format) rescue nil
+        end
+
+        def _formatted_date_time_format
+          I18n.t('time.formats.default')
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/custom_fields/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -218,6 +218,7 @@ files:
 - lib/custom_fields/types/belongs_to.rb
 - lib/custom_fields/types/boolean.rb
 - lib/custom_fields/types/date.rb
+- lib/custom_fields/types/date_time.rb
 - lib/custom_fields/types/default.rb
 - lib/custom_fields/types/email.rb
 - lib/custom_fields/types/file.rb
@@ -252,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1041583237264786085
+      hash: 4124785133345041024
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: