yubikey 1.3.0 → 1.3.1

data/README.md

@@ -1,6 +1,6 @@
 # yubikey
 
-[![Build Status](https://travis-ci.org/rainforestapp/yubikey.png?branch=master)](https://travis-ci.org/rainforestapp/yubikey)
+[![Build Status](https://travis-ci.org/titanous/yubikey.png?branch=master)](https://travis-ci.org/titanous/yubikey)
 
 ## Description
 
@@ -31,7 +31,7 @@ begin
   otp = Yubikey::OTP::Verify.new(:api_id => 1234,
                                  :api_key => 'NiSwGZBQ0gTbwXbRGWAf4kM5xXg=',
                                  :otp => 'dteffujehknhfjbrjnlnldnhcujvddbikngjrtgh')
-    
+
   if otp.valid?
     p 'valid OTP'
   elsif otp.replayed?
@@ -57,14 +57,11 @@ Then run bundle install.
 ## Copyright
 
 ### Ruby library
-  Written by [Jonathan Rudenberg](https://github.com/titanous) <jon335@gmail.com>
-  Copyright (c) 2009 Jonathan Rudenberg
-  The MIT License. See LICENSE.
+
+Written by [Jonathan Rudenberg](https://github.com/titanous). Copyright (c) 2009 Jonathan Rudenberg
+
+The MIT License. See [LICENSE](https://github.com/titanous/yubikey/blob/master/LICENSE).
 
 ### Contributors
-- Carl Byström
-- Erik Ruwalder
-- [Russell Smith](https://github.com/ukd1)
-- [Chris Lundquist](https://github.com/ChrisLundquist)
-- [Maarten van Grootel](https://github.com/maartenvg)
-- [Chris Benedict](https://github.com/chrisbdaemon)
+
+[List of contributors](https://github.com/titanous/yubikey/graphs/contributors)

data/lib/yubikey.rb

@@ -4,9 +4,13 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) unless
 require 'net/https'
 require 'openssl'
 
-module Yubikey; end;
-
+require 'yubikey/configuration'
 require 'yubikey/hex'
 require 'yubikey/modhex'
 require 'yubikey/otp'
 require 'yubikey/otp_verify'
+
+module Yubikey
+  extend Configuration
+end
+

data/lib/yubikey/configuration.rb

@@ -0,0 +1,42 @@
+module Yubikey
+  # Defines constants and methods related to configuration
+  module Configuration
+    # An array of valid keys in the options hash when configuring a Yubikey::OTP::Verify
+    VALID_OPTIONS_KEYS = [
+      :api_id,
+      :api_key,
+    ].freeze
+
+    # By default, don't have an api_id
+    DEFAULT_API_ID = nil
+
+    # By default, don't have an api_key
+    DEFAULT_API_KEY = nil
+
+    # @private
+    attr_accessor *VALID_OPTIONS_KEYS
+
+    # When this module is extended, set all configuration options to their default values
+    def self.extended(base)
+      base.reset
+    end
+
+    # Convenience method to allow configuration options to be set in a block
+    def configure
+      yield self
+    end
+
+    # Create a hash of options and their values
+    def options
+      VALID_OPTIONS_KEYS.inject({}) do |option, key|
+        option.merge!(key => send(key))
+      end
+    end
+
+    # Reset all configuration options to defaults
+    def reset
+      self.api_id  = DEFAULT_API_ID
+      self.api_key = DEFAULT_API_KEY
+    end
+  end
+end

data/lib/yubikey/otp_verify.rb

@@ -10,13 +10,13 @@ module Yubikey
     attr_reader :status
 
     def initialize(args)
-      raise(ArgumentError, "Must supply API ID") if args[:api_id].nil?
-      raise(ArgumentError, "Must supply API Key") if args[:api_key].nil?
+      @api_key = args[:api_key] || Yubikey.api_key
+      @api_id  = args[:api_id]  || Yubikey.api_id
+      raise(ArgumentError, "Must supply API ID") if @api_id.nil?
+      raise(ArgumentError, "Must supply API Key") if @api_key.nil?
+
       raise(ArgumentError, "Must supply OTP") if args[:otp].nil?
 
-      @api_key = args[:api_key]
-      @api_id = args[:api_id]
-      
       @url = args[:url] || API_URL
       @nonce = args[:nonce] || OTP::Verify.generate_nonce(32)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yubikey
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -21,6 +21,7 @@ extra_rdoc_files:
 files:
 - examples/otp.rb
 - lib/yubikey.rb
+- lib/yubikey/configuration.rb
 - lib/yubikey/hex.rb
 - lib/yubikey/modhex.rb
 - lib/yubikey/otp.rb