bootswatch_rails 3.3.7.4 → 3.3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b572743a1d4a3d24feb82b9ead77e2f529f9bf
-  data.tar.gz: 7d52efecdd75bef25cc5b58bbd79a3d858cf3146
+  metadata.gz: a1927fd3e6076243a3153378c4d92b9dba666690
+  data.tar.gz: de6ab442b3893d0d8f414e41f1fe89e0061b52ce
 SHA512:
-  metadata.gz: 8133266cf893a0136cbe64349c249634cace36110b2439cbc3704660f8813064cdf49a49d33ca80a2936d929c583015f83aa8042d0f5dbd448461c8b48392d07
-  data.tar.gz: 84ae085f1c1f5924d08ecf35e2869457e937741c8dbd106494c1d687b602f7eb10dbf38bf7a3e3bf175337a60a3010a05969506e0c1a8442fdce7a54fb01826f
+  metadata.gz: 70dce1f103ef3e9defece6b1bc15abf47c9d8bf6ef1a262aa3e0483c146bfcb2bca04afad3fb1f9229680f13bd7ad578b0b223a95ef782ea8274ca8448f34454
+  data.tar.gz: a7fbb58a508ecf0d3dd667c7b235d3fcac4c4eb74450dede492aab6d1ae5b85314d06559604f9ed70a3285317db2b480c9f809b268a93de4a2bd908fdad40b18

data/lib/bootswatch_rails/version.rb

@@ -4,7 +4,7 @@ module BootswatchRails
   FONT_AWESOME = "4.6.2"
   DATATABLES = "1.10.12"
   RESPONSIVE = "2.1.0"
-  VERSION = "3.3.7.4"
+  VERSION = "3.3.7.5"
 
   THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 0

data/lib/generators/bootswatch_rails/install/install_generator.rb

@@ -7,36 +7,70 @@ module BootswatchRails
       class_option :ui, type: :boolean, default: false,
                desc: 'Include jQuery-ui (requires jquery-ui-rails gem)'
       class_option :dt, type: :boolean, default: false,
-               desc: 'Include the jQuery DataTables plugin'
+               desc: 'Include the jQuery DataTables plugin (and responsive)'
       class_option :cdn, type: :string, default: 'none',
-               banner: 'none, google, microsoft, jquery or yandex',
+               banner: 'none/google/microsoft/jquery/yandex',
                desc: 'Use CDN (requires jquery[-ui]-rails-cdn gems)'
-      class_option :devise, type: :boolean, default: false,
-               desc: 'Call user_signed_in? instead of logged_in?'
-      class_option :layout, type: :string, default: 'single',
-               banner: 'single, sidebar or even',
-               desc: 'Setup application layout (default single=12-col)'
+      class_option :auth, type: :string, default: 'sorcery',
+               banner: 'none/devise resource (e.g. user)/sorcery',
+               desc: 'Setup some authentication logic for sorcery or devise'
+      class_option :layout, type: :string, default: 'custom',
+               banner: 'custom(just div.row)/single(col-lg-12)/sidebar(content_for)',
+               desc: 'Install default application layout'
       source_root File.expand_path("../templates", __FILE__)
 
       def update_application_controller
         file = "app/controllers/application_controller.rb"
-        inject_into_file file, "\n\n  private", after: /protect_from_forgery.*$/
-
-        lines = [
+        if options.auth == "none"
+          lines = [
+            ""
+          ]
+        elsif options.auth == "sorcery"
+          lines = [
+            "",
+            "  before_action :require_login"
+          ]
+        else
+          lines = [
+            "",
+            "  before_action :authenticate_#{options.auth}!"
+          ]
+        end
+        lines += [
+          "",
+          "  private",
           "",
           "  def default_theme",
           "    BootswatchRails::THEMES[BootswatchRails::DEFAULT].to_s",
           "  end",
-          "  helper_method :default_theme",
-          "",
-          "  def current_theme",
-          "    @current_theme = current_user.theme if #{auth_check}",
-          "    @current_theme ||= default_theme",
-          "  end",
-          "  helper_method :current_theme",
-          ""
+          "  helper_method :default_theme"
         ]
-        inject_into_file file, lines.join("\n"), before: /^end$/
+        if options.auth != "none"
+          lines += [
+            "",
+            "  def current_theme",
+            "    @current_theme = current_#{auth_resource}.theme if #{auth_check}",
+            "    @current_theme ||= default_theme",
+            "  end",
+            "  helper_method :current_theme"
+          ]
+        end
+        if options.auth == "sorcery"
+          lines += [
+            "",
+            "  def not_authenticated",
+            "    redirect_to login_path, alert: t('sorcery.required')",
+            "  end"
+          ]
+        elsif options.auth != "none"
+          lines += [
+            "",
+            "  def after_sign_in_path_for(resource)",
+            "    session['#{auth_resource}_return_to'] || root_path",
+            "  end"
+          ]
+        end
+        inject_into_file file, lines.join("\n"), after: /protect_from_forgery.*$/
       end
 
       def update_application_js
@@ -99,13 +133,19 @@ module BootswatchRails
         file = "app/views/layouts/application.html.erb"
         remove_file file
         template "#{options.layout}.html.erb", file
-        template "theme.html.erb", "app/views/layouts/_theme.html.erb"
+        if options.auth != "none"
+          template "theme.html.erb", "app/views/layouts/_theme.html.erb"
+        end
       end
 
       protected
 
+      def auth_resource
+        options.auth == "sorcery" ?  "user" : options.auth
+      end
+
       def auth_check
-        options.devise? ? "user_signed_in?" : "logged_in?"
+        options.auth == "sorcery" ? "logged_in?" : "#{options.auth}_signed_in?"
       end
 
       def turbolinks

data/lib/generators/bootswatch_rails/install/templates/custom.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="de">
+  <%%= render 'layouts/head' %>
+
+  <body>
+    <%%= render 'layouts/topnav' %>
+    <%%= render 'layouts/theme' %>
+
+    <div class="container" id="main-content">
+      <div class="row">
+        <%%= render 'layouts/flash' %>
+        <%%= yield %>
+      </div>
+    </div>
+
+    <%%= render 'layouts/footer' %>
+  </body>
+</html>
+
+<%%-# vim: set expandtab softtabstop=2 shiftwidth=2 autoindent : -%>

data/lib/generators/bootswatch_rails/install/templates/theme.html.erb

@@ -4,11 +4,11 @@
       <div class='modal-content'>
         <div class='modal-header'>
           <button type='button' class='close' data-dismiss='modal'>&times;</button>
-          <h4 class='modal-title'><%%= t('activerecord.attributes.user.theme') %></h4>
+          <h4 class='modal-title'><%%= t('activerecord.attributes.<%= auth_resource %>.theme') %></h4>
         </div>
         <div class='modal-body theme-list'>
           <%%- BootswatchRails::THEMES.each do |theme| -%>
-            <%%= link_to theme.to_s, user_path(current_user, theme: theme), class: 'theme-link' %>
+            <%%= link_to theme.to_s, <%= auth_resource %>_path(current_<%= auth_resource %>, theme: theme), class: 'theme-link' %>
           <%%- end -%>
         </div>
         <div class='modal-footer'>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.3.7.4
+  version: 3.3.7.5
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -130,6 +130,7 @@ files:
 - lib/generators/bootswatch_rails/install/templates/config/locales/scaffold.de.yml
 - lib/generators/bootswatch_rails/install/templates/config/locales/scaffold.en.yml
 - lib/generators/bootswatch_rails/install/templates/config/locales/simple_form.de.yml
+- lib/generators/bootswatch_rails/install/templates/custom.html.erb
 - lib/generators/bootswatch_rails/install/templates/even.html.erb
 - lib/generators/bootswatch_rails/install/templates/head.html.erb
 - lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/_form.html.erb