storytime-admin 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4034243444693388c7c42a2c1d46ebfb8dcfadf2
-  data.tar.gz: 8de839ef143272a9cd9ad59bb431779d3dab2cf3
+  metadata.gz: 9efd1b6120c7321e55cd4420d1fa448a98143686
+  data.tar.gz: f7c29ae62e5a30b6e64993e1576ebe1d1498413f
 SHA512:
-  metadata.gz: e0d8878001d19386475cd970de8343eabb6e3c2b2b497601ae0e9ebb711416cd4e8d2dddc7838ad5fb646f5511222e1ecf7447d7123ac3e7b557f66c153ae185
-  data.tar.gz: 658e530a9b76abe7350677c3e11a9477fa94cca222829e145268a6333f8ff8df73219ba1999152aa94d6643183678ea9765e13a7e482856d6055c6401e023935
+  metadata.gz: f858a1b34617cd6366c31ad1fd33040f646293c9ad988e0a1f2050733b665c3ddd0721b71fd04e742b60a52927ebfc0f10829d6b14eef2b153f04dea0f4502f0
+  data.tar.gz: c36d792826ff52f7e47d8ea88c125cf5f5eaacfaab31b3d6c33af2e2232933552d0004f32357126dd79cee6dedb85a173fdf40a984e805116e29276ed6d13f9e

data/app/assets/javascripts/{admin/application.js → storytime_admin.js}

@@ -1,3 +1,3 @@
 //= require jquery
 //= require jquery_ujs
-//= require_tree .
+//= require_tree .

data/app/assets/javascripts/storytime_admin/table_links.js.coffee

@@ -0,0 +1,5 @@
+$ ->
+  $(".table-row-link").on "click", (e) ->
+    unless $(e.target).data("confirm")? || $(e.target).parent("a[data-confirm]").length > 0
+      url = $(@).data('url')
+      document.location.href = url

data/app/assets/stylesheets/storytime_admin.css.scss

@@ -0,0 +1,2 @@
+@import 'storytime_admin/content';
+@import 'storytime_admin/tables';

data/app/controllers/storytime_admin/application_controller.rb

@@ -1,15 +1,19 @@
 module StorytimeAdmin
   class ApplicationController < StorytimeAdmin.base_controller.constantize
+    include StorytimeAdmin::Concerns::PolymorphicRouteGeneration
+
     layout :set_layout
 
     before_action :authenticate_user!
     before_action :ensure_admin!
     before_action :load_model, only: [:edit, :update, :destroy]
 
-    helper_method :model, :model_name, :model_sym, :admin_controller?, :headers, :form_attributes, :index_attr, :current_user
+    helper_method :model, :model_display_name, :model_display_name_pluralized, :model_name, 
+                  :model_sym, :sort_column, :sort_direction,  :admin_controller?, :headers,
+                  :form_attributes, :index_attr, :current_user, :polymorphic_route_components
 
     def index
-      @collection = model.all.page(params[:page]).per(20)
+      @collection = model.all.order("#{sort_column} #{sort_direction}").page(params[:page]).per(20)
     end
 
     def new
@@ -24,7 +28,7 @@ module StorytimeAdmin
       @model.user = current_user if @model.respond_to? :user
 
       if @model.save
-        redirect_to model, notice: "#{model_name} successfully created"
+        redirect_to polymorphic_route_components(model), notice: "#{model_name} successfully created"
       else
         render :new
       end
@@ -32,7 +36,7 @@ module StorytimeAdmin
 
     def update
       if @model.update(permitted_params)
-        redirect_to model, notice: "#{model_name} successfully updated"
+        redirect_to polymorphic_route_components(model), notice: "#{model_name} successfully updated"
       else
         render :edit
       end
@@ -40,20 +44,28 @@ module StorytimeAdmin
 
     def destroy
       @model.destroy
-      redirect_to model, notice: "#{model_name} successfully deleted"
+      redirect_to polymorphic_route_components(model), notice: "#{model_name} successfully deleted"
     end
 
   private
     def permitted_params
-      params.require(model_sym).permit(permitted_attributes.map(&:to_sym))
+      params.require(model.name.underscore.split("/").last).permit(permitted_attributes.map(&:to_sym))
     end
 
     def ensure_admin!
-      unless current_user && current_user.admin?
+      unless current_user && admin_check
         redirect_to main_app.root_url, flash: { error: "Only admin users can access this page" }
       end
     end
 
+    def admin_check
+      if StorytimeAdmin.ensure_admin_scope.nil?
+        current_user.send(StorytimeAdmin.ensure_admin_method)
+      else
+        current_user.send(StorytimeAdmin.ensure_admin_method, send(StorytimeAdmin.ensure_admin_scope))
+      end
+    end
+
     def attributes 
       @attributes ||= model.columns.map(&:name)
     end
@@ -92,12 +104,28 @@ module StorytimeAdmin
       model_name.classify.constantize
     end
 
+    def model_display_name
+      model_name.split("::").last
+    end
+
+    def model_display_name_pluralized
+      model_display_name.pluralize
+    end
+
     def model_name
-      @model_name ||= self.class.name.split("::").last.gsub("Controller", "").singularize
+      @model_name ||= self.class.name.gsub("Controller", "").gsub("StorytimeAdmin::", "").singularize
     end
 
     def model_sym
-      @model_sym ||= model.name.underscore.to_sym
+      @model_sym ||= model.name.underscore.gsub("/", "_").to_sym
+    end
+
+    def sort_column
+      model.column_names.include?(params[:sort]) ? params[:sort] : "#{model_name.underscore.pluralize}.id"
+    end
+
+    def sort_direction
+      %w[asc desc].include?(params[:direction]) ? params[:direction] : "asc"
     end
 
     def admin_controller?
@@ -113,5 +141,6 @@ module StorytimeAdmin
         send("current_#{Admin.user_class_underscore_all}".to_sym)
       end
     end
+
   end
 end

data/app/controllers/storytime_admin/concerns/polymorphic_route_generation.rb

@@ -0,0 +1,28 @@
+module StorytimeAdmin
+  module Concerns
+    module PolymorphicRouteGeneration
+      def self.included(base)
+        base.helper_method :polymorphic_route_components
+      end
+      
+      def polymorphic_route_components(object_or_class_name)
+        object = nil
+
+        class_name = if object_or_class_name.is_a?(String)
+          object = object_or_class_name.constantize
+          object_or_class_name
+        elsif object_or_class_name.is_a?(Class)
+          object = object_or_class_name
+          object_or_class_name.name
+        else
+          object = object_or_class_name
+          object_or_class_name.class.name
+        end
+        
+        pieces = class_name.split("::").map{|part| part.underscore.to_sym } 
+        pieces.pop 
+        pieces << object
+      end
+    end
+  end
+end

data/app/helpers/storytime_admin/application_helper.rb

@@ -24,5 +24,17 @@ module StorytimeAdmin
         super
       end
     end
+
+    def sortable(column, title=nil)
+      title ||= column.titleize
+      direction = column == sort_column && sort_direction == "asc" ? "desc" : "asc"
+      direction_arrow = if column == sort_column
+        direction == "asc" ? icon("caret-up") : icon("caret-down")
+      else 
+        nil
+      end
+
+      link_to "#{title} #{direction_arrow}".html_safe, {:sort => column, :direction => direction}
+    end
   end
 end

data/app/views/storytime_admin/application/_form.html.haml

@@ -1,5 +1,5 @@
-= simple_form_for @model do |f|
+= simple_form_for polymorphic_route_components(@model) do |f|
   = f.error_notification
   = render 'fields', f: f
   = f.submit "Save", class: "btn btn-primary btn-outline"
-  = link_to "Cancel", model, class: "btn btn-link"
+  = link_to "Cancel", polymorphic_route_components(model), class: "btn btn-link"

data/app/views/storytime_admin/application/_headers.html.haml

@@ -1,2 +1,3 @@
 - index_attr.each do |attribute|
-  %th= attribute.titleize
+  %th{:class => "sort_by"}
+    = sortable(attribute.parameterize)

data/app/views/storytime_admin/application/_object.html.haml

@@ -1,3 +1,3 @@
-%tr.table-row-link{ data: { url: url_for([:edit, object]) } }
+%tr.table-row-link{ data: { url: url_for([:edit, *polymorphic_route_components(object)]) } }
   = render 'row', object: object
-  %td.text-right= link_to icon('trash-o'), object, class: "btn btn-sm btn-outline btn-danger", id: "delete_#{model_sym.to_s}_#{object.id}", method: :delete, data: { confirm: "Are you sure you want to delete this #{model_name}?" }
+  %td.text-right= link_to icon('trash-o'), polymorphic_route_components(object), class: "btn btn-sm btn-outline btn-danger", id: "delete_#{model_sym.to_s}_#{object.id}", method: :delete, data: { confirm: "Are you sure you want to delete this #{model_display_name}?" }

data/app/views/storytime_admin/application/edit.html.haml

@@ -3,7 +3,7 @@
     .scroll-panel-header
       = link_to '#', class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas", target: "#dashboard-nav" } do
         %i.icon-st-icons-st-logo
-      = link_to "Cancel", model, class: "btn btn-default btn-sm pull-right"
-      %h3.scroll-panel-title Edit #{model_name}
+      = link_to "Cancel", polymorphic_route_components(model), class: "btn btn-default btn-sm pull-right"
+      %h3.scroll-panel-title Edit #{model_display_name}
     .scroll-panel-body
       = render "form"

data/app/views/storytime_admin/application/index.html.haml

@@ -3,8 +3,8 @@
     .scroll-panel-header
       = link_to '#', class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas", target: "#dashboard-nav" } do
         %i.icon-st-icons-st-logo
-      = link_to "New #{model_name}", [:new, model_sym], class: "btn btn-sm btn-primary btn-outline pull-right"
-      %h3.scroll-panel-title= model_name.pluralize
+      = link_to "New #{model_display_name}", [:new, model_sym], class: "btn btn-sm btn-primary btn-outline pull-right"
+      %h3.scroll-panel-title= model_display_name_pluralized
     .scroll-panel-body
       = render 'table'
       = paginate @collection, theme: 'twitter-bootstrap-3'

data/app/views/storytime_admin/application/new.html.haml

@@ -3,7 +3,7 @@
     .scroll-panel-header
       = link_to '#', class: "btn btn-default btn-icon pull-left visible-xs visible-sm", data: { toggle: "off-canvas", target: "#dashboard-nav" } do
         %i.icon-st-icons-st-logo
-      = link_to "Cancel", model, class: "btn btn-default btn-sm pull-right"
-      %h3.scroll-panel-title New #{model_name}
+      = link_to "Cancel", polymorphic_route_components(model), class: "btn btn-default btn-sm pull-right"
+      %h3.scroll-panel-title New #{model_display_name}
     .scroll-panel-body
       = render "form"

data/config/routes.rb

@@ -1,5 +1,11 @@
 StorytimeAdmin::Engine.routes.draw do
   StorytimeAdmin.models.each do |model|
-    resources model.tableize.to_sym
+    if model.include?("::")      
+      components = model.tableize.split("/")
+      resource_name = components.pop
+      namespace(components.join("/")){ resources resource_name }
+    else
+      resources model.tableize.to_sym
+    end
   end
 end

data/lib/storytime_admin.rb

@@ -2,10 +2,12 @@ require "storytime_admin/engine"
 
 module StorytimeAdmin
   class << self
-    mattr_accessor :nav_title, :models, :user_class, :layout, :base_controller
+    mattr_accessor :nav_title, :models, :user_class, :layout, :base_controller, :ensure_admin_method, :ensure_admin_scope
     self.nav_title = "Admin"
     self.base_controller = "::ApplicationController"
     @@user_class = "User"
+    self.ensure_admin_method = "admin?"
+    self.ensure_admin_scope = nil
   end
 
   def self.configure(&block)
@@ -13,7 +15,11 @@ module StorytimeAdmin
   end
 
   def self.models
-    Dir.glob(Rails.root.join("app", "controllers", "storytime_admin", "**/*")).map{|controller| controller.split("/").last.split("_controller")[0]}
+    @@models ||= begin
+      files = Dir.glob(Rails.root.join("app", "controllers", "storytime_admin", "**/*"))
+      files.select{|val| val.ends_with?("_controller.rb") }
+           .map{|controller| controller.split("storytime_admin").last.gsub("_controller.rb", "").sub("/", "").classify }
+   end
   end
 
   def self.user_class

data/lib/storytime_admin/engine.rb

@@ -11,5 +11,11 @@ require 'bootstrap-kaminari-views'
 module StorytimeAdmin
   class Engine < ::Rails::Engine
     isolate_namespace StorytimeAdmin
+
+    initializer "storytime_admin.controller_helpers" do
+      ActiveSupport.on_load(:action_controller) do
+        include StorytimeAdmin::Concerns::PolymorphicRouteGeneration
+      end
+    end
   end
 end

data/lib/storytime_admin/version.rb

@@ -1,3 +1,3 @@
 module StorytimeAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storytime-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Van Der Beek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -272,11 +272,13 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/admin/application.js
-- app/assets/stylesheets/admin.css.scss
-- app/assets/stylesheets/admin/_content.css.scss
-- app/assets/stylesheets/admin/_tables.css.scss
+- app/assets/javascripts/storytime_admin.js
+- app/assets/javascripts/storytime_admin/table_links.js.coffee
+- app/assets/stylesheets/storytime_admin.css.scss
+- app/assets/stylesheets/storytime_admin/_content.css.scss
+- app/assets/stylesheets/storytime_admin/_tables.css.scss
 - app/controllers/storytime_admin/application_controller.rb
+- app/controllers/storytime_admin/concerns/polymorphic_route_generation.rb
 - app/helpers/storytime_admin/application_helper.rb
 - app/views/storytime_admin/application/_fields.html.haml
 - app/views/storytime_admin/application/_flashes.html.haml

data/app/assets/stylesheets/admin.css.scss

@@ -1,2 +0,0 @@
-@import 'admin/content';
-@import 'admin/tables';