tramway-core 1.18.1 → 1.18.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f57e54e293b5c5a85a88563762fd8c26df2ccbcb6eedebcb8ad1636d19ab08
-  data.tar.gz: 721461846180ea4eb78ebdbc314029be09ff3c391c995900ef0d2a498236af62
+  metadata.gz: ff863d7c75ba76a10d1f9c751b9710474a16b0cd126a6974224d8cbcb26d9dd4
+  data.tar.gz: b890fdbb1e3a33e6dc9cac04ca8cc3d91a5c240a9337c4313b576faf44f47c7b
 SHA512:
-  metadata.gz: b641dc9b842fb20fef05c90a73ed0007ddb9804b45cef8e6b74b2c6eea99e6610580d79450a7ef121a53a373685369addb83078e0db5e658c2129306c542c62c
-  data.tar.gz: 7f19244857938c969c03e52d49c063d34b52e25e4aad17d9bdee41bc7d12b2e650f241ec51a2f6a90ce71ab2cc2fd5409ac5d26857c59b464d44a095632d69c8
+  metadata.gz: 2ae3500906ffdc568ce881fad3c6581958bfcb32d5f145242f93eac7d6710a05a0d549e734ae3542040366cc75e584846f5100bdcada8e29e9529975f6e194af
+  data.tar.gz: f6be135129633829f2585831fc2576a566618f023f1bc4ab15f7b96e35437c9fddc668c6fa14a02d273d3c46e8c5ee5be4149946f6df8a679fe5628c8a26d398

data/app/decorators/tramway/core/associations/class_helper.rb

@@ -29,12 +29,14 @@ module Tramway::Core::Associations::ClassHelper
   def define_main_association_method(association_name, decorator)
     define_method association_name do
       association = object.class.reflect_on_association(association_name)
+      return if association_type(association) == :has_one && object.send(association_name) == nil
+
       check_association object, association_name, association
       decorator_class_name = decorator || decorator_class_name(class_name(association))
       if association_type(association).in? %i[has_many has_and_belongs_to_many]
         return associations_collection(object, association_name, decorator_class_name)
       end
-      return decorator_class_name.decorate object.send association_name if association_type(association) == :belongs_to
+      return decorator_class_name.decorate object.send association_name if association_type(association).in? [ :belongs_to, :has_one ]
     end
   end
 end

data/app/decorators/tramway/core/associations/object_helper.rb

@@ -36,6 +36,15 @@ module Tramway::Core::Associations::ObjectHelper
   end
 
   def add_association_form_class_name(object, association_name)
-    "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form".constantize
+    form_class = "Admin::#{object.class.to_s.pluralize}::Add#{association_name.to_s.camelize.singularize}Form"
+
+    begin
+      form_class.constantize
+    rescue
+      Tramway::Error.raise_error(
+        :tramway, :core, :associations, :object_helper, :habtm_add_class_not_defined,
+        class: form_class, association_name: association_name
+      )
+    end
   end
 end

data/app/models/tramway/core/application_record.rb

@@ -12,7 +12,7 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     state :removed
 
     event :remove do
-      transition active: :remove
+      transition active: :removed
     end
   end
 

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.1'
+    VERSION = '1.18.1.1'
   end
 end

data/lib/tramway/error.rb

@@ -21,6 +21,7 @@ class Tramway::Error < RuntimeError
     def raise_error(*coordinates, **options)
       @errors ||= YAML.load_file("#{Tramway::Core.root}/yaml/errors.yml").with_indifferent_access
       error = @errors.dig(*coordinates)
+      raise 'Error is not defined in YAML' unless error
       options.each do |pair|
         error.gsub!("%{#{pair[0]}}", pair[1].to_s)
       end

data/lib/yaml/errors.yml

@@ -29,6 +29,7 @@ tramway:
     associations:
       object_helper:
         please_specify_association_name: "Please, specify `%{association_name}` association class_name in %{object_class} model. For example: `has_many :%{association_name}, class_name: '%{association_class_name}'`"
+        habtm_add_class_not_defined: "You should define class `%{class}` to be able add and remove `%{association_name}`"
       class_helper:
         model_does_not_have_association: "Model %{object_class} does not have association named `%{association_name}`"
     application_decorator:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited