RubyGems - bootswatch_rails - Versions diffs - 3.1.1.9 → 3.1.1.10 - Mend

bootswatch_rails 3.1.1.9 → 3.1.1.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7989183c9f2fb3c5b184ac9d940b442830f3fd74
-  data.tar.gz: 793aff92aa704ba265311bf984fd4f7bac9bfc45
+  metadata.gz: 07d95e02e359636014ad1526bf7d9aefd0ec7793
+  data.tar.gz: 995facc0d2f1a13e3a75194ff4f1c4588ca0b205
 SHA512:
-  metadata.gz: 4ea6cc933b50074ea9accaa20d48768693d499f576a3732807fce8bb617713360a099c1f59854f8b819ff66fc3535d12c85dd18686969ba1446698c6dd5e2140
-  data.tar.gz: b756e1db9d89740df404e5af74f9e6061922188d54791e19296b4e6b6a870152457a77d501daa751a3a0bd0b54e549b08b0448a5a76d96959a34852c143ffcb1
+  metadata.gz: 438bb65b155e53dcc666949c3c014d6676ff260b36a74c264733ab2e6a34ca6ae0a8921459c6e59c7036b7e6d1e2bea4f7a4c98e6aaa7fb0210b634439f39783
+  data.tar.gz: e38e2cf9b143c50da825e8e958b14d375ec91aaa376d743f76d0036c853d2e59a1b528bffd594dea43606318b4cdd1c1774e0499383c241ca12d83a5114f1f23

data/lib/bootswatch_rails/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module BootswatchRails
-  VERSION = "3.1.1.9"
+  VERSION = "3.1.1.10"
   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 CHANGED Viewed

@@ -29,7 +29,7 @@ module BootswatchRails
             "  helper_method :default_theme",
             "",
             "  def current_theme",
-            "    @current_theme = current_user.theme if user_signed_in?",
+            "    @current_theme = current_user.theme if current_user.present?",
             "    @current_theme ||= default_theme",
             "  end",
             "  helper_method :current_theme",

data/lib/generators/bootswatch_rails/install/templates/app/views/layouts/application.html.erb CHANGED Viewed

@@ -4,10 +4,10 @@
   <body>
     <%= render 'layouts/topnav' %>
     <div class="container" id="main-content">
       <div class="row">
-<%- if user_signed_in? -%>
+<%- if current_user.present? -%>
         <div class="col-md-9">
           <%= render 'layouts/flash' %>
           <%= yield %>
@@ -23,7 +23,7 @@
 <%- end -%>
       </div>
     </div>
     <%= render 'layouts/footer' %>
   </body>
 </html>

data/lib/generators/bootswatch_rails/install/templates/app/views/layouts/centered.html.erb CHANGED Viewed

@@ -12,8 +12,8 @@
           <%= yield %>
         </div>
       </div>
-      <%= render 'layouts/footer' %>
     </div>
+    <%= render 'layouts/footer' %>
   </body>
 </html>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/show.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
       <td>
   <%- if attribute.name.include?("picture") -%>
         <p>
-          <%%= link_to "Anzeigen in Originalgröße", '#' %>
+          <%%= link_to "TODO: Anzeigen in Originalgröße", '#' %>
         </p>
         <%%= image_tag(@<%= singular_table_name %>.<%= attribute.name %>_url(:display)) %>
   <%- elsif attribute.type == :boolean -%>

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

@@ -0,0 +1,164 @@
+require 'rails/generators/active_record'
+module BootswatchRails
+  USER_STATUS = %w(guest member admin sysadm)
+  module Generators
+    class SorceryGenerator < ActiveRecord::Generators::Base
+      desc "Install model, views and controller for Sorcery."
+      argument :name, type: :string, default: "user",
+               banner: "user model (default 'user')"
+      class_option :user_activation, type: :boolean, default: false,
+               desc: 'User activation by email with optional success email'
+      class_option :reset_password, type: :boolean, default: false,
+               desc: 'Reset password with email verification'
+      class_option :remember_me, type: :boolean, default: false,
+               desc: 'Remember me with configurable expiration'
+      class_option :session_timeout, type: :boolean, default: false,
+               desc: 'Configurable session timeout'
+      class_option :brute_force_protection, type: :boolean, default: false,
+               desc: 'Brute force login hammering protection'
+      class_option :http_basic_auth, type: :boolean, default: false,
+               desc: 'A before filter for requesting authentication with HTTP Basic'
+      class_option :activity_logging, type: :boolean, default: false,
+               desc: 'Automatic logging of last login, logout and activity'
+      class_option :external, type: :boolean, default: false,
+               desc: 'OAuth1 and OAuth2 support (Twitter, Facebook, etc.)'
+      class_option :layout, type: :string, default: 'centered',
+               desc: 'Layout to be used for rendering login.html.erb'
+      source_root File.expand_path("../templates", __FILE__)
+      def add_migration
+        migration_template "user_migration.rb", "db/migrate/create_#{table_name}.rb"
+      end
+      def add_model
+        template "user_model.rb", "app/models/#{name}.rb"
+      end
+      def add_mailer
+        return unless reset_password?
+        template "user_mailer.rb", "app/mailers/#{name}_mailer.rb"
+        template "reset_password_email.html.erb", "app/views/#{name}_mailer/reset_password_email.html.erb"
+      end
+      def add_controller
+        template "users_controller.rb", "app/controllers/#{table_name}_controller.rb"
+      end
+      def add_views
+        views  = %w[edit _form index log_in new show]
+        views += %w[password change] if reset_password?
+        views.each do |view|
+          template "#{view}.html.erb", "app/views/#{table_name}/#{view}.html.erb"
+        end
+      end
+      def add_routes
+        lines = [
+          "resources :#{table_name} do",
+          "    collection do",
+          "      get   'log_in'",
+          "      post  'access'",
+          "      get   'log_out'"
+        ]
+        lines << [
+          "      get   'password'",
+          "      post  'reset'"
+        ] if reset_password?
+        lines << [
+          "    end"
+        ]
+        lines << [
+          "    member do",
+          "      get   'change'",
+          "      patch 'refresh'",
+          "      put   'refresh'",
+          "    end"
+        ] if reset_password?
+        lines << [
+          "  end",
+          ""
+        ]
+        route lines.join("\n")
+      end
+      def add_initializer
+        template "initializer.rb", "config/initializers/sorcery.rb"
+      end
+      def add_locales
+        %w[de].each do |locale|
+          template "sorcery.#{locale}.yml", "config/locales/sorcery.#{locale}.yml"
+        end
+      end
+      protected
+      def user_activation?
+        options.user_activation?
+      end
+      def reset_password?
+        options.reset_password?
+      end
+      def remember_me?
+        options.remember_me?
+      end
+      def session_timeout?
+        options.session_timeout?
+      end
+      def brute_force_protection?
+        options.brute_force_protection?
+      end
+      def http_basic_auth?
+        options.http_basic_auth?
+      end
+      def activity_logging?
+        options.activity_logging?
+      end
+      def external?
+        options.external?
+      end
+      def submodules
+        modules = []
+        modules << ":user_activation"        if user_activation?
+        modules << ":reset_password"         if reset_password?
+        modules << ":remember_me"            if remember_me?
+        modules << ":session_timeout"        if session_timeout?
+        modules << ":brute_force_protection" if brute_force_protection?
+        modules << ":http_basic_auth"        if http_basic_auth?
+        modules << ":activity_logging"       if activity_logging?
+        modules << ":external"               if external?
+        modules.join(', ')
+      end
+      def layout
+        options.layout
+      end
+      def migration_name
+        "create_#{table_name}"
+      end
+      def mailer_name
+        "#{name}_mailer"
+      end
+      def controller_name
+        "#{table_name}_controller"
+      end
+      def whitelist
+        ":email, :name, :active, :status, :password, :password_confirmation, :theme"
+      end
+    end
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb ADDED Viewed

@@ -0,0 +1,19 @@
+<%%= simple_form_for(@<%= name %>) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.input :email %>
+  <%%= f.input :name %>
+  <%%= f.input :active %>
+  <%%= f.input :password %>
+  <%%= f.input :password_confirmation %>
+  <%%= f.input :status %>
+  <%%= f.input :theme %>
+  <%%= f.button :submit, class: 'btn btn-primary' %>
+  <%%- if @<%= name %>.new_record? -%>
+    <%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
+  <%%- else -%>
+    <%%= link_to t('actions.back.show'), @<%= name %>, class: 'btn btn-default' %>
+    <%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
+  <%%- end -%>
+<%% end %>

data/lib/generators/bootswatch_rails/sorcery/templates/change.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<h2><%%= t('sorcery.reset.choose') %></h2>
+<%%= simple_form_for(@<%= name %>, url: {action: "refresh"}) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.input :email, disabled: true, required: false %>
+  <%%= f.input :reset_password_token, as: :hidden %>
+  <%%= f.input :password, required: true %>
+  <%%= f.input :password_confirmation, required: true %>
+  <%%= f.button :submit, t('sorcery.reset.change'), class: 'btn btn-primary' %>
+  <%%= link_to t('sorcery.reset.back'), log_in_<%= table_name %>_path, class: 'btn btn-default' %>
+<%% end %>

data/lib/generators/bootswatch_rails/sorcery/templates/edit.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<h2><%%= t('headers.edit', name: t('activerecord.models.<%= name %>.one')) %></h2>
+<%%= render 'form' %>

data/lib/generators/bootswatch_rails/sorcery/templates/index.html.erb ADDED Viewed

@@ -0,0 +1,37 @@
+<h2><%%= t('headers.index', name: t('activerecord.models.<%= name %>.other')) %></h2>
+<table class="table table-striped table-hover">
+  <thead>
+    <tr>
+      <th><%%= t('activerecord.attributes.<%= name %>.email') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.name') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.active') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.status') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.theme') %></th>
+      <th class="index-actions"><%%= t('actions.title') %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%% @<%= table_name %>.each do |<%= name %>| %>
+      <tr>
+        <td><%%= <%= name %>.email %></td>
+        <td><%%= <%= name %>.name %></td>
+        <td><%%= <%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
+        <td><%%= t('enums.<%= name %>.status.' + <%= name %>.status) %></td>
+        <td><%%= <%= name %>.theme %></td>
+        <td class="index-actions">
+          <%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
+          <br>
+          <%%= link_to t('actions.edit'), [:edit, <%= name %>], class: 'btn btn-default btn-xs' %>
+          <br>
+          <%%= link_to t('actions.destroy'), <%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger btn-xs' %>
+        </td>
+      </tr>
+    <%% end %>
+  </tbody>
+</table>
+<br>
+<%%= link_to t('actions.add', name: t('activerecord.models.<%= name %>.one')), new_<%= name %>_path, class: 'btn btn-primary' %>

data/lib/generators/bootswatch_rails/sorcery/templates/initializer.rb ADDED Viewed

@@ -0,0 +1,114 @@
+#
+# This initializer was derived from the original Sorcery initializer
+#
+Rails.application.config.sorcery.submodules = [<%= submodules %>]
+Rails.application.config.sorcery.configure do |config|
+  # -- core --
+  # config.not_authenticated_action = :not_authenticated
+  # config.save_return_to_url = true
+  # config.cookie_domain = nil
+<%- if session_timeout? -%>
+  # -- session_timeout --
+  # config.session_timeout = 3600
+  # config.session_timeout_from_last_action = false
+<%- end -%>
+<%- if http_basic_auth? -%>
+  # -- http_basic_auth --
+  # config.controller_to_realm_map = { "application" => "Application" }
+<%- end -%>
+<%- if activity_logging? -%>
+  # -- activity_logging --
+  # config.register_login_time = true
+  # config.register_logout_time = true
+  # config.register_last_activity_time = true
+<%- end -%>
+<%- if external? -%>
+  # -- external --
+  # config.external_providers = []
+  # config.ca_file = 'path/to/ca_file'
+<%- end -%>
+  # --- user config ---
+  config.user_config do |user|
+    # -- core --
+    # user.username_attribute_names = [:email]
+    # user.password_attribute_name = :password
+    # user.downcase_username_before_authenticating = false
+    # user.email_attribute_name = :email
+    # user.crypted_password_attribute_name = :crypted_password
+    # user.salt_join_token = ""
+    # user.salt_attribute_name = :salt
+    # user.stretches = nil
+    # user.encryption_key = nil
+    # user.custom_encryption_provider = nil
+    # user.encryption_algorithm = :bcrypt
+    # user.subclasses_inherit_config = false
+<%- if user_activation? -%>
+    # -- user_activation --
+    # user.activation_state_attribute_name = :activation_state
+    # user.activation_token_attribute_name = :activation_token
+    # user.activation_token_expires_at_attribute_name = :activation_token_expires_at
+    # user.activation_token_expiration_period = nil
+    # user.user_activation_mailer = nil
+    # user.activation_mailer_disabled = false
+    # user.activation_needed_email_method_name = :activation_needed_email
+    # user.activation_success_email_method_name = :activation_success_email
+    # user.prevent_non_active_users_to_login = true
+<%- end -%>
+<%- if reset_password? -%>
+    # -- reset_password --
+    # user.reset_password_token_attribute_name = :reset_password_token
+    # user.reset_password_token_expires_at_attribute_name = :reset_password_token_expires_at
+    # user.reset_password_email_sent_at_attribute_name = :reset_password_email_sent_at
+    user.reset_password_mailer = <%= class_name %>Mailer
+    # user.reset_password_email_method_name = :reset_password_email
+    # user.reset_password_mailer_disabled = false
+    # user.reset_password_expiration_period = nil
+    # user.reset_password_time_between_emails = 300
+<%- end -%>
+<%- if remember_me? -%>
+    # -- remember_me --
+    # user.remember_me_httponly = true
+    # user.remember_me_for = 604800
+<%- end -%>
+<%- if brute_force_protection? -%>
+    # -- brute_force_protection --
+    # user.failed_logins_count_attribute_name = :failed_logins_count
+    # user.lock_expires_at_attribute_name = :lock_expires_at
+    # user.consecutive_login_retries_amount_limit = 50
+    # user.login_lock_time_period = 3600
+    # user.unlock_token_attribute_name = :unlock_token
+    # user.unlock_token_email_method_name = :send_unlock_token_email
+    # user.unlock_token_mailer_disabled = false
+    # user.unlock_token_mailer = nil
+<%- end -%>
+<%- if activity_logging? -%>
+    # -- activity_logging --
+    # user.last_login_at_attribute_name = :last_login_at
+    # user.last_logout_at_attribute_name = :last_logout_at
+    # user.last_activity_at_attribute_name = :last_activity_at
+    # user.activity_timeout = 600
+<%- end -%>
+<%- if external? -%>
+    # -- external --
+    # user.authentications_class = nil
+    # user.authentications_user_id_attribute_name = :user_id
+    # user.provider_attribute_name = :provider
+    # user.provider_uid_attribute_name = :uid
+<%- end -%>
+  end
+  config.user_class = "<%= class_name %>"
+end

data/lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb ADDED Viewed

@@ -0,0 +1,16 @@
+<h2><%%= t('sorcery.header') %></h2>
+<%%= simple_form_for(@<%= name %>, url: {action: "access"}) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.input :email %>
+  <%%= f.input :password %>
+<%- if remember_me? -%>
+  <%%= f.input :remember_me %>
+<%- end -%>
+  <%%= f.button :submit, t('sorcery.submit'), class: 'btn btn-primary' %>
+<%- if reset_password? -%>
+  <%%= link_to t('sorcery.reset.forgot'), password_<%= table_name %>_path, class: 'btn btn-default' %>
+<%- end -%>
+<%% end %>

data/lib/generators/bootswatch_rails/sorcery/templates/new.html.erb ADDED Viewed

@@ -0,0 +1,3 @@
+<h2><%%= t('headers.new', name: t('activerecord.models.<%= name %>.one')) %></h2>
+<%%= render 'form' %>

data/lib/generators/bootswatch_rails/sorcery/templates/password.html.erb ADDED Viewed

@@ -0,0 +1,10 @@
+<h2><%%= t('sorcery.reset.header') %></h2>
+<%%= simple_form_for(@<%= name %>, url: {action: "reset"}) do |f| %>
+  <%%= f.error_notification %>
+  <%%= f.input :email %>
+  <%%= f.button :submit, t('sorcery.reset.send'), class: 'btn btn-primary' %>
+  <%%= link_to t('sorcery.reset.back'), log_in_<%= table_name %>_path, class: 'btn btn-default' %>
+<%% end %>

data/lib/generators/bootswatch_rails/sorcery/templates/reset_password_email.html.erb ADDED Viewed

@@ -0,0 +1,8 @@
+Hello, <%%= @<%= name %>.email %>
+===============================================
+You have requested to reset your password.
+To choose a new password, just follow this link: <%%= @url %>.
+Have a great day!

data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb ADDED Viewed

@@ -0,0 +1,58 @@
+<h2><%%= t('headers.show', name: t('activerecord.models.<%= name %>.one')) %></h2>
+<table class="table table-striped table-hover">
+  <tbody>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.email') %></td>
+      <td><%%= @<%= name %>.email %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.name') %></td>
+      <td><%%= @<%= name %>.name %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.active') %></td>
+      <td><%%= @<%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.status') %></td>
+      <td><%%= t('enums.<%= name %>.status.' + @<%= name %>.status) %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.theme') %></td>
+      <td><%%= @<%= name %>.theme %></td>
+    </tr>
+<%- if activity_logging? -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.last_login_at') %></td>
+      <td><%%= @<%= name %>.last_login_at %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.last_login_from_ip_address') %></td>
+      <td><%%= @<%= name %>.last_login_from_ip_address %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.last_logout_at') %></td>
+      <td><%%= @<%= name %>.last_logout_at %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.last_activity_at') %></td>
+      <td><%%= @<%= name %>.last_activity_at %></td>
+    </tr>
+<%- end -%>
+<%- if brute_force_protection? -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.failed_logins_count') %></td>
+      <td><%%= @<%= name %>.failed_logins_count %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.lock_expires_at') %></td>
+      <td><%%= @<%= name %>.lock_expires_at %></td>
+    </tr>
+<%- end -%>
+  </tbody>
+</table>
+<%%= link_to t('actions.edit'), [:edit, @<%= name %>], class: 'btn btn-primary' %>
+<%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
+<%%= link_to t('actions.destroy'), @<%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger' %>

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

@@ -0,0 +1,64 @@
+de:
+  sorcery:
+    log_in: "Login"
+    log_out: "Logout"
+    sign_up: "Benutzerkonto anlegen"
+    header: "Anmelden am System"
+    submit: "Login"
+<%- if reset_password? -%>
+    reset:
+      forgot: "Kennwort vergessen?"
+      header: "Kennwort anfordern"
+      send: "Anleitung senden"
+      back: "Zurück zum Login"
+      delivered: "Eine Anleitung wurde an Ihre E-Mail Adresse gesendet."
+      missing: "Keine E-Mail Adresse angegeben."
+      choose: "Eingabe neues Kennwort"
+      change: "Kennwort ändern"
+      success: "Das Kennwort wurde aktualisiert."
+      failed: "Das Kennwort konnte nicht aktualisiert werden."
+<%- end -%>
+    new_password: "Neues Kennwort"
+    failed: "E-Mail oder Kennwort ungültig"
+    success: "Willkommen und frohes Schaffen!"
+    goodbye: "Tschüss und bis bald."
+  <%= name %>_mailer:
+    reset_password_email:
+      subject: "Kennwort für #{name} zurücksetzen"
+  enums:
+    <%= name %>:
+      status:
+        guest: "Gast"
+        member: "Mitglied"
+        admin: "Admin"
+        sysadm: "System-Admin"
+  activerecord:
+    models:
+      <%= name %>:
+        one: "Benutzer"
+        other: "Benutzer"
+    attributes:
+      <%= name %>:
+        email: "E-Mail"
+        name: "Name"
+        active: "Aktiv"
+        status: "Status"
+        theme: "Oberfläche"
+        password: "Kennwort"
+        password_confirmation: "Kennwort wiederholen"
+<%- if remember_me? -%>
+        remember_me: "Angemeldet bleiben"
+<%- end -%>
+<%- if activity_logging? -%>
+        last_login_at: "Letzte Anmeldung"
+        last_logout_at: "Letzte Abmeldung"
+        last_activity_at: "Letzte Aktivität"
+        last_login_from_ip_address: "Letzte IP-Adresse"
+<%- end -%>
+<%- if brute_force_protection? -%>
+        failed_logins_count: "Fehlversuche Anmeldung"
+        lock_expires_at: "Gesperrt bis"
+<%- end -%>

data/lib/generators/bootswatch_rails/sorcery/templates/user_mailer.rb ADDED Viewed

@@ -0,0 +1,14 @@
+class <%= mailer_name.camelize %> < ActionMailer::Base
+  default from: "from@example.com"
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.<%= name %>_mailer.reset_password_email.subject
+  #
+  def reset_password_email(<%= name %>)
+    @<%= name %> = <%= name %>
+    @url = change_<%= name %>_url(<%= name %>.reset_password_token)
+    mail to: <%= name %>.email
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb ADDED Viewed

@@ -0,0 +1,60 @@
+class <%= migration_name.camelize %> < ActiveRecord::Migration
+  def change
+    create_table :<%= table_name %> do |t|
+      t.string :email, null: false
+      t.string :name
+      t.boolean :active, default: true
+      t.integer :status, default: 0
+      t.integer :theme, default: BootswatchRails::DEFAULT
+      t.string :crypted_password, null: false
+      t.string :salt, null: false
+<%- if user_activation? -%>
+      t.string :activation_state, default: nil
+      t.string :activation_token, default: nil
+      t.datetime :activation_token_expires_at, default: nil
+<%- end -%>
+<%- if reset_password? -%>
+      t.string :reset_password_token, default: nil
+      t.datetime :reset_password_token_expires_at, default: nil
+      t.datetime :reset_password_email_sent_at, default: nil
+<%- end -%>
+<%- if remember_me? -%>
+      t.boolean :remember_me
+      t.string :remember_me_token, default: nil
+      t.datetime :remember_me_token_expires_at, default: nil
+<%- end -%>
+<%- if brute_force_protection? -%>
+      t.integer :failed_logins_count, default: 0
+      t.datetime :lock_expires_at, default: nil
+      t.string :unlock_token, default: nil
+<%- end -%>
+<%- if activity_logging? -%>
+      t.datetime :last_login_at, default: nil
+      t.datetime :last_logout_at, default: nil
+      t.datetime :last_activity_at, default: nil
+      t.string :last_login_from_ip_address, default: nil
+<%- end -%>
+      t.timestamps
+    end
+    add_index :<%= table_name %>, :email, unique: true
+    add_index :<%= table_name %>, :status
+<%- if user_activation? -%>
+    add_index :<%= table_name %>, :activation_token
+<%- end -%>
+<%- if reset_password? -%>
+    add_index :<%= table_name %>, :reset_password_token
+<%- end -%>
+<%- if remember_me? -%>
+    add_index :<%= table_name %>, :remember_me_token
+<%- end -%>
+<%- if brute_force_protection? -%>
+    add_index :<%= table_name %>, :unlock_token
+<%- end -%>
+<%- if activity_logging? -%>
+    add_index :<%= table_name %>, [:last_logout_at, :last_activity_at]
+<%- end -%>
+  end
+end

data/lib/generators/bootswatch_rails/sorcery/templates/user_model.rb ADDED Viewed

@@ -0,0 +1,13 @@
+class <%= class_name %> < ActiveRecord::Base
+  authenticates_with_sorcery!
+  validates :email, presence: true, uniqueness: true
+  validates :password, presence: true, on: :create
+  validates :password, length: { minimum: 6 }, unless: Proc.new { |a| a.password.blank? }
+  validates :password, confirmation: true
+  validates :password_confirmation, presence: true, on: :create
+  enum status: <%= BootswatchRails::USER_STATUS %>
+  validates :status, presence: true
+  enum theme: BootswatchRails::THEMES
+end

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

@@ -0,0 +1,151 @@
+class <%= controller_name.camelize %> < ApplicationController
+  before_action :set_<%= name %>, only: [:show, :edit, :update, :destroy]
+  # GET /<%= table_name %>
+  # GET /<%= table_name %>.json
+  def index
+    @<%= table_name %> = <%= class_name %>.order(:email)
+  end
+  # GET /<%= table_name %>/1
+  # GET /<%= table_name %>/1.json
+  def show
+  end
+  # GET /<%= table_name %>/new
+  def new
+    @<%= name %> = <%= class_name %>.new
+  end
+  # POST /<%= table_name %>
+  # POST /<%= table_name %>.json
+  def create
+    @<%= name %> = <%= class_name %>.new(<%= name %>_params)
+    respond_to do |format|
+      if @<%= name %>.save
+        format.html { redirect_to @<%= name %>, notice: t('results.created', name: t('activerecord.models.<%= name %>.one')) }
+        format.json { render :show, status: :created, location: @<%= name %> }
+      else
+        format.html { render :new }
+        format.json { render json: @<%= name %>.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+  # GET /<%= table_name %>/1/edit
+  def edit
+  end
+  # PATCH/PUT /<%= table_name %>/1
+  # PATCH/PUT /<%= table_name %>/1.json
+  def update
+    respond_to do |format|
+      if @<%= name %>.update(<%= name %>_params)
+        format.html { redirect_to @<%= name %>, notice: t('results.updated', name: t('activerecord.models.<%= name %>.one')) }
+        format.json { render :show, status: :ok, location: @<%= name %> }
+      else
+        format.html { render :edit }
+        format.json { render json: @<%= name %>.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+  # GET /<%= table_name %>/log_in
+  def log_in
+    @<%= name %> = <%= class_name %>.new
+    render layout: '<%= layout %>'
+  end
+  # POST /<%= table_name %>/access
+  def access
+    @<%= name %> = <%= class_name %>.find_by email: params[:<%= name %>][:email]
+    if @<%= name %>.present? and @<%= name %>.active
+<%- if remember_me? -%>
+      @<%= name %> = login(params[:<%= name %>][:email], params[:<%= name %>][:password], params[:<%= name %>][:remember_me])
+<%- else -%>
+      @<%= name %> = login(params[:<%= name %>][:email], params[:<%= name %>][:password])
+<%- end -%>
+    else
+      @<%= name %> = nil
+    end
+    if @<%= name %>.present?
+      redirect_back_or_to root_path, notice: t('sorcery.success')
+    else
+      redirect_to log_in_users_path, alert: t('sorcery.failed')
+    end
+  end
+<%- if reset_password? -%>
+  # GET /<%= table_name %>/password
+  def password
+    @<%= name %> = <%= class_name %>.new
+    render layout: '<%= layout %>'
+  end
+  # POST /<%= table_name %>/reset
+  def reset
+    if params[:<%= name %>][:email].present?
+      @<%= name %> = <%= class_name %>.find_by email: params[:<%= name %>][:email]
+      @<%= name %>.deliver_reset_password_instructions! if @<%= name %>
+      redirect_to log_in_<%= table_name %>_path, notice: t('sorcery.reset.delivered')
+    else
+      redirect_to log_in_<%= table_name %>_path, alert: t('sorcery.reset.missing')
+    end
+  end
+  # GET /<%= table_name %>/token/change
+  def change
+    @<%= name %> = <%= class_name %>.load_from_reset_password_token(params[:id])
+    @token = params[:id]
+    if @<%= name %>.blank?
+      not_authenticated
+      return
+    end
+    render layout: '<%= layout %>'
+  end
+  # PATCH/PUT /<%= table_name %>/token/refresh
+  def refresh
+    @token = params[:<%= name %>][:reset_password_token]
+    @<%= name %> = <%= class_name %>.load_from_reset_password_token(@token)
+    if @<%= name %>.blank?
+      not_authenticated
+      return
+    end
+    @<%= name %>.password_confirmation = params[:<%= name %>][:password_confirmation]
+    if @<%= name %>.change_password!(params[:<%= name %>][:password])
+      redirect_to root_path, notice: t('sorcery.reset.success')
+    else
+      redirect_to change_<%= name %>_path(@token), alert: t('sorcery.reset.failed')
+    end
+  end
+<%- end -%>
+  # DELETE /<%= table_name %>/1
+  # DELETE /<%= table_name %>/1.json
+  def destroy
+    @<%= name %>.destroy
+    respond_to do |format|
+      format.html { redirect_to <%= table_name %>_url, notice: t('results.deleted', name: t('activerecord.models.<%= name %>.one')) }
+      format.json { head :no_content }
+    end
+  end
+  # GET /<%= table_name %>/log_out
+  def log_out
+    logout
+    redirect_to root_url, notice: t('login.goodbye')
+  end
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_<%= name %>
+      @<%= name %> = <%= class_name %>.find(params[:id])
+    end
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def <%= name %>_params
+      params.require(:<%= name %>).permit(<%= whitelist %>)
+    end
+end

data/vendor/assets/stylesheets/amelia.css CHANGED Viewed

@@ -5836,6 +5836,9 @@ legend {
   font-family: 'Lobster', cursive;
   color: #fff;
 }
+.input-group-addon {
+  color: #444444;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .form-control-feedback {
@@ -5845,6 +5848,9 @@ legend {
 .has-warning .form-control:focus {
   border-color: #ecd77f;
 }
+.has-warning .input-group-addon {
+  border: none;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .form-control-feedback {
@@ -5854,6 +5860,9 @@ legend {
 .has-error .form-control:focus {
   border-color: #f0a6ac;
 }
+.has-error .input-group-addon {
+  border: none;
+}
 .has-success .help-block,
 .has-success .control-label,
 .has-success .form-control-feedback {
@@ -5863,8 +5872,8 @@ legend {
 .has-success .form-control:focus {
   border-color: #93e08b;
 }
-.input-group-addon {
-  color: #444444;
+.has-success .input-group-addon {
+  border: none;
 }
 .pagination a:hover {
   color: #fff;

data/vendor/assets/stylesheets/cosmo.css CHANGED Viewed

@@ -5838,7 +5838,8 @@ table .info a,
   color: #ff7518;
 }
 .has-warning .form-control,
-.has-warning .form-control:focus {
+.has-warning .form-control:focus,
+.has-warning .input-group-addon {
   border: 1px solid #ff7518;
 }
 .has-error .help-block,
@@ -5847,7 +5848,8 @@ table .info a,
   color: #ff0039;
 }
 .has-error .form-control,
-.has-error .form-control:focus {
+.has-error .form-control:focus,
+.has-error .input-group-addon {
   border: 1px solid #ff0039;
 }
 .has-success .help-block,
@@ -5856,7 +5858,8 @@ table .info a,
   color: #3fb618;
 }
 .has-success .form-control,
-.has-success .form-control:focus {
+.has-success .form-control:focus,
+.has-success .input-group-addon {
   border: 1px solid #3fb618;
 }
 .nav-pills > li > a {

data/vendor/assets/stylesheets/cyborg.css CHANGED Viewed

@@ -5825,7 +5825,8 @@ table .text-muted,
   color: #ff8800;
 }
 .has-warning .form-control,
-.has-warning .form-control:focus {
+.has-warning .form-control:focus,
+.has-warning .input-group-addon {
   border-color: #ff8800;
 }
 .has-error .help-block,
@@ -5834,7 +5835,8 @@ table .text-muted,
   color: #cc0000;
 }
 .has-error .form-control,
-.has-error .form-control:focus {
+.has-error .form-control:focus,
+.has-error .input-group-addon {
   border-color: #cc0000;
 }
 .has-success .help-block,
@@ -5843,7 +5845,8 @@ table .text-muted,
   color: #77b300;
 }
 .has-success .form-control,
-.has-success .form-control:focus {
+.has-success .form-control:focus,
+.has-success .input-group-addon {
   border-color: #77b300;
 }
 legend {

data/vendor/assets/stylesheets/lumen.css CHANGED Viewed

@@ -5947,6 +5947,9 @@ label {
   -webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
 }
+.has-warning .input-group-addon {
+  border: 1px solid #ff851b;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .form-control-feedback {
@@ -5958,6 +5961,9 @@ label {
   -webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
 }
+.has-error .input-group-addon {
+  border: 1px solid #ff4136;
+}
 .has-success .help-block,
 .has-success .control-label,
 .has-success .form-control-feedback {
@@ -5969,6 +5975,9 @@ label {
   -webkit-box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 2px 0 rgba(0, 0, 0, 0.075);
 }
+.has-success .input-group-addon {
+  border: 1px solid #28b62c;
+}
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {

data/vendor/assets/stylesheets/slate.css CHANGED Viewed

@@ -5974,6 +5974,10 @@ textarea {
 .has-warning .form-control:focus {
   border-color: #f89406;
 }
+.has-warning .input-group-addon {
+  background-color: #272b30;
+  border: none;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .form-control-feedback {
@@ -5983,6 +5987,10 @@ textarea {
 .has-error .form-control:focus {
   border-color: #ee5f5b;
 }
+.has-error .input-group-addon {
+  background-color: #272b30;
+  border: none;
+}
 .has-success .help-block,
 .has-success .control-label,
 .has-success .form-control-feedback {
@@ -5992,6 +6000,10 @@ textarea {
 .has-success .form-control:focus {
   border-color: #62c462;
 }
+.has-success .input-group-addon {
+  background-color: #272b30;
+  border: none;
+}
 legend {
   color: #fff;
 }

data/vendor/assets/stylesheets/superhero.css CHANGED Viewed

@@ -5887,16 +5887,25 @@ label,
 .has-warning .form-control-feedback {
   color: #f0ad4e;
 }
+.has-warning .input-group-addon {
+  border: none;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .form-control-feedback {
   color: #d9534f;
 }
+.has-error .input-group-addon {
+  border: none;
+}
 .has-success .help-block,
 .has-success .control-label,
 .has-success .form-control-feedback {
   color: #5cb85c;
 }
+.has-success .input-group-addon {
+  border: none;
+}
 .form-control:focus {
   -webkit-box-shadow: none;
   box-shadow: none;

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.1.1.9
+  version: 3.1.1.10
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -105,6 +105,22 @@ files:
 - lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/index.html.erb
 - lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/new.html.erb
 - lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/show.html.erb
+- lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb
+- lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/change.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/edit.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/index.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/initializer.rb
+- lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/new.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/password.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/reset_password_email.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/show.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml
+- lib/generators/bootswatch_rails/sorcery/templates/user_mailer.rb
+- lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb
+- lib/generators/bootswatch_rails/sorcery/templates/user_model.rb
+- lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb
 - vendor/assets/fonts/glyphicons-halflings-regular.eot
 - vendor/assets/fonts/glyphicons-halflings-regular.svg
 - vendor/assets/fonts/glyphicons-halflings-regular.ttf
@@ -145,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key:
 specification_version: 4
 summary: Add bootswatch.com themes to the Rails asset pipeline