formalism-model_forms 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65944c5d862966df0531c80ae45d603e01bd8a576983a5ad180e75c29f9116e6
-  data.tar.gz: eedd373f63d2e6b4dc2da93c896fa9ebdf65a0e172a8c2794f5497abe622195f
+  metadata.gz: '082c6bb37c880171e718d59e44a932587ef6cdeb14b4e4bd089e74ac93bfea7f'
+  data.tar.gz: 48fa334241bea2219ca7ef170ba4e1f013c06aa9ce197e2b2593e6aae4cce118
 SHA512:
-  metadata.gz: 5580e66079f5f4fafa3819a0fe9bb0a8825819bd2daacf5da932689e5123748be187613fd7bc9d3e01b285f7ffa952ad7602980705efa3987e75dcca9954db75
-  data.tar.gz: e2b511cb8a47a70018fa55af7a2a0807d51429740ebf243edd203826751316a6ae500b3e3f709e6df370b1ffe3928bd3987341725af428e5911a15e31acea22e
+  metadata.gz: da4c7f403b76dff4ed7f918a4e715d74468d11cc7b819278d81975836c5411d9267dbb39c35046c598ec5d589d91b74d881cc571e8602ec7afe4ea093c7aa002
+  data.tar.gz: 03fc4d464b2758279405bee6a8b6a69a5175c863ed792d8e373927103345f6a9a7cc2f5d72f9bc56ec6d0c5daf845887cd78ec4269d5fd66943d9083aabe37f2

data/CHANGELOG.md

@@ -2,8 +2,38 @@
 
 ## master (unreleased)
 
+## 0.7.2 (2020-11-11)
+
+*   Fix error with `primary_field`.
+*   Fix an error when project has no models (and namespace) yet.
+*   Update development dependencies.
+
+## 0.7.1 (2020-10-15)
+
+*   Fix `Delete` form for models without `auditable` plugin.
+
+## 0.7.0 (2020-10-14)
+
+*   Add `primary_field`, don't lock on `id` field.
+
+## 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.
+
 ## 0.6.0 (2020-09-23)
 
+*   Fix complex error with `name` of anonymous classes and `inherited`.
+    1.  Update `formalism` to a version with `super` in `inherited` method.
+    2.  Define non-anonymous classes and modules,
+        even `stub_class` or `def self.name` assignes `name` only after `inherited`.
+    3.  Yes, I hate `eval`, but I don't know how I can define these things in another working way.
+*   Use correct assigned constants, fix broken lookup.
+*   Fix `Base#initialize` for cases when there are no `static_cache` plugin at all.
+
 ## 0.5.0 (2020-09-22)
 
 *   Require `forwardable` before its usage.

data/lib/formalism/model_forms.rb

@@ -41,14 +41,20 @@ module Formalism
 
 			def define_other_model_forms(forms_namespace)
 				FORM_CLASSES.each do |form_name, parent_name|
+					## https://github.com/rubocop-hq/rubocop/issues/9026
+					# rubocop:disable Style/DocumentDynamicEvalDefinition
 					forms_namespace::Model.class_eval(
 						<<~CODE,
+							# class Update < FB::Forms::Model::Base
+							#   include ModelForms::Update
+							# end
 							class #{form_name} < #{forms_namespace}::Model::#{parent_name}
 								include ModelForms::#{form_name}
 							end
 						CODE
-						__FILE__, __LINE__ - 4
+						__FILE__, __LINE__ - 7
 					)
+					# rubocop:enable Style/DocumentDynamicEvalDefinition
 				end
 			end
 		end

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,27 @@ module Formalism
 					form.alias_method "#{form.instance_name}=", :instance=
 				end
 
+				def included(something)
+					super
+					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
 
@@ -43,7 +66,7 @@ module Formalism
 
 				memoize def model_name
 					deconstantize.split('::')[2..-1].reverse
-						.find { |part| self::MODELS_NAMESPACE.const_defined?(part, false) || part == 'Model' }
+						.find { |part| self::MODELS_NAMESPACE&.const_defined?(part, false) || part == 'Model' }
 				end
 
 				memoize def model
@@ -93,7 +116,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,12 +16,14 @@ module Formalism
 			# 	end
 			# end
 
-			field :id, Integer
+			primary_field :id, Integer
 
 			private
 
 			def execute
-				instance.changes_author = changes_author if model.auditable?
+				if model.respond_to?(:auditable?) && model.auditable?
+					instance.changes_author = changes_author
+				end
 
 				instance.destroy
 				super

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,16 +21,16 @@ 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
+				super params || {}
 			end
 
 			private

data/lib/formalism/model_forms/version.rb

@@ -2,6 +2,6 @@
 
 module Formalism
 	module ModelForms
-		VERSION = '0.6.0'
+		VERSION = '0.7.2'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formalism-model_forms
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alt_memery
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: gorilla_patch
   requirement: !ruby/object:Gem::Requirement
@@ -199,14 +199,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -227,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 description: 'Standard Formalism forms for Sequel Models, such like create, find,
   delete, etc.
 
@@ -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