graph_starter 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d8931782640148547bdcff51e7b45db7cefd99
-  data.tar.gz: d61edf2f01857f3288679b85be49116b00381e57
+  metadata.gz: 53c9a32b3cbb8e38d7fe5f4c22d8527467e0b7f4
+  data.tar.gz: 6f14b707978baa388f539620d7fc6777c38d9948
 SHA512:
-  metadata.gz: 5c89014834ba89fc372b9fbfb6ebab6d47d13a7427a6eb6d92bb9f4a8533fe7ba3d37848a8f302010f57cc1ca15578142c6b69c8c50b2808ffce345177c7122d
-  data.tar.gz: a8f709580f59a75d6f3145e673d50a0e4eb855cf869dfe8a5001f825277277ca9f9865f93b3adcf914fb084d1075db4edb75a375612c062ba497ddb42733d56e
+  metadata.gz: 2ad7fed5e72ffe6f2f494534cc818c73d9cc3dfe50ec78c04dcb34d27344282ed186bd5f813662ecce92dde31fdfad36ca5329b1cac4ea4b9803ab79091af7ac
+  data.tar.gz: 55fe1204a0e1a7dad5d32b1a07bc936eb93981da47b1771e531e9974bc1f32adbd47f673a8de6bd4398590046b854a2d4057ec9203d3ed160a5f44833778824e

data/app/controllers/graph_starter/assets_controller.rb

@@ -35,7 +35,7 @@ module GraphStarter
     def asset_set(var = :asset, limit = 50)
       associations = []
       associations << model_class.image_association
-      associations << model_class.category_association
+      associations += model_class.category_associations
       associations.compact!
 
       scope = model_class_scope(var)

data/app/models/graph_starter/asset.rb

@@ -68,20 +68,24 @@ module GraphStarter
       first_image && first_image.source_url
     end 
 
-    def self.category_association(association_name = nil)
-      if association_name.nil?
-        @category_association
+    def self.category_associations(*association_names)
+      if association_names.empty?
+        @category_associations || []
       else
-        fail "Cannot declare category_association twice" if @category_association.present?
-        name = association_name.to_sym
-        fail ArgumentError, "Association #{name} is not defined" if associations[name].nil?
-        @category_association = name
+        fail "Cannot declare category_associations twice" if @category_associations.present?
+        names = association_names.map(&:to_sym)
+        bad_names = names.select {|name| associations[name].nil? }
+        fail ArgumentError, "Associations #{bad_names.join(', ')} is not defined" if !bad_names.empty?
+
+        @category_associations = names
       end
     end
 
     def categories
-      if self.class.category_association
-        send(self.class.category_association)
+      if self.class.category_associations
+        self.class.category_associations.flat_map do |category_association|
+          send(category_association)
+        end.compact
       else
         []
       end

data/app/views/graph_starter/assets/_cards.html.slim

@@ -23,15 +23,17 @@
         - categories = Array(asset.categories).sort_by(&:name)
         - if categories.present?
           .content
-            - categories[0,2].each do |category|
-              .extra.content
-                - if (category.class.has_images? || category.class.has_image?) && category.first_image_source_url.present?
-                  = image_tag category.first_image_source_url, class: 'ui avatar image'
-                - else
-                  i class="#{category.class.icon_class || 'folder'} icon"
-                = link_to category.name, asset_path(category)
-            - if categories.size > 2
-              .extra.content
-                i.ellipsis.horizontal.icon
-                | more categories
+            .ui.relaxed.divided.list
+              - categories[0,2].each do |category|
+                .item
+                  - if (category.class.has_images? || category.class.has_image?) && category.first_image_source_url.present?
+                    = image_tag category.first_image_source_url, class: 'ui avatar image'
+                  - else
+                    i class="#{category.class.icon_class || 'folder'} large icon"
+                  .content
+                    = link_to category.name, asset_path(category)
+              - if categories.size > 2
+                .item
+                  i.ellipsis.horizontal.large.icon
+                  .content more categories
 

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails