graph_starter 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 350ce248b79fc1b18a2e7a9ad256c8b01e447bb0
-  data.tar.gz: 023b3825066f5df655065a7e1ff9ed89043f6ed0
+  metadata.gz: 2ee7e090e013ceee1f953a9859c2d469ec6f82c1
+  data.tar.gz: f039138c5c6fea91161098c1722979e5a85e2a40
 SHA512:
-  metadata.gz: 2fdf420ca258602b934c1402cb342bd532c013396b7c0130fc9a38edf02770fc50b02adb29a4668b716a947f301e0a7125c7c095d585794aa6d34d6db901fa66
-  data.tar.gz: 29d58154894aeeda6055341e1ad0ecb861f63b5c30963636e57bc96837dc1e00f8cd485def599b4820a12e68c05550f0e38de27f034ef1227349c7bad8629112
+  metadata.gz: ff56c5adb8387d6d1ef8266faf4b07402548c7521a5dd668693c66f1507a2c4961241b99eae8231095178ad4daaf44c73c9f306247d0527001245b019c29754d
+  data.tar.gz: 4eec5d0d5d330cece01ca5fb15f4d0c2acfe2a9e8c47307af807d87c6180b2ba0f5352e24d5ec737cf3e23680f03236a32e976e5e85ff74d876c1741b5d523c7

data/app/controllers/graph_starter/assets_controller.rb

@@ -70,9 +70,11 @@ module GraphStarter
     def rate
       if current_user
         rating = asset.rating_for(current_user)
-        rating ||= Rating.find(from_node: current_user, to_node: asset)
+        rating ||= Rating.create(from_node: current_user, to_node: asset)
 
-        rating.update_attribute(:level, params[:new_rating])
+        new_rating = params[:new_rating].to_i
+        new_rating = nil if new_rating.zero?
+        rating.update_attribute(:level, new_rating)
 
         render json: rating
       else

data/app/helpers/graph_starter/application_helper.rb

@@ -6,6 +6,14 @@ module GraphStarter
 
     def engine_view(&b)
        yield eval("__FILE__.gsub(Rails.root.to_s, GraphStarter::Engine.root.to_s)",b.binding) 
-    end    
+    end
+
+    def render_body
+      views = Dir.glob(Rails.root.join("app/views/#{@model_slug}/_body.html.*"))
+
+      partial_path = views.present? ? "#{@model_slug}/body" : 'body'
+
+      render partial: partial_path, locals: {asset: @asset}
+    end
   end
 end

data/app/models/graph_starter/asset.rb

@@ -13,9 +13,6 @@ module GraphStarter
 
     property :view_count, type: Integer
 
-    property :private, type: Boolean, default: false
-
-
     if GraphStarter.configuration.user_class
       #has_many :in, :creators, type: :CREATED, model_class: GraphStarter.configuration.user_class
 
@@ -27,12 +24,14 @@ module GraphStarter
 
     SecretSauceRecommendation = Struct.new(:asset, :score)
 
-    def body
-    end
-
     def self.has_images
       @has_images = true
       has_many :out, :images, type: :HAS_IMAGE, model_class: '::GraphStarter::Image'
+      has_one :out, :image, type: :HAS_IMAGE, model_class: '::GraphStarter::Image'
+    end
+
+    def self.has_image
+      has_images
     end
 
     def self.has_images?
@@ -40,7 +39,7 @@ module GraphStarter
     end
 
     def first_image_source_url
-      images.first && images.first.source_url
+      image && image.source_url
     end 
 
     def self.category_association(association_name = nil)
@@ -80,7 +79,7 @@ module GraphStarter
       else
         fail "Cannot declare name_property twice" if @name_property.present?
         name = property_name.to_sym
-        fail ArgumentError, "Property #{name} is not defined" if attributes[name.to_s].nil?
+        fail ArgumentError, "Property #{name} is not defined" if !attributes.key?(name.to_s)
         @name_property = name
 
         validates name, presence: true
@@ -88,6 +87,10 @@ module GraphStarter
       end
     end
 
+    def self.name_property?(property_name)
+      @name_property && @name_property.to_sym == property_name.to_sym
+    end
+
     def self.default_name_property
       (%w(name title) & attributes.keys)[0].tap do |property|
         if property.nil?
@@ -96,6 +99,46 @@ module GraphStarter
       end
     end
 
+
+    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?
+        name = property_name.to_sym
+        fail ArgumentError, "Property #{name} is not defined" if !attributes.key?(name.to_s)
+        @body_property = name
+      end
+    end
+
+    def self.body_property?(property_name)
+      @body_property && @body_property.to_sym == property_name.to_sym
+    end
+
+    def self.default_body_property
+      if @body_property.nil? && !attributes.key?('body')
+        fail "No body_property defined for #{self.name}!"
+      end
+
+      body_property || 'body'
+    end
+
+
+    def self.display_properties(*property_names)
+      if property_names.empty?
+        @display_properties || []
+      else
+        @display_properties = property_names.map(&:to_sym)
+      end
+    end
+
+    def self.display_property?(property_name)
+      display_properties.include?(property_name.to_sym)
+    end
+
+
     def rating_level_for(user)
       rating = rating_for(user)
       rating && rating.level
@@ -111,6 +154,12 @@ module GraphStarter
           read_attribute(self.class.name_property)
         end
 
+        send(method_name)
+      elsif method_name.to_sym == :body
+        self.class.send(:define_method, method_name) do
+          read_attribute(self.class.body_property)
+        end
+
         send(method_name)
       else
         super
@@ -138,6 +187,8 @@ module GraphStarter
 
     def secret_sauce_recommendations
       user_class = GraphStarter.configuration.user_class
+      return [] if user_class.nil? # Should fix this later
+
       user_class = (user_class.is_a?(Class) ? user_class : user_class.to_s.constantize)
       user_label = user_class.mapped_label_name
 
@@ -225,7 +276,9 @@ module GraphStarter
 
     def self.property_name_and_uuid_and_ruby_type_query
       properties_and_uuids_and_ruby_types = properties.map do |property|
-        [property, SecureRandom.uuid, self.attributes[property][:type]]
+        type = self.attributes[property][:type]
+        type = type.name if type.is_a?(Class)
+        [property, SecureRandom.uuid, type]
       end
 
       Neo4j::Session.current.query
@@ -236,7 +289,7 @@ module GraphStarter
     end
 
     def self.authorized_associations
-      associations.except(*Asset.associations.keys + [:images])
+      associations.except(*Asset.associations.keys + [:images, :image])
     end
 
     def self.icon_class

data/app/models/graph_starter/rating.rb

@@ -10,7 +10,7 @@ module GraphStarter
     creates_unique
 
     property :level, type: Integer
-    validates :level, inclusion: {in: 1..5}
+    validates :level, inclusion: {in: (1..5).to_a + [nil]}
 
     property :rated_at
 

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

@@ -0,0 +1,15 @@
+- if asset.body.present?
+  = asset.body
+- if asset.images.present?
+  .ui.link.cards
+    - asset.images.each do |image|
+      .card
+        .image = image_tag image.source_url, class: 'ui image tiny rounded'
+        .content
+          .header = image.title if image.title.present?
+          - if image.description.present?
+            .meta = image.description
+        .extra.content
+          a.ui.large.green.button href="#{image.source_url}" Full Size
+
+

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

@@ -55,29 +55,17 @@ javascript:
 
   - if main_column_exists
     .ten.wide.column
-      - if @asset.body.present?
-        = @asset.body
-      - if @asset.images.present?
-        .ui.link.cards
-          - @asset.images.each do |image|
-            .card
-              .image = image_tag image.source_url, class: 'ui image tiny rounded'
-              .content
-                .header = image.title if image.title.present?
-                - if image.description.present?
-                  .meta = image.description
-              .extra.content
-                a.ui.large.green.button href="#{image.source_url}" Full Size
-
+      = render_body
 
   div class="#{side_column_width} wide column" id="right-column"
     - if @current_user_is_admin
       a.ui.labeled.icon.button.right.floated data-authorizable="#{@asset.to_json}"
         | Edit Permissions
 
-    a.ui.labeled.icon.button.right.floated href="#{edit_asset_path(id: @asset)}"
-      i.edit.icon
-      | Edit
+    - if @current_user_is_admin
+      a.ui.labeled.icon.button.right.floated href="#{edit_asset_path(id: @asset)}"
+        i.edit.icon
+        | Edit
 
     .ui.items
       - if @asset.class.rated? && defined?(current_user) && current_user
@@ -88,6 +76,7 @@ javascript:
               .ui.star.rating data-max-rating="5" data-rating="#{@asset.rating_level_for(current_user)}"
               coffee:
                 $('#right-column .ui.rating').rating
+                  clearable: true
                   onRate: (new_rating) ->
                     $.ajax
                       method: 'PUT'
@@ -95,6 +84,9 @@ javascript:
 
 
       - @asset.class.authorized_properties(defined?(current_user) && current_user).each do |property|
+        - next if !@asset.class.display_property?(property.name)
+        - next if @asset.class.name_property?(property.name) || @asset.class.body_property?(property.name)
+
         - if @asset.read_attribute(property.name).present?
           .item
             .content
@@ -105,12 +97,14 @@ javascript:
               .description
                 = render partial: 'graph_starter/properties/property', locals: {property: property, asset: @asset, level: 'read'}
 
-      .item
-        .content
-          .ui.horizontal.divider Created
-          .description = @asset.created_at
+      - if @asset.class.display_property?(:created_at)
+        .item
+          .content
+            .ui.horizontal.divider Created
+            .description = @asset.created_at
 
-      .item
-        .content
-          .ui.horizontal.divider Last updated
-          .description = @asset.updated_at
+      - if @asset.class.display_property?(:updated_at)
+        .item
+          .content
+            .ui.horizontal.divider Last updated
+            .description = @asset.updated_at

data/app/views/graph_starter/properties/_property.html.slim

@@ -1,12 +1,14 @@
 - can_write = (level == 'write') && !form.nil?
 
+- value = asset.read_attribute(property.name)
+
 - ruby_type = property.ruby_type.to_s
 - case ruby_type
 - when 'Integer'
   - if can_write
     = form.number_field property.name
   - else
-    = asset.read_attribute(property.name)
+    = value
 - when 'DateTime', 'Date'
   - if can_write
     i.calendar.icon
@@ -15,7 +17,6 @@
     - strftime_format = {'DateTime' => '%Y-%m-%d %H:%M', 'Date' => '%Y-%m-%d'}[ruby_type]
 
     - id = SecureRandom.uuid
-    - value = asset.read_attribute(property.name)
 
     = form.text_field property.name, value: value && value.strftime(strftime_format), id: id
 
@@ -25,10 +26,13 @@
         $('##{id}').datetimepicker({#{js_options.html_safe}});
       });
   - else
-    = asset.read_attribute(property.name)
+    = value
 
 - else
   - if can_write
     = form.text_field property.name
   - else
-    = asset.read_attribute(property.name)
+    - if property.name.to_s.match(/url$/i)
+      = link_to value, value
+    - else
+      = value

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

@@ -2,6 +2,6 @@
   = link_to 'Home', '/', class: "item #{'active' if request.path == '/'}"
   - GraphStarter::Asset.descendants.each do |model_class|
     - path = graph_starter.assets_path(model_slug: model_class.model_slug)
-    = link_to model_class.name.pluralize.humanize, path, class: "item #{'active' if request.path.match(/^#{path}/)}"
+    = link_to model_class.name.tableize.humanize, path, class: "item #{'active' if request.path.match(/^#{path}/)}"
 
   = render 'layouts/graph_starter/custom_menu'

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

@@ -3,7 +3,7 @@ doctype html
 html
 
   head
-    title AssetPortal
+    title = @title || Rails.application.class.to_s.split("::").first.tableize.singularize.humanize
     = stylesheet_link_tag    'graph_starter/application', media: 'all', 'data-turbolinks-track' => true
 
     = render partial: 'layouts/graph_starter/twitter_meta_tags'

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -131,6 +131,7 @@ files:
 - app/models/graph_starter/rating.rb
 - app/models/graph_starter/view.rb
 - app/views/graph_starter/assets/TODO.md
+- app/views/graph_starter/assets/_body.html.slim
 - app/views/graph_starter/assets/_cards.html.slim
 - app/views/graph_starter/assets/edit.html.slim
 - app/views/graph_starter/assets/home.html.slim