graph_starter 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec68f902c939f0d9fa77a0bd809f7bd028306a4
-  data.tar.gz: 8f25eef0ecd140167da7192396ffbb35f6df2ce1
+  metadata.gz: 2e93b2fd5ab114bce65b7cd36d10356fcceb10d8
+  data.tar.gz: 6d1cb374a9e762c72dd1936fbee87713e73ae465
 SHA512:
-  metadata.gz: e953e46300491928880f94d64fde22b4668f9a086a977c927a320c02810f811f69100c2586b4313f9c568d274ae2d166087ca1b7a0ea844eb42763cff9aa2066
-  data.tar.gz: a7a320754fcbde4de9e04e5c4b04bd40e5d1206e402119cf52f51576a367b5af242345dcfb2c02ccc0808dcfa849b35214995b25ac809883da2c7774eec0594d
+  metadata.gz: c6a8a9430df7817c48146f63821a7dac8453f726205e53e34cc3dc64855eecc8c1281a250fa64ed06bb560f28b1dc5f9f75b08a4c10d91fddd172c8f0106ac14
+  data.tar.gz: 2fd86d7a0b3ad29214d240f0396f997f41da9a5058543e494931a67cedadeef0e2bde7b53d80f23c365ca8cca30516c8c80b757828b109406452e740ae8c5bda

data/app/models/graph_starter/asset.rb

@@ -156,8 +156,6 @@ module GraphStarter
 
     def self.body_property(property_name = nil)
       if property_name.nil?
-        body_property(default_name_property) if @body_property.nil?
-
         @body_property
       else
         fail "Cannot declare body_property twice" if @body_property.present?
@@ -176,7 +174,7 @@ module GraphStarter
         fail "No body_property defined for #{self.name}!"
       end
 
-      body_property || 'body'
+      @body_property
     end
 
 
@@ -210,11 +208,13 @@ module GraphStarter
 
         send(method_name)
       elsif method_name.to_sym == :body
-        self.class.send(:define_method, method_name) do
-          read_attribute(self.class.body_property)
-        end
+        if self.class.body_property
+          self.class.send(:define_method, method_name) do
+            read_attribute(self.class.body_property)
+          end
 
-        send(method_name)
+          send(method_name)
+        end
       else
         super
       end
@@ -363,7 +363,7 @@ module GraphStarter
     end
 
     def self.authorized_associations
-      associations.except(*Asset.associations.keys + [:images, :image])
+      @authorized_associations ||= associations.except(*Asset.associations.keys + [:images, :image])
     end
 
     def self.icon_class

data/app/presenters/graph_starter/asset_presenter.rb

@@ -13,11 +13,27 @@ module GraphStarter
     end
 
     def left_sidebar_exists?
-      @left_sidebar_exists ||= asset.class.authorized_associations.size > 2
+      @left_sidebar_exists ||= authorized_associations.size > 4
     end
 
     def main_column_exists?
-      @main_column_exists ||= ((asset.class.has_images? || asset.class.has_image?) && asset.image_array.present?) || asset.body.present?
+      @main_column_exists ||= images_present? || body_present? || associations_in_body?
+    end
+
+    def images_present?
+      @images_present ||= ((asset.class.has_images? || asset.class.has_image?) && asset.image_array.present?)
+    end
+
+    def body_present?
+      @body_present ||= asset.body.present?
+    end
+
+    def associations_in_body?
+      @associations_in_body ||= !images_present? && !body_present? && authorized_associations.size > 0
+    end
+
+    def authorized_associations
+      @authorized_associations ||= asset.class.authorized_associations
     end
   end
 end

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

@@ -0,0 +1,21 @@
+- as_cards = false if !defined?(as_cards)
+
+- asset.class.authorized_associations.each do |name, association|
+  - result = asset.send(name)
+  - if result.present?
+    .item
+      .content
+        .ui.horizontal.divider = name.to_s.humanize
+        .description
+          - if as_cards
+            .ui.link.cards
+              - Array(result).each do |object|
+                = render partial: 'card', locals: {asset: object}
+          - else
+            .ui.middle.aligned.big.divided.list
+              - Array(result).each do |object|
+                .item
+                  i class="#{association.target_class.icon_class} icon"
+                  .content
+                    = link_to object.title, asset_path(object)
+

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

@@ -0,0 +1,30 @@
+.card
+  .content
+    - if asset.private?
+      .right.floated.meta
+        i.hide.large.red.icon
+    .header = link_to asset.safe_title, asset_path(asset)
+  - if asset.class.has_images? || asset.class.has_image?
+    .image
+      - if asset.first_image_source_url.present?
+        = image_tag asset.first_image_source_url
+      - else
+        = image_tag 'missing'
+  - categories = Array(asset.categories).sort_by(&:name)
+  - if categories.present?
+    .content
+      .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/app/views/graph_starter/assets/_cards.html.slim

@@ -8,32 +8,4 @@
 
   .ui.link.cards
     - asset_group.each do |asset|
-      .card
-        .content
-          - if asset.private?
-            .right.floated.meta
-              i.hide.large.red.icon
-          .header = link_to asset.safe_title, asset_path(asset)
-        - if asset.class.has_images? || asset.class.has_image?
-          .image
-            - if asset.first_image_source_url.present?
-              = image_tag asset.first_image_source_url
-            - else
-              = image_tag 'missing'
-        - categories = Array(asset.categories).sort_by(&:name)
-        - if categories.present?
-          .content
-            .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
-
+      = render partial: 'card', locals: {asset: asset}

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

@@ -18,6 +18,8 @@
         = render partial: 'graph_starter/properties/property', locals: {property: property, asset: @asset, form: f, can_write: can_write}
 
   - @asset.class.authorized_associations.each do |name, association|
+    - target_class = association.target_class
+    - next if !target_class.is_a?(GraphStarter::Asset)
     javascript:
       var current_#{name} = [];
 
@@ -25,7 +27,6 @@
       label = name.to_s.humanize
 
       - field_name = (association.type == :has_many ? "#{name.to_s.singularize}_ids" : "#{name}_id")
-      - target_class = association.target_class
       - options = target_class.as(:n).pluck(target_class.name_property, target_class.id_property_name)
 
       - html_options = {class: 'ui fluid search dropdown'}

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

@@ -0,0 +1,11 @@
+- recommendations = asset.secret_sauce_recommendations
+- if recommendations.present?
+  .item
+    .content
+      .ui.horizontal.divider Recommended
+      .description
+        .ui.middle.aligned.big.divided.list
+          - recommendations.each do |recommendation|
+            .item data-score="#{recommendation.score}"
+              .content = link_to recommendation.asset.title, asset_path(recommendation.asset)
+

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

@@ -18,14 +18,20 @@ javascript:
 
     - if asset_presenter.main_column_exists?
       div class="#{center_width} wide column"
-        = render_body(@asset, @model_slug)
+        - if asset_presenter.associations_in_body?
+          = render partial: 'associations', locals: {asset: @asset, as_cards: true}
+        - else
+          = render_body(@asset, @model_slug)
 
     div class="#{right_width} wide column" id="right-column"
       - if app_user_is_admin?
         = render partial: 'admin_buttons', locals: {asset: @asset}
 
       - if !asset_presenter.left_sidebar_exists?
-        = render partial: 'dynamic_items', locals: {asset: @asset}
+        .ui.items
+          - if !asset_presenter.associations_in_body?
+            = render partial: 'associations', locals: {asset: @asset}
+          = render partial: 'recommendations', locals: {asset: @asset}
 
       = render partial: 'property_items', locals: {asset: @asset}
 

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Brian Underwood
@@ -135,12 +135,14 @@ files:
 - app/presenters/graph_starter/asset_presenter.rb
 - app/views/graph_starter/assets/TODO.md
 - app/views/graph_starter/assets/_admin_buttons.html.slim
+- app/views/graph_starter/assets/_associations.html.slim
 - app/views/graph_starter/assets/_body.html.slim
+- app/views/graph_starter/assets/_card.html.slim
 - app/views/graph_starter/assets/_cards.html.slim
-- app/views/graph_starter/assets/_dynamic_items.html.slim
 - app/views/graph_starter/assets/_form.html.slim
 - app/views/graph_starter/assets/_images.html.slim
 - app/views/graph_starter/assets/_property_items.html.slim
+- app/views/graph_starter/assets/_recommendations.html.slim
 - app/views/graph_starter/assets/_search.html.slim
 - app/views/graph_starter/assets/edit.html.slim
 - app/views/graph_starter/assets/home.html.slim

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

@@ -1,48 +0,0 @@
-.ui.items
-  .item
-    .ui.statistic
-      .label
-        | Total Views
-      .value
-        = asset.total_view_count || 0
-
-    .ui.statistic
-      .label
-        | Unique Views
-      .value
-        = asset.unique_view_count || 0
-
-
-
-  - asset.class.authorized_associations.each do |name, association|
-    - result = asset.send(name)
-    - if result.present?
-      .item
-        .content
-          .ui.horizontal.divider = name.to_s.humanize
-          .description
-            - case association.type
-            - when :has_one
-              - object = result
-              i class="#{association.target_class.icon_class} icon"
-              = link_to object.title, asset_path(object)
-            - when :has_many
-              .ui.middle.aligned.big.divided.list
-                - result.each do |object|
-                  .item
-                    i class="#{association.target_class.icon_class} icon"
-                    .content
-                      = link_to object.title, asset_path(object)
-
-  - recommendations = asset.secret_sauce_recommendations
-  - if recommendations.present?
-    .item
-      .content
-        .ui.horizontal.divider Recommended
-        .description
-          .ui.middle.aligned.big.divided.list
-            - recommendations.each do |recommendation|
-              .item data-score="#{recommendation.score}"
-                .content = link_to recommendation.asset.title, asset_path(recommendation.asset)
-
-