pillboxr 0.8.0 → 0.8.1

data/README.md

@@ -16,7 +16,16 @@ Getting started is fairly easy:
 
 	$ gem install pillboxr
 
-Next obtain an API key and paste it into a file called `api_key.yml` in the root directory of your project. See below for directions on obtaining an API key.
+Next obtain an API key. See below for directions on obtaining an API key.  There are several ways to tell Pillboxr about your API key.  All of the following are valid:
+
+```ruby
+Pillboxr.api_key = "Your API key as a string." # simple string
+Pillboxr.api_key = Pathname.new("/path/to/yaml/or/text/file/containing/only/api/key/as/string") # absolute or relative path
+Pillboxr.api_key = File.new("/path/to/yaml/or/text/file/containing/only/api/key/as/string", "r") # file descriptor object
+Pillboxr.api_key = Object.new.tap { |obj| obj.define_singleton_method(:key) { "Your API key string" } } # object that responds to 'key' method
+```
+
+If you do not specify a key Pillboxr will try to find an api_key.yml in the current working directory and load the key from that file.
 
 Finally:
 

data/lib/pillboxr.rb

@@ -8,8 +8,10 @@ require_relative 'pillboxr/request'
 
 module Pillboxr
 
-  def api_key=(str)
-    Request.api_key = str
+  # Assign an api_key to this session.  Delegates to Request#api_key=
+  # @param [String, Pathname, File, Object] the key itself, or a way to load the key, or an object that responds to the 'key' method.
+  def api_key=(arg)
+    Request.api_key = arg
   end
 
   # Search API for pages of pills. Also accepts a block that yields pages for iterating through.

data/lib/pillboxr/request.rb

@@ -43,18 +43,39 @@ module Pillboxr
 
     # Assign an API key to this session.
     # @param [String] your API key in string format.
-    def self.api_key=(str)
-      @api_key = str
+    def self.api_key=(arg)
+      @api_key = arg
     end
 
     private
     def self.api_key
-      begin
-        @api_key ||= YAML.load_file(File.expand_path("api_key.yml"))
-      rescue Errno::ENOENT => e
-        raise e, "API key not found. You must create an api_key.yml file in the root directory of the project."
-      rescue TypeError => e
-        raise e, "api_key.yml does not contain an appropriate key."
+      case @api_key
+      when String
+        return @api_key
+      when Pathname
+        if @api_key.absolute?
+          return YAML.load_file(@api_key)
+        else
+          return YAML.load_file(@api_key.realpath)
+        end
+      when File
+        return YAML.load_file(@api_key)
+      when Object
+        begin
+          return @api_key.key
+        rescue NoMethodError => e
+          raise e, "The object passed as an argument to api_key= must respond to the 'key' method."
+        end
+      when nil
+        begin
+          return YAML.load_file(File.expand_path("api_key.yml"))
+        rescue Errno::ENOENT => e
+          raise e, "API key not found. Please create an api_key.yml file in the current working directory of the project or pass the key as an argument."
+        rescue TypeError => e
+          raise e, "The api_key.yml in this directory does not contain an appropriate key."
+        end
+      else
+        raise ArgumentError, "api_key must be one of 'String', 'Pathname', 'File', or an object that responds to the 'key' method."
       end
     end
 

data/lib/pillboxr/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Pillboxr
- VERSION = "0.8.0"
+ VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pillboxr
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty