quo_vadis 1.2.3 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fd5c30c44899810a95d8d3316ad1955d080883ef
+  data.tar.gz: 15b805d818d9878a348ad52f81ef34906b5c5b02
+SHA512:
+  metadata.gz: '058b7b734fb667976cd4eba65106c7e963b5c32c0846d576c4ba37fda86344ddd5b21df2e8d1e17dfbce259417a9d44e288e5a363cf231c869c64a373f9f1e6c'
+  data.tar.gz: ff28b1d215e0573fa639394b62c032ad21deb88b5d9a108c0edb4084b391d4d25bc5635bd6ec56150177da8589be8fbf7b521110db97d78a408699ff9e7785d3

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # CHANGELOG
 
 
+## 1.4.0 (12 October 2016)
+
+* Internationalise emails' subject lines.
+
+
+## 1.3.2 (22 July 2015)
+
+* Loosen Rails dependency.
+* Remove unnecessary code from test app.
+
+
+## 1.3.1 (22 July 2015)
+
+* Prefer an instance method to prepare for activation.
+
+
+## 1.3.0 (23 May 2013)
+
+* Validate username's uniqueness case-insensitively.
+
+
 ## 1.2.3 (21 March 2013)
 
 * Ability to override the activation email's from and subject.

data/README.md

@@ -161,7 +161,7 @@ Write the mailer view, i.e. the email which will be sent to your new users ([exa
 * be at `app/views/quo_vadis/notifier/invite.text.erb`
 * render `@url` somewhere (this is the link the user clicks to go to the invitation page)
 
-You can also refer to `@user` in the email view, as well as any other data you pass to `invite_to_activate`.  Note that passing `:from` and/or `:subject` in the hash to `invite_to_activate` overrides the default `QuoVadis.from` and/or `QuoVadis.subject_invitation` respectively.
+You can also refer to `@user` in the email view, as well as any other data you pass to `invite_to_activate`.  Note that passing `:from` and/or `:subject` in the hash to `invite_to_activate` overrides the default `QuoVadis.from` and/or `I18n.t('quo_vadis.notifier.invite.subject')` respectively.
 
 Configure the email's from address in `config/initializers/quo_vadis.rb` (or pass in the data hash to `invite_to_activate`).
 

data/Rakefile

@@ -2,21 +2,13 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
-end
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Quo Vadis'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('app/**/*.rb')
+  t.warning = false
 end
 
 task :default => :test

data/app/mailers/quo_vadis/notifier.rb

@@ -6,7 +6,7 @@ module QuoVadis
     def change_password(user)
       @username = user.username
       @url = change_password_url user.token
-      mail :to => user.email, :from => QuoVadis.from, :subject => QuoVadis.subject_change_password
+      mail :to => user.email, :from => QuoVadis.from, :subject => I18n.t('quo_vadis.notifier.change_password.subject')
     end
 
     # Sends an email to <tt>user</tt> with a link to a page where they
@@ -20,8 +20,8 @@ module QuoVadis
       @url = invitation_url user.token
       
       from    = data.delete(:from)    || QuoVadis.from
-      subject = data.delete(:subject) || QuoVadis.subject_invitation
-      
+      subject = data.delete(:subject) || I18n.t('quo_vadis.notifier.invite.subject')
+
       data.each { |k,v| instance_variable_set :"@#{k}", v }
       mail :to => user.email, :from => from, :subject => subject
     end

data/app/models/model_mixin.rb

@@ -19,7 +19,7 @@ module ModelMixin
       attr_reader    :password
       attr_protected :password_digest
 
-      validates :username,        :presence => true, :uniqueness => true, :if => :should_authenticate?
+      validates :username,        :presence => true, :uniqueness => {case_sensitive: false}, :if => :should_authenticate?
       validates :password_digest, :presence => true, :if => :should_authenticate?
 
       scope :valid_token, lambda { |token| where("token = ? AND token_created_at > ?", token, 24.hours.ago) }
@@ -46,14 +46,12 @@ module ModelMixin
           end
         end
 
-        # Instantiates a user suitable for user-activation.
+        # [Deprecated] Instantiates a user suitable for user-activation.
+        #
+        # NOTE: use instance method `#randomise_credentials` instead.
         def new_for_activation(attributes = nil)
           user = new attributes
-          # Satisfy username and password validations by setting to random values.
-          begin
-            user.username = SecureRandom.base64(10)
-          end while exists?(:username => user.username)
-          user.password = SecureRandom.base64(10)
+          user.randomise_credentials
           user
         end
       END
@@ -66,6 +64,16 @@ module ModelMixin
       true
     end
 
+    # Sets the `username` and `password` to random values.
+    # Use this for a user who should authenticate where they need to activate
+    # themselves first.
+    def randomise_credentials
+      begin
+        self.username = SecureRandom.base64(10)
+      end while self.class.exists?(:username => username)
+      self.password = SecureRandom.base64(10)
+    end
+
     def password=(plain_text_password) # :nodoc:
       @password = plain_text_password
       unless @password.blank?

data/config/locales/quo_vadis.en.yml

@@ -20,3 +20,9 @@ en:
         accepted: "Your account is active and you're now signed in."
         invalid_token: "Sorry, this link isn't valid anymore."
         invalid_credentials: "Sorry, we couldn't accept that username and/or password."
+
+    notifier:
+      change_password:
+        subject: Change your password
+      invite:
+        subject: Activate your account

data/lib/quo_vadis.rb

@@ -101,14 +101,6 @@ module QuoVadis
   mattr_accessor :from
   @@from = 'noreply@example.com'
 
-  # Subject of the forgotten-password email.
-  mattr_accessor :subject_change_password
-  @@subject_change_password = 'Change your password.'
-
-  # Subject of the invitation email.
-  mattr_accessor :subject_invitation
-  @@subject_invitation = 'Activate your account'
-
 
   #
   # Miscellaneous

data/lib/quo_vadis/version.rb

@@ -1,3 +1,3 @@
 module QuoVadis
-  VERSION = '1.2.3'
+  VERSION = '1.4.1'
 end

data/quo_vadis.gemspec

@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'rails',       '~>3.0'
-  s.add_dependency 'bcrypt-ruby', '~> 3.0.0'
+  s.add_dependency 'rails',       '> 3.0.4', '< 5'
+  s.add_dependency 'bcrypt-ruby', '> 3.0.0'
 
-  s.add_development_dependency 'rails', '~>3.0.4'  # so we can test CSRF protection
-  s.add_development_dependency 'sqlite3-ruby'
+  # s.add_development_dependency 'rails', '~> 3.0.4'  # so we can test CSRF protection
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'capybara', '~>1.1'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit', '~> 3.0'
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -2,8 +2,6 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
 </head>
 <body>

data/test/dummy/config/initializers/quo_vadis.rb

@@ -67,13 +67,6 @@ QuoVadis.configure do |config|
   # From whom the forgotten-password email should be sent.
   config.from = 'noreply@example.com'
 
-  # Subject of the forgotten-password email.
-  config.subject_change_password = 'Change your password'
-
-  # Subject of the invitation email.
-  config.subject_invitation = 'Activate your account'
-
-
   #
   # Miscellaneous
   #

data/test/integration/config_test.rb

@@ -115,18 +115,4 @@ class ConfigTest < ActiveSupport::IntegrationCase
     assert_equal ['jim@example.com'], email.from
   end
 
-  test 'change-password mailer subject config' do
-    QuoVadis.subject_change_password = 'You idiot!'
-    (user = User.last).generate_token
-    email = QuoVadis::Notifier.change_password(user)
-    assert_equal 'You idiot!', email.subject
-  end
-
-  test 'invitation mailer subject config' do
-    QuoVadis.subject_invitation = 'Wooha'
-    (user = User.last).generate_token
-    email = QuoVadis::Notifier.invite(user)
-    assert_equal 'Wooha', email.subject
-  end
-
 end

data/test/test_helper.rb

@@ -56,8 +56,6 @@ def reset_quo_vadis_configuration
   QuoVadis.signed_out_hook       = nil
   QuoVadis.layout                = 'application'
   QuoVadis.from                  = 'noreply@example.com'
-  QuoVadis.subject_change_password = 'Change your password'
-  QuoVadis.subject_invitation    = 'Activate your account'
   QuoVadis.remember_for          = 2.weeks
   QuoVadis.blocked               = false
 end

data/test/unit/user_test.rb

@@ -5,6 +5,7 @@ class UserTest < ActiveSupport::TestCase
   test 'user must have a unique username' do
     User.create :username => 'bob', :password => 'secret'
     assert User.new(:username => 'bob', :password => 'secret').invalid?
+    assert User.new(:username => 'Bob', :password => 'secret').invalid?
   end
 
   test 'user must have a valid password on create' do

metadata

@@ -1,128 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: quo_vadis
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Andy Stewart
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.4
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Simple username/password authentication for Rails 3.
 email:
 - boss@airbladesoftware.com
@@ -130,7 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -225,33 +216,26 @@ files:
 - test/unit/user_test.rb
 homepage: https://github.com/airblade/quo_vadis
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2281906662398485868
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2281906662398485868
 requirements: []
 rubyforge_project: quo_vadis
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 2.5.2.3
+signing_key:
+specification_version: 4
 summary: Simple username/password authentication for Rails 3.
 test_files:
 - test/dummy/.gitignore