challah 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5267d7f2cfbc84cb4a6af2c0d4a863ef8790a853
-  data.tar.gz: cbf3accdb5a30c551041e0b749ce3fd7a3f84eb7
+  metadata.gz: 0c5d55264692dddf543d5c67c2590a56ca95ba7e
+  data.tar.gz: f1c1b7db86c25987bc4ec369a9928a6ff6a2043a
 SHA512:
-  metadata.gz: 8849cba25a8264c34e120aa9c875040cac7aff7dc7a0f423b844098686f56544f66c973caaf089a018b5fd4bcbf7d7011ac972bb2124fb4ef888135eeea6b06b
-  data.tar.gz: d4c31ad4cc1301412bce1f6ebbeb3b1a5b6b79cb65ecfdbbe26041db09c8ac1eedd9b3e38839ce5ccee2855c5acd98f28bdbc299bf2b84f11b35d860202dd106
+  metadata.gz: 66d518430ab8db7e27eb0bfd6ef23681b7d49af39eb20baf77c88b1ae6d403db85e4a972e0b852e9408800e9dba5323a345d9fff85c3930d5025a87c730d53ae
+  data.tar.gz: 272d606557225f242aa605c09e4ac76a62d5e19e8672b0861abe71a2eee10c97c55a48958b7468f25d0876f6370ed864ad99379561238860188357816e2c7091

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Challah 1.6.0
+
+* For token technique, don't bother checking the database for an empty token query param
+* Add migration generator to account for Rails 5 migration inheritance syntax (`ActiveRecord::Migration[5.1]`)
+* Minor testing updates
+* Dependency updates, including renaming FactoryGirl to FactoryBot
+* Readme typo [PR #32](https://github.com/jdtornow/challah/pull/34) @stevenschobert
+
 ## Challah 1.5.0
 
 * Extract status enum to separate concern [PR #32](https://github.com/jdtornow/challah/pull/32) @philtr

data/README.md

@@ -10,7 +10,7 @@ Challah doesn't provide any fancy controllers or views that clutter your app or
 
 * Ruby 2.2.2+
 * Bundler
-* Rails 4.2+ (5.0 Recommended)
+* Rails 5.0+ (4.2 still supported, but not recommended)
 
 ## Installation
 
@@ -35,7 +35,7 @@ This will copy over the necessary migrations to your app and migrate the databas
 If you would prefer to handle these steps manually, you can do so by using these rake tasks instead:
 
 ```bash
-rails challah:setup:migrations
+rails g challah
 rails challah:unpack:user
 rails db:migrate
 ```
@@ -253,7 +253,7 @@ By default, the `first_name`, `last_name`, and `email` fields are required on th
 
 ```ruby
 # in config/initializers/challah.rb
-Challah[:skip_user_validations] = true
+Challah.options[:skip_user_validations] = true
 ```
 
 ## Authorization Model

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/lib/challah/techniques/token_technique.rb

@@ -18,6 +18,8 @@ module Challah
       # This is turned off by default and must be manually enabled for security reasons.
       return nil unless Challah.options[:token_enabled]
 
+      return nil unless token.present?
+
       if user = user_model.where(api_key: token).first
         if user.valid_session?
           return user

data/lib/generators/challah_generator.rb

@@ -0,0 +1,23 @@
+require "rails/generators/active_record"
+
+class ChallahGenerator < Rails::Generators::Base
+
+  include ActiveRecord::Generators::Migration
+
+  source_root File.expand_path("../templates", __FILE__)
+
+  def copy_migration
+    migration_template "migration.rb", "db/migrate/challah_create_users.rb", migration_version: migration_version
+  end
+
+  def rails5?
+    Rails.version.start_with? "5"
+  end
+
+  def migration_version
+    if rails5?
+      "[#{ Rails::VERSION::MAJOR }.#{ Rails::VERSION::MINOR }]"
+    end
+  end
+
+end

data/{db/migrate/20120127150433_create_users.rb → lib/generators/templates/migration.rb}

@@ -1,7 +1,6 @@
-class CreateUsers < ActiveRecord::Migration
-
+class ChallahCreateUsers < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :users do |t|
+     create_table :users do |t|
       t.string      :first_name
       t.string      :last_name
       t.string      :email
@@ -24,6 +23,22 @@ class CreateUsers < ActiveRecord::Migration
     add_index :users, :last_name
     add_index :users, :email
     add_index :users, :api_key
-  end
 
+    create_table :authorizations do |t|
+      t.integer     :user_id
+      t.string      :provider, limit: 50
+      t.string      :uid
+      t.string      :token, limit: 500
+      t.datetime    :expires_at
+      t.datetime    :last_session_at
+      t.string      :last_session_ip
+      t.integer     :session_count, default: 0
+      t.timestamps  null: true
+    end
+
+    add_index :authorizations, :user_id
+    add_index :authorizations, [ :user_id, :provider ]
+    add_index :authorizations, :uid
+    add_index :authorizations, :token
+  end
 end

data/lib/tasks/setup.rake

@@ -3,6 +3,10 @@ namespace :challah do
   task :setup => [ "challah:setup:migrations", "challah:unpack:user", "db:migrate", "challah:banner" ]
 
   task :banner do
+    is_rails5 = Rails.version.start_with? "5"
+
+    cmd = is_rails5 ? "rails" : "rake"
+
     banner = <<-str
 
   ==========================================================================
@@ -15,7 +19,7 @@ namespace :challah do
 
   If you want to create a new user now, just run:
 
-  rails challah:users:create
+  #{ cmd } challah:users:create
 
   ==========================================================================
 
@@ -26,8 +30,8 @@ namespace :challah do
 
   namespace :setup do
     task :migrations do
-      puts "Copying migrations..."
-      Rake::Task["challah_engine:install:migrations"].invoke
+      puts "Setting up migrations..."
+      sh "rails generate challah"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - John Tornow
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -80,28 +80,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,6 @@ files:
 - app/views/sessions/access_denied.html.erb
 - app/views/sessions/new.html.erb
 - config/locales/en.yml
-- db/migrate/20120127150433_create_users.rb
-- db/migrate/20121116210759_create_authorizations.rb
 - lib/challah.rb
 - lib/challah/audit.rb
 - lib/challah/authenticators.rb
@@ -171,6 +169,8 @@ files:
 - lib/challah/validators/email_validator.rb
 - lib/challah/validators/password_validator.rb
 - lib/challah/version.rb
+- lib/generators/challah_generator.rb
+- lib/generators/templates/migration.rb
 - lib/tasks/crud.rake
 - lib/tasks/setup.rake
 - lib/tasks/unpack.rake

data/db/migrate/20121116210759_create_authorizations.rb

@@ -1,22 +0,0 @@
-class CreateAuthorizations < ActiveRecord::Migration
-
-  def change
-    create_table :authorizations do |t|
-      t.integer     :user_id
-      t.string      :provider, limit: 50
-      t.string      :uid
-      t.string      :token, limit: 500
-      t.datetime    :expires_at
-      t.datetime    :last_session_at
-      t.string      :last_session_ip
-      t.integer     :session_count, default: 0
-      t.timestamps  null: true
-    end
-
-    add_index :authorizations, :user_id
-    add_index :authorizations, [ :user_id, :provider ]
-    add_index :authorizations, :uid
-    add_index :authorizations, :token
-  end
-
-end