graph_starter 0.12.5 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46724f458f7aaf3d0444f7f15b35252a61941ee6
-  data.tar.gz: 2a66cbb3406a49ba1064385932c94447ff7b28d3
+  metadata.gz: 8d1fa716435b1f5c2cbc5429b1dd9567651de86b
+  data.tar.gz: 4dd99e0d6f47c5d9591f2886060b199abf50a50f
 SHA512:
-  metadata.gz: 78c387e83a2e2f0971fa1090152bb866a16f9fe7d8ad0a312610a82de582830cd14cdefa38055b0ebe55bed9f1001380c16da67d72618f93de2234b132ff8250
-  data.tar.gz: 81b041fa06e79b9a0f3147ba97ce97e8aa923b07dadafcf2ed1c77cc334d8648c826362d5c54f00430f69f629e6f61826ce77c65cdcb55b36d5e731b015af271
+  metadata.gz: 8ad2a74e69e199ffdf7c32ca23fd2b8a0911f46ff47a74e49a36b5378aaaba3eab04bae3d7d9050cbbff99124c259290cf9492af6d8e444945ee84db36f32ddf
+  data.tar.gz: 1c54c2ae4913e699723a8b375be7b9a78aae8752458cbf7fff82e77d44521ab081f3f456b2b5ee1e289a15795acef8db3bc05c83fb912afbeedfb9c0183c37e5

data/app/controllers/graph_starter/assets_controller.rb

@@ -43,11 +43,7 @@ module GraphStarter
 
       scope = scope.limit(limit)
 
-      scope = if associations.present?
-                scope.query_as(var).with(var).proxy_as(model_class, var).with_associations(*associations)
-              else
-                scope
-              end
+      scope = apply_associations(scope, var)
 
       scope
     end
@@ -122,7 +118,7 @@ module GraphStarter
     end
 
     def asset
-      model_class_scope.where(uuid: params[:id]).to_a[0]
+      apply_associations(model_class_scope.where(uuid: params[:id])).to_a[0]
     end
 
     def asset_with_access_level
@@ -141,5 +137,23 @@ module GraphStarter
         model_class.all(var)
       end
     end
+
+    def associations
+      return @associations if @associations.present?
+
+      @associations = []
+      @associations << model_class.image_association
+      @associations += model_class.category_associations
+      @associations.compact!
+      @associations
+    end
+
+    def apply_associations(scope, var = :asset)
+      if associations.present?
+        scope.query_as(var).with(var).proxy_as(model_class, var).with_associations(*associations)
+      else
+        scope
+      end
+    end
   end
 end

data/app/helpers/graph_starter/application_helper.rb

@@ -27,5 +27,9 @@ module GraphStarter
     def app_user
       defined?(:current_user) ? current_user : nil
     end
+
+    def missing_image_tag
+      @missing_image_tag ||= image_tag 'missing'
+    end
   end
 end

data/app/models/graph_starter/asset.rb

@@ -263,16 +263,18 @@ module GraphStarter
       end
     end
 
-    def as_json(_options = {})
-      {self.class.model_slug =>
-        {id: id,
-         title: title,
-         name: title,
-         model_slug: self.class.model_slug}
-       }.tap do |result|
-         result[:images] = images.map {|image| image.source.url } if self.class.has_images?
-         result[:image] = image.source_url if self.class.has_image? && image
-       end
+    def as_json(options = {})
+      data = {
+        id: id,
+        title: title,
+        name: title,
+        model_slug: self.class.model_slug
+      }.tap do |result|
+        result[:images] = images.map {|image| image.source.url } if self.class.has_images?
+        result[:image] = image.source_url if self.class.has_image? && image
+      end
+
+      options[:root] ? {self.class.model_slug.singularize => data} : data
     end
 
     def views

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

@@ -9,7 +9,7 @@
       - if asset.first_image_source_url.present?
         = image_tag asset.first_image_source_url
       - else
-        = image_tag 'missing'
+        = missing_image_tag
   - categories = Array(asset.categories).sort_by(&:name)
   - if categories.present?
     .content

data/app/views/graph_starter/assets/show.json.jbuilder

@@ -0,0 +1,11 @@
+@asset.class.authorized_properties(current_user).each do |property|
+  json.set! property.name, @asset.read_attribute(property.name)
+end
+
+
+json.associations do
+  @asset.class.authorized_associations.each do |name, association|
+    json.set! name, @asset.send(name).to_a
+  end
+end
+

data/config/routes.rb

@@ -22,7 +22,7 @@ GraphStarter::Engine.routes.draw do
   get ':model_slug/new' => 'assets#new', as: :new_asset
   post ':model_slug' => 'assets#create', as: :create_asset
 
-  get ':model_slug/:id' => 'assets#show', as: :asset
+  get ':model_slug/:id(.:format)' => 'assets#show', as: :asset
   get ':model_slug/:id/edit' => 'assets#edit', as: :edit_asset
   put ':model_slug/:id/rate(/:new_rating)' => 'assets#rate', as: :rate_asset
   get ':model_slug/search/:query.json' => 'assets#search', as: :search_assets

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.12.5"
+  VERSION = "0.13.0"
 end

data/test/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    config.neo4j.include_root_in_json = false
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.13.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha
+        version: 6.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0.alpha
+        version: 6.0.0.rc
 - !ruby/object:Gem::Dependency
   name: semantic-ui-sass
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - app/views/graph_starter/assets/index.html.slim
 - app/views/graph_starter/assets/new.html.slim
 - app/views/graph_starter/assets/show.html.slim
+- app/views/graph_starter/assets/show.json.jbuilder
 - app/views/graph_starter/authorizables/show.json.jbuilder
 - app/views/graph_starter/authorizables/user_and_group_search.json.jbuilder
 - app/views/graph_starter/categories/show.html.slim