bootswatch_rails 3.1.1.11 → 3.1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d292cd0ac0502d539ba38469e004f251b674d568
-  data.tar.gz: 3e0147c90db10cbda94cd6fd83e253def48ab807
+  metadata.gz: 277159fe829dec481e3483ba9ced4cbf462ba513
+  data.tar.gz: 55876bfef80f2fdae6b697864ed8f2937464643a
 SHA512:
-  metadata.gz: 9a01fcf1875935a31e1802631ced3df739e4a9c38e28f884c9bb2810e540786a87b4ad9a492e46f1495019152d9f2b06ab0054aa8abfcfd237e31d9e3a17978f
-  data.tar.gz: c3c17f7bbd24e92e2bf0d627f928d752963d3ff23b2ade8824e7eac12586ef764da0727ffdfcd3c227f1379d6e43aeb4bd3d62618ea7b3351100110738f5a864
+  metadata.gz: 334f1abb47c528e096fce1b6aa91fa0aab95220c4996339636a7306c174ea61aaa8cda2dc9b04fb31a1c349924144edc3c31685a359b1429b0fa2b9cad7f5401
+  data.tar.gz: a5ebf20d243bf52b69cd060420c34bef4d885f89cecdb360635c1950dd532643e78308f7649467802cf777c6f0641c6d18a60ba57d27828b555d6c0553423cdf

data/lib/bootswatch_rails/version.rb

@@ -1,5 +1,5 @@
 module BootswatchRails
-  VERSION = "3.1.1.11"
+  VERSION = "3.1.1.13"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :readable, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

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

@@ -8,37 +8,28 @@ module BootswatchRails
       
       def update_javascripts
         return unless options.bootstrap?
-        inside "app/assets/javascripts" do
-          inject_into_file "application.js", after: /require jquery_ujs$/ do
-            "\n//= require bootstrap"
-          end
-        end
+        file = "app/assets/javascripts/application.js"
+        inject_into_file file, "\n//= require bootstrap", after: /require jquery_ujs$/
       end
       
       def update_application_controller
-        inside "app/controllers" do
-          file = "application_controller.rb"
-          inject_into_file file, after: /protect_from_forgery.*$/ do
-            "\n\n  private"
-          end
-          lines = [
-            "",
-            "  def default_theme",
-            "    BootswatchRails::THEMES[BootswatchRails::DEFAULT].to_s",
-            "  end",
-            "  helper_method :default_theme",
-            "",
-            "  def current_theme",
-            "    @current_theme = current_user.theme if current_user.present?",
-            "    @current_theme ||= default_theme",
-            "  end",
-            "  helper_method :current_theme",
-            ""
-          ]
-          inject_into_file file, before: /^end$/ do
-            lines.join("\n")
-          end
-        end
+        file = "app/controllers/application_controller.rb"
+        inject_into_file file, "\n\n  private", after: /protect_from_forgery.*$/
+        lines = [
+          "",
+          "  def default_theme",
+          "    BootswatchRails::THEMES[BootswatchRails::DEFAULT].to_s",
+          "  end",
+          "  helper_method :default_theme",
+          "",
+          "  def current_theme",
+          "    @current_theme = current_user.theme if current_user.present?",
+          "    @current_theme ||= default_theme",
+          "  end",
+          "  helper_method :current_theme",
+          ""
+        ]
+        inject_into_file file, lines.join("\n"), before: /^end$/
       end
       
       def copy_directories
@@ -49,4 +40,3 @@ module BootswatchRails
     end
   end
 end
-

data/lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb

@@ -78,6 +78,8 @@ module BootswatchRails
         ] if reset_password?
         lines << [
           "  end",
+          "get '/login'  => '#{table_name}#log_in',  as: :login",
+          "get '/logout' => '#{table_name}#log_out', as: :logout",
           ""
         ]
         route lines.join("\n")
@@ -93,6 +95,20 @@ module BootswatchRails
         end
       end
 
+      def update_application_controller
+        file = "app/controllers/application_controller.rb"
+        inject_into_class file, "ApplicationController", "  before_filter :require_login\n\n"
+        inject_into_file file, "\n\n  private", after: /protect_from_forgery.*$/
+        lines = [
+          "",
+          "  def not_authenticated",
+          "    redirect_to login_path, alert: t('sorcery.required')",
+          "  end",
+          ""
+        ]
+        inject_into_file file, lines.join("\n"), before: /^end$/
+      end
+
       protected
 
       def user_activation?

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml

@@ -22,6 +22,7 @@ de:
     failed: "E-Mail oder Kennwort ungültig"
     success: "Willkommen und frohes Schaffen!"
     goodbye: "Tschüss und bis bald."
+    required: "Bitte melden Sie sich zurerst an."
 
   <%= name %>_mailer:
     reset_password_email:

data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb

@@ -1,4 +1,5 @@
 class <%= controller_name.camelize %> < ApplicationController
+  skip_before_filter :require_login, only: [:log_in, :access, :password, :reset, :change, :refresh]
   before_action :set_<%= name %>, only: [:show, :edit, :update, :destroy]
 
   # GET /<%= table_name %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.1.1.11
+  version: 3.1.1.13
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties