passwd 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d747281623609db763e8bbefa99fc1fb14cdad2
+  data.tar.gz: fa857ec1c64e9fc4f0967fd963a435793e1050b5
+SHA512:
+  metadata.gz: 21df8d0e09673b322a47834202f2663e0a687a10c28665283c832a35b857f37575a19bbf25a66110eb7ffe8b67f3e4546930676e25ed816f6ab33beea5b7bdef
+  data.tar.gz: b2672f8d1c14d48b0b7f0171eee41a6c9aeead396e61af1c6a058592876c3da106214888c134c1ec9c4ecd54dac049ce37adeb827257e777696534422132fbf7

data/.coveralls.yml

@@ -1 +1 @@
-repo_token: juJNf3K7FF93l6tzdF8cv1V2NFgGdCaWv
+repo_token: 106V5oEIwXeOfqT35UWifTnifi5sEO2QP

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
   - 2.0.0
 gemfile:
   - Gemfile
-script: bundle exec rspec
+script: bundle exec rake spec
 branches:
   only:
     - master

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 group :test do
   gem 'coveralls', require: false
+  gem 'simplecov', require: false
 end

data/README.md

@@ -45,12 +45,16 @@ password_hash = Passwd.hashing(password)
 
 ### Password settings
 
-Default config is stored in the class variable. (@@config)
+Default config is stored in the class instance variable.
 Changing the default configs are as follows:
 
 ```ruby
 Passwd.config => Get config hash.
 Passwd.config(length: 10) => Change to the default length.
+
+Passwd.configure do |c|
+  c.length = 10
+end
 ```
 
 Options that can be specified:

data/Rakefile

@@ -1,11 +1,9 @@
 require "bundler/gem_tasks"
-
-Bundler.setup
 require 'rspec/core/rake_task'
 
-task default: [:spec]
-
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ["-c", "-fs"]
 end
+
+task :default => :spec

data/lib/passwd.rb

@@ -5,23 +5,16 @@ require "digest/sha1"
 require "passwd/version"
 require "passwd/password"
 require "passwd/active_record"
+require "passwd/configuration"
 
 module Passwd
-  @@config = {
-    length: 8,
-    lower: true,
-    upper: true,
-    number: true,
-    letters_lower: ('a'..'z').to_a,
-    letters_upper: ('A'..'Z').to_a,
-    letters_number: ('0'..'9').to_a
-  }
+  @config = Configuration.new
 
   class << self
     def create(options={})
-      config = @@config.merge(config_validator(options))
-      letters = get_retters(config)
-      Array.new(config[:length]){letters[rand(letters.size)]}.join
+      config = @config.dup
+      config.merge options
+      Array.new(config.length){config.letters[rand(config.letters.size)]}.join
     end
 
     def auth(password_text, salt_hash, password_hash)
@@ -29,26 +22,25 @@ module Passwd
       password_hash == enc_pass
     end
 
-    def hashing(password)
-      Digest::SHA1.hexdigest password
+    def hashing(plain)
+      Digest::SHA1.hexdigest plain
     end
 
-    def config(options={})
-      @@config.merge!(config_validator(options))
-    end
-
-    private
-    def get_retters(config)
-      ["lower", "upper", "number"].inject([]) do |letters, type|
-        letters.concat(config["letters_#{type}".to_sym]) if config[type.to_sym]
-        letters
+    def configure(options={}, &block)
+      if block_given?
+        @config.configure &block
+      else
+        if options.empty?
+          @config
+        else
+          @config.merge options
+        end
       end
     end
+    alias :config :configure
 
-    def config_validator(config_hash)
-      parameters = [:length, :lower, :upper, :number, :letters_lower, :letters_upper, :letters_number]
-      config = config_hash.inject({}){|r, (k, v)| r.store(k.to_sym, v); r}
-      config.select{|k, v| parameters.include? k}
+    def reset_config
+      @config.reset
     end
   end
 end

data/lib/passwd/configuration.rb

@@ -0,0 +1,50 @@
+# coding: utf-8
+
+module Passwd
+  class Configuration
+    VALID_OPTIONS_KEYS = [
+      :length,
+      :lower,
+      :upper,
+      :number,
+      :letters_lower,
+      :letters_upper,
+      :letters_number
+    ].freeze
+
+    attr_accessor *VALID_OPTIONS_KEYS
+
+    def initialize
+      reset
+    end
+
+    def configure
+      yield self
+    end
+
+    def merge(configs)
+      configs.keys.each do |k|
+        send("#{k}=", configs[k])
+      end
+    end
+
+    def letters
+      chars = []
+      chars.concat(self.letters_lower) if self.lower
+      chars.concat(self.letters_upper) if self.upper
+      chars.concat(self.letters_number) if self.number
+      raise "letters is empty" if chars.empty?
+      chars
+    end
+
+    def reset
+      self.length = 8
+      self.lower = true
+      self.upper = true
+      self.number = true
+      self.letters_lower = ("a".."z").to_a
+      self.letters_upper = ("A".."Z").to_a
+      self.letters_number = ("0".."9").to_a
+    end
+  end
+end

data/lib/passwd/version.rb

@@ -1,3 +1,3 @@
 module Passwd
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/passwd/active_record_spec.rb

@@ -139,4 +139,4 @@ describe Passwd::ActiveRecord do
       end
     end
   end
-end
+end

data/spec/passwd/configuration_spec.rb

@@ -0,0 +1,242 @@
+# coding: utf-8
+
+require "spec_helper"
+
+describe Passwd::Configuration do
+  let(:config) {Passwd::Configuration.new}
+
+  describe "defined accessors" do
+    it "defined length" do
+      expect(config.respond_to? :length).to be_true
+    end
+
+    it "defined lower" do
+      expect(config.respond_to? :lower).to be_true
+    end
+
+    it "defined upper" do
+      expect(config.respond_to? :upper).to be_true
+    end
+
+    it "defined number" do
+      expect(config.respond_to? :number).to be_true
+    end
+
+    it "defined letters_lower" do
+      expect(config.respond_to? :letters_lower).to be_true
+    end
+
+    it "defined letters_upper" do
+      expect(config.respond_to? :letters_upper).to be_true
+    end
+
+    it "defined letters_number" do
+      expect(config.respond_to? :letters_number).to be_true
+    end
+  end
+
+  describe "#initialize" do
+    it "length should be a default" do
+      expect(config.length).to eq(8)
+    end
+
+    it "lower should be a default" do
+      expect(config.lower).to be_true
+    end
+
+    it "upper should be a default" do
+      expect(config.upper).to be_true
+    end
+
+    it "number should be a default" do
+      expect(config.number).to be_true
+    end
+
+    it "letters_lower should be a default" do
+      expect(config.letters_lower).to eq(("a".."z").to_a)
+    end
+
+    it "letters_upper should be a default" do
+      expect(config.letters_upper).to eq(("A".."Z").to_a)
+    end
+
+    it "letters_number should be a default" do
+      expect(config.letters_number).to eq(("0".."9").to_a)
+    end
+  end
+
+  describe "#configure" do
+    before {
+      config.configure do |c|
+        c.length = 20
+        c.lower = false
+        c.upper = false
+        c.number = false
+        c.letters_lower = ["a"]
+        c.letters_upper = ["A"]
+        c.letters_number = ["0"]
+      end
+    }
+
+    it "set length from block" do
+      expect(config.length).to eq(20)
+    end
+
+    it "set lower from block" do
+      expect(config.lower).to be_false
+    end
+
+    it "set upper from block" do
+      expect(config.upper).to be_false
+    end
+
+    it "set number from block" do
+      expect(config.number).to be_false
+    end
+
+    it "set letters_lower from block" do
+      expect(config.letters_lower).to eq(["a"])
+    end
+
+    it "set letters_upper from block" do
+      expect(config.letters_upper).to eq(["A"])
+    end
+
+    it "set letters_number from block" do
+      expect(config.letters_number).to eq(["0"])
+    end
+
+    it "raise error unknown setting" do
+      expect {
+        config.configure do |c|
+          c.unknown = true
+        end
+      }.to raise_error
+    end
+  end
+
+  describe "#merge" do
+    it "set length from hash" do
+      config.merge(length: 10)
+      expect(config.length).to eq(10)
+    end
+
+    it "set lower from hash" do
+      config.merge(lower: false)
+      expect(config.lower).to be_false
+    end
+
+    it "set upper from hash" do
+      config.merge(upper: false)
+      expect(config.upper).to be_false
+    end
+
+    it "set number from hash" do
+      config.merge(number: false)
+      expect(config.number).to be_false
+    end
+
+    it "set letters_lower from hash" do
+      config.merge(letters_lower: ["a"])
+      expect(config.letters_lower).to eq(["a"])
+    end
+
+    it "set letters_upper from hash" do
+      config.merge(letters_upper: ["A"])
+      expect(config.letters_upper).to eq(["A"])
+    end
+
+    it "set letters_number from hash" do
+      config.merge(letters_number: ["0"])
+      expect(config.letters_number).to eq(["0"])
+    end
+
+    it "raise error unknown setting" do
+      expect {
+        config.merge(unknown: true)
+      }.to raise_error
+    end
+  end
+
+  describe "#letters" do
+    it "return Array object" do
+      expect(config.letters.is_a? Array).to be_true
+    end
+
+    it "all elements of the string" do
+      config.letters.each do |l|
+        expect(l.is_a? String).to be_true
+      end
+    end
+
+    it "return all letters" do
+      all_letters = ("a".."z").to_a.concat(("A".."Z").to_a).concat(("0".."9").to_a)
+      expect(config.letters).to eq(all_letters)
+    end
+
+    it "return except for the lower case" do
+      config.merge(lower: false)
+      expect(config.letters.include? "a").to be_false
+    end
+
+    it "return except for the upper case" do
+      config.merge(upper: false)
+      expect(config.letters.include? "A").to be_false
+    end
+
+    it "return except for the number case" do
+      config.merge(number: false)
+      expect(config.letters.include? "0").to be_false
+    end
+
+    it "raise error if letters is empty" do
+      config.merge(lower: false, upper: false, number: false)
+      expect {
+        config.letters
+      }.to raise_error
+    end
+  end
+
+  describe "#reset" do
+    before {
+      config.configure do |c|
+        c.length = 20
+        c.lower = false
+        c.upper = false
+        c.number = false
+        c.letters_lower = ["a"]
+        c.letters_upper = ["A"]
+        c.letters_number = ["0"]
+      end
+      config.reset
+    }
+
+    it "length should be a default" do
+      expect(config.length).to eq(8)
+    end
+
+    it "lower should be a default" do
+      expect(config.lower).to be_true
+    end
+
+    it "upper should be a default" do
+      expect(config.upper).to be_true
+    end
+
+    it "number should be a default" do
+      expect(config.number).to be_true
+    end
+
+    it "letters_lower should be a default" do
+      expect(config.letters_lower).to eq(("a".."z").to_a)
+    end
+
+    it "letters_upper should be a default" do
+      expect(config.letters_upper).to eq(("A".."Z").to_a)
+    end
+
+    it "letters_number should be a default" do
+      expect(config.letters_number).to eq(("0".."9").to_a)
+    end
+  end
+end

data/spec/passwd/password_spec.rb

@@ -3,7 +3,6 @@
 require "spec_helper"
 
 describe Passwd::Password do
-  let(:default) {@default}
   let(:password) {Passwd::Password.new}
 
   describe "#initialize" do
@@ -21,7 +20,7 @@ describe Passwd::Password do
       }
 
       it "@text should be a random password" do
-        expect(password.text.size).to eq(default[:length])
+        expect(password.text.size).to eq(8)
         expect(password.text).to eq(password_text)
       end
 

data/spec/passwd_spec.rb

@@ -3,45 +3,13 @@
 require "spec_helper"
 
 describe Passwd do
-  let(:default) {@default}
-
-  describe "default settings" do
-    let(:config) {Passwd.config}
-
-    it "length should be a default" do
-      expect(config[:length]).to eq(default[:length])
-    end
-
-    it "lower should be a default" do
-      expect(config[:lower]).to eq(default[:lower])
-    end
-
-    it "upper should be a default" do
-      expect(config[:upper]).to eq(default[:upper])
-    end
-
-    it "number should be a default" do
-      expect(config[:number]).to eq(default[:number])
-    end
-
-    it "letters_lower should be a default" do
-      expect(config[:letters_lower]).to eq(default[:letters_lower])
-    end
-
-    it "letters_upper should be a default" do
-      expect(config[:letters_upper]).to eq(default[:letters_upper])
-    end
-
-    it "letters_number should be a default" do
-      expect(config[:letters_number]).to eq(default[:letters_number])
-    end
-  end
+  let(:default) {Passwd::Configuration.new}
 
   describe ".create" do
     it "create random password" do
       password = Passwd.create
       expect(password.is_a? String).to be_true
-      expect(password.size).to eq(default[:length])
+      expect(password.size).to eq(default.length)
     end
 
     it "password was created specified characters" do
@@ -50,17 +18,17 @@ describe Passwd do
 
     it "password create without lower case" do
       password = Passwd.create lower: false
-      expect(default[:letters_lower].include? password).to be_false
+      expect(default.letters_lower.include? password).to be_false
     end
 
     it "password create without upper case" do
       password = Passwd.create upper: false
-      expect(default[:letters_upper].include? password).to be_false
+      expect(default.letters_upper.include? password).to be_false
     end
 
     it "password create without number" do
       password = Passwd.create(number: false)
-      expect(default[:letters_number].include? password).to be_false
+      expect(default.letters_number.include? password).to be_false
     end
   end
 
@@ -96,42 +64,74 @@ describe Passwd do
     end
   end
 
-  describe ".config" do
-    after {Passwd.config(default)}
+  describe ".configure" do
+    after {Passwd.reset_config}
 
-    it "return config hash" do
-      expect(Passwd.config.is_a? Hash).to be_true
+    it "return configuration object" do
+      expect(Passwd.configure.is_a? Passwd::Configuration).to be_true
     end
 
-    it "set config value" do
-      Passwd.config(length: 10)
-      expect(Passwd.config[:length]).not_to eq(default[:length])
-      expect(Passwd.config[:lower]).to eq(default[:lower])
+    it "set config value from block" do
+      Passwd.configure do |c|
+        c.length = 10
+      end
+      expect(Passwd.configure.length).not_to eq(default.length)
+      expect(Passwd.configure.length).to eq(10)
     end
-  end
 
-  describe ".get_retters" do
-    it "return letters" do
-      letters = Passwd.send(:get_retters, default)
-      expect(letters.is_a? Array).to be_true
-      expect(letters.select{|s| s.is_a? String}).to eq(letters)
-      expect(letters).to eq(default[:letters_lower] + default[:letters_upper] + default[:letters_number])
+    it "set config value from hash" do
+      Passwd.configure length: 20
+      expect(Passwd.config.length).not_to eq(default.length)
+      expect(Passwd.config.length).to eq(20)
     end
 
-    it "should create exception if not specified argument" do
-      expect(proc{Passwd.send(:get_retters)}).to raise_error
+    it "alias of configure as config" do
+      expect(Passwd.configure.object_id).to eq(Passwd.config.object_id)
     end
   end
 
-  describe ".config_validator" do
-    it "convert to symbol the key" do
-      config = default.inject({}){|r, (k, v)| r.store(k.to_s, v); r}
-      expect(Passwd.send(:config_validator, config)).to eq(default)
+  describe ".reset_config" do
+    let(:config) {Passwd.config}
+    
+    before {
+      config.configure do |c|
+        c.length = 20
+        c.lower = false
+        c.upper = false
+        c.number = false
+        c.letters_lower = ["a"]
+        c.letters_upper = ["A"]
+        c.letters_number = ["0"]
+      end
+      config.reset
+    }
+
+    it "length should be a default" do
+      expect(config.length).to eq(8)
+    end
+
+    it "lower should be a default" do
+      expect(config.lower).to be_true
+    end
+
+    it "upper should be a default" do
+      expect(config.upper).to be_true
+    end
+
+    it "number should be a default" do
+      expect(config.number).to be_true
     end
 
-    it "delete not defined parameters" do
-      config = default.merge(invalid_parameter: true)
-      expect(Passwd.send(:config_validator, config)).to eq(default)
+    it "letters_lower should be a default" do
+      expect(config.letters_lower).to eq(("a".."z").to_a)
+    end
+
+    it "letters_upper should be a default" do
+      expect(config.letters_upper).to eq(("A".."Z").to_a)
+    end
+
+    it "letters_number should be a default" do
+      expect(config.letters_number).to eq(("0".."9").to_a)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,15 @@
-require "passwd"
-
+require "simplecov"
 require "coveralls"
 Coveralls.wear!
 
+# SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
+SimpleCov.start do
+  add_filter "spec"
+  add_filter ".bundle"
+end
+
+require "passwd"
+
 RSpec.configure do |config|
   config.order = "random"
-  config.before do
-    @default = {
-      length: 8,
-      lower: true,
-      upper: true,
-      number: true,
-      letters_lower: ('a'..'z').to_a,
-      letters_upper: ('A'..'Z').to_a,
-      letters_number: ('0'..'9').to_a
-    }
-  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: passwd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,33 +27,29 @@ dependencies:
 - !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: rspec
   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'
 description: The various utilities on password
@@ -75,46 +68,42 @@ files:
 - Rakefile
 - lib/passwd.rb
 - lib/passwd/active_record.rb
+- lib/passwd/configuration.rb
 - lib/passwd/password.rb
 - lib/passwd/version.rb
 - passwd.gemspec
 - spec/passwd/active_record_spec.rb
+- spec/passwd/configuration_spec.rb
 - spec/passwd/password_spec.rb
 - spec/passwd_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/i2bskn/passwd
 licenses:
 - MIT
+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: 35413922955959980
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 35413922955959980
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Password utility
 test_files:
 - spec/passwd/active_record_spec.rb
+- spec/passwd/configuration_spec.rb
 - spec/passwd/password_spec.rb
 - spec/passwd_spec.rb
 - spec/spec_helper.rb