formalism-model_forms 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e9e6077948f6108a399e2bae336e72107022b28120bc0278be0a0b05b0a6ca
-  data.tar.gz: 69eb5613bad324817f826cffff430de81baf7822a18d43748b5df77dbae4c42d
+  metadata.gz: cb6265733b776ca5782e1aba24dddc3c970757a89d9bb98471d98a920aa9a505
+  data.tar.gz: c043043ca1857d578e7640048cd506bd4f8c6ed20e2105f8f0372e9f0a1d4b5e
 SHA512:
-  metadata.gz: abd8a9b8110e2b69dedc06e8a64861951cf2059508287b43c3412f4dd05d631036809294a6f3ab1b4a2861e3b09773e11ff341898a1ae17a48977aa1c6c1fa8c
-  data.tar.gz: 0f4ac0480a4939d07acc968058dd03f36f39c24530446d52f66827e735acee0cb5e267d5ce086bb1b04a1b413852b6de565714e181281c01c1845e87bcb0a051
+  metadata.gz: c5328cd192ef3378b687bb82a17aaa65665bbf021b10903ec232d032943e81068a9686695fc2976bd42301d2db48b4c75bf8f3e6e3c8e587528a8ba07574b1ac
+  data.tar.gz: 5e06bbf7f096280a8b73ef6bd346529656c60d295082b49e5e9dc354b434e4b96c31c141afdcc7b8fef440a14efbb9dca804a1ec7dd221b364fee745124cae78

data/CHANGELOG.md

@@ -2,8 +2,30 @@
 
 ## master (unreleased)
 
+## 0.8.0 (2021-02-11)
+
+## 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`.

data/lib/formalism/model_forms.rb

@@ -43,11 +43,14 @@ module Formalism
 				FORM_CLASSES.each do |form_name, parent_name|
 					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
 					)
 				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,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.1'
+		VERSION = '0.8.0'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formalism-model_forms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-27 00:00:00.000000000 Z
+date: 2021-02-10 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.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: gorilla_patch
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: toys
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,28 +185,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.92.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.
 
@@ -274,14 +274,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Standard Formalism forms for Sequel Models