passwd 0.1.5 → 0.2.0

data/spec/passwd/configuration_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Passwd::Configuration do
+  describe "#initialize" do
+    subject { Passwd::PwConfig }
+    # defined options
+    it { is_expected.to respond_to(:algorithm) }
+    it { is_expected.to respond_to(:length) }
+    it { is_expected.to respond_to(:policy) }
+    it { is_expected.to respond_to(:stretching) }
+    it { is_expected.to respond_to(:lower) }
+    it { is_expected.to respond_to(:upper) }
+    it { is_expected.to respond_to(:number) }
+    it { is_expected.to respond_to(:letters_lower) }
+    it { is_expected.to respond_to(:letters_upper) }
+    it { is_expected.to respond_to(:letters_number) }
+
+    # default settings
+    it { is_expected.to have_attributes(algorithm: :sha512) }
+    it { is_expected.to have_attributes(length: 8) }
+    it { is_expected.to satisfy {|v| v.policy.is_a?(Passwd::Policy) } }
+    it { is_expected.to have_attributes(stretching: nil) }
+    it { is_expected.to have_attributes(lower: true) }
+    it { is_expected.to have_attributes(upper: true) }
+    it { is_expected.to have_attributes(number: true) }
+    it { is_expected.to have_attributes(letters_lower: [*"a".."z"]) }
+    it { is_expected.to have_attributes(letters_upper: [*"A".."Z"]) }
+    it { is_expected.to have_attributes(letters_number: [*"0".."9"]) }
+  end
+
+  describe "Writable" do
+    subject { Passwd }
+
+    it {
+      klass = Class.new { extend Passwd::Configuration::Writable }
+      expect(defined?(klass::PwConfig)).to be_truthy
+    }
+
+    it { is_expected.to respond_to(:configure) }
+    it { is_expected.to respond_to(:policy_configure) }
+  end
+
+  describe "Accessible" do
+    it {
+      klass = Class.new { include Passwd::Configuration::Accessible }
+      expect(klass::PwConfig.is_a?(Passwd::Configuration)).to be_truthy
+    }
+  end
+end
+

data/spec/passwd/password_spec.rb

@@ -1,150 +1,156 @@
-# coding: utf-8
-
 require "spec_helper"
 
 describe Passwd::Password do
-  let(:password) {Passwd::Password.new}
+  let!(:pswd) { Passwd::Password.new }
 
   describe "#initialize" do
-    context "with default params" do
-      let!(:password_text) {
-        password_text = Passwd.create
-        Passwd.should_receive(:create).and_return(password_text)
-        password_text
-      }
-
-      let!(:time_now) {
-        time_now = Time.now
-        Time.should_receive(:now).and_return(time_now)
-        time_now
-      }
-
-      it "@text should be a random password" do
-        expect(password.text.size).to eq(8)
-        expect(password.text).to eq(password_text)
-      end
-
-      it "@salt_text should be a auto created" do
-        expect(password.salt_text).to eq(time_now.to_s)
-      end
-
-      it "@salt_hash should be a hashed salt" do
-        expect(password.salt_hash).to eq(Passwd.hashing(time_now.to_s))
-      end
-
-      it "@password_hash should be a hashed password with salt" do
-        password_hash = Passwd.hashing("#{Passwd.hashing(time_now.to_s)}#{password_text}")
-        expect(password.hash).to eq(password_hash)
-      end
-    end
+    context "without argument" do
+      subject { Passwd::Password.new }
 
-    context "with custom params" do
-      let(:password_text) {Passwd.create}
-      let(:salt_text) {"salt"}
-      let!(:time_now) {
-        time_now = Time.now
-        Time.stub(:create).and_return(time_now)
-        time_now
-      }
-
-      it "@text is specified password" do
-        password = Passwd::Password.new(password: password_text)
-        expect(password.text).to eq(password_text)
-      end
-
-      it "@hash is hash of specified password" do
-        password = Passwd::Password.new(password: password_text)
-        password_hash = Passwd.hashing("#{Passwd.hashing(time_now.to_s)}#{password_text}")
-        expect(password.hash).to eq(password_hash)
-      end
-
-      it "@salt_text is specified salt" do
-        password = Passwd::Password.new(salt_text: salt_text)
-        expect(password.salt_text).to eq(salt_text)
-      end
-
-      it "@salt_hash is hash of specified salt" do
-        salt_hash = Passwd.hashing(salt_text)
-        password = Passwd::Password.new(salt_text: salt_text)
-        expect(password.salt_hash).to eq(salt_hash)
-      end
+      it { is_expected.not_to have_attributes(plain: nil) }
+      it { is_expected.not_to have_attributes(hash: nil) }
+      it { is_expected.not_to have_attributes(salt: nil) }
+      it { is_expected.to satisfy {|v| v.salt.is_a?(Passwd::Salt) } }
     end
-  end
 
-  describe "#text=" do
-    it "@text is changed" do
-      old_password = password.text
-      password.text = password.text.reverse
-      expect(password.text).not_to eq(old_password)
-    end
+    context "with plain" do
+      subject { Passwd::Password.new(plain: pswd.plain) }
 
-    it "@hash is changed" do
-      old_hash = password.hash
-      new_password = password.text = password.text.reverse
-      expect(password.hash).not_to eq(old_hash)
-      expect(password.hash).to eq(Passwd.hashing("#{password.salt_hash}#{new_password}"))
+      it { is_expected.to have_attributes(plain: pswd.plain) }
+      it { is_expected.not_to have_attributes(hash: nil) }
+      it { is_expected.not_to have_attributes(salt: nil) }
+      it { is_expected.to satisfy {|v| v.salt.is_a?(Passwd::Salt) } }
     end
-  end
 
-  describe "#hash=" do
-    it "@text is nil" do
-      password.hash = Passwd.hashing("secret")
-      expect(password.text).to be_nil
-    end
+    context "with plain and salt_plain" do
+      subject { Passwd::Password.new(plain: pswd.plain, salt_plain: pswd.salt.plain) }
 
-    it "@hash is changed" do
-      old_hash = password.hash
-      password.hash = Passwd.hashing("secret")
-      expect(password.hash).not_to eq(old_hash)
+      it { is_expected.to have_attributes(plain: pswd.plain) }
+      it { is_expected.to have_attributes(hash: pswd.hash) }
+      it { is_expected.to satisfy {|v| v.salt.plain == pswd.salt.plain } }
+      it { is_expected.to satisfy {|v| v.salt.hash == pswd.salt.hash } }
     end
-  end
 
-  describe "#salt_text=" do
-    it "@salt_text is changed" do
-      old_salt = password.salt_text
-      password.salt_text = "salt"
-      expect(password.salt_text).not_to eq(old_salt)
-    end
+    context "with plain and salt_hash" do
+      subject { Passwd::Password.new(plain: pswd.plain, salt_hash: pswd.salt.hash) }
 
-    it "@salt_hash is changed" do
-      old_salt = password.salt_hash
-      password.salt_text = "salt"
-      expect(password.salt_hash).not_to eq(old_salt)
+      it { is_expected.to have_attributes(plain: pswd.plain) }
+      it { is_expected.to have_attributes(hash: pswd.hash) }
+      it { is_expected.to satisfy {|v| v.salt.plain.nil? } }
+      it { is_expected.to satisfy {|v| v.salt.hash == pswd.salt.hash } }
     end
 
-    it "@hash is changed" do
-      old_hash = password.hash
-      password.salt_text = "salt"
-      expect(password.hash).not_to eq(old_hash)
+    context "with hash and salt_hash" do
+      subject { Passwd::Password.new(hash: pswd.hash, salt_hash: pswd.salt.hash) }
+
+      it { is_expected.to have_attributes(plain: nil) }
+      it { is_expected.to have_attributes(hash: pswd.hash) }
+      it { is_expected.to satisfy {|v| v.salt.plain.nil? } }
+      it { is_expected.to satisfy {|v| v.salt.hash == pswd.salt.hash } }
     end
+
+    it {
+      expect {
+        Passwd::Password.new(hash: pswd.hash)
+      }.to raise_error(ArgumentError)
+    }
   end
 
-  describe "#salt_hash=" do
-    it "@salt_text is nil" do
-      password.salt_hash = Passwd.hashing("salt")
-      expect(password.salt_text).to eq(nil)
-    end
+  describe "#update_plain" do
+    it {
+      expect(pswd).to receive(:rehash)
+      pswd.update_plain("secret")
+      expect(pswd).to have_attributes(plain: "secret")
+    }
+
+    it {
+      expect {
+        pswd.update_plain("secret")
+      }.to change { pswd.plain }
+    }
+  end
 
-    it "@salt_hash is changed" do
-      old_salt_hash = password.salt_hash
-      password.salt_hash = Passwd.hashing("salt")
-      expect(password.salt_hash).not_to eq(old_salt_hash)
-    end
+  describe "#update_hash" do
+    it {
+      expect(pswd).not_to receive(:rehash)
+      pswd.update_hash("hashed", "salt")
+      expect(pswd).to have_attributes(hash: "hashed")
+      expect(pswd.salt).to have_attributes(hash: "salt")
+    }
+
+    it {
+      expect {
+        pswd.update_hash("hashed", "salt")
+      }.to change { pswd.plain }
+    }
+  end
 
-    it "@hash is changed" do
-      old_hash = password.hash
-      password.salt_hash = Passwd.hashing("salt")
-      expect(password.hash).not_to eq(old_hash)
-    end
+  describe "#match?" do
+    it { expect(pswd.match?(pswd.plain)).to be_truthy }
+
+    it {
+      invalid = [pswd.plain, "invalid"].join
+      expect(pswd.match?(invalid)).to be_falsy
+    }
   end
 
   describe "#==" do
-    it "return true with valid password" do
-      expect(password == password.text).to be_true
-    end
+    it {
+      expect(pswd).to receive(:match?)
+      pswd == pswd.plain
+    }
+  end
 
-    it "return false with invalid password" do
-      expect(password == "secret").to be_false
-    end
+  describe "#valid?" do
+    it {
+      pswd.update_plain("ValidPassw0rd")
+      expect(pswd.valid?).to be_truthy
+    }
+
+    it {
+      pswd.update_plain("a" * (Passwd::PwConfig.policy.min_length - 1))
+      expect(pswd.valid?).to be_falsy
+    }
+
+    it {
+      pswd.update_hash("hashed", "salt")
+      expect {
+        pswd.valid?
+      }.to raise_error(Passwd::PasswdError)
+    }
+  end
+
+  describe "#default_options" do
+    it {
+      expect(pswd.send(:default_options)).to satisfy {|v| v.has_key?(:plain) }
+    }
+  end
+
+  describe "#include_char?" do
+    it {
+      pswd.update_plain("secret")
+      expect(pswd.send(:include_char?, ["s"])).to be_truthy
+    }
+
+    it {
+      expect {
+        pswd.update_hash("hashed", "salt")
+        pswd.send(:include_char?, [])
+      }.to raise_error(Passwd::PasswdError)
+    }
+  end
+
+  describe ".from_plain" do
+    it {
+      expect(Passwd::Password).to receive(:new)
+      Passwd::Password.from_plain("secret")
+    }
+  end
+
+  describe ".from_hash" do
+    it {
+      expect(Passwd::Password).to receive(:new)
+      Passwd::Password.from_hash("hashed", "salt")
+    }
   end
-end
+end

data/spec/spec_helper.rb

@@ -10,14 +10,25 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start do
   add_filter "spec"
   add_filter ".bundle"
+  add_filter "example"
 end
 
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path("../../example/config/environment", __FILE__)
 require "passwd"
 
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
 RSpec.configure do |config|
   config.order = "random"
-  config.after do
-    Passwd::Config.instance.reset
-    Passwd::Policy.instance.reset
+
+  config.before :all do
+    require "db/schema"
+  end
+
+  config.after :each do
+    Passwd::PwConfig.reset
+    DataUtil.clear
   end
 end
+

data/spec/support/data_util.rb

@@ -0,0 +1,11 @@
+class DataUtil
+  TARGETS = %w(User)
+
+  def self.clear
+    models.each(&:delete_all)
+  end
+
+  def self.models
+    TARGETS.map(&:constantize)
+  end
+end

data/spec/support/paths.rb

@@ -0,0 +1,2 @@
+$:.unshift(Rails.root.to_s) unless $:.include?(Rails.root.to_s)
+

metadata

@@ -1,55 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: passwd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: coveralls
+  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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: database_rewinder
   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: The various utilities on password
@@ -59,32 +129,95 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - 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
 - lib/passwd.rb
-- lib/passwd/active_record.rb
+- lib/passwd/action_controller_ext.rb
+- lib/passwd/active_record_ext.rb
 - lib/passwd/base.rb
-- lib/passwd/configuration/abstract_config.rb
-- lib/passwd/configuration/config.rb
-- lib/passwd/configuration/policy.rb
-- lib/passwd/configuration/tmp_config.rb
+- lib/passwd/configuration.rb
 - lib/passwd/errors.rb
 - lib/passwd/password.rb
+- lib/passwd/policy.rb
+- lib/passwd/railtie.rb
+- lib/passwd/salt.rb
 - lib/passwd/version.rb
 - passwd.gemspec
-- spec/passwd/active_record_spec.rb
+- spec/passwd/.keep
+- spec/passwd/active_record_ext_spec.rb
 - spec/passwd/base_spec.rb
-- spec/passwd/configuration/config_spec.rb
-- spec/passwd/configuration/policy_spec.rb
-- spec/passwd/configuration/tmp_config_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
@@ -95,25 +228,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Password utility
 test_files:
-- spec/passwd/active_record_spec.rb
+- spec/passwd/.keep
+- spec/passwd/active_record_ext_spec.rb
 - spec/passwd/base_spec.rb
-- spec/passwd/configuration/config_spec.rb
-- spec/passwd/configuration/policy_spec.rb
-- spec/passwd/configuration/tmp_config_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