tramway-core 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efdc4a5a5751cc69f9c125314d352f6130c001c606ecfab121ecef2b0399ae7f
-  data.tar.gz: 38b5a27d2cde376f3a5ec5b967f4c7ab2236f0c118e65bb2be537ab6452dfc6a
+  metadata.gz: a7a31d83fb7b26555a3b8576ca1b95e411be1b37cdf17a06fd799e2a07623201
+  data.tar.gz: 0f6f62ec9a9e36575747947c55932dedbab9292c77e05012d5dd66020f29aa8d
 SHA512:
-  metadata.gz: 6bef5ae0da8faec96f405f3563e750e0870e5d112a80910b3032b9b5cb766ab07713515cd6b2b4f7d2359cfff251e0cffa7acf9c357a28e071b021530edf6c84
-  data.tar.gz: 9605911b8fa87c42e09b495a096a0452305533fca3fa9957eda6e6840a88df1bed23bb0ff248511d020a59b58705074c7ba309a890373a0a4f7320f7ce1ae542
+  metadata.gz: 6d5166de9d1a332ccc120d027d6563c93fcbdbb499236bf01e8019add7cdb3900e72c3551a5c0761fcd0b0f1169b1511a24e5d1c13fa9149cc078bc4f0283b55
+  data.tar.gz: ffa7418423d002e5efb9809db865bdcd6132d92485968f79876ba729bcfc1f05d5c0ad41f1f2236e0c6e9c127b41e29b9f02ea7093a933e42249cc09b05d48d5

data/app/assets/stylesheets/tramway/core/application.sass

@@ -15,3 +15,6 @@
   cursor: pointer
   &:hover
     opacity: 0.8
+
+.circle
+  border-radius: 50%

data/app/decorators/tramway/core/application_decorator.rb

@@ -27,14 +27,20 @@ class Tramway::Core::ApplicationDecorator
       end
     end
 
-    def decorate_association(association_name)
+    def decorate_association(association_name, decorator: nil)
       @@decorated_associations ||= []
       @@decorated_associations << association_name
 
       define_method association_name do
         class_name = object.class.reflect_on_association(association_name).options[:class_name]
-        object.send(association_name).map do |association_object|
-          "#{class_name}Decorator".constantize.decorate association_object
+        #FIXME use error abstraction
+        unless class_name
+          raise "Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: 'ModelName'`"
+        end
+
+        object.send(association_name).active.map do |association_object|
+          decorator_class_name = decorator || "#{class_name.singularize}Decorator".constantize
+          decorator_class_name.decorate association_object
         end
       end
     end

data/app/forms/tramway/core/application_form.rb

@@ -5,13 +5,7 @@ module Tramway::Core
         @@model_class = object.class
         @@enumerized_attributes = object.class.enumerized_attributes
 
-        @@associations&.each do |association|
-          options = object.class.reflect_on_all_associations(:belongs_to).select do |a|
-            a.name == association.to_sym
-          end.first&.options
-          next unless options
-
-          class_name = options[:class_name].constantize
+        self.class.full_class_name_associations.each do |association, class_name|
           self.class.send(:define_method, "#{association}=") do |value|
             super class_name.find value
           end
@@ -40,6 +34,26 @@ module Tramway::Core
         @@associations ||= []
         @@associations << property
       end
+
+      def associations(*properties)
+        properties.each do |property|
+          association property
+        end
+      end
+
+      def full_class_name_associations
+        @@associations&.reduce({}) do |hash, association|
+          options = @@model_class.reflect_on_all_associations(:belongs_to).select do |a|
+            a.name == association.to_sym
+          end.first&.options
+          
+          options ? hash.merge!(association => options[:class_name].constantize) : hash
+        end
+      end
+
+      def full_class_name_association(association_name)
+        full_class_name_associations[association_name]
+      end
       
       def enumerized_attributes
         @@enumerized_attributes

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.6.3'
+    VERSION = '1.6.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails