effective_style_guide 1.5.5 → 2.0.0

data/config/effective_style_guide.rb

@@ -2,25 +2,25 @@ EffectiveStyleGuide.setup do |config|
   # Authorization Method
   #
   # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
+  # If it raises an exception or returns false, an Effective::AccessDenied Error will be raised
   #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
+  # Use via Proc:
+  # Proc.new { |controller, action, resource| authorize!(action, resource) }       # CanCan
+  # Proc.new { |controller, action, resource| can?(action, resource) }             # CanCan with skip_authorization_check
+  # Proc.new { |controller, action, resource| authorize "#{action}?", resource }   # Pundit
+  # Proc.new { |controller, action, resource| current_user.is?(:admin) }           # Custom logic
   #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
+  # Use via Boolean:
+  # config.authorization_method = true  # Always authorized
+  # config.authorization_method = false # Always unauthorized
   #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
+  # Use via Method (probably in your application_controller.rb):
+  # config.authorization_method = :my_authorization_method
+  # def my_authorization_method(resource, action)
+  #   true
   # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
   config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }  # CanCanCan
 
-  # Admin Screens Layout Settings
+  # Layout Settings
   config.layout = 'application'   # All EffectiveStyleGuide controllers will use this layout
-
 end

data/config/routes.rb

@@ -4,8 +4,7 @@ end
 
 EffectiveStyleGuide::Engine.routes.draw do
   scope :module => 'effective' do
-    match '/styleguide', :to => 'style_guide#show', :via => [:get], :as => 'style_guide'
-    match '/style-guide', :to => 'style_guide#show', :via => [:get]
-    match '/style_guide', :to => 'style_guide#show', :via => [:get]
+    match '/styleguide', to: 'style_guide#show', via: [:get, :post, :patch], as: 'style_guide'
+    match '/styleguide/bootstrap3', to: 'style_guide#bootstrap3', via: :get
   end
 end

data/lib/effective_style_guide.rb

@@ -12,10 +12,20 @@ module EffectiveStyleGuide
   end
 
   def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+
+    return !!authorization_method unless authorization_method.respond_to?(:call)
+    controller = controller.controller if controller.respond_to?(:controller)
+
+    begin
+      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
+    rescue *@_exceptions
+      false
     end
-    true
+  end
+
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied unless authorized?(controller, action, resource)
   end
 
   def self.colors
@@ -23,14 +33,18 @@ module EffectiveStyleGuide
   end
 
   def self.foods
+    ['bacon', 'eggs', 'hash browns']
+  end
+
+  def self.drinks
     ['Coffee', 'Tea', 'Soda']
   end
 
   def self.grouped_colors
     {
-      'Top' => [['Red', 1], ['Orange', 2], ['Yellow', 3]],
-      'Middle' => [['Green', 4], ['Blue', 5], ['Indigo', 6]],
-      'Bottom' => [['Violet', 7]]
+      'Top' => [['red', 'red'], ['orange', 'orange'], ['yellow', 'yellow']],
+      'Middle' => [['green', 'green'], ['blue', 'blue'], ['indigo', 'indigo']],
+      'Bottom' => [['violet', 'violet']]
     }
   end
 

data/lib/effective_style_guide/version.rb

@@ -1,3 +1,3 @@
 module EffectiveStyleGuide
-  VERSION = '1.5.5'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_style_guide
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -52,22 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Ensure that your custom CSS theme looks good with all Twitter Bootstrap3
-  html components.
+description: Ensure that your custom CSS theme looks good with all Twitter Bootstrap4
+  (and 3) html components.
 email:
 - info@codeandeffect.com
 executables: []
@@ -76,32 +48,45 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/controllers/effective/style_guide_controller.rb
-- app/datatables/effective_style_guide_datatable.rb
 - app/models/effective/access_denied.rb
-- app/models/effective/datatables/style_guide.rb
 - app/models/effective/style_guide.rb
-- app/views/effective/style_guide/_alerts.html.haml
-- app/views/effective/style_guide/_breadcrumbs.html.haml
-- app/views/effective/style_guide/_buttons.html.haml
-- app/views/effective/style_guide/_effective_datatable.html.haml
-- app/views/effective/style_guide/_form_horizontal.html.haml
-- app/views/effective/style_guide/_form_inline.html.haml
-- app/views/effective/style_guide/_form_vertical.html.haml
-- app/views/effective/style_guide/_jumbotron.html.haml
-- app/views/effective/style_guide/_labels.html.haml
-- app/views/effective/style_guide/_list_groups.html.haml
-- app/views/effective/style_guide/_modals.html.haml
-- app/views/effective/style_guide/_navs.html.haml
-- app/views/effective/style_guide/_pagination.html.haml
-- app/views/effective/style_guide/_panels.html.haml
-- app/views/effective/style_guide/_progress_bars.html.haml
-- app/views/effective/style_guide/_tables.html.haml
-- app/views/effective/style_guide/_thumbnails.html.haml
-- app/views/effective/style_guide/_typography.html.haml
-- app/views/effective/style_guide/_wells.html.haml
+- app/views/effective/style_guide/_alerts.html
+- app/views/effective/style_guide/_badges.html
+- app/views/effective/style_guide/_breadcrumbs.html
+- app/views/effective/style_guide/_buttons.html
+- app/views/effective/style_guide/_buttons_group.html
+- app/views/effective/style_guide/_cards.html
+- app/views/effective/style_guide/_collapse.html
+- app/views/effective/style_guide/_dropdowns.html
+- app/views/effective/style_guide/_form_with.html.haml
+- app/views/effective/style_guide/_input_groups.html
+- app/views/effective/style_guide/_jumbotrons.html
+- app/views/effective/style_guide/_list_groups.html
+- app/views/effective/style_guide/_modals.html
+- app/views/effective/style_guide/_navs.html
+- app/views/effective/style_guide/_pagination.html
+- app/views/effective/style_guide/_progress.html
 - app/views/effective/style_guide/show.html.haml
+- app/views/effective/style_guide_bootstrap3/_alerts.html.haml
+- app/views/effective/style_guide_bootstrap3/_breadcrumbs.html.haml
+- app/views/effective/style_guide_bootstrap3/_buttons.html.haml
+- app/views/effective/style_guide_bootstrap3/_form_horizontal.html.haml
+- app/views/effective/style_guide_bootstrap3/_form_inline.html.haml
+- app/views/effective/style_guide_bootstrap3/_form_vertical.html.haml
+- app/views/effective/style_guide_bootstrap3/_jumbotron.html.haml
+- app/views/effective/style_guide_bootstrap3/_labels.html.haml
+- app/views/effective/style_guide_bootstrap3/_list_groups.html.haml
+- app/views/effective/style_guide_bootstrap3/_modals.html.haml
+- app/views/effective/style_guide_bootstrap3/_navs.html.haml
+- app/views/effective/style_guide_bootstrap3/_pagination.html.haml
+- app/views/effective/style_guide_bootstrap3/_panels.html.haml
+- app/views/effective/style_guide_bootstrap3/_progress_bars.html.haml
+- app/views/effective/style_guide_bootstrap3/_tables.html.haml
+- app/views/effective/style_guide_bootstrap3/_thumbnails.html.haml
+- app/views/effective/style_guide_bootstrap3/_typography.html.haml
+- app/views/effective/style_guide_bootstrap3/_wells.html.haml
+- app/views/effective/style_guide_bootstrap3/show.html.haml
 - config/effective_style_guide.rb
 - config/routes.rb
 - lib/effective_style_guide.rb
@@ -132,6 +117,6 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Ensure that your custom CSS theme looks good with all Twitter Bootstrap3
-  html components.
+summary: Ensure that your custom CSS theme looks good with all Twitter Bootstrap4
+  (and 3) html components.
 test_files: []

data/Rakefile

@@ -1,20 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec

data/app/datatables/effective_style_guide_datatable.rb

@@ -1,45 +0,0 @@
-if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSION) >= Gem::Version.new('3.0')
-  class EffectiveStyleGuideDatatable < Effective::Datatable
-
-    datatable do
-      col :id
-      col :material, search: { collection: ['Stainless Steel', 'Copper', 'Cast Iron', 'Composite'] }
-      col :bowl, search: { collection: ['Single Bowl', 'Double Bowl', 'Triple Bowl'] }
-      col :name
-
-      actions_col show: false, edit: false, destroy: false do
-        [link_to('View', '#'), link_to('Edit', '#')].join('&nbsp;-&nbsp;').html_safe
-      end
-    end
-
-    collection do
-      [
-        [1, 'Stainless Steel', 'Single Bowl', 'KOHLER Staccato'],
-        [2, 'Stainless Steel', 'Double Bowl', 'KOHLER Vault Undercounter'],
-        [3, 'Stainless Steel', 'Triple Bowl', 'KRAUS All-In-One'],
-        [4, 'Stainless Steel', 'Single Bowl', 'KOHLER Vault Dual Mount'],
-        [5, 'Stainless Steel', 'Single Bowl', 'KRAUS All-In-One Undermount'],
-        [6, 'Stainless Steel', 'Double Bowl', 'Glacier Bay All-in-One'],
-        [7, 'Stainless Steel', 'Single Bowl', 'Elkay Neptune'],
-        [8, 'Copper', 'Single Bowl', 'ECOSINKS Apron Front Dual Mount'],
-        [9, 'Copper', 'Double Bowl', 'ECOSINKS Dual Mount Front Hammered'],
-        [10, 'Copper', 'Triple Bowl', 'Glarier Bay Undermount'],
-        [11, 'Copper', 'Single Bowl', 'Whitehaus Undermount'],
-        [12, 'Copper', 'Double Bowl', 'Belle Foret Apron Front'],
-        [13, 'Copper', 'Double Bowl', 'Pegasus Dual Mount'],
-        [14, 'Cast Iron', 'Double Bowl', 'KOHLER Whitehaven'],
-        [15, 'Cast Iron', 'Triple Bowl', 'KOHLER Hartland'],
-        [16, 'Cast Iron', 'Single Bowl', 'KOHLER Cape Dory Undercounter'],
-        [17, 'Cast Iron', 'Double Bowl', 'KOLER Bakersfield'],
-        [18, 'Cast Iron', 'Double Bowl', 'American Standard Offset'],
-        [19, 'Cast Iron', 'Single Bowl', 'Brookfield Top'],
-        [20, 'Composite', 'Single Bowl', 'Blanco Diamond Undermount'],
-        [21, 'Composite', 'Double Bowl', 'Mont Blanc Waterbrook'],
-        [22, 'Composite', 'Triple Bowl', 'Pegasus Triple Mount'],
-        [23, 'Composite', 'Single Bowl', 'Swanstone Dual Mount']
-      ]
-    end
-
-  end
-end
-

data/app/models/effective/datatables/style_guide.rb

@@ -1,55 +0,0 @@
-if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  module Effective
-    module Datatables
-      class StyleGuide < Effective::Datatable
-        any_version = Proc.new do
-          array_column :id, :width => '10%'
-          array_column :material, :filter => {:type => :select, :values => ['Stainless Steel', 'Copper', 'Cast Iron', 'Composite']}
-          array_column :bowl, :filter => {:type => :select, :values => ['Single Bowl', 'Double Bowl', 'Triple Bowl']}
-          array_column :name
-          array_column :actions, :filter => false, :sortable => false do
-            [link_to('View', '#'), link_to('Edit', '#')].join('&nbsp;-&nbsp;').html_safe
-          end
-        end
-
-        require 'effective_datatables/version'
-        if Gem::Version.new(EffectiveDatatables::VERSION) >= Gem::Version.new('2.0')
-          datatable do
-            instance_eval &any_version
-          end
-        else
-          instance_eval &any_version
-        end
-
-        def collection
-          [
-            [1, 'Stainless Steel', 'Single Bowl', 'KOHLER Staccato'],
-            [2, 'Stainless Steel', 'Double Bowl', 'KOHLER Vault Undercounter'],
-            [3, 'Stainless Steel', 'Triple Bowl', 'KRAUS All-In-One'],
-            [4, 'Stainless Steel', 'Single Bowl', 'KOHLER Vault Dual Mount'],
-            [5, 'Stainless Steel', 'Single Bowl', 'KRAUS All-In-One Undermount'],
-            [6, 'Stainless Steel', 'Double Bowl', 'Glacier Bay All-in-One'],
-            [7, 'Stainless Steel', 'Single Bowl', 'Elkay Neptune'],
-            [8, 'Copper', 'Single Bowl', 'ECOSINKS Apron Front Dual Mount'],
-            [9, 'Copper', 'Double Bowl', 'ECOSINKS Dual Mount Front Hammered'],
-            [10, 'Copper', 'Triple Bowl', 'Glarier Bay Undermount'],
-            [11, 'Copper', 'Single Bowl', 'Whitehaus Undermount'],
-            [12, 'Copper', 'Double Bowl', 'Belle Foret Apron Front'],
-            [13, 'Copper', 'Double Bowl', 'Pegasus Dual Mount'],
-            [14, 'Cast Iron', 'Double Bowl', 'KOHLER Whitehaven'],
-            [15, 'Cast Iron', 'Triple Bowl', 'KOHLER Hartland'],
-            [16, 'Cast Iron', 'Single Bowl', 'KOHLER Cape Dory Undercounter'],
-            [17, 'Cast Iron', 'Double Bowl', 'KOLER Bakersfield'],
-            [18, 'Cast Iron', 'Double Bowl', 'American Standard Offset'],
-            [19, 'Cast Iron', 'Single Bowl', 'Brookfield Top'],
-            [20, 'Composite', 'Single Bowl', 'Blanco Diamond Undermount'],
-            [21, 'Composite', 'Double Bowl', 'Mont Blanc Waterbrook'],
-            [22, 'Composite', 'Triple Bowl', 'Pegasus Triple Mount'],
-            [23, 'Composite', 'Single Bowl', 'Swanstone Dual Mount']
-          ]
-        end
-
-      end
-    end
-  end
-end

data/app/views/effective/style_guide/_effective_datatable.html.haml

@@ -1,9 +0,0 @@
-%br
-- if defined?(EffectiveDatatables)
-  - if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-    = render_datatable Effective::Datatables::StyleGuide.new()
-  - else
-    = render_datatable EffectiveStyleGuideDatatable.new()
-
-- else
-  %p Please install the effective_datatables gem