graph_starter 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47a9f8cc99f25f8bd774204ee058e875ae59796e
-  data.tar.gz: 7c764770c6b64a5f5a0df814930489a013846a94
+  metadata.gz: 0ec68f902c939f0d9fa77a0bd809f7bd028306a4
+  data.tar.gz: 8f25eef0ecd140167da7192396ffbb35f6df2ce1
 SHA512:
-  metadata.gz: 3851899c4e50fe3eed296ae8de286ea594ba6d2f311d9f4d6068771ef2944da7d3684c2f14a01fd002ccb8342ce5558b8fa392f5fb004ded4bc9a5d0b646ff4c
-  data.tar.gz: d50223200f167ab6b991c16a9a7f89c8981218cf5e80f04ab31897141dd0ae7d8abd347a428a69333be53255fb5baa58c9d3b5918efb561b06aea9142d52b7be
+  metadata.gz: e953e46300491928880f94d64fde22b4668f9a086a977c927a320c02810f811f69100c2586b4313f9c568d274ae2d166087ca1b7a0ea844eb42763cff9aa2066
+  data.tar.gz: a7a320754fcbde4de9e04e5c4b04bd40e5d1206e402119cf52f51576a367b5af242345dcfb2c02ccc0808dcfa849b35214995b25ac809883da2c7774eec0594d

data/app/assets/javascripts/graph_starter/application.coffee.erb

@@ -2,8 +2,6 @@
 #= require jquery_ujs
 #= require turbolinks
 #= require graph_starter/underscore
-#= require graph_starter/ember
-#= require graph_starter/ember-template-compiler
 #= require semantic-ui
 
 

data/app/models/graph_starter/asset.rb

@@ -304,12 +304,16 @@ module GraphStarter
       require 'graph_starter/query_authorizer'
 
       query, associations = if category_associations.size > 0
-                              where_clause = category_associations.map do |association_name|
+                              query = all(:asset).query
+
+                              query = category_associations.each_with_index.inject(query) do |query, (association_name, i)|
                                 category_association = self.associations[association_name]
-                                "(asset)#{category_association.arrow_cypher}(category:#{category_association.target_class})"
-                              end.join(' OR ')
+                                clause = "(asset)#{category_association.arrow_cypher}(category:#{category_association.target_class})"
+
+                                query.optional_match(clause).with(:asset, "#{"categories#{i-1} +" if i > 0} collect(category) AS categories#{i}")
+                              end.unwind(category: "categories#{category_associations.size - 1}")
 
-                              [all(:asset).query.optional_match(:category).where(where_clause),
+                              [query,
                                [:asset, :category]]
                             else
                               [all(:asset),

data/app/views/layouts/graph_starter/_change_permissions_modal.html.slim

@@ -26,7 +26,7 @@ script type="text/x-handlebars"
                       th colspan="3"
                         h2
                           i class="#{result_type == 'user' ? 'user' : 'users'} icon"
-                          = result_type.humanize.pluralize                         
+                          = result_type.humanize.pluralize
                     | {{#each #{result_type}_results as |result|}}
                     tr
                       td

data/app/views/layouts/graph_starter/application.html.slim

@@ -40,8 +40,8 @@ html
 
       = yield
 
-    - if @current_user_is_admin
+    /- if @current_user_is_admin
       #change-object-permissions
 
-      - if !request.env['HTTP_X_XHR_REFERER']
+      /- if !request.env['HTTP_X_XHR_REFERER']
         = render partial: 'layouts/graph_starter/change_permissions_modal', locals: {asset: @asset}

data/lib/graph_starter/version.rb

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

metadata

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