challah 1.6.1 → 2.0.0.beta1

data/lib/challah/techniques/api_key_technique.rb

@@ -5,7 +5,7 @@ module Challah
     attr_accessor :user_model
 
     def initialize(session)
-      @key        = session.key? ? session.key : nil
+      @key = session.key? ? session.key : nil
     end
 
     def authenticate
@@ -16,7 +16,7 @@ module Challah
       unless @key.to_s.blank?
         user = user_model.find_by_api_key(@key)
 
-        if user and user.valid_session?
+        if user && user.valid_session?
           return user
         end
       end

data/lib/challah/techniques/password_technique.rb

@@ -12,7 +12,7 @@ module Challah
 
     # if we can successfully authenticate, return a User instance, otherwise nil
     def authenticate
-      if username? and password?
+      if username? && password?
         user = user_model.find_for_session(username)
 
         if user
@@ -49,5 +49,6 @@ module Challah
     def username
       @username
     end
+
   end
 end

data/lib/challah/techniques/token_technique.rb

@@ -43,7 +43,7 @@ module Challah
 
     private
 
-    attr_reader :token
+      attr_reader :token
 
   end
 end

data/lib/challah/techniques.rb

@@ -54,6 +54,7 @@ module Challah
   # +ApiKeyTechnique+.
   #
   module Techniques
+
     # Register a new technique class. Pass in a name as an identifier, and the class to use
     # when attempting to authenticate.
     def register_technique(name, klass)
@@ -69,5 +70,6 @@ module Challah
     def techniques
       @techniques.dup
     end
+
   end
 end

data/lib/challah/test.rb

@@ -1,7 +1,9 @@
 module Challah
+
   # Used to persist session data in test mode instead of using cookies. Stores the session
   # data lazily in a global var, accessible across the testing environment.
   class TestSessionStore
+
     def initialize(session = nil)
       @session = session
     end
@@ -22,6 +24,7 @@ module Challah
       $challah_test_session = "#{ token }@#{ user_id }"
       true
     end
+
   end
 
   module Testing
@@ -39,17 +42,20 @@ module Challah
     alias_method :logout, :signout
 
   end
+
 end
 
 if defined?(ActionController::TestCase)
   Challah.options[:storage_class] = Challah::TestSessionStore
 
   class ActionController::TestCase
+
     include Challah::Testing
 
     setup do
       $challah_test_session = nil
     end
+
   end
 end
 

data/lib/challah/validators/email_validator.rb

@@ -6,6 +6,7 @@ module Challah
   #       validates :email, :presence => true, :email => true
   #     end
   class EmailValidator < ActiveModel::EachValidator
+
     # Called automatically by ActiveModel validation..
     def validate_each(record, attribute, value)
       unless value =~ EmailValidator.pattern
@@ -17,5 +18,6 @@ module Challah
     def self.pattern
       /\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,}\z/
     end
+
   end
 end

data/lib/challah/validators/password_validator.rb

@@ -1,9 +1,10 @@
 module Challah
   class PasswordValidator < ActiveModel::Validator
+
     # Check to make sure a valid password and confirmation were set
     def validate(record)
-      if record.password_provider? or options[:force]
-        if record.new_record? and record.password.to_s.blank? and !record.password_changed?
+      if record.password_provider? || options[:force]
+        if record.new_record? && record.password.to_s.blank? && !record.password_changed?
           record.errors.add :password, :blank
         elsif record.password_changed?
           if record.password.to_s.size < 4
@@ -14,5 +15,6 @@ module Challah
         end
       end
     end
+
   end
-end
+end

data/lib/challah/version.rb

@@ -1,5 +1,7 @@
 module Challah
+
   unless defined?(Challah::VERSION)
-    VERSION = File.read(File.expand_path('../../../VERSION', __FILE__)).strip.freeze
+    VERSION = File.read(File.expand_path("../../../VERSION", __FILE__)).strip.freeze
   end
+
 end

data/lib/challah.rb

@@ -1,6 +1,7 @@
 require "challah/version"
 
 module Challah
+
   autoload :Audit,                            "challah/audit"
 
   autoload :CookieStore,                      "challah/cookie_store"
@@ -9,7 +10,6 @@ module Challah
   autoload :Authenticators,                   "challah/authenticators"
   autoload :Controller,                       "challah/controller"
   autoload :Encrypter,                        "challah/encrypter"
-  autoload :Plugins,                          "challah/plugins"
   autoload :Providers,                        "challah/providers"
   autoload :Random,                           "challah/random"
   autoload :Session,                          "challah/session"
@@ -74,10 +74,6 @@ module Challah
   register_technique :password,       PasswordTechnique
   register_technique :token,          TokenTechnique
 
-  # Set up plugin registering capability
-  extend Plugins
-  @plugins ||= {}
-
   # Set up authenticators
   extend Authenticators
   @authenticators ||= {}
@@ -91,6 +87,7 @@ module Challah
   @providers ||= {}
 
   register_provider :password, PasswordProvider
+
 end
 
 require "challah/engine" if defined?(Rails)

data/lib/generators/challah_generator.rb

@@ -7,17 +7,11 @@ class ChallahGenerator < Rails::Generators::Base
   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"
+    migration_template "migration.erb", "db/migrate/challah_create_users.rb", migration_version: migration_version
   end
 
   def migration_version
-    if rails5?
-      "[#{ Rails::VERSION::MAJOR }.#{ Rails::VERSION::MINOR }]"
-    end
+    "[#{ Rails::VERSION::MAJOR }.#{ Rails::VERSION::MINOR }]"
   end
 
 end

data/lib/generators/templates/{migration.rb → migration.erb}

@@ -10,10 +10,8 @@ class ChallahCreateUsers < ActiveRecord::Migration<%= migration_version %>
       t.datetime    :last_session_at
       t.integer     :session_count, default: 0
       t.integer     :failed_auth_count, default: 0
-      t.integer     :created_by, default: 0
-      t.integer     :updated_by, default: 0
-      t.datetime    :created_at
-      t.datetime    :updated_at
+      t.bigint      :created_by, default: 0
+      t.bigint      :updated_by, default: 0
       t.integer     :status, default: 0 # defaults to :active
       t.timestamps  null: true
     end
@@ -24,7 +22,7 @@ class ChallahCreateUsers < ActiveRecord::Migration<%= migration_version %>
     add_index :users, :api_key
 
     create_table :authorizations do |t|
-      t.integer     :user_id
+      t.references  :user
       t.string      :provider, limit: 50
       t.string      :uid
       t.string      :token, limit: 500
@@ -34,7 +32,6 @@ class ChallahCreateUsers < ActiveRecord::Migration<%= migration_version %>
       t.timestamps  null: true
     end
 
-    add_index :authorizations, :user_id
     add_index :authorizations, [ :user_id, :provider ]
     add_index :authorizations, :uid
     add_index :authorizations, :token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - John Tornow
@@ -10,42 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +136,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: A simple gem for authorization and session management in Rails.
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Authorization and session management for Rails apps
 email:
 - john@johntornow.com
 - p@rdln.net
@@ -167,7 +187,6 @@ files:
 - lib/challah/cookie_store.rb
 - lib/challah/encrypter.rb
 - lib/challah/engine.rb
-- lib/challah/plugins.rb
 - lib/challah/providers.rb
 - lib/challah/providers/password_provider.rb
 - lib/challah/random.rb
@@ -184,14 +203,19 @@ files:
 - lib/challah/validators/password_validator.rb
 - lib/challah/version.rb
 - lib/generators/challah_generator.rb
-- lib/generators/templates/migration.rb
+- lib/generators/templates/migration.erb
 - lib/tasks/crud.rake
 - lib/tasks/setup.rake
 - lib/tasks/unpack.rake
 homepage: https://github.com/jdtornow/challah
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/jdtornow/challah/issues
+  changelog_uri: https://github.com/jdtornow/challah/releases
+  homepage_uri: https://github.com/jdtornow/challah
+  source_code_uri: https://github.com/jdtornow/challah
+  wiki_uri: https://github.com/jdtornow/challah/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -200,15 +224,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails authentication and sessions

data/lib/challah/plugins.rb

@@ -1,54 +0,0 @@
-module Challah
-  # Plugins are used to extend the functionality of Challah.
-  module Plugins
-    # A simple DSL for registering a plugin
-    class Plugin
-      attr_reader :active_record, :action_controller, :user_extensions, :user_init_methods
-
-      def initialize
-        @active_record ||= []
-        @action_controller ||= []
-        @user_extensions ||= []
-        @user_init_methods ||= []
-      end
-
-      # When active_record or action_controller is loaded, run the given block
-      def on_load(framework, &block)
-        return unless [ :active_record, :action_controller ].include?(framework)
-        instance_variable_get("@#{framework}") << block
-      end
-
-      # Pass a module name to include it in the base User model after challah_user
-      # is run
-      def extend_user(module_name, init_method = nil)
-        @user_extensions << module_name
-        @user_init_methods << init_method unless init_method.nil?
-      end
-    end
-
-    # Register a new plugin.
-    def register_plugin(name, &block)
-      plugin = Plugin.new
-      plugin.instance_eval(&block)
-      @plugins[name] = plugin
-    end
-
-    # Get the list of all plugins
-    def plugins
-      @plugins
-    end
-  end
-
-  # Loop through all registered plugins and extend User functionality.
-  def self.include_user_plugins!
-    Challah.plugins.values.each do |plugin|
-      plugin.user_extensions.each do |mod|
-        Challah.user.send(:extend, mod)
-      end
-
-      plugin.user_init_methods.each do |method_name|
-        Challah.user.send(method_name)
-      end
-    end
-  end
-end