pillboxr 0.7.5 → 0.7.6

data/lib/pillboxr.rb

@@ -8,13 +8,19 @@ require_relative 'pillboxr/request'
 
 module Pillboxr
 
+  def api_key=(str)
+    Request.api_key = str
+  end
+
   # Search API for pages of pills. Also accepts a block that yields pages for iterating through.
   # @param [Hash] search parameters, see {Pillboxr::Attributes} for accepted parameters.
   # @return [Result] a {Pillboxr::Result} object that has pages of data that can be iterated through.
-  def with(query_hash, &block)
+  def with(options, &block)
     @params ||= Params.new(self)
 
-    query_hash.each do |k,v|
+    self.api_key = options.delete(:api_key)
+
+    options.each do |k,v|
       if attributes.keys.include?(k)
         @params << symbol_to_instance(k,v)
       elsif api_attributes.keys.include?(k)

data/lib/pillboxr/request.rb

@@ -18,7 +18,7 @@ module Pillboxr
                   result = {'Pills' => {'pill' => [], 'record_count' => 0 }}
                   return result
                 elsif e.message == API_KEY_ERROR_MESSAGE
-                  raise "Invalid api_key.yml. Check format and try again."
+                  raise "Invalid api_key. Check format and try again."
                 else
                   raise
                 end
@@ -41,8 +41,14 @@ module Pillboxr
       return self.api_response
     end
 
+    # Assign an API key to this session.
+    # @param [String] your API key in string format.
+    def self.api_key=(str)
+      @api_key = str
+    end
+
     private
-    def api_key
+    def self.api_key
       begin
         @api_key ||= YAML.load_file(File.expand_path("api_key.yml"))
       rescue Errno::ENOENT => e
@@ -53,7 +59,7 @@ module Pillboxr
     end
 
     def default_path
-      "/PHP/pillboxAPIService.php?key=#{api_key}"
+      "/PHP/pillboxAPIService.php?key=#{self.class.api_key}"
     end
   end
 end

data/lib/pillboxr/version.rb

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

data/test/pillboxr/pillboxr_test.rb

@@ -2,7 +2,6 @@
 require_relative 'test_helper'
 require 'vcr'
 
-
 VCR.configure do |c|
   c.cassette_library_dir = 'test/pillboxr/fixtures/vcr_cassettes'
   c.hook_into :webmock
@@ -21,15 +20,19 @@ class TestPillboxr < MiniTest::Unit::TestCase
   end
 
   def test_api_key
-    assert_raises(NoMethodError) { Pillboxr::Request.api_key }
+    assert_raises(NoMethodError) { Pillboxr.api_key }
     assert_raises(NoMethodError) do
       @request_object.api_key
     end
+    Pillboxr.api_key = "foo"
+    assert_equal("foo", Pillboxr::Request.send(:api_key))
+    assert_raises(RuntimeError) { Pillboxr.with({:api_key => 'bar', :color => :blue}) }
+    assert_equal("bar", Pillboxr::Request.send(:api_key))
   end
 
   def test_returns_the_correct_default_path
     assert_raises(NoMethodError) { @request_object.default_path }
-    assert_equal("/PHP/pillboxAPIService.php?key=#{@request_object.send(:api_key)}", @request_object.send(:default_path))
+    assert_equal("/PHP/pillboxAPIService.php?key=#{@request_object.class.send(:api_key)}", @request_object.send(:default_path))
   end
 
   def test_returns_number_of_records

data/test/pillboxr/request_test.rb

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+require_relative 'test_helper'
+
+class TestRequest < MiniTest::Unit::TestCase
+  def test_setting_api_key
+    Pillboxr.api_key = "foo"
+    assert_equal("foo", Pillboxr::Request.send(:api_key))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pillboxr
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -146,6 +146,7 @@ files:
 - test/pillboxr/params_test.rb
 - test/pillboxr/pill_test.rb
 - test/pillboxr/pillboxr_test.rb
+- test/pillboxr/request_test.rb
 - test/pillboxr/response_test.rb
 - test/pillboxr/test_helper.rb
 homepage: http://rubygems.org/gems/pillboxr