formalism-model_forms 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6934a45b110aec6928cb8a4a04245be5869e652a6120cc4e5e411f1b4762ce
-  data.tar.gz: 6f7dfc4d1bc40657739eee946f007d324016ccee51e036d609965aa001ed98da
+  metadata.gz: 95151411e345c20bfa1f48b1d4b81b9b278d7a0d78d98f69479e9f4cea2fdc79
+  data.tar.gz: 73986aaeb3079d6e2b2a7416466f8b4be353f3b4792f0209a3bc1116bb6ddf38
 SHA512:
-  metadata.gz: 6a444fb88a4b2c982d627bf1b7e6eb664a3777d9b033fc28d2d3cbfaccb6901ce241a56322dc497497ef47f09150beaf74e0de7e0b3bfb4d24f59807d4142047
-  data.tar.gz: f1f7a1350bc894c938cdf552b2a521abd65d42d2bbcca79dd36753c1d35be85d5a7285f81f8d852bef432ef7f3c115d7ecda7d7828ae1c447dc9139800c3eebe
+  metadata.gz: c0255a6211a4b6fea6a214763df0afaf02b16da026da6b338db047188e194a290880399f9bd87bd5c2ef6ad0b6cb04113d0b6e4e62336e5c6d056d89236272f3
+  data.tar.gz: 9c5a28f7ea6016437191f70f6c98e127a9c461d24500a30971d7ac360b1f0ab0f4908c7c91875b7ae1e6aa98c85e68bc8b4923744a1f50fde902c9f04281e33f

data/CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## master (unreleased)
 
+## 0.7.0 (2020-10-14)
+
 ## 0.6.2 (2020-09-28)
 
+*   Update `formalism` to a new version.
+
 ## 0.6.1 (2020-09-28)
 
 *   Fix case when there is instance and `nil` params for `Update` form.

data/lib/formalism/model_forms/_base.rb

@@ -17,7 +17,7 @@ module Formalism
 			extend Forwardable
 			def_delegators(
 				'self.class',
-				:namespace, :model_name, :model, :instance_variable_name
+				:primary_field_name, :namespace, :model_name, :model, :instance_variable_name
 			)
 
 			## Module for Base form class methods
@@ -27,6 +27,8 @@ module Formalism
 				def inherited(form)
 					super
 
+					form.primary_field_name = primary_field_name
+
 					return if form.instance_name == :model
 					return if form.method_defined?(form.instance_name.to_s)
 
@@ -34,6 +36,26 @@ module Formalism
 					form.alias_method "#{form.instance_name}=", :instance=
 				end
 
+				def included(something)
+					something.primary_field_name = primary_field_name
+				end
+
+				attr_accessor :primary_field_name
+
+				def primary_field(name, *args, **kwargs)
+					remove_field primary_field_name if primary_field_name
+
+					field name, *args, **kwargs
+
+					self.primary_field_name = name
+				end
+
+				def remove_field(name)
+					super
+
+					self.primary_field_name = nil if name == primary_field_name
+				end
+
 				using GorillaPatch::Namespace
 				using GorillaPatch::Inflections
 
@@ -93,7 +115,9 @@ module Formalism
 			attr_writer :instance
 
 			def find_instance
-				model[id].public_send(@cached ? :dup : :itself)
+				model
+					.first(primary_field_name => public_send(primary_field_name))
+					.public_send(@cached ? :dup : :itself)
 			end
 
 			def field_condition(name, value)

data/lib/formalism/model_forms/delete.rb

@@ -16,7 +16,7 @@ module Formalism
 			# 	end
 			# end
 
-			field :id, Integer
+			primary_field :id, Integer
 
 			private
 

data/lib/formalism/model_forms/find.rb

@@ -7,7 +7,7 @@ module Formalism
 			include Formalism::ModelForms::Base
 			include Memery
 
-			field :id, Integer, default: nil
+			primary_field :id, Integer, default: nil
 
 			def initialize(params_or_instance = {})
 				if params_or_instance.is_a?(Hash)

data/lib/formalism/model_forms/find_or_create.rb

@@ -11,11 +11,20 @@ module Formalism
 				def inherited(child_form)
 					super
 
-					child_form.nested :find, child_form.namespace::Find,
+					child_form_path = File.dirname caller_locations(1..1).first.path
+					%w[find create].each { |form_type| require "#{child_form_path}/#{form_type}" }
+
+					child_form.define_nested_forms
+				end
+
+				protected
+
+				def define_nested_forms
+					nested :find, namespace::Find,
 						initialize: ->(form) { form.new(@params_or_instance) },
-						errors_key: nil
+						merge_errors: false
 
-					child_form.nested :create, child_form.namespace::Create,
+					nested :create, namespace::Create,
 						initialize: ->(form) { form.new(@params_or_instance) },
 						errors_key: nil,
 						merge_errors: -> { find_form.instance.nil? }

data/lib/formalism/model_forms/list.rb

@@ -78,7 +78,7 @@ module Formalism
 
 			def ordered_unfiltered_dataset
 				result = unfiltered_dataset.from_self(alias: model.table_name)
-				result = result.reverse_order(:id) unless unfiltered_dataset.opts[:order]
+				result = result.reverse_order(:created_at) unless unfiltered_dataset.opts[:order]
 				result
 			end
 
@@ -87,7 +87,9 @@ module Formalism
 			end
 
 			def non_cached_dataset_for_execute
-				dataset.where(id: dataset.select(:id).limit(limit_by_page))
+				dataset.where(
+					primary_field_name => dataset.select(primary_field_name).limit(limit_by_page)
+				)
 			end
 		end
 	end

data/lib/formalism/model_forms/move.rb

@@ -6,15 +6,15 @@ module Formalism
 		module Move
 			include Formalism::ModelForms::Base
 
-			field :id, Integer
+			primary_field :id, Integer
 
 			attr_reader :direction
 
-			def initialize(direction, id, how_many = 1)
+			def initialize(direction, primary_field_value, how_many = 1)
 				@direction = direction.to_sym
 				@how_many = how_many.to_i
 
-				super(id: id)
+				super(primary_field_name => primary_field_value)
 			end
 
 			private

data/lib/formalism/model_forms/select.rb

@@ -7,7 +7,7 @@ module Formalism
 			include Formalism::ModelForms::Base
 			extend ModelForms::Base::Plural
 
-			field :id, Array, of: Integer, default: []
+			primary_field :id, Array, of: Integer, default: []
 
 			def initialize(params_or_instance = {})
 				## Instance should be an `Array` if there is not `params`

data/lib/formalism/model_forms/update.rb

@@ -21,13 +21,13 @@ module Formalism
 				end
 			end
 
-			field :id, Integer, merge: false
+			primary_field :id, Integer, merge: false
 
-			def initialize(params, id_or_instance)
-				if id_or_instance.is_a?(model)
-					self.instance = id_or_instance
+			def initialize(params, pf_or_instance)
+				if pf_or_instance.is_a?(model)
+					self.instance = pf_or_instance
 				else
-					self.id = id_or_instance
+					public_send "#{primary_field_name}=", pf_or_instance
 				end
 
 				super params || {}

data/lib/formalism/model_forms/version.rb

@@ -2,6 +2,6 @@
 
 module Formalism
 	module ModelForms
-		VERSION = '0.6.2'
+		VERSION = '0.7.0'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formalism-model_forms
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alt_memery
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Standard Formalism forms for Sequel Models