refinerycms-authentication 0.9.9.20 → 0.9.9.21

data/app/controllers/{registrations_controller.rb → users_controller.rb}

@@ -1,4 +1,4 @@
-class RegistrationsController < ::Devise::RegistrationsController
+class UsersController < ::Devise::RegistrationsController
 
   # Protect these actions behind an admin login
   before_filter :redirect?, :only => [:new, :create]

data/app/models/user.rb

@@ -18,6 +18,11 @@ class User < ActiveRecord::Base
   validates :username, :presence => true, :uniqueness => true
 
   class << self
+    # Configure authentication_keys here instead of devise.rb initialzer so we don't overwrite standard devise models
+    def authentication_keys
+      [:login]
+    end
+
     # Find user by email or username.
     # https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-sign_in-using-their-username-or-email-address
     def find_for_database_authentication(conditions)
@@ -42,9 +47,9 @@ class User < ActiveRecord::Base
 
   def can_delete?(user_to_delete = self)
     user_to_delete.persisted? and
+    id != user_to_delete.id and
     !user_to_delete.has_role?(:superuser) and
-    Role[:refinery].users.count > 1 and
-    id != user_to_delete.id
+    Role[:refinery].users.count > 1
   end
 
   def add_role(title)

data/config/locales/fi.yml

@@ -0,0 +1,72 @@
+fi:
+  plugins:
+    refinery_users:
+      title: Käyttäjät
+      description: Hallitse käyttäjiä
+  admin:
+    users:
+      delete: Poista tämä käyttäjä ikuisesti
+      edit: Muokkaa tätä käyttäjää
+      update:
+        cannot_remove_user_plugin_from_current_user: "Et voi poistaa 'Käyttäjät-' palikkaa tunnukselta, jolla olet kirjautunut sisään."
+      form:
+        blank_password_keeps_current: "Jätä tyhjäksi, jos et halua vaihtaa salasanaa"
+        plugin_access: Palikkaluvat
+        role_access: Rooliluvat
+        enable_all: "salli kaikki"
+      actions:
+        create_new_user: Lisää uusi käyttäjä
+      user:
+        email_user: Lähetä sähköpostia tälle käyttäjälle
+        preview: '(%{who}) lisätty %{created_at}'
+  sessions:
+    new:
+      hello_please_sign_in: "Hei! Ole hyvä, ja kirjaudu."
+      sign_in: Kirjaudu
+      forgot_password: Unohdin salasanani
+  users:
+    setup_website_name_html: "Annetaan nettisivustolle ensimmäiseksi nimi. <a href='%{link}' name='%{title}'>Mene tänne</a> muokataksesi nettisivusi nimeä"
+    new:
+      fill_form: "Täytä alhaalla olevat tiedot, että voimme aloittaa."
+      sign_up: Rekisteröidy
+    create:
+      welcome: 'Tervetuloa Refineryyn, %{who}'
+    forgot:
+      email_address: Sähköpostiosoite
+      enter_email_address: Kirjoita tunnuksesi sähköpostiosoite.
+      reset_password: Nollaa salasanasi
+      blank_email: Et kirjoittanut sähköpostiosoitetta.
+      email_not_associated_with_account_html: "Valitettavasti osoitetta '%{email}' ei löydy tietokannasta.<br />Oletko varma, että kirjoitit oikean osoitteen?"
+      email_reset_sent: "Sinulle on lähetetty sähköposti, joka sisältää linkin salasanan vaihtoon"
+      password_encryption: "Sinun täytyy vaihtaa salasanasi, koska Refineryn käyttämää salausmenetelmää on muokattu turvallisuussyistä."
+    reset:
+      code_invalid: "Olemme pahoillamme, mutta tämä vaihtokoodi on joko vanhentunut tai viallinen. Yritä kopioida ja liittää osoite sähköpostistasi selaimeen, tai käynnistää salasanan vaihto uudelleen."
+      successful: "Salasana nollattu onnistuneesti osoitteelle '%{email}'"
+      pick_new_password_for: "Kirjoita uusi salasana osoitteelle %{email}"
+      reset_password: Nollaa salasana
+  user_mailer:
+    reset_notification:
+      subject: Linkki salasanan nollaukseen
+      reset_request_received_for: "Pyyntö nollata käyttäjän %{username} salasana"
+      visit_this_url: Käy tässä osoitteessa valitaksesi uuden salasanan
+      remain_same_if_no_action: "Jos et tee mitään, salasanaasi ei vaihdeta"
+  devise:
+    failure:
+      unauthenticated: Sinun täytyy kirjautua sisään.
+      invalid: "Valitettavasti käyttäjätunnuksesi tai salasanasi oli väärin."
+    sessions:
+      signed_in: Kirjautuminen onnistui.
+  roles:
+    superuser: Superuser
+    refinery: Refinery
+  activerecord:
+    models:
+      user: user
+    attributes:
+      user:
+        login: Kirjautuminen
+        username: Käyttäjätunnus
+        password: Salasana
+        password_confirmation: Salasana (uudelleen)
+        email: Sähköpostiosoite
+        remember_me: Muista minut

data/config/routes.rb

@@ -2,17 +2,15 @@
 
   # Add Devise necessary routes.
   # For Devise routes, see: https://github.com/plataformatec/devise
-  #namespace :refinery do
-    devise_for :users, :path => :registrations, :controllers => {
-      :sessions => 'sessions',
-      :registrations => 'registrations',
-      :passwords => 'passwords'
-    }, :path_names => {
-      :sign_out => 'logout',
-      :sign_in => 'login',
-      :sign_up => 'register'
-    }
-  #end
+  devise_for :users, :controllers => {
+    :sessions => 'sessions',
+    :registrations => 'users',
+    :passwords => 'passwords'
+  }, :path_names => {
+    :sign_out => 'logout',
+    :sign_in => 'login',
+    :sign_up => 'register'
+  }
 
   # Override Devise's default after login redirection route.  This will pushed a logged in user to the dashboard.
   get 'refinery', :to => 'admin/dashboard#index', :as => :refinery_root

data/lib/gemspec.rb

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables       = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
 
   s.add_dependency 'refinerycms-core',            '= #{::Refinery::Version}'
-  s.add_dependency 'devise',                      '~> 1.2.0'
+  s.add_dependency 'devise',                      '~> 1.3.0'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
 
   s.files             = [

data/lib/refinerycms-authentication.rb

@@ -1,20 +1,13 @@
 require 'devise'
 require 'refinerycms-core'
 require 'friendly_id'
-# Attach authenticated system methods to the ::Refinery::ApplicationController
-require File.expand_path('../authenticated_system', __FILE__)
-[::Refinery::ApplicationController, ::Refinery::ApplicationHelper].each do |c|
-  c.class_eval {
-    include AuthenticatedSystem
-  }
-end
 
 module Refinery
   module Authentication
 
     class Engine < ::Rails::Engine
 
-      initializer "serve static assets" do |app|
+      initializer 'serve static assets' do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
 
@@ -22,14 +15,21 @@ module Refinery
 
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|
-          plugin.name = "refinery_users"
-          plugin.version = %q{0.9.9.17}
+          plugin.name = 'refinery_users'
+          plugin.version = %q{0.9.9.21}
           plugin.menu_match = /(refinery|admin)\/users$/
           plugin.activity = {
             :class => User,
             :title => 'username'
           }
-          plugin.url = {:controller => "/admin/users"}
+          plugin.url = {:controller => '/admin/users'}
+        end
+      end
+
+      refinery.before_inclusion do
+        [::Refinery::ApplicationController, ::Refinery::ApplicationHelper].each do |c|
+          c.send :require, File.expand_path('../authenticated_system', __FILE__)
+          c.send :include, AuthenticatedSystem
         end
       end
     end

data/refinerycms-authentication.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-authentication}
-  s.version           = %q{0.9.9.20}
+  s.version           = %q{0.9.9.21}
   s.summary           = %q{Authentication engine for Refinery CMS}
   s.description       = %q{The default authentication engine for Refinery CMS}
-  s.date              = %q{2011-04-28}
+  s.date              = %q{2011-05-03}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-core',            '= 0.9.9.20'
-  s.add_dependency 'devise',                      '~> 1.2.0'
+  s.add_dependency 'refinerycms-core',            '= 0.9.9.21'
+  s.add_dependency 'devise',                      '~> 1.3.0'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
 
   s.files             = [
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
     'app/controllers/admin',
     'app/controllers/admin/users_controller.rb',
     'app/controllers/passwords_controller.rb',
-    'app/controllers/registrations_controller.rb',
     'app/controllers/sessions_controller.rb',
+    'app/controllers/users_controller.rb',
     'app/helpers',
     'app/helpers/sessions_helper.rb',
     'app/helpers/users_helper.rb',
@@ -52,13 +52,13 @@ Gem::Specification.new do |s|
     'app/views/passwords',
     'app/views/passwords/edit.html.erb',
     'app/views/passwords/new.html.erb',
-    'app/views/registrations',
-    'app/views/registrations/new.html.erb',
     'app/views/sessions',
     'app/views/sessions/new.html.erb',
     'app/views/user_mailer',
     'app/views/user_mailer/reset_notification.html.erb',
     'app/views/user_mailer/reset_notification.text.plain.erb',
+    'app/views/users',
+    'app/views/users/new.html.erb',
     'config',
     'config/locales',
     'config/locales/cs.yml',
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
     'config/locales/el.yml',
     'config/locales/en.yml',
     'config/locales/es.yml',
+    'config/locales/fi.yml',
     'config/locales/fr.yml',
     'config/locales/it.yml',
     'config/locales/jp.yml',

data/spec/models/user_spec.rb

@@ -10,18 +10,18 @@ describe User do
   context "Roles" do
     context "add_role" do
       it "raises Exception when Role object is passed" do
-        lambda{ user.add_role(Role.new)}.should raise_exception
+        proc {user.add_role(Role.new)}.should raise_exception
       end
 
       it "adds a Role to the User when role not yet assigned to User" do
-        lambda {
+        proc {
           user.add_role(:new_role)
         }.should change(user.roles, :count).by(1)
         user.roles.collect(&:title).should include("NewRole")
       end
 
       it "does not add a Role to the User when this Role is already assigned to User" do
-        lambda {
+        proc {
           refinery_user.add_role(:refinery)
         }.should_not change(refinery_user.roles, :count).by(1)
         refinery_user.roles.collect(&:title).should include("Refinery")
@@ -30,7 +30,7 @@ describe User do
 
     context "has_role" do
       it "raises Exception when Role object is passed" do
-        lambda{ user.has_role?(Role.new)}.should raise_exception
+        proc{ user.has_role?(Role.new)}.should raise_exception
       end
 
       it "returns the true if user has Role" do
@@ -61,7 +61,6 @@ describe User do
       }
     end
 
-
     it "requires username" do
       User.new(attr.merge(:username => "")).should_not be_valid
     end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-authentication
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.20
+  version: 0.9.9.21
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.20
+        version: 0.9.9.21
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,8 @@ extra_rdoc_files: []
 files: 
 - app/controllers/admin/users_controller.rb
 - app/controllers/passwords_controller.rb
-- app/controllers/registrations_controller.rb
 - app/controllers/sessions_controller.rb
+- app/controllers/users_controller.rb
 - app/helpers/sessions_helper.rb
 - app/helpers/users_helper.rb
 - app/mailers/user_mailer.rb
@@ -79,16 +79,17 @@ files:
 - app/views/layouts/login.html.erb
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
-- app/views/registrations/new.html.erb
 - app/views/sessions/new.html.erb
 - app/views/user_mailer/reset_notification.html.erb
 - app/views/user_mailer/reset_notification.text.plain.erb
+- app/views/users/new.html.erb
 - config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/jp.yml