passwd 0.2.0 → 0.3.0

data/lib/passwd/rails/active_record_ext.rb

@@ -0,0 +1,37 @@
+module Passwd::Rails
+  module ActiveRecordExt
+    def with_authenticate(passwd: nil, user_id: :email, salt: :salt, password: :password)
+      passwd ||= Passwd.current
+      define_singleton_auth_with_passwd(user_id)
+      define_instance_auth_with_passwd(passwd, salt, password)
+      define_instance_set_password(passwd, salt, password)
+    end
+
+    private
+
+      def define_singleton_auth_with_passwd(user_id_col)
+        define_singleton_method :authenticate do |user_id, plain|
+          user = find_by(user_id_col => user_id)
+          return nil unless user
+
+          user.authenticate(plain) ? user : nil
+        end
+      end
+
+      def define_instance_auth_with_passwd(passwd, salt_col, password_col)
+        define_method :authenticate do |plain|
+          passwd.hashed_password(plain, send(salt_col)) == send(password_col)
+        end
+      end
+
+      def define_instance_set_password(passwd, salt_col, password_col)
+        define_method :set_password do |plain = nil|
+          plain ||= passwd.random
+          random_salt = Rails.application.config.passwd.random_salt || proc { SecureRandom.uuid }
+          send("#{salt_col}=", random_salt.call(self)) unless send(salt_col)
+          send("#{password_col}=", passwd.hashed_password(plain, send(salt_col)))
+          plain
+        end
+      end
+  end
+end

data/lib/passwd/railtie.rb

@@ -1,19 +1,18 @@
-module Passwd
+class Passwd
   class Railtie < ::Rails::Railtie
     config.passwd = ActiveSupport::OrderedOptions.new
 
     initializer "passwd" do
-      require "passwd/action_controller_ext"
-      require "passwd/active_record_ext"
+      require "passwd/rails/action_controller_ext"
+      require "passwd/rails/active_record_ext"
 
       ActiveSupport.on_load(:action_controller) do
-        ::ActionController::Base.send(:include, Passwd::ActionControllerExt)
+        ::ActionController::Base.send(:include, ::Passwd::Rails::ActionControllerExt)
       end
 
       ActiveSupport.on_load(:active_record) do
-        ::ActiveRecord::Base.send(:extend, Passwd::ActiveRecordExt)
+        ::ActiveRecord::Base.send(:extend, Passwd::Rails::ActiveRecordExt)
       end
     end
   end
 end
-

data/lib/passwd/version.rb

@@ -1,4 +1,4 @@
-module Passwd
-  VERSION = "0.2.0"
+class Passwd
+  VERSION = "0.3.0".freeze
 end
 

data/passwd.gemspec

@@ -1,29 +1,28 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'passwd/version'
+require "passwd/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "passwd"
   spec.version       = Passwd::VERSION
   spec.authors       = ["i2bskn"]
   spec.email         = ["i2bskn@gmail.com"]
-  spec.description   = %q{The various utilities on password}
-  spec.summary       = %q{Password utility}
+
+  spec.description   = %q{Passwd is provide hashed password creation and authentication.}
+  spec.summary       = %q{Passwd is provide hashed password creation and authentication.}
   spec.homepage      = "https://github.com/i2bskn/passwd"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "database_rewinder"
+  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "pry"
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passwd
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,77 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: minitest
   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'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  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'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: database_rewinder
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,102 +66,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The various utilities on password
+description: Passwd is provide hashed password creation and authentication.
 email:
 - i2bskn@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
-- CHANGELOG.md
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
-- example/.gitignore
-- example/Gemfile
-- example/README.rdoc
-- example/Rakefile
-- example/app/assets/images/.keep
-- example/app/assets/javascripts/application.js
-- example/app/assets/stylesheets/application.css
-- example/app/controllers/application_controller.rb
-- example/app/controllers/concerns/.keep
-- example/app/controllers/profiles_controller.rb
-- example/app/controllers/root_controller.rb
-- example/app/controllers/sessions_controller.rb
-- example/app/helpers/application_helper.rb
-- example/app/mailers/.keep
-- example/app/models/.keep
-- example/app/models/concerns/.keep
-- example/app/models/user.rb
-- example/app/views/layouts/application.html.erb
-- example/app/views/profiles/edit.html.erb
-- example/app/views/profiles/show.html.erb
-- example/app/views/root/index.html.erb
-- example/app/views/sessions/new.html.erb
-- example/bin/bundle
-- example/bin/rails
-- example/bin/rake
-- example/config.ru
-- example/config/application.rb
-- example/config/boot.rb
-- example/config/database.yml
-- example/config/environment.rb
-- example/config/environments/development.rb
-- example/config/environments/production.rb
-- example/config/environments/test.rb
-- example/config/initializers/assets.rb
-- example/config/initializers/backtrace_silencers.rb
-- example/config/initializers/cookies_serializer.rb
-- example/config/initializers/filter_parameter_logging.rb
-- example/config/initializers/inflections.rb
-- example/config/initializers/mime_types.rb
-- example/config/initializers/passwd.rb
-- example/config/initializers/session_store.rb
-- example/config/initializers/wrap_parameters.rb
-- example/config/locales/en.yml
-- example/config/routes.rb
-- example/config/secrets.yml
-- example/db/migrate/20141122165914_create_users.rb
-- example/db/schema.rb
-- example/db/seeds.rb
-- example/lib/assets/.keep
-- example/lib/tasks/.keep
-- example/lib/tasks/user.rake
-- example/log/.keep
-- example/public/404.html
-- example/public/422.html
-- example/public/500.html
-- example/public/favicon.ico
-- example/public/robots.txt
-- example/vendor/assets/javascripts/.keep
-- example/vendor/assets/stylesheets/.keep
-- lib/generators/passwd/config_generator.rb
-- lib/generators/passwd/templates/passwd_config.rb
+- bin/console
+- bin/setup
+- lib/generators/passwd/install/USAGE
+- lib/generators/passwd/install/install_generator.rb
+- lib/generators/passwd/install/templates/passwd.rb
 - lib/passwd.rb
-- lib/passwd/action_controller_ext.rb
-- lib/passwd/active_record_ext.rb
-- lib/passwd/base.rb
-- lib/passwd/configuration.rb
+- lib/passwd/config.rb
 - lib/passwd/errors.rb
-- lib/passwd/password.rb
-- lib/passwd/policy.rb
+- lib/passwd/rails/action_controller_ext.rb
+- lib/passwd/rails/active_record_ext.rb
 - lib/passwd/railtie.rb
-- lib/passwd/salt.rb
 - lib/passwd/version.rb
 - passwd.gemspec
-- spec/passwd/.keep
-- spec/passwd/active_record_ext_spec.rb
-- spec/passwd/base_spec.rb
-- spec/passwd/configuration_spec.rb
-- spec/passwd/password_spec.rb
-- spec/spec_helper.rb
-- spec/support/data_util.rb
-- spec/support/paths.rb
 homepage: https://github.com/i2bskn/passwd
 licenses:
 - MIT
@@ -238,16 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Password utility
-test_files:
-- spec/passwd/.keep
-- spec/passwd/active_record_ext_spec.rb
-- spec/passwd/base_spec.rb
-- spec/passwd/configuration_spec.rb
-- spec/passwd/password_spec.rb
-- spec/spec_helper.rb
-- spec/support/data_util.rb
-- spec/support/paths.rb
+summary: Passwd is provide hashed password creation and authentication.
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: 106V5oEIwXeOfqT35UWifTnifi5sEO2QP

data/CHANGELOG.md

@@ -1,35 +0,0 @@
-## 0.2.0
-
-Remake the this library.
-
-#### Upgrade
-
-1. Run the following commands.
-
-```
-$ bundle update passwd
-$ bundle exec rails gneratate passwd:config
-```
-
-2. Migrate your passwd settings to `config/initializers/passwd.rb`.
-3. Updates your code!
-
-#### Changes
-
-- Add extention to ActiveController.
-    - Add `current_user`, `signin!` and `signout!` to ActionController.
-    - Add `require_signin` method for `before_action`.
-- Include the `Passwd::ActiveRecord` was no longer needed.
-- Rename method `define_column` to `with_authenticate` in your User model.
-- Rename method `Passwd.create` to `Passwd.random`.
-- Rename method `Passwd.hashing` to `Passwd.digest`.
-- Add `passwd` method User class. Create Passwd::Password object from target user attributes.
-- Split object password and salt.
-
-## 0.1.5
-
-#### Changes
-
-- Can be specified algorithm of hashing
-- Change default hashing algorithm to SHA512 from SHA1
-

data/LICENSE.txt

@@ -1,23 +0,0 @@
-Copyright (c) 2013-2014 i2bskn
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/example/.gitignore

@@ -1,16 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp

data/example/Gemfile

@@ -1,25 +0,0 @@
-source 'https://rubygems.org'
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.8'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
-
-gem 'passwd', path: File.expand_path("../..", __FILE__)
-
-group :development do
-  gem 'pry-rails'
-end
-