carload 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff22a6684193d3260d0c364a034f2e3fc5f41871
-  data.tar.gz: f4d5c92e4c6d469982c5582b217a5d6bfd6e8055
+  metadata.gz: f350dacce7aa957bd2c6af9782006929339f7491
+  data.tar.gz: 4b7e30376296ee3e46ee6fe6e2be768190cd8af7
 SHA512:
-  metadata.gz: 46ad15299795918e1e24bfbc17044083339316d844f5efdc2b6f74c2b9dcefb94e8d3a78fcda937d16e6d2c8686a64c55ea9fd02d99549d69e065f0737b414c5
-  data.tar.gz: 7a573e700e86417e212caa46ec9ed20d739bd7a7f755dc4b1c792b2f42aab4eb459c1a5ff5d80d42c36f78941a663b614115044f7fcde7b93265e27124720217
+  metadata.gz: 9400063af855689cf4f18789cd61c6c2138b878305fc9e5aec918c983fd2b7cefca0006d5ffbd8c39cd39c24a79feef7d1967524e4007aa4e57fc5b01f124bbd
+  data.tar.gz: 8c100d526f14dd09b6cb1ad3eb08c6b072df0490aee3518fe730686405a61855584b7520621c895c007711249159c662ac1228889e6e2288f052d51aeefcf2ef

data/app/helpers/carload/application_helper.rb

@@ -16,8 +16,8 @@ module Carload
       false
     end
 
-    def image? attribute_name
-      attribute_name.to_s =~ /image|logo|img/
+    def image? model_name, attribute_name
+      attribute_name.to_s =~ /image|logo|img/ or (Dashboard.model(model_name).attributes.images.include? attribute_name.to_sym rescue nil)
     end
 
     def associated_model_name model_name, attribute_name

data/app/helpers/carload/dashboard_helper.rb

@@ -35,7 +35,7 @@ module Carload
               placeholder: t('carload.placeholder.select', thing: t("activerecord.attributes.#{class_name}.#{label_attribute}"))
             }
           }
-      elsif needs_upload?(model_name, attribute_name) and image?(attribute_name)
+      elsif needs_upload?(model_name, attribute_name) and image?(model_name, attribute_name)
         upload_image form: form, image_name: attribute_name, width: 150, height: 150
       elsif options[:type] == :text
         form.input(attribute_name, label: raw(<<-EOT

data/lib/carload/engine.rb

@@ -63,16 +63,16 @@ module Carload
       # Reopen model classes to handle polymorphic association.
       Dashboard.models.each do |name, spec|
         spec.associations.values.select { |x| x[:reflection].options[:polymorphic] }.each do |association|
-          polymorphic_objects = []
-          association[:instance_models].each do |instance_model|
-            Dashboard.model(instance_model).klass.all.each do |object|
-              polymorphic_objects << ["#{object.class} - #{object.send(association[:choose_by])}", "#{object.id},#{object.class}"]
-            end
-          end
           spec.klass.class_eval do
             class_eval <<-RUBY
               def self.#{association[:reflection].name.to_s.pluralize}
-                #{polymorphic_objects}
+                polymorphic_objects = []
+                #{association[:instance_models]}.each do |instance_model|
+                  Dashboard.model(instance_model).klass.all.each do |object|
+                    polymorphic_objects << ["\#{object.class} - \#{object.send(:#{association[:choose_by]})}", "\#{object.id},\#{object.class}"]
+                  end
+                end
+                polymorphic_objects
               end
             RUBY
           end

data/lib/carload/model_spec.rb

@@ -53,7 +53,8 @@ module Carload
             @attributes[:permitted] << { :"#{reflection.delegate_reflection.name.to_s.singularize}_ids" => [] }
           end
         elsif reflection.options[:polymorphic]
-          ActiveRecord::Base.descendants.each do |_model|
+          Dir.glob("#{Rails.root}/app/models/*.rb").each do |filename|
+            _model = File.basename(filename).gsub('.rb', '').camelize.constantize rescue next
             next if _model.name == 'ApplicationRecord' or _model.name.underscore == @name.to_s
             _model.reflect_on_all_associations.each do |_reflection|
               next unless _reflection.options[:as] == reflection.name

data/lib/carload/version.rb

@@ -1,3 +1,3 @@
 module Carload
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/generators/carload/dash_generator.rb

@@ -8,7 +8,7 @@ module Carload
       # Process model once atime.
       model_specs = {}
       ActiveRecord::Base.descendants.each do |model| # Rails 5 can use ApplicationRecord.
-        next if model.name == 'ApplicationRecord' or model.name == 'PgSearch::Document'
+        next if ['ApplicationRecord', 'PgSearch::Document', 'ActsAsTaggableOn::Tagging', 'ActsAsTaggableOn::Tag'].include? model.name
         model_specs[model.name.underscore.to_sym] = ModelSpec.new model
       end
       model_name = file_name.to_sym
@@ -18,14 +18,18 @@ module Carload
         spec.associations.each do |name, association|
           next if association[:filtered]
           reflection = association[:reflection]
-          next if reflection.class ==
-          if reflection.options[:polymorphic]
-            attributes = association[:attributes]
-          elsif reflection.options[:class_name]
-            attributes = model_specs[reflection.options[:class_name].underscore.to_sym].attributes.permitted.select { |x| x.class != Hash }
-          else
-            attributes = model_specs[reflection.name.to_s.singularize.to_sym].attributes.permitted.select { |x| x.class != Hash }
+          begin
+            if reflection.options[:polymorphic]
+              attributes = association[:attributes]
+            elsif reflection.options[:class_name]
+              attributes = model_specs[reflection.options[:class_name].underscore&.to_sym].attributes.permitted.select { |x| x.class != Hash }
+            else
+              attributes = model_specs[reflection.name.to_s.singularize.to_sym].attributes.permitted.select { |x| x.class != Hash }
+            end
+          rescue
+            attributes = nil
           end
+          next unless attributes
           if attributes.size == 1
             association[:choose_by] = attributes.first
           else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carload
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Li Dong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails