graph_starter 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ee67c9edb905bcbcaf00196df32fd59506342c
-  data.tar.gz: e47a621be011732358cbeff0dd1e446d59208997
+  metadata.gz: 0d2e2e8b0afb79a398d41320fef3cd0a88e96ee9
+  data.tar.gz: 0e289c3ba5e588e43e02786f50a3447fb05439e5
 SHA512:
-  metadata.gz: 7be608b9b5cce0023d3c25feca90fe866170f06f1fb465aff71b0c667a226909af149ba3a6b2ebaf03c86f710a2b04f4796941567406613d14bfb4c26494f092
-  data.tar.gz: bbe6be6272fd21abc23a747c796abc707e48713d136b72d0601bc802d251158d1ef77de7ead6dee71ee42b6658061d71dc6131cb27ded19f1472d9da74536a7e
+  metadata.gz: f5d3c17986542ec15587d12462990a11831df53bf7f45b13feb16e2f8b615ce000ee0c415309da03980e64ac9cd91a984dbe4ec0866cbfcd42c83c8eb8df0fa8
+  data.tar.gz: 52b261fcf39547777311d34722cbb485822af0cf228990303d9398698cc88149e3c8c04fe3fa1c736eea5068f80186d18582fa00f76b72c8a7df34724f4386af

data/app/assets/stylesheets/graph_starter/application.scss

@@ -49,3 +49,9 @@ body.graph_starter-assets-controller.show-action #right-column .items .content {
   width: 100%;
   overflow-wrap: break-word;
 }
+
+.cards .card .item .ui.avatar.image {
+  width: 1.7em;
+  height: 1.7em;
+  margin-left: -0.25em;
+}

data/app/controllers/graph_starter/application_controller.rb

@@ -6,25 +6,34 @@ module GraphStarter
     def load_session_node
       session.delete('this_key_should_never_exist') # Make sure we have a session
 
-      @session_node = Session.merge(session_id: session.id).tap do |session_node|
-        if current_user && session_node.user.nil?
-          session_node.user = current_user
-        end
+      @session_node_thread = Thread.new do
+        Session.merge(session_id: session.id).tap do |session_node|
+          if current_user && session_node.user.nil?
+            session_node.user = current_user
+          end
 
-        previous_session_id = session['previous_session_id']
-        if previous_session_id && previous_session_id != session.id
-          session_node.previous_session = Session.find_by(session_id: previous_session_id)
+          previous_session_id = session['previous_session_id']
+          if previous_session_id && previous_session_id != session.id
+            session_node.previous_session = Session.find_by(session_id: previous_session_id)
+          end
         end
       end
 
       session['previous_session_id'] = session.id
     end
 
+    def session_node
+      puts 'joining...'
+      @session_node_thread.join.value
+    end
+
     protected
 
     def model_class
       @model_slug = params[:model_slug]
       @model_slug.classify.constantize
+    rescue NameError
+      raise ActionController::RoutingError.new('Not Found')
     end
   end
 end

data/app/controllers/graph_starter/assets_controller.rb

@@ -8,10 +8,12 @@ module GraphStarter
       @assets = asset_set.to_a
       @title = model_class.name.tableize.humanize
 
-      @category_images = Asset.where(id: @assets.map(&:categories).flatten.map(&:id))
+      ids = @assets.map(&:categories).flatten.map(&:id)
+      @category_images = Asset.where(id: ids)
                           .query_as(:asset)
                           .match('(asset)-[:HAS_IMAGE]->(image:Image)')
                           .pluck('asset.uuid', :image)
+
       @category_images = Hash[*@category_images.flatten]
     end
 
@@ -39,28 +41,19 @@ module GraphStarter
       render json: {results: results_data}.to_json
     end
 
-    def require_model_class
-      # For cases where the route picked up more than it should have and we try to constantize something wrong
-      begin
-        model_class
-      rescue NameError
-        render text: 'Not found', status: :not_found
-        false
-      end
-
-    end
-
     def show
-      return if !require_model_class
-
       @asset = asset
       @title = @asset.title
 
       if @asset
-        View.record_view(@session_node,
-                         @asset,
-                         browser_string: request.env['HTTP_USER_AGENT'],
-                         ip_address: request.remote_ip)
+        # Don't wait
+        Thread.new do
+          View.record_view(session_node,
+                           @asset,
+                           browser_string: request.env['HTTP_USER_AGENT'],
+                           ip_address: request.remote_ip)
+          puts 'ending view thread'
+        end
       else
         render file: 'public/404.html', status: :not_found, layout: false
       end
@@ -93,8 +86,6 @@ module GraphStarter
     end
 
     def create
-      return if !require_model_class
-
       @asset = model_class.create(params[params[:model_slug].singularize])
 
       if @asset.persisted?
@@ -144,7 +135,9 @@ module GraphStarter
     end
 
     def asset
-      apply_associations(model_class_scope.as(:asset).where('asset.uuid = {id} OR asset.slug = {id}', id: params[:id])).to_a[0]
+      apply_associations(model_class_scope.as(:asset).where('asset.uuid = {id} OR asset.slug = {id}', id: params[:id])).to_a[0].tap do |asset|
+        raise ActionController::RoutingError.new('Asset not found') if asset.blank?
+      end
     end
 
     def asset_with_access_level
@@ -176,7 +169,7 @@ module GraphStarter
 
     def apply_associations(scope, var = :asset)
       if associations.present?
-        scope.query_as(var).with(var).proxy_as(model_class, var).with_associations(*associations)
+        scope.with_associations(*associations)
       else
         scope
       end

data/app/helpers/graph_starter/application_helper.rb

@@ -1,7 +1,9 @@
 module GraphStarter
   module ApplicationHelper
-    def asset_path(asset, options = {})
-      graph_starter.asset_path({id: asset.slug, model_slug: asset.class.model_slug}.merge(options))
+    def asset_path(asset)
+      # graph_starter.asset_path({id: asset.slug, model_slug: asset.class.model_slug}.merge(options))
+      # Switched to string for performance
+      "/#{asset.class.model_slug}/#{asset.slug}"
     end
 
     def engine_view(&b)
@@ -31,5 +33,20 @@ module GraphStarter
     def missing_image_tag
       @missing_image_tag ||= image_tag 'missing.png'
     end
+
+    # I know, right?
+    def asset_icon(asset, image = (image_unspecified = true; nil))
+      image_url = if !image_unspecified
+                    image.source.url if image.present?
+                  elsif (asset.class.has_images? || asset.class.has_image?) && asset.first_image_source_url.present?
+                    asset.first_image_source_url
+                  end
+
+      if image_url
+        image_tag image_url, class: 'ui avatar image'
+      else
+        content_tag :i, '', class: [asset.class.icon_class || 'folder', 'large', 'icon']
+      end
+    end
   end
 end

data/app/models/concerns/graph_starter/authorizable.rb

@@ -3,7 +3,7 @@ module GraphStarter
     extend ActiveSupport::Concern
 
     included do
-      property :private, type: ActiveAttr::Typecasting::Boolean, default: nil
+      property :private, default: nil
       validates :private, inclusion: {in: [true, false, nil]}
 
       if GraphStarter.configuration.user_class

data/app/models/graph_starter/asset.rb

@@ -190,10 +190,10 @@ module GraphStarter
       self.class.sanitize_title(title)
     end
 
+    SANITIZER = Rails::Html::WhiteListSanitizer.new
+    # Should probably save in the DB?
     def self.sanitize_title(title)
-      sanitizer = Rails::Html::WhiteListSanitizer.new
-
-      sanitizer.sanitize(title, tags: %w(b em i strong)).try(:html_safe)
+      SANITIZER.sanitize(title, tags: %w(b em i strong)).try(:html_safe)
     end
 
 
@@ -309,11 +309,11 @@ module GraphStarter
       user_label = user_class.mapped_label_name
 
       query_as(:source)
-        .match('source-[:HAS_CATEGORY]->(category:Category)<-[:HAS_CATEGORY]-(asset:Asset)')
+        .match('(source)-[:HAS_CATEGORY]->(category:Category)<-[:HAS_CATEGORY]-(asset:Asset)')
         .break
-        .optional_match("source<-[:CREATED]-(creator:#{user_label})-[:CREATED]->asset")
+        .optional_match("(source)<-[:CREATED]-(creator:#{user_label})-[:CREATED]->(asset)")
         .break
-        .optional_match("source<-[:VIEWED]-(viewer:#{user_label})-[:VIEWED]->asset")
+        .optional_match("(source)<-[:VIEWED]-(viewer:#{user_label})-[:VIEWED]->(asset)")
         .limit(5)
         .order('score DESC')
         .pluck(
@@ -336,12 +336,12 @@ module GraphStarter
         categories: categories # DEPRECATED
       }.tap do |result|
         result[:image_urls] = image_array.map(&:source_url) if image_array
-        result[:images] = images.map {|image| image.source.url } if self.class.has_images?
+        result[:images] = images.map {|image| image.source_url } if self.class.has_images?
         result[:image] = image.source_url if self.class.has_image? && image
 
         self.class.category_associations.each do |association_name|
           result[association_name] = send(association_name)
-          result[association_name].uniq! if result[association_name] && result[association_name].respond_to?(:to_a)
+          result[association_name].to_a.uniq! if result[association_name] && result[association_name].respond_to?(:to_a)
         end
       end
 
@@ -366,7 +366,7 @@ module GraphStarter
     end
 
     def self.model_slug
-      name.tableize
+      @model_slug ||= name.tableize
     end
 
     def self.properties
@@ -389,7 +389,7 @@ module GraphStarter
                                :asset, [:category]]
                             else
                               [all(:asset),
-                               :asset]
+                               :asset, []]
                             end
 
       ::GraphStarter::QueryAuthorizer.new(query, asset: GraphStarter.configuration.scope_filters[self.name.to_sym])
@@ -412,13 +412,13 @@ module GraphStarter
               .merge(model: {Model: {name: name}})
               .on_create_set(model: {private: false})
               .break
-              .merge('model-[:HAS_PROPERTY]->(property:Property {name: property_name})')
+              .merge('(model)-[:HAS_PROPERTY]->(property:Property {name: property_name})')
               .on_create_set(property: {private: false})
               .on_create_set('property.uuid = uuid, property.ruby_type = ruby_type')
               .with(:property)
 
       ::GraphStarter::Property # rubocop:disable Lint/Void
-      QueryAuthorizer.new(query).authorized_query(:property, user, [])
+      QueryAuthorizer.new(query).authorized_query(:property, [], user)
     end
 
     def self.property_name_and_uuid_and_ruby_type_query

data/app/models/graph_starter/image.rb

@@ -14,7 +14,8 @@ module GraphStarter
     validates_attachment_content_type :source, content_type: ['image/jpg', 'image/jpeg', 'image/png', 'image/gif']
 
     def source_url
-      source.present? ? source.url : original_url
+      default_style = GraphStarter.configuration.default_image_style
+      source.present? ? source.url(default_style) : original_url
     end
   end
 end

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

@@ -17,6 +17,6 @@
                 - Array(result).each do |object|
                   .item
                     .content
-                      = render partial: '/graph_starter/assets/icon', locals: {asset: object}
+                      = asset_icon object
                       = link_to object.title, asset_path(object)
 

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

@@ -17,9 +17,10 @@
       .ui.relaxed.divided.list
         - categories[0,2].each do |category|
           .item
-            = render partial: 'graph_starter/assets/icon', locals: {asset: category, image: (@category_images || {})[category.id]}
-            .content
-              = link_to category.safe_title, asset_path(category)
+            = asset_icon(category, (@category_images || {})[category.id])
+
+            .content = link_to category.safe_title, asset_path(category)
+
         - if categories.size > 2
           .item
             i.ellipsis.horizontal.large.icon

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

@@ -7,5 +7,4 @@
   - properties = model_class.properties
 
   .ui.link.cards
-    - asset_group.each do |asset|
-      = render partial: 'graph_starter/assets/card', locals: {asset: asset}
+    = render partial: 'graph_starter/assets/card', collection: asset_group, as: :asset

data/lib/graph_starter/configuration.rb

@@ -2,7 +2,7 @@ module GraphStarter
   class Configuration
     attr_writer :user_class
 
-    attr_accessor :menu_models, :icon_classes, :scope_filters, :editable_properties
+    attr_accessor :menu_models, :icon_classes, :scope_filters, :editable_properties, :default_image_style
 
     def initialize
       @icon_classes = {}

data/lib/graph_starter/query_authorizer.rb

@@ -89,9 +89,9 @@ module GraphStarter
     end
 
     def user_authorization_paths(variable, user_variable = :user)
-      ["#{variable}<-[#{variable}_created_rel:CREATED]-#{user_variable}",
-       "#{variable}<-[#{variable}_direct_access_rel:CAN_ACCESS]-#{user_variable}",
-       "#{variable}<-[#{variable}_indirect_can_access_rel:CAN_ACCESS]-(:Group)<-[:HAS_SUBGROUP*0..5]-(:Group)<-[:BELONGS_TO]-#{user_variable}"]
+      ["(#{variable})<-[#{variable}_created_rel:CREATED]-(#{user_variable})",
+       "(#{variable})<-[#{variable}_direct_access_rel:CAN_ACCESS]-(#{user_variable})",
+       "(#{variable})<-[#{variable}_indirect_can_access_rel:CAN_ACCESS]-(:Group)<-[:HAS_SUBGROUP*0..5]-(:Group)<-[:BELONGS_TO]-(#{user_variable})"]
     end
   end
 end

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.16.1"
+  VERSION = "0.16.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: neo4j
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: semantic-ui-sass
   requirement: !ruby/object:Gem::Requirement
@@ -196,9 +196,9 @@ files:
 - app/views/graph_starter/assets/_card.html.slim
 - app/views/graph_starter/assets/_cards.html.slim
 - app/views/graph_starter/assets/_extra_admin_buttons.html
+- app/views/graph_starter/assets/_extra_buttons.html
 - app/views/graph_starter/assets/_extra_card_content.html.slim
 - app/views/graph_starter/assets/_form.html.slim
-- app/views/graph_starter/assets/_icon.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

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

@@ -1,11 +0,0 @@
-- image_url = nil
-- if defined?(image)
-  - image_url = image.source.url if defined?(image) && image.present?
-- elsif (asset.class.has_images? || asset.class.has_image?) && asset.first_image_source_url.present?
-  - image_url = asset.first_image_source_url
-
-- if image_url
-  = image_tag image_url, class: 'ui avatar image'
-- else
-  i class="#{asset.class.icon_class || 'folder'} large icon"
-