graph_starter 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba39a8bf4b8f837b968c093923dca37474fa52d
-  data.tar.gz: 9d5467ecf2e9dd763aa582ed4c772b6d30ca4ad9
+  metadata.gz: 64a2154a735c343c9b8a826f52292ffde568d3a1
+  data.tar.gz: 8c098ff7b6d48c0663d2bbc7876dc624b5e07efd
 SHA512:
-  metadata.gz: a5a2117422be0c98f4474ff04e55ee1ab725be9232c1df9d18a5977062dc8088c63b2f9ec7963fdacaf6cc07e46ee467aaab94e0898b46517ab49f1cdf04714b
-  data.tar.gz: 7acdf172f6e9bebafe591ded966bcdab595be6303b10ca76ff6e219089b99eee3e11ba4e3f305fb1e2b903d894fa476a80f56ab7a5df5b39bfc73e373253e980
+  metadata.gz: 5f0308ad85cb0d8f83c138aaff589afe23fa67df1164b889f470c9f7b0f71df037841eb2a9c2a4c02ab0422147fcc03a3022f574369df712876d96e277edf8b2
+  data.tar.gz: 2e7152a1ee53e367a034d21c81042bd1bcf19ae64cad712615b6468f69f4f21c7d5f3b56127b96e8f41c9596e17bf1e167ef3a4deb0a4253e84a99a67fd3a7fa

data/app/controllers/graph_starter/assets_controller.rb

@@ -65,7 +65,7 @@ module GraphStarter
 
     def update
       @asset = asset
-      @asset.update(params[:book])
+      @asset.update(params[params[:model_slug].singularize])
 
       redirect_to action: :edit
     end

data/app/helpers/graph_starter/application_helper.rb

@@ -19,5 +19,13 @@ module GraphStarter
     def present_asset(object)
       yield(AssetPresenter.new(object, self)) if block_given?
     end
+
+    def app_user_is_admin?
+      current_user && current_user.respond_to?(:admin?) && current_user.admin?
+    end
+
+    def app_user
+      defined?(:current_user) ? current_user : nil
+    end
   end
 end

data/app/models/graph_starter/asset.rb

@@ -90,6 +90,25 @@ module GraphStarter
     end
 
 
+    def self.enumerable_property(property_name, values)
+      fail "values needs to be an Array, was #{values.inspect}" if !values.is_a?(Array)
+
+      validates :status, inclusion: {in: values}
+
+      enumerable_property_values[self.name.to_sym] ||= {}
+      enumerable_property_values[self.name.to_sym][property_name.to_sym] ||= values
+    end
+
+    def self.enumerable_property_values_for(property_name)
+      enumerable_property_values[self.name.to_sym] && 
+        enumerable_property_values[self.name.to_sym][property_name.to_sym]
+    end
+
+    def self.enumerable_property_values
+      @enumerable_property_values ||= {}
+    end
+
+
     def self.rated
       @rated = true
     end
@@ -242,9 +261,11 @@ module GraphStarter
         {id: id,
          title: title,
          name: title,
-         images: images.map {|image| image.source.url },
          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?
+       end
     end
 
     def self.descendants

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

@@ -0,0 +1,10 @@
+.ui.buttons
+  a.ui.labeled.icon.button.right.floated data-authorizable="#{asset.to_json}"
+    | Permissions
+
+  .or
+
+  a.ui.labeled.icon.button.right.floated href="#{edit_asset_path(id: asset)}"
+    i.edit.icon
+    | Edit
+

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

@@ -1,12 +1,3 @@
-- if @current_user_is_admin
-  a.ui.labeled.icon.button.right.floated data-authorizable="#{asset.to_json}"
-    | Edit Permissions
-
-- 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
     .item

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

@@ -14,9 +14,13 @@ h1 = @asset.name
 
   - @asset.class.authorized_properties_and_levels(current_user).each do |property, level|
     .field
-      label = property.name.humanize
+      - editable_properties = GraphStarter.configuration.editable_properties[@asset.class.name.to_sym]
+      - can_write = (level == 'write') && !f.nil? && (editable_properties.nil? || editable_properties.map(&:to_s).include?(property.name))
 
-      = render partial: 'graph_starter/properties/property', locals: {property: property, asset: @asset, level: level, form: f}
+      - if @asset.class.display_property?(property.name) || can_write
+        label = property.name.humanize
+
+        = render partial: 'graph_starter/properties/property', locals: {property: property, asset: @asset, form: f, can_write: can_write}
 
 
   = f.submit 'Update', class: 'ui button'

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

@@ -21,6 +21,9 @@ javascript:
         = render_body(@asset, @model_slug)
 
     div class="#{right_width} wide column" id="right-column"
+      - if app_user_is_admin?
+        = render partial: 'admin_buttons', locals: {asset: @asset}
+
       - if !asset_presenter.left_sidebar_exists?
         = render partial: 'dynamic_items', locals: {asset: @asset}
 

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

@@ -1,5 +1,3 @@
-- can_write = (level == 'write') && !form.nil?
-
 - value = asset.read_attribute(property.name)
 
 - ruby_type = property.ruby_type.to_s
@@ -28,9 +26,18 @@
   - else
     = value
 
+- when /ActiveAttr::Typecasting::Boolean$/, /Boolean$/
+  - if can_write
+    = form.select property.name, [['True', true], ['False', false]], {}, class: 'ui dropdown'
+  - else
+    = value
 - else
+
   - if can_write
-    = form.text_field property.name
+    - if values = asset.class.enumerable_property_values_for(property.name)
+      = form.select property.name, values, {}, class: 'ui dropdown'
+    - else
+      = form.text_field property.name
   - else
     - if property.name.to_s.match(/url$/i)
       = link_to value, value

data/lib/graph_starter/configuration.rb

@@ -2,11 +2,12 @@ module GraphStarter
   class Configuration
     attr_writer :user_class
 
-    attr_accessor :menu_models, :icon_classes, :scope_filters
+    attr_accessor :menu_models, :icon_classes, :scope_filters, :editable_properties
 
     def initialize
       @icon_classes = {}
       @scope_filters = {}
+      @editable_properties = {}
     end
 
     def user_class
@@ -23,6 +24,10 @@ module GraphStarter
           errors[:icon_classes] = 'should be a Hash'
         end
 
+        if !@editable_properties.is_a?(Hash)
+          errors[:editable_properties] = 'should be a Hash'
+        end
+
         if !@scope_filters.is_a?(Hash)
           errors[:scope_filters] = 'should be a Hash'
         end

data/lib/graph_starter/version.rb

@@ -1,3 +1,3 @@
 module GraphStarter
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_starter
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,7 @@ files:
 - app/presenters/graph_starter/application_presenter.rb
 - app/presenters/graph_starter/asset_presenter.rb
 - app/views/graph_starter/assets/TODO.md
+- app/views/graph_starter/assets/_admin_buttons.html.slim
 - app/views/graph_starter/assets/_body.html.slim
 - app/views/graph_starter/assets/_cards.html.slim
 - app/views/graph_starter/assets/_dynamic_items.html.slim