graph_starter 0.15.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846d2b3c24ae439f3e2431a4cfc1662fdf320f47
-  data.tar.gz: 7d0bb849a37a60e4c77f5318288ee82282fecc5e
+  metadata.gz: 62e9a2ebc655144abef8886b72a43477b9c93ec5
+  data.tar.gz: 9e40816fa0f5026366513ed85a34932595c9afc5
 SHA512:
-  metadata.gz: 1f27817808730ca4c850a96bd5551d843b9fadb1be1d2c76de88dccce7e09da1701d6aa6c891e30aa631fd426a84418a3373bade7fe92481630ee73d31984de9
-  data.tar.gz: f58a50e1a8dd9b1749c76123d71c647db8c33d3f1fb6b69de20ed6f80dad8ebe875aa38b6729f1dc79e773b8b638075c0bcfc0a9286799114f87ddc5b3d66b1e
+  metadata.gz: 021ca13a9adbd7dab7651a9b2a3aebc75ff7e29284f505f620a1b58ad57cd44698008b32a98737e2a8efe7f46505f1fbb003d08bc70d152d89a0e7eb7acd97fa
+  data.tar.gz: 4d2a06c175bd8e901479b301b0618bed55bc23fc07025d911aa9ecec57a571dff25dd271a40a831ef209fd9ebb1ff2b884af74e4596ba80156ee3d515e16f0a4

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

@@ -29,6 +29,13 @@ ready = ->
   $('.message > .close').on 'click', ->
     $(@).closest('.message').transition('fade')
 
+
+  # Make sure page is in the right place when an anchor is clicked
+  # See: https://github.com/twbs/bootstrap/issues/1768
+  shiftWindow = -> scrollBy(0, -50)
+  shiftWindow() if location.hash
+  window.addEventListener('hashchange', shiftWindow)
+
 $(document).ready ready
 $(document).on 'page:load', ready
 

data/app/controllers/graph_starter/assets_controller.rb

@@ -6,6 +6,7 @@ module GraphStarter
     def index
       @all_assets = asset_set(:asset, nil)
       @assets = asset_set.to_a
+      @title = model_class.name.tableize.humanize
 
       @category_images = Asset.where(id: @assets.map(&:categories).flatten.map(&:id))
                           .query_as(:asset)
@@ -38,15 +39,22 @@ module GraphStarter
       render json: {results: results_data}.to_json
     end
 
-    def show
+    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
-        return render text: 'Not found', status: :not_found
+        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,
@@ -60,6 +68,7 @@ module GraphStarter
 
     def edit
       @asset, @access_level = asset_with_access_level
+      @title = @asset.title.to_s + ' - Edit'
 
       render file: 'public/404.html', status: :not_found, layout: false if !@asset
     end
@@ -68,10 +77,12 @@ module GraphStarter
       @asset = asset
       @asset.update(params[params[:model_slug].singularize])
 
-      if @asset.class.has_image?
-        @asset.image = Image.create(source: params[:image])
-      elsif @asset.class.has_images?
-        @asset.images << Image.create(source: params[:image])
+      if params[:image].present?
+        if @asset.class.has_image?
+          @asset.image = Image.create(source: params[:image])
+        elsif @asset.class.has_images?
+          @asset.images << Image.create(source: params[:image])
+        end
       end
 
       redirect_to action: :edit
@@ -82,6 +93,8 @@ module GraphStarter
     end
 
     def create
+      return if !require_model_class
+
       @asset = model_class.create(params[params[:model_slug].singularize])
 
       if @asset.persisted?
@@ -120,6 +133,7 @@ module GraphStarter
       associations.compact!
 
       scope = model_class_scope(var)
+      scope = scope.for_category(var, params[:category]) if params[:category].present?
       scope = yield scope if block_given?
 
       scope = scope.limit(limit)
@@ -130,7 +144,7 @@ module GraphStarter
     end
 
     def asset
-      apply_associations(model_class_scope.where(uuid: 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]
     end
 
     def asset_with_access_level

data/app/controllers/graph_starter/categories_controller.rb

@@ -1,79 +1,21 @@
 module GraphStarter
   class CategoriesController < ApplicationController
-    before_action :set_category, only: [:show, :edit, :update, :destroy]
-
-    # GET /categories
-    # GET /categories.json
-    def index
-      @categories = Category.all
-    end
-
-    # GET /categories/1
-    # GET /categories/1.json
     def show
-    end
-
-    # GET /categories/new
-    def new
-      @category = Category.new
-    end
-
-    # GET /categories/1/edit
-    def edit
-    end
-
-    # POST /categories
-    # POST /categories.json
-    def create
-      @category = Category.new(category_params)
-
-      respond_to do |format|
-        if @category.save
-          format.html { redirect_to @category, notice: 'Category was successfully created.' }
-          format.json { render :show, status: :created, location: @category }
-        else
-          format.html { render :new }
-          format.json { render json: @category.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    # PATCH/PUT /categories/1
-    # PATCH/PUT /categories/1.json
-    def update
-      respond_to do |format|
-        if @category.update(category_params)
-          format.html { redirect_to @category, notice: 'Category was successfully updated.' }
-          format.json { render :show, status: :ok, location: @category }
-        else
-          format.html { render :edit }
-          format.json { render json: @category.errors, status: :unprocessable_entity }
-        end
-      end
-    end
+      @category = category
 
-    # DELETE /categories/1
-    # DELETE /categories/1.json
-    def destroy
-      @category.destroy
-      respond_to do |format|
-        format.html do
-          redirect_to categories_url, notice: 'Category was successfully destroyed.'
-        end
-        format.json { head :no_content }
-      end
+      render json: @category
     end
 
     private
 
     # Use callbacks to share common setup or constraints between actions.
-    def set_category
-      @category = Category.find(params[:id])
+    def category
+      Asset.find_by(slug: slug)
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
-    def category_params
-      params[:category]
+    def slug
+      params.require(:slug)
     end
   end
 end

data/app/helpers/graph_starter/application_helper.rb

@@ -1,7 +1,7 @@
 module GraphStarter
   module ApplicationHelper
     def asset_path(asset, options = {})
-      graph_starter.asset_path({id: asset, model_slug: asset.class.model_slug}.merge(options))
+      graph_starter.asset_path({id: asset.slug, model_slug: asset.class.model_slug}.merge(options))
     end
 
     def engine_view(&b)

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

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

data/app/models/graph_starter/asset.rb

@@ -12,30 +12,34 @@ module GraphStarter
 
     property :summary
 
-
-    # This is doing something strange, commenting out for now...
-    # def self.inherited(subclass)
-    #   subclass.property :slug
-    #   subclass.before_validation :place_slug
-    #   subclass.validates :slug, presence: true
-    #   subclass.constraint :slug, type: :unique
-    # end
+    property :slug
+    before_validation :place_slug
+    validates :slug, presence: true, uniqueness: true
+    constraint :slug, type: :unique
 
     def place_slug
       return if self.slug.present?
 
-      name_value = read_attribute(self.class.name_property)
-      self.slug = self.class.unique_slug_from(name_value)
-        name_value.to_slug.normalize.to_s if name_value
+      self.slug = self.class.unique_slug_from(safe_title)
     end
 
     def self.unique_slug_from(string)
-      base = string.to_slug.normalize.to_s
+      if string.present?
+        slug = string.to_slug.normalize.to_s
+        while where(slug: slug).count > 0
+          if slug.match(/-\d+$/)
+            slug.gsub!(/-(\d+)$/) { "-#{$1.to_i + 1}" }
+          else
+            slug += '-2'
+          end
+        end
+        slug
+      end
     end
 
 
     if GraphStarter.configuration.user_class
-      #has_many :in, :creators, type: :CREATED, model_class: GraphStarter.configuration.user_class
+      has_many :in, :creators, type: :CREATED, model_class: GraphStarter.configuration.user_class
 
       has_many :in, :viewer_sessions, rel_class: :'GraphStarter::View', model_class: 'GraphStarter::Session'
 
@@ -115,6 +119,17 @@ module GraphStarter
     end
 
 
+    def self.for_category(node_var, category_slug)
+      string = category_associations.map do |association_name|
+        association = GraphGist.associations[association_name]
+
+        "(#{node_var}#{association.arrow_cypher}(:#{association.target_class.mapped_label_name} {slug: {category_slug}}))"
+      end.join(' OR ')
+
+      all.where(string, category_slug: category_slug)
+    end
+
+
     def self.enumerable_property(property_name, values)
       fail "values needs to be an Array, was #{values.inspect}" if !values.is_a?(Array)
 
@@ -219,6 +234,25 @@ module GraphStarter
     end
 
 
+    def self.hidden_json_properties(*property_names)
+      if property_names.empty?
+        @hidden_json_properties || []
+      else
+        @hidden_json_properties = property_names.map(&:to_sym)
+      end
+    end
+
+
+    def self.json_methods(*method_names)
+      if method_names.empty?
+        @json_methods || []
+      else
+        @json_methods = method_names.map(&:to_sym)
+      end
+    end
+
+
+
     def rating_level_for(user)
       rating = rating_for(user)
       rating && rating.level
@@ -296,13 +330,19 @@ module GraphStarter
         id: id,
         title: title,
         name: title,
+        slug: slug,
         model_slug: self.class.model_slug,
         summary: summary,
-        categories: categories
+        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[: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)
+        end
       end
 
       options[:root] ? {self.class.model_slug.singularize => data} : data
@@ -336,7 +376,7 @@ module GraphStarter
     def self.authorized_for(user)
       require 'graph_starter/query_authorizer'
 
-      query, associations = if category_associations.size > 0
+      query, var, sec_var = if category_associations.size > 0
                               query = all(:asset).query
 
                               category_associations
@@ -346,14 +386,14 @@ module GraphStarter
                               query = query.optional_match("(asset)-[:#{relationship_types_cypher}]-(category:Asset)")
 
                               [query,
-                               [:asset, :category]]
+                               :asset, [:category]]
                             else
                               [all(:asset),
                                :asset]
                             end
 
       ::GraphStarter::QueryAuthorizer.new(query, asset: GraphStarter.configuration.scope_filters[self.name.to_sym])
-        .authorized_query(associations, user)
+        .authorized_query(var, sec_var, user)
         .with('DISTINCT asset AS asset, level')
         .break
         .proxy_as(self, :asset)

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

@@ -11,8 +11,9 @@
 
   .ui.divider
 
-  a.ui.labeled.icon.red.button.right.floated href="#{graph_starter.destroy_asset_path(id: asset)}"
-    i.delete.icon
-    | Delete
+  .ui.buttons
+    a.ui.labeled.icon.red.button.right.floated href="#{graph_starter.destroy_asset_path(id: asset)}"
+      i.delete.icon
+      | Delete
 
 

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

@@ -1,21 +1,22 @@
 - 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: '/graph_starter/assets/card', locals: {asset: object}
-          - else
-            .ui.middle.aligned.big.divided.list
-              - Array(result).each do |object|
-                .item
-                  .content
-                    = render partial: '/graph_starter/assets/icon', locals: {asset: object}
-                    = link_to object.title, asset_path(object)
+  - if association.target_class.ancestors.include?(GraphStarter::Asset)
+    - 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: '/graph_starter/assets/card', locals: {asset: object}
+            - else
+              .ui.middle.aligned.big.divided.list
+                - Array(result).each do |object|
+                  .item
+                    .content
+                      = render partial: '/graph_starter/assets/icon', locals: {asset: object}
+                      = link_to object.title, asset_path(object)
 

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

@@ -7,6 +7,11 @@
 
       = file_field_tag 'image'
 
+  .field
+    label Summary
+
+    = f.text_area :summary
+
   - @asset.class.authorized_properties_and_levels(current_user).each do |property, level|
     .field
       - editable_properties = GraphStarter.configuration.editable_properties[@asset.class.name.to_sym]

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

@@ -0,0 +1 @@
+json.array! @assets

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

@@ -26,6 +26,7 @@ javascript:
     div class="#{right_width} wide column" id="right-column"
       - if app_user_is_admin?
         = render partial: '/graph_starter/assets/admin_buttons', locals: {asset: @asset}
+        = render partial: '/graph_starter/assets/extra_admin_buttons', locals: {asset: @asset}
 
       - if !asset_presenter.left_sidebar_exists?
         .ui.items

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

@@ -1,25 +1,29 @@
 @asset.class.authorized_properties(current_user).each do |property|
+  next if @asset.class.hidden_json_properties.include?(property.name.to_sym)
+
   json.set! property.name, @asset.read_attribute(property.name)
 end
 
+@asset.class.json_methods.each do |method_name|
+  json.set! method_name, @asset.send(method_name)
+end
+
 json.summary @asset.summary
 
 json.image_urls @asset.reload.image_array.map(&:source_url)
 
 json.categories @asset.categories
 
-json.associations do
-  @asset.class.authorized_associations.each do |name, association|
-    value = case association.type
-            when :has_many
-              @asset.send(name).to_a
-            when :has_one
-              @asset.send(name)
-            else
-              fail "Invalid association: #{association.inspect}"
-            end
-
-    json.set! name, value
-  end
+@asset.class.authorized_associations.each do |name, association|
+  value = case association.type
+          when :has_many
+            @asset.send(name).to_a
+          when :has_one
+            @asset.send(name)
+          else
+            fail "Invalid association: #{association.inspect}"
+          end
+
+  json.set! name, value
 end
 

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

@@ -5,7 +5,8 @@ doctype html
 html
 
   head
-    title = @title || Rails.application.class.to_s.split("::").first.tableize.singularize.humanize
+    - app_name = Rails.application.class.to_s.split("::").first.tableize.singularize.humanize
+    title = @title ? "#{@title} - #{app_name}" : app_name
     = stylesheet_link_tag    'graph_starter/application', media: 'all', 'data-turbolinks-track' => true
 
     = render partial: 'layouts/graph_starter/twitter_meta_tags'
@@ -29,7 +30,7 @@ html
 
     = render partial: 'layouts/graph_starter/menu'
 
-    #main.ui.container
+    #main class="#{@no_ui_container ? '' : 'ui container'}"
       - if notice.present?
         p.ui.green.message
           i.close.icon

data/config/routes.rb

@@ -3,7 +3,8 @@ GraphStarter::Engine.routes.draw do
 
   root 'assets#home'
 
-  resources :categories
+  get 'categories/:slug(.:format)' => 'categories#show'
+
   resources :groups do
     member do
       get :users_to_add

data/lib/graph_starter/query_authorizer.rb

@@ -12,23 +12,25 @@ module GraphStarter
     end
 
     def authorized_pluck(variable, user)
-      authorized_query(variable, user).pluck(variable)
+      authorized_query(variable, [], user).pluck(variable)
     end
 
-    def authorized_query(variables, user)
-      variables = Array(variables)
+    def authorized_query(variable, secondary_variables, user)
+      result_query = query.with(variable, *secondary_variables)
 
-      result_query = query.with(*variables)
+      result_query = authorized_user_query(result_query, user, variable, secondary_variables)
 
-      result_query = authorized_user_query(result_query, user, variables)
+      # result_query.print_cypher
+      # puts result_query.pluck('*').inspect
+
+      list_variables = secondary_variables.map { |variable| "#{variable}_list" }
 
       # Collapse 2D array of all possible levels into one column of levels
       result_query
-        .unwind(level_collection: :level_collections)
+        .where_not("'denied' IN level_collection")
         .unwind(level: :level_collection).break
-        .with(:level, *variables).where_not(level: nil)
-        .with('collect(level) AS levels', *variables)
-        .with("CASE WHEN 'write' IN levels THEN 'write' ELSE 'read' END AS level", *variables)
+        .with('collect(level) AS levels', variable, *list_variables)
+        .with("CASE WHEN 'write' IN levels THEN 'write' ELSE 'read' END AS level", variable, *list_variables)
     end
 
     private
@@ -56,14 +58,17 @@ module GraphStarter
       end
     end
 
-    def authorized_user_query(query, user, variables, user_variable = :user)
+    def authorized_user_query(query, user, variable, secondary_variables, user_variable = :user)
+      variables = [variable] + secondary_variables
       collect_levels_string = variables.flat_map do |variable|
         filter = scope_filter(variable)
 
         filter_string = filter ? ' AND ' + filter.call(variable) : ''
-        ["CASE WHEN (user.admin OR #{variable}_created_rel IS NOT NULL) THEN 'write' WHEN NOT(#{variable}.private) #{filter_string} THEN 'read' END",
+        secondary = secondary_variables.include?(variable)
+        # First lines gives write or read access based on properties of the asset and wether or not user is admin
+        ["CASE WHEN (user.admin #{secondary ? nil : "OR #{variable}_created_rel IS NOT NULL"}) THEN 'write' WHEN (#{variable} IS NOT NULL AND (#{secondary ? '' : "#{variable}.private IS NULL OR"} #{variable}.private = false)) #{filter_string} THEN 'read' END",
          "#{variable}_direct_access_rel.level",
-         "#{variable}_indirect_can_access_rel.level"]
+         (secondary ? nil : "#{variable}_indirect_can_access_rel.level")]
       end.compact.join(', ')
 
       result_query = variables.flat_map { |v| user_authorization_paths(v, user_variable) }
@@ -71,8 +76,8 @@ module GraphStarter
         result.optional_match(clause).break
       end.with('*')
 
-      result_query
-        .with("collect([#{collect_levels_string}]) AS level_collections", *variables)
+      list_variables = secondary_variables.map { |variable| "collect(#{variable}) AS #{variable}_list" }
+      result_query.with("FILTER(i IN REDUCE(a = [], sub_a IN collect([#{collect_levels_string}]) | a + sub_a) WHERE i IS NOT NULL) AS level_collection", variable, *list_variables)
     end
 
     def scope_filter(variable)

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.15.6"
+  VERSION = "0.16.0"
 end

data/spec/asset_authorization_spec.rb

@@ -5,14 +5,16 @@ describe 'Asset authorization' do
 
   let(:current_user) { nil }
   let(:asset_attributes) { {} }
-  let(:asset) { Person.create(asset_attributes) }
+  let!(:asset) { create(:person, asset_attributes) }
 
-  subject { Person.authorized_for(current_user) }
+  let(:category_attributes) { {} }
+  let!(:category) { create(:company, category_attributes) }
+
+  subject { Person.authorized_for(current_user).to_a }
 
   it { should include(asset) }
 
-  context 'private asset' do
-    let(:asset_attributes) { {private: true} }
+  let_context(asset_attributes: {private: true}) do
     it { should_not include(asset) }
 
     context 'user is logged in' do
@@ -21,8 +23,15 @@ describe 'Asset authorization' do
 
       it { should_not include(asset) }
 
+      context 'current_user is the asset creator' do
+        before { asset.creators << current_user }
+
+        it { should include(asset) }
+      end
+
       context 'current_user is admin' do
         let(:current_user_attributes) { {admin: true} }
+
         it { should include(asset) }
       end
 
@@ -31,16 +40,134 @@ describe 'Asset authorization' do
         it { should include(asset) }
       end
 
-      context 'user has access to one of the asset categories' do
-        let(:category) { Company.create(name: 'Acme Inc. Co.') }
+      context 'asset has the category' do
+        before { asset.employer = category }
+
+        it { should_not include(asset) }
+
+        context 'current_user is admin' do
+          let(:current_user_attributes) { {admin: true} }
+
+          it { should include(asset) }
+        end
+
+        context 'current_user is the category creator' do
+          before { category.creators << current_user }
 
-        before do
-          asset.employer = category
-          category.allowed_users = current_user
+          it { should_not include(asset) }
         end
 
+        context 'current_user has access to the category' do
+          before { category.allowed_users = current_user }
+
+          it { should include(asset) }
+        end
+      end
+    end
+  end
+
+  let_context(asset_attributes: {private: nil}) do
+    it { should include(asset) }
+
+    context 'user is logged in' do
+      let(:current_user_attributes) { {} }
+      let(:current_user) { User.create(current_user_attributes) }
+
+      it { should include(asset) }
+
+      context 'current_user is the asset creator' do
+        before { asset.creators << current_user }
+
         it { should include(asset) }
       end
+
+      context 'current_user is admin' do
+        let(:current_user_attributes) { {admin: true} }
+
+        it { should include(asset) }
+      end
+
+      context 'user has access to asset' do
+        before { asset.allowed_users = current_user }
+        it { should include(asset) }
+      end
+
+      context 'asset has the category' do
+        before { asset.employer = category }
+
+        it { should include(asset) }
+
+        context 'current_user is admin' do
+          let(:current_user_attributes) { {admin: true} }
+
+          it { should include(asset) }
+        end
+
+        context 'current_user is the category creator' do
+          before { category.creators << current_user }
+
+          it { should include(asset) }
+        end
+
+        context 'current_user has access to the category' do
+          before { category.allowed_users = current_user }
+
+          it { should include(asset) }
+        end
+      end
+    end
+  end
+
+  let_context(asset_attributes: {private: false}) do
+    it { should include(asset) }
+
+    context 'user is logged in' do
+      let(:current_user_attributes) { {} }
+      let(:current_user) { User.create(current_user_attributes) }
+
+      it { should include(asset) }
+
+      context 'current_user is the asset creator' do
+        before { asset.creators << current_user }
+
+        it { should include(asset) }
+      end
+
+      context 'current_user is admin' do
+        let(:current_user_attributes) { {admin: true} }
+
+        it { should include(asset) }
+      end
+
+      context 'user has access to asset' do
+        before { asset.allowed_users = current_user }
+        it { should include(asset) }
+      end
+
+      context 'asset has the category' do
+        before { asset.employer = category }
+
+        it { should include(asset) }
+
+        context 'current_user is admin' do
+          let(:current_user_attributes) { {admin: true} }
+
+          it { should include(asset) }
+        end
+
+        context 'current_user is the category creator' do
+          before { category.creators << current_user }
+
+          it { should include(asset) }
+        end
+
+        context 'current_user has access to the category' do
+          before { category.allowed_users = current_user }
+
+          it { should include(asset) }
+        end
+      end
     end
   end
+
 end

data/spec/asset_slug_spec.rb

@@ -1,35 +1,43 @@
-# require './spec/rails_helper'
-# 
-# describe 'Asset slugs' do
-#   class Foo < GraphStarter::Asset
-#     property :title
-# 
-#     name_property :title
-#   end
-# 
-#   before { clear_db }
-# 
-#   describe '.unique_slug_from' do
-#     subject { GraphStarter::Asset.unique_slug_from(string) }
-# 
-#     context 'Without assets with slugs' do
-#       let_context string: 'Test title' do
-#         it { should eq 'test-title' }
-#       end
-# 
-#       let_context string: 'Gölcük, Turkey Number 2!' do
-#         it { should eq 'golcuk-turkey-number-2' }
-#       end
-#     end
-# 
-#     context 'With existing asset slugs' do
-#       before { Foo.create(title: 'Gölcük, Turkey', slug: 'golcuk-turkey') }
-# 
-#       let_context string: 'Gölcük, Turkey!' do
-#         it { should eq 'golcuk-turkey-2' }
-#       end
-#     end
-# 
-#   end
-# end
+require './spec/rails_helper'
+
+describe 'Asset slugs' do
+  class Foo < GraphStarter::Asset
+    property :title
+
+    name_property :title
+  end
+
+  before { clear_db }
+
+  describe '.unique_slug_from' do
+    subject { GraphStarter::Asset.unique_slug_from(string) }
+
+    context 'Without assets with slugs' do
+      let_context string: 'Test title' do
+        it { should eq 'test-title' }
+      end
+
+      let_context string: 'Gölcük, Turkey Number 2!' do
+        it { should eq 'golcuk-turkey-number-2' }
+      end
+    end
+
+    context 'With existing asset slug' do
+      before { Foo.create(title: 'Gölcük, Turkey', slug: 'golcuk-turkey') }
+
+      let_context string: 'Gölcük, Turkey!' do
+        it { should eq 'golcuk-turkey-2' }
+      end
+
+      context 'With another existing asset slug' do
+        before { Foo.create(title: 'Gölcük, Turkey!', slug: 'golcuk-turkey-2') }
+
+        let_context string: 'Gölcük, Turkey!!' do
+          it { should eq 'golcuk-turkey-3' }
+        end
+      end
+    end
+
+  end
+end
 

data/spec/factories.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :person do
+    sequence(:name) { |i| "Person ##{i}" }
+    slug { SecureRandom.uuid }
+  end
+
+  factory :company do
+    sequence(:name) { |i| "Company ##{i}" }
+    slug { SecureRandom.uuid }
+  end
+end

data/spec/spec_helper.rb

@@ -8,11 +8,10 @@ module LetContextHelpers
   # When a String is specified that becomes the context description
   # If String isn't specified, Hash#inspect becomes the context description
   def let_context(*args, &block)
-    classes = args.map(&:class)
     context_string, hash =
-      case classes
+      case args.map(&:class)
       when [String, Hash] then ["#{args[0]} #{args[1]}", args[1]]
-      when [Hash] then args + args
+      when [Hash] then [args[0].inspect, args[0]]
       end
 
     context(context_string) do
@@ -23,6 +22,7 @@ module LetContextHelpers
   end
 end
 
+require 'factory_girl'
 
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -68,6 +68,8 @@ RSpec.configure do |config|
 
   config.extend LetContextHelpers
 
+  config.include FactoryGirl::Syntax::Methods
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.16.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,6 +195,7 @@ files:
 - 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/_extra_admin_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
@@ -205,6 +206,7 @@ files:
 - app/views/graph_starter/assets/edit.html.slim
 - app/views/graph_starter/assets/home.html.slim
 - app/views/graph_starter/assets/index.html.slim
+- app/views/graph_starter/assets/index.json.jbuilder
 - app/views/graph_starter/assets/new.html.slim
 - app/views/graph_starter/assets/show.html.slim
 - app/views/graph_starter/assets/show.json.jbuilder
@@ -276,6 +278,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/factories.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: http://github.com/neo4j-examples/graph_starter
@@ -343,5 +346,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
+- spec/factories.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb