tramway-core 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3348ffc445ecc81aad1ca01f307174a84d0952c6a399aa261b5cf15a92a1c99a
-  data.tar.gz: 17aa3f015b0b0b405317abe2496980ccbb736439ba312e69609782fd6f9281b4
+  metadata.gz: '08d6ae73913d795796280bd95921fd183b9c5931ad108ead009b16b78989d5fe'
+  data.tar.gz: 750b88db7c70b119c282a0f59d6f67f3b5cd82f1a8783eab48aff5223095d5f7
 SHA512:
-  metadata.gz: b605c1f468816a86c3b8934deec966fe065a1d9bd422838fd5a93c4f7ae1759b244ac019853756a5821d678d7199aa41aedfe0984a5a11b056cedd7432d8b823
-  data.tar.gz: 9769196d88397cb81bf2c7562ff69259e2328eb9cda0a9d2d3a4112f229265f51c850f71382350a648370c2d6f2dc7959a01d4b8c5e436614810dc1354bfd86f
+  metadata.gz: 0b68b0b2247476b927ba050b4256926b9698453fbe38fb7eaa97d37c219da9f3307407c989c101746b254b7ccbf968599fb9446baf0c09472dc2464258dc70a5
+  data.tar.gz: d49b32f30fb6e1c33c6890c3aa610b2a1f93d32e71207622fb2e8b0b486a7296c553908f6cccc099b0d58701ab70f2f0bdddcdc69f6d62899c5ddad0cf70e186

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

@@ -51,15 +51,25 @@ class Tramway::Core::ApplicationDecorator
       @@decorated_associations << association_name
 
       define_method association_name do
-        class_name = object.class.reflect_on_association(association_name).options[:class_name]
-        unless class_name
-          error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: ("Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`"))
-          raise error.message
+        association = object.class.reflect_on_association(association_name)
+        class_name = if association.polymorphic?
+                       object.send(association_name).class
+                     else
+                       unless association.options[:class_name]
+                         error = Tramway::Error.new(plugin: :core, method: :decorate_association, message: ("Please, specify `#{association_name}` association class_name in #{object.class} model. For example: `has_many :#{association_name}, class_name: '#{association_name.to_s.singularize.camelize}'`"))
+                         raise error.message
+                       end
+                       association.options[:class_name]
+                     end
+        decorator_class_name = decorator || "#{class_name.to_s.singularize}Decorator".constantize
+        # FIXME rails has_many association don't have belongs_to? method... bullshit. Need PR to rails
+        if association.try :has_many?
+          object.send(association_name).active.map do |association_object|
+            decorator_class_name.decorate association_object
+          end
         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
+        if association.try :belongs_to?
+          decorator_class_name.decorate object.send association_name
         end
       end
     end
@@ -128,4 +138,7 @@ class Tramway::Core::ApplicationDecorator
   def object
     @object
   end
+
+  def association_class_name
+  end
 end 

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

@@ -32,6 +32,10 @@ module Tramway
             super attribute_name
           end
         end
+
+        def search_by(*attributes, **associations)
+          pg_search_scope :full_text_search, against: attributes, associated_against: associations
+        end
       end
 
       # FIXME detect inhertited locales

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.11.1'
+    VERSION = '1.11.2'
   end
 end

metadata

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