granite-form 0.1.0 → 0.2.0

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

@@ -27,7 +27,7 @@ module Granite
             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 +43,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

@@ -30,10 +30,6 @@ module Granite
               RUBY
             end
 
-            def type
-              Object
-            end
-
             def inspect_reflection
               "#{name}: (reference)"
             end

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

@@ -79,7 +79,7 @@ module Granite
             errors.where(from).each do |error|
               options = error.options
               # If we generate message for built-in validation, we don't want to later escape it in our monkey-patch
-              options = options.merge(message: error.message.html_safe) unless options.key?(:message)
+              options = options.merge(message: error.message.html_safe)
 
               errors.add(to, error.type, **options)
             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/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

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Time < Object
+        def typecast(value)
+          value.is_a?(::String) && ::Time.zone ? ::Time.zone.parse(value) : value.try(:to_time)
+        rescue ArgumentError
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class UUID < Object
+        def typecast(value)
+          case value
+          when UUIDTools::UUID
+            Granite::Form::UUID.parse_raw value.raw
+          when Granite::Form::UUID
+            value
+          when ::String
+            Granite::Form::UUID.parse_string value
+          when ::Integer
+            Granite::Form::UUID.parse_int value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/granite/form/types.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'granite/form/types/object'
+require 'granite/form/types/array'
+require 'granite/form/types/big_decimal'
+require 'granite/form/types/boolean'
+require 'granite/form/types/date'
+require 'granite/form/types/date_time'
+require 'granite/form/types/hash_with_action_controller_parameters'
+require 'granite/form/types/float'
+require 'granite/form/types/integer'
+require 'granite/form/types/string'
+require 'granite/form/types/time'
+require 'granite/form/types/uuid'
+require 'granite/form/types/active_support/time_zone'

data/lib/granite/form/version.rb

@@ -1,5 +1,5 @@
 module Granite
   module Form
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/granite/form.rb

@@ -11,6 +11,7 @@ require 'granite/form/version'
 require 'granite/form/errors'
 require 'granite/form/extensions'
 require 'granite/form/undefined_class'
+require 'granite/form/types'
 require 'granite/form/config'
 require 'granite/form/railtie' if defined? Rails
 require 'granite/form/model'
@@ -19,130 +20,26 @@ require 'granite/form/model/associations/persistence_adapters/active_record'
 
 module Granite
   module Form
-    BOOLEAN_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.config
       Granite::Form::Config.instance
     end
 
     singleton_class.delegate(*Granite::Form::Config.delegated, to: :config)
 
-    typecaster('Object') { |value, attribute| value if value.class < attribute.type }
-    typecaster('String') { |value, _| value.to_s }
-    typecaster('Array') do |value|
-      case value
-      when ::Array then
-        value
-      when ::String then
-        value.split(',').map(&:strip)
-      end
-    end
-    typecaster('Hash') do |value|
-      case value
-      when ::Hash then
-        value
-      end
-    end
-    ActiveSupport.on_load :action_controller do
-      Granite::Form.typecaster('Hash') do |value|
-        case value
-        when ActionController::Parameters
-          value.to_h if value.permitted?
-        when ::Hash then
-          value
-        end
-      end
-    end
-    typecaster('Date') do |value|
-      begin
-        value.to_date
-      rescue ArgumentError, NoMethodError
-        nil
-      end
-    end
-    typecaster('DateTime') do |value|
-      begin
-        value.to_datetime
-      rescue ArgumentError
-        nil
-      end
-    end
-    typecaster('Time') do |value|
-      begin
-        value.is_a?(String) && ::Time.zone ? ::Time.zone.parse(value) : value.to_time
-      rescue ArgumentError
-        nil
-      end
-    end
-    typecaster('ActiveSupport::TimeZone') do |value|
-      case value
-      when ActiveSupport::TimeZone
-        value
-      when ::TZInfo::Timezone
-        ActiveSupport::TimeZone[value.name]
-      when String, Numeric, ActiveSupport::Duration
-        value = begin
-                  Float(value)
-                rescue ArgumentError, TypeError
-                  value
-                end
-        ActiveSupport::TimeZone[value]
-      end
-    end
-    typecaster('BigDecimal') do |value|
-      next unless value
-      begin
-        BigDecimal(Float(value).to_s)
-      rescue ArgumentError, TypeError
-        nil
-      end
-    end
-    typecaster('Float') do |value|
-      begin
-        Float(value)
-      rescue ArgumentError, TypeError
-        nil
-      end
-    end
-    typecaster('Integer') do |value|
-      begin
-        Float(value).to_i
-      rescue ArgumentError, TypeError
-        nil
-      end
-    end
-    typecaster('Boolean') { |value| BOOLEAN_MAPPING[value] }
-    typecaster('Granite::Form::UUID') do |value|
-      case value
-      when UUIDTools::UUID
-        Granite::Form::UUID.parse_raw value.raw
-      when Granite::Form::UUID
-        value
-      when String
-        Granite::Form::UUID.parse_string value
-      when Integer
-        Granite::Form::UUID.parse_int value
-      end
-    end
+    config.types = {
+      'Object' => Types::Object,
+      'String' => Types::String,
+      'Array' => Types::Array,
+      'Date' => Types::Date,
+      'DateTime' => Types::DateTime,
+      'Time' => Types::Time,
+      'ActiveSupport::TimeZone' => Types::ActiveSupport::TimeZone,
+      'BigDecimal' => Types::BigDecimal,
+      'Float' => Types::Float,
+      'Integer' => Types::Integer,
+      'Boolean' => Types::Boolean,
+      'Granite::Form::UUID' => Types::UUID
+    }
   end
 end
 
@@ -150,6 +47,10 @@ require 'granite/form/base'
 
 Granite::Form.base_class = Granite::Form::Base
 
+ActiveSupport.on_load :action_controller do
+  Granite::Form.config.types['Hash'] = Granite::Form::Types::HashWithActionControllerParameters
+end
+
 ActiveSupport.on_load :active_record do
   require 'granite/form/active_record/associations'
   require 'granite/form/active_record/nested_attributes'

data/spec/{lib/granite → granite}/form/active_record/nested_attributes_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'shared/nested_attribute_examples'
 
 describe Granite::Form::ActiveRecord::NestedAttributes do
   before do

data/spec/{lib/granite → granite}/form/config_spec.rb

@@ -47,20 +47,32 @@ describe Granite::Form::Config do
 
   describe '#typecaster' do
     specify do
-      expect { subject.typecaster('Object') {} }
-        .to change { muffle(Granite::Form::TypecasterMissing) { subject.typecaster(Time, Object) } }
-        .from(nil).to(an_instance_of(Proc))
+      expect { subject.typecaster('Object', &:to_s) }
+        .to change { subject.types['Object'] }.from(nil).to(an_instance_of(Class))
+
+      expect(subject.types['Object'].new(Object, nil, stub_model.new).typecast(1)).to eq('1')
     end
+
+    specify do
+      expect { subject.typecaster(Object) {} }
+        .to change { subject.types['Object'] }.from(nil).to(an_instance_of(Class))
+    end
+
     specify do
-      expect { subject.typecaster('Object') {} }
-        .to change { muffle(Granite::Form::TypecasterMissing) { subject.typecaster('time', 'object') } }
-        .from(nil).to(an_instance_of(Proc))
+      expect { subject.typecaster('object') {} }
+        .to change { subject.types['Object'] }.from(nil).to(an_instance_of(Class))
     end
+  end
+
+  describe '#type_for' do
+    let(:definition) { subject.types['Numeric'] }
+
+    before { subject.typecaster('Numeric') {} }
+
     specify do
-      expect { subject.typecaster('Object') {} }
-        .to change { muffle(Granite::Form::TypecasterMissing) { subject.typecaster(Object) } }
-        .from(nil).to(an_instance_of(Proc))
+      expect(subject.type_for(Numeric)).to eq(definition)
+      expect(subject.type_for(Integer)).to eq(definition)
+      expect { subject.type_for(String) }.to raise_error(Granite::Form::TypecasterMissing)
     end
-    specify { expect { subject.typecaster(Object) }.to raise_error Granite::Form::TypecasterMissing }
   end
 end

data/spec/granite/form/extensions_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Granite::Form::UUID do
+  subject(:uuid) { Granite::Form::UUID.random_create }
+
+  specify { expect(uuid.as_json).to eq(uuid.to_s) }
+  specify { expect(uuid.to_json).to eq("\"#{uuid}\"") }
+  specify { expect(uuid.to_param).to eq(uuid.to_s) }
+  specify { expect(uuid.to_query(:key)).to eq("key=#{uuid}") }
+end

data/spec/{lib/granite → granite}/form/model/associations/nested_attributes_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'shared/nested_attribute_examples'
 
 describe Granite::Form::Model::Associations::NestedAttributes do
   context '' do