granite-form 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df27378689a1bdcdc95593c32c65046ecaab452cc3303839979ace6f1a12ef0f
-  data.tar.gz: 41b0ee8c8b22f1cf992e7b46c91528b4596ad6b362930c5299b6fde58a9bd2b8
+  metadata.gz: ebac9979a786e2a3638b1dd7b21648320c779770c10f7fe63707b38a58c0164c
+  data.tar.gz: 604dcf0abda92863e1503b0d977a53ca1de7a39823bfc8a4aabab8d9c6a27045
 SHA512:
-  metadata.gz: aef5479a5c58afc85c8e68635fbd8382039c69b8235beaeda74d5caf320540c2fd8aac330f70f4c031abfd37d6a214c3acab0086c9c0a1d3843aedd7aab5a1db
-  data.tar.gz: 5fcc7f498c8685167096ec9d835c6cc80efec7915b17c32aa27f8e912776d2ef25e215ed24c076e7c8e4cb32790eba060d8a7aac827ff1c2cd8d93819b7ae7e2
+  metadata.gz: cfc2c624834fe5d0ad4fadb903e6b9a38eed17778cea3c0cf9430437fb095436429c1a0941fd418e143805b064c1a74c0c959fb57493d96fb9602cdca625f36d
+  data.tar.gz: 4937e3d02a378edf48daa770799206b3ecdb91ee71ed1025169e6e3bf4a25bc157c01aea9db54dcb70645728eeb0055ca42be7db23258f0b7f2744d8f7415dd9

data/.rubocop_todo.yml

@@ -8,7 +8,7 @@
 
 # Offense count: 19
 Metrics/AbcSize:
-  Max: 54
+  Max: 55
 
 # Offense count: 2
 # Configuration parameters: CountComments.

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # master
 
+## Next
+## v0.2.0
+
+- Replace typecasters with proper type definitions.
+  - Instead of `typecaster(type) { |value, _| ... }` you'll have to use `typecaster(type) { |value| ... }`.
+  - Consequently you can access type definition in typecaster, e.g. `typecaster('Object') { |value| value if value.class < type }`, here `type` comes from type definition.
+
 ## v0.1.1
 
 - Fixed represented error message copying when represented model uses symbols for `message`. 

data/Rakefile

@@ -1,6 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'bump/tasks'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+Bump.tag_by_default = true
+Bump.changelog = true

data/granite-form.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'actionpack', '>= 4.0'
   gem.add_development_dependency 'activerecord', '>= 4.0'
   gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'bump'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.7.0'

data/lib/granite/form/config.rb

@@ -4,7 +4,7 @@ module Granite
       include Singleton
 
       attr_accessor :include_root_in_json, :i18n_scope, :logger, :primary_attribute, :base_class, :base_concern,
-        :_normalizers, :_typecasters
+        :_normalizers, :types
 
       def self.delegated
         public_instance_methods - superclass.public_instance_methods - Singleton.public_instance_methods
@@ -16,7 +16,7 @@ module Granite
         @logger = Logger.new(STDERR)
         @primary_attribute = :id
         @_normalizers = {}
-        @_typecasters = {}
+        @types = {}
       end
 
       def normalizer(name, &block)
@@ -27,16 +27,16 @@ module Granite
         end
       end
 
-      def typecaster(*classes, &block)
-        classes = classes.flatten
-        if block
-          _typecasters[classes.first.to_s.camelize] = block
-        else
-          _typecasters[classes.detect do |klass|
-            _typecasters[klass.to_s.camelize]
-          end.to_s.camelize] or raise TypecasterMissing, classes
+      def typecaster(class_name, &block)
+        types[class_name.to_s.camelize] = Class.new(Types::Object) do
+          define_method(:typecast, &block)
         end
       end
+
+      def type_for(klass)
+        key = klass.ancestors.grep(Class).map(&:to_s).find(&types) or raise TypecasterMissing, klass
+        types.fetch(key)
+      end
     end
   end
 end

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

@@ -74,7 +74,7 @@ module Granite
               primary_attribute_name = primary_name_for(association.reflection.klass)
               if existing_record
                 primary_attribute = existing_record.attribute(primary_attribute_name)
-                primary_attribute_value = primary_attribute.typecast(attributes[primary_attribute_name]) if primary_attribute
+                primary_attribute_value = primary_attribute.type_definition.ensure_type(attributes[primary_attribute_name]) if primary_attribute
               end
 
               if existing_record && (!primary_attribute || options[:update_only] || existing_record.primary_attribute == primary_attribute_value)
@@ -123,7 +123,7 @@ module Granite
                 else
                   existing_record = association.target.detect do |record|
                     primary_attribute_value = record.attribute(primary_attribute_name)
-                      .typecast(attributes[primary_attribute_name])
+                      .type_definition.ensure_type(attributes[primary_attribute_name])
                     record.primary_attribute == primary_attribute_value
                   end
                   if existing_record
@@ -162,7 +162,7 @@ module Granite
             end
 
             def self.destroy_flag?(hash)
-              Granite::Form.typecaster(Boolean).call(hash[DESTROY_ATTRIBUTE])
+              Types::Boolean.typecast(hash[DESTROY_ATTRIBUTE])
             end
 
             def self.reject_new_object?(object, association_name, attributes, options)

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

@@ -14,7 +14,9 @@ module Granite
 
               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/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,6 +96,10 @@ 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)

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/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/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.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end