granite-form 0.2.0 → 0.4.0

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/representation.rb

@@ -1,5 +1,6 @@
 require 'active_model/version'
 require 'granite/form/model/attributes/reflections/represents'
+require 'granite/form/model/attributes/reflections/represents/build_type_definition'
 require 'granite/form/model/attributes/represents'
 
 module Granite

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

@@ -12,6 +12,12 @@ module Granite
           alias_method :validate, :valid?
         end
 
+        class_methods do
+          def validates_presence?(attr)
+            _validators[attr.to_sym].grep(ActiveModel::Validations::PresenceValidator).present?
+          end
+        end
+
         def validate!(context = nil)
           valid?(context) || raise_validation_error
         end

data/lib/granite/form/model.rb

@@ -3,11 +3,8 @@ 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'
 require 'granite/form/model/dirty'
 
@@ -24,6 +21,7 @@ module Granite
         include ActiveModel::Serialization
         include ActiveModel::Serializers::JSON
 
+        include Util
         include Conventions
         include Attributes
         include Validations

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

@@ -5,6 +5,8 @@ module Granite
     module Types
       module ActiveSupport
         class TimeZone < Float
+        private
+
           def typecast(value)
             case value
             when ::ActiveSupport::TimeZone

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class Array < Object
+      private
+
         def typecast(value)
           if value.is_a?(::String)
             value.split(',').map(&:strip)

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class BigDecimal < Object
+      private
+
         def typecast(value)
           BigDecimal(Float(value).to_s) if value
         rescue ArgumentError, TypeError

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

@@ -29,6 +29,8 @@ module Granite
           MAPPING[value]
         end
 
+      private
+
         def typecast(value)
           self.class.typecast(value)
         end

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

@@ -0,0 +1,11 @@
+module Granite
+  module Form
+    module Types
+      class Collection < HasSubtype
+        def prepare(value)
+          ::Array.wrap(value).map { |v| subtype_definition.prepare(v) }
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class Date < Object
+      private
+
         def typecast(value)
           value.try(:to_date)
         rescue ArgumentError

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class DateTime < Object
+      private
+
         def typecast(value)
           value.try(:to_datetime)
         rescue ArgumentError

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Granite
+  module Form
+    module Types
+      class Dictionary < HasSubtype
+        def prepare(value)
+          value = to_hash(value)
+          value = value.stringify_keys.slice(*reflection.keys) if reflection.keys.present?
+          value.transform_values { |v| subtype_definition.prepare(v) }.with_indifferent_access
+        end
+
+      private
+
+        def to_hash(value)
+          Hash[value]
+        rescue ArgumentError
+          {}
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class Float < Object
+      private
+
         def typecast(value)
           Float(value)
         rescue ArgumentError, TypeError

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

@@ -0,0 +1,18 @@
+module Granite
+  module Form
+    module Types
+      class HasSubtype
+        attr_reader :subtype_definition
+        delegate :reflection, :owner, :type, :name, :enum, to: :subtype_definition
+
+        def initialize(subtype_definition)
+          @subtype_definition = subtype_definition
+        end
+
+        def build_duplicate(*args)
+          self.class.new(subtype_definition.build_duplicate(*args))
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class HashWithActionControllerParameters < Object
+      private
+
         def typecast(value)
           case value
           when ActionController::Parameters

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class Integer < Float
+      private
+
         def typecast(value)
           super.try(:to_i)
         end

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

@@ -13,6 +13,29 @@ module Granite
           @owner = owner
         end
 
+        def build_duplicate(reflection, owner)
+          self.class.new(type, reflection, owner)
+        end
+
+        def prepare(value)
+          enumerize(ensure_type(value))
+        end
+
+        def enum
+          source = owner.evaluate(reflection.enum)
+
+          case source
+          when ::Range
+            source.to_a
+          when ::Set
+            source
+          else
+            ::Array.wrap(source)
+          end.to_set
+        end
+
+      private
+
         def ensure_type(value)
           if value.instance_of?(type)
             value
@@ -24,6 +47,11 @@ module Granite
         def typecast(value)
           value if value.is_a?(type)
         end
+
+        def enumerize(value)
+          set = enum if reflection.enum
+          value if !set || (set.none? || set.include?(value))
+        end
       end
     end
   end

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class String < Object
+      private
+
         def typecast(value)
           value.to_s
         end

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class Time < Object
+      private
+
         def typecast(value)
           value.is_a?(::String) && ::Time.zone ? ::Time.zone.parse(value) : value.try(:to_time)
         rescue ArgumentError

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

@@ -4,6 +4,8 @@ module Granite
   module Form
     module Types
       class UUID < Object
+      private
+
         def typecast(value)
           case value
           when UUIDTools::UUID

data/lib/granite/form/types.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require 'granite/form/types/has_subtype'
 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/collection'
 require 'granite/form/types/date'
 require 'granite/form/types/date_time'
+require 'granite/form/types/dictionary'
 require 'granite/form/types/hash_with_action_controller_parameters'
 require 'granite/form/types/float'
 require 'granite/form/types/integer'

data/lib/granite/form/util.rb

@@ -0,0 +1,55 @@
+module Granite
+  module Form
+    module Util
+      extend ActiveSupport::Concern
+
+      # Evaluates value and returns result based on what was passed:
+      # - if Proc was passed, then executes it in context of self
+      # - if Symbol was passed, then calls a method with that name and returns result
+      # - otherwise just returns the value itself
+      # @param value [Object] value to evaluate
+      # @return [Object] result of evaluation
+      def evaluate(value, *args)
+        value.is_a?(Symbol) ? evaluate_symbol(value, *args) : evaluate_if_proc(value, *args)
+      end
+
+      # Evaluates value and returns result based on what was passed:
+      # - if Proc was passed, then executes it in context of self
+      # - otherwise just returns the value itself
+      # @param value [Object] value to evaluate
+      # @return [Object] result of evaluation
+      def evaluate_if_proc(value, *args)
+        value.is_a?(Proc) ? evaluate_proc(value, *args) : value
+      end
+
+      # Evaluates `if` or `unless` conditions present in the supplied
+      # `options` being it a symbol or callable.
+      #
+      # @param [Hash] options The method options to evaluate.
+      # @option options :if method name or callable
+      # @option options :unless method name or callable
+      # @return [Boolean] whether conditions are satisfied
+      def conditions_satisfied?(**options)
+        raise ArgumentError, 'You cannot specify both if and unless' if options.key?(:if) && options.key?(:unless)
+
+        if options.key?(:if)
+          evaluate(options[:if])
+        elsif options.key?(:unless)
+          !evaluate(options[:unless])
+        else
+          true
+        end
+      end
+
+    private
+
+      def evaluate_proc(value, *args)
+        instance_exec(*args, &value)
+      end
+
+      def evaluate_symbol(value, *args)
+        __send__(value, *args)
+      end
+    end
+  end
+end

data/lib/granite/form/version.rb

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

data/lib/granite/form.rb

@@ -8,6 +8,7 @@ require 'singleton'
 require 'active_model'
 
 require 'granite/form/version'
+require 'granite/form/util'
 require 'granite/form/errors'
 require 'granite/form/extensions'
 require 'granite/form/undefined_class'

data/spec/granite/form/active_record/associations_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Granite::Form::ActiveRecord::Associations do
   before do
     stub_model(:project) do
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
       include Granite::Form::Model::Associations
 
       attribute :title, String
@@ -18,7 +18,8 @@ describe Granite::Form::ActiveRecord::Associations do
     end
 
     stub_model(:profile) do
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
+      include Granite::Form::Model::Associations
 
       attribute :first_name, String
       attribute :last_name, String
@@ -89,7 +90,10 @@ describe Granite::Form::ActiveRecord::Associations do
       end
 
       context 'with profile already set' do
-        before { user.create_profile(admin: true) }
+        before do
+          user.build_profile(admin: true)
+          user.save!
+        end
 
         specify do
           user.profile.admin = false
@@ -104,13 +108,9 @@ describe Granite::Form::ActiveRecord::Associations do
     let(:user) { User.create }
 
     describe '#projects' do
-      specify do
-        expect { user.projects << Project.new }
-          .not_to change { user.read_attribute(:projects) }
-      end
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .to change { user.projects.reload.count }.from(0).to(1)
+          .not_to change { user.read_attribute(:projects) }
       end
       specify do
         user.projects << Project.new(title: 'First')
@@ -124,15 +124,14 @@ describe Granite::Form::ActiveRecord::Associations do
 
         specify do
           expect { user.projects << project }
-            .to change { user.read_attribute(:projects) }.from(nil)
-            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+            .not_to change { user.read_attribute(:projects) }
         end
         specify do
           expect do
             user.projects << project
             user.save
           end
-            .to change { user.reload.read_attribute(:projects) }.from(nil)
+            .to change { user.reload.read_attribute(:projects) }.from([])
             .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
         end
       end
@@ -150,8 +149,7 @@ describe Granite::Form::ActiveRecord::Associations do
       end
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .to change { user.read_attribute(:profile) }.from(nil)
-          .to({first_name: 'google.com', last_name: nil, admin: nil}.to_json)
+          .not_to change { user.read_attribute(:profile) }
       end
       specify do
         expect do
@@ -196,16 +194,16 @@ describe Granite::Form::ActiveRecord::Associations do
 
     specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
     specify { expect(User.new.projects).to eq([]) }
-    specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-    specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.read_attribute(:projects)).to eq([{title: 'Project'}].to_json) }
+    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
+    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project')]) }
 
     specify { expect(User.reflect_on_association(:profile).klass).to eq(User::Profile) }
     specify { expect(User.reflect_on_association(:profile).klass).to be < Profile }
     specify { expect(User.new.profile).to be_nil }
-    specify { expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
+    specify { expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
     specify do
-      expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.read_attribute(:profile))
-        .to eq({first_name: 'Profile', last_name: nil, admin: nil, age: nil}.to_json)
+      expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile)
+        .to have_attributes(first_name: 'Profile', last_name: nil, admin: nil, age: nil)
     end
   end
 end