granite-form 0.1.1 → 0.3.0

data/lib/granite/form/model/associations/references_many.rb

@@ -3,38 +3,6 @@ module Granite
     module Model
       module Associations
         class ReferencesMany < ReferencesAny
-          def build(attributes = {})
-            append([build_object(attributes)]).last
-          end
-
-          def create(attributes = {})
-            object = build(attributes)
-            persist_object(object)
-            object
-          end
-
-          def create!(attributes = {})
-            object = build(attributes)
-            persist_object(object, raise_error: true)
-            object
-          end
-
-          def apply_changes
-            target.all? do |object|
-              if object
-                if object.marked_for_destruction? && reflection.autosave?
-                  object.destroy
-                elsif object.new_record? || (reflection.autosave? && object.changed?)
-                  persist_object(object)
-                else
-                  true
-                end
-              else
-                true
-              end
-            end
-          end
-
           def target=(object)
             loaded!
             @target = object.to_a

data/lib/granite/form/model/associations/references_one.rb

@@ -3,34 +3,6 @@ module Granite
     module Model
       module Associations
         class ReferencesOne < ReferencesAny
-          def build(attributes = {})
-            replace(build_object(attributes))
-          end
-
-          def create(attributes = {})
-            persist_object(build(attributes))
-            target
-          end
-
-          def create!(attributes = {})
-            persist_object(build(attributes), raise_error: true)
-            target
-          end
-
-          def apply_changes
-            if target
-              if target.marked_for_destruction? && reflection.autosave?
-                target.destroy
-              elsif target.new_record? || (reflection.autosave? && target.changed?)
-                persist_object(target)
-              else
-                true
-              end
-            else
-              true
-            end
-          end
-
           def target=(object)
             loaded!
             @target = object

data/lib/granite/form/model/associations/reflections/embeds_any.rb

@@ -22,7 +22,7 @@ module Granite
                 Class.new(superclass || Granite::Form.base_class) do
                   include Granite::Form::Model
                   include Granite::Form::Model::Associations
-                  include Granite::Form::Model::Lifecycle
+                  include Granite::Form::Model::Persistence
                   include Granite::Form::Model::Primary
                   include Granite::Form.base_concern if Granite::Form.base_concern
                 end

data/lib/granite/form/model/associations/reflections/references_any.rb

@@ -53,10 +53,6 @@ module Granite
             def inspect
               "#{self.class.name.demodulize}(#{persistence_adapter.data_type})"
             end
-
-            def autosave?
-              !!options[:autosave]
-            end
           end
         end
       end

data/lib/granite/form/model/associations/reflections/references_many.rb

@@ -12,7 +12,9 @@ module Granite
 
               target.add_attribute(
                 Granite::Form::Model::Attributes::Reflections::ReferenceMany,
-                reflection.reference_key, association: name
+                reflection.reference_key,
+                type: reflection.persistence_adapter.primary_key_type,
+                association: name
               )
 
               reflection

data/lib/granite/form/model/associations/reflections/references_one.rb

@@ -7,14 +7,14 @@ module Granite
       module Associations
         module Reflections
           class ReferencesOne < ReferencesAny
-            include Singular
-
             def self.build(target, generated_methods, name, *args, &block)
               reflection = super
 
               target.add_attribute(
                 Granite::Form::Model::Attributes::Reflections::ReferenceOne,
-                reflection.reference_key, association: name
+                reflection.reference_key,
+                type: reflection.persistence_adapter.primary_key_type,
+                association: name
               )
 
               reflection

data/lib/granite/form/model/associations/reflections/singular.rb

@@ -14,14 +14,6 @@ module Granite
                 def build_#{name} attributes = {}
                   association(:#{name}).build(attributes)
                 end
-
-                def create_#{name} attributes = {}
-                  association(:#{name}).create(attributes)
-                end
-
-                def create_#{name}! attributes = {}
-                  association(:#{name}).create!(attributes)
-                end
                 RUBY
               end
             end

data/lib/granite/form/model/associations.rb

@@ -100,12 +100,6 @@ module Granite
           (@_associations ||= {})[reflection.name] ||= reflection.build_association(self)
         end
 
-        def apply_association_changes!
-          association_names.all? do |name|
-            association(name).apply_changes!
-          end
-        end
-
       private
 
         def attributes_for_inspect

data/lib/granite/form/model/attributes/attribute.rb

@@ -14,7 +14,7 @@ module Granite
 
           def read
             variable_cache(:value) do
-              normalize(enumerize(typecast(read_before_type_cast)))
+              normalize(enumerize(type_definition.ensure_type(read_before_type_cast)))
             end
           end
 

data/lib/granite/form/model/attributes/base.rb

@@ -3,19 +3,16 @@ module Granite
     module Model
       module Attributes
         class Base
-          attr_reader :name, :owner
-          delegate :type, :typecaster, :readonly, to: :reflection
+          attr_reader :owner, :reflection
+          delegate :name, :readonly, to: :reflection
+          delegate :type, to: :type_definition
 
-          def initialize(name, owner)
-            @name = name
+          def initialize(reflection, owner)
+            @reflection = reflection
             @owner = owner
             @origin = :default
           end
 
-          def reflection
-            @owner.class._attributes[name]
-          end
-
           def write_value(value, origin: :user)
             reset
             @origin = origin
@@ -55,18 +52,14 @@ module Granite
             !(read.respond_to?(:zero?) ? read.zero? : read.blank?)
           end
 
-          def typecast(value)
-            if value.instance_of?(type)
-              value
-            else
-              typecaster.call(value, self) unless value.nil?
-            end
-          end
-
           def readonly?
             !!(readonly.is_a?(Proc) ? evaluate(&readonly) : readonly)
           end
 
+          def type_definition
+            @type_definition ||= build_type_definition(reflection.type)
+          end
+
           def inspect_attribute
             value = case read
             when Date, Time, DateTime
@@ -103,11 +96,15 @@ module Granite
 
         private
 
+          def build_type_definition(type)
+            Granite::Form.type_for(type).new(type, reflection, owner)
+          end
+
           def evaluate(*args, &block)
             if block.arity >= 0 && block.arity <= args.length
               owner.instance_exec(*args.first(block.arity), &block)
             else
-              args = block.arity < 0 ? args : args.first(block.arity)
+              args = block.arity.negative? ? args : args.first(block.arity)
               yield(*args, owner)
             end
           end

data/lib/granite/form/model/attributes/collection.rb

@@ -5,7 +5,7 @@ module Granite
         class Collection < Attribute
           def read
             @value ||= normalize(read_before_type_cast.map do |value|
-              enumerize(typecast(value))
+              enumerize(type_definition.ensure_type(value))
             end)
           end
 

data/lib/granite/form/model/attributes/dictionary.rb

@@ -11,7 +11,7 @@ module Granite
                          hash = hash.stringify_keys.slice(*keys) if keys.present?
 
                          normalize(Hash[hash.map do |key, value|
-                           [key, enumerize(typecast(value))]
+                           [key, enumerize(type_definition.ensure_type(value))]
                          end].with_indifferent_access).with_indifferent_access
                        end
           end

data/lib/granite/form/model/attributes/localized.rb

@@ -5,7 +5,7 @@ module Granite
         class Localized < Attribute
           def read
             @value ||= Hash[read_before_type_cast.map do |locale, value|
-              [locale.to_s, normalize(enumerize(typecast(value)))]
+              [locale.to_s, normalize(enumerize(type_definition.ensure_type(value)))]
             end]
           end
 

data/lib/granite/form/model/attributes/reference_many.rb

@@ -5,7 +5,7 @@ module Granite
         class ReferenceMany < ReferenceOne
           def type_casted_value
             variable_cache(:value) do
-              read_before_type_cast.map { |id| typecast(id) }
+              read_before_type_cast.map { |id| type_definition.ensure_type(id) }
             end
           end
 

data/lib/granite/form/model/attributes/reference_one.rb

@@ -24,7 +24,7 @@ module Granite
 
           def type_casted_value
             variable_cache(:value) do
-              typecast(read_before_type_cast)
+              type_definition.ensure_type(read_before_type_cast)
             end
           end
 
@@ -32,14 +32,6 @@ module Granite
             @value_cache
           end
 
-          def type
-            @type ||= association.reflection.persistence_adapter.primary_key_type
-          end
-
-          def typecaster
-            @typecaster ||= Granite::Form.typecaster(type.ancestors.grep(Class))
-          end
-
         private
 
           def association

data/lib/granite/form/model/attributes/reflections/attribute.rb

@@ -4,12 +4,6 @@ module Granite
       module Attributes
         module Reflections
           class Attribute < Base
-            def self.build(target, generated_methods, name, *args, &block)
-              attribute = super(target, generated_methods, name, *args, &block)
-              generate_methods name, generated_methods
-              attribute
-            end
-
             def self.generate_methods(name, target)
               target.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}

data/lib/granite/form/model/attributes/reflections/base.rb

@@ -7,11 +7,9 @@ module Granite
             attr_reader :name, :options
 
             class << self
-              def build(_target, _generated_methods, name, *args, &block)
-                options = args.extract_options!
-                options[:type] = args.first if args.first
-                options[:default] = block if block
-                new(name, options)
+              def build(_target, generated_methods, name, *args, &block)
+                generate_methods name, generated_methods
+                new(name, *args, &block)
               end
 
               def generate_methods(name, target) end
@@ -21,13 +19,16 @@ module Granite
               end
             end
 
-            def initialize(name, options = {})
+            def initialize(name, *args, &block)
               @name = name.to_s
-              @options = options
+
+              @options = args.extract_options!
+              @options[:type] = args.first if args.first
+              @options[:default] = block if block
             end
 
             def build_attribute(owner, raw_value = Granite::Form::UNDEFINED)
-              attribute = self.class.attribute_class.new(name, owner)
+              attribute = self.class.attribute_class.new(self, owner)
               attribute.write_value(raw_value, origin: :persistence) unless raw_value == Granite::Form::UNDEFINED
               attribute
             end
@@ -43,10 +44,6 @@ module Granite
               end
             end
 
-            def typecaster
-              @typecaster ||= Granite::Form.typecaster(type.ancestors.grep(Class))
-            end
-
             def readonly
               @readonly ||= options[:readonly]
             end

data/lib/granite/form/model/attributes/reflections/reference_one.rb

@@ -4,12 +4,6 @@ module Granite
       module Attributes
         module Reflections
           class ReferenceOne < Base
-            def self.build(_target, generated_methods, name, *args)
-              options = args.extract_options!
-              generate_methods name, generated_methods
-              new(name, options)
-            end
-
             def self.generate_methods(name, target)
               target.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}
@@ -30,10 +24,6 @@ module Granite
               RUBY
             end
 
-            def type
-              Object
-            end
-
             def inspect_reflection
               "#{name}: (reference)"
             end

data/lib/granite/form/model/persistence.rb

@@ -26,32 +26,14 @@ module Granite
           !!@persisted
         end
 
-        def destroyed?
-          !!@destroyed
-        end
-
         def marked_for_destruction?
-          @marked_for_destruction
-        end
-
-        def mark_for_destruction
-          @marked_for_destruction = true
-        end
-
-        def _destroy
-          marked_for_destruction?
+          false
         end
 
       private
 
         def mark_persisted!
           @persisted = true
-          @destroyed = false
-        end
-
-        def mark_destroyed!
-          @persisted = false
-          @destroyed = true
         end
       end
     end

data/lib/granite/form/model/validations/nested.rb

@@ -19,7 +19,7 @@ module Granite
             def self.import_errors(from, to, prefix)
               from.each do |error|
                 key = "#{prefix}.#{error.attribute}"
-                to.import(error, attribute: key) unless to.added?(key, error.type, error.options)
+                to.import(error, attribute: key) unless to.messages_for(key).include?(error.message)
               end
             end
           else

data/lib/granite/form/model.rb

@@ -3,9 +3,7 @@ require 'granite/form/model/attributes'
 require 'granite/form/model/validations'
 require 'granite/form/model/scopes'
 require 'granite/form/model/primary'
-require 'granite/form/model/lifecycle'
 require 'granite/form/model/persistence'
-require 'granite/form/model/callbacks'
 require 'granite/form/model/associations'
 require 'granite/form/model/localization'
 require 'granite/form/model/representation'

data/lib/granite/form/types/active_support/time_zone.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      module ActiveSupport
+        class TimeZone < Float
+          def typecast(value)
+            case value
+            when ::ActiveSupport::TimeZone
+              value
+            when ::TZInfo::Timezone
+              ::ActiveSupport::TimeZone[value.name]
+            when ::String, ::Numeric, ::ActiveSupport::Duration
+              ::ActiveSupport::TimeZone[super || value]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/array.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Array < Object
+        def typecast(value)
+          if value.is_a?(::String)
+            value.split(',').map(&:strip)
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/big_decimal.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class BigDecimal < Object
+        def typecast(value)
+          BigDecimal(Float(value).to_s) if value
+        rescue ArgumentError, TypeError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/boolean.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Boolean < Object
+        MAPPING = {
+          1 => true,
+          0 => false,
+          '1' => true,
+          '0' => false,
+          't' => true,
+          'f' => false,
+          'T' => true,
+          'F' => false,
+          true => true,
+          false => false,
+          'true' => true,
+          'false' => false,
+          'TRUE' => true,
+          'FALSE' => false,
+          'y' => true,
+          'n' => false,
+          'yes' => true,
+          'no' => false
+        }.freeze
+
+        def self.typecast(value)
+          MAPPING[value]
+        end
+
+        def typecast(value)
+          self.class.typecast(value)
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/date.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Date < Object
+        def typecast(value)
+          value.try(:to_date)
+        rescue ArgumentError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/date_time.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class DateTime < Object
+        def typecast(value)
+          value.try(:to_datetime)
+        rescue ArgumentError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/float.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Float < Object
+        def typecast(value)
+          Float(value)
+        rescue ArgumentError, TypeError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/hash_with_action_controller_parameters.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class HashWithActionControllerParameters < Object
+        def typecast(value)
+          case value
+          when ActionController::Parameters
+            value.to_h if value.permitted?
+          when ::Hash then
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/integer.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Integer < Float
+        def typecast(value)
+          super.try(:to_i)
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/object.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Object
+        attr_reader :reflection, :owner, :type
+        delegate :name, to: :reflection
+
+        def initialize(type, reflection, owner)
+          @type = type
+          @reflection = reflection
+          @owner = owner
+        end
+
+        def ensure_type(value)
+          if value.instance_of?(type)
+            value
+          elsif !value.nil?
+            typecast(value)
+          end
+        end
+
+        def typecast(value)
+          value if value.is_a?(type)
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types/string.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class String < Object
+        def typecast(value)
+          value.to_s
+        end
+      end
+    end
+  end
+end