pillboxr 0.8.1 → 0.8.2

data/lib/pillboxr/request.rb

@@ -60,12 +60,6 @@ module Pillboxr
         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"))
@@ -74,6 +68,12 @@ module Pillboxr
         rescue TypeError => e
           raise e, "The api_key.yml in this directory does not contain an appropriate key."
         end
+      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
       else
         raise ArgumentError, "api_key must be one of 'String', 'Pathname', 'File', or an object that responds to the 'key' method."
       end

data/lib/pillboxr/result.rb

@@ -52,6 +52,12 @@ module Pillboxr
 
     alias_method :to_s, :inspect
 
+    # Shortcut method for listing all the pills on the current page of results
+    # @return [Array] An array of pill objects
+    def pills
+      self.pages.current.pills
+    end
+
     private
 
     def initialize_pages_array(api_response, initial_page_number)

data/lib/pillboxr/version.rb

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

data/test/pillboxr/pillboxr_test.rb

@@ -19,6 +19,10 @@ class TestPillboxr < MiniTest::Unit::TestCase
     @request_object = Pillboxr::Request.new(Pillboxr::Params.new([Pillboxr::Attributes::Shape.new(:round)]))
   end
 
+  def teardown
+    Pillboxr.api_key = nil
+  end
+
   def test_api_key
     assert_raises(NoMethodError) { Pillboxr.api_key }
     assert_raises(NoMethodError) do

data/test/pillboxr/request_test.rb

@@ -2,8 +2,41 @@
 require_relative 'test_helper'
 
 class TestRequest < MiniTest::Unit::TestCase
-  def test_setting_api_key
+  def teardown
+    Pillboxr.api_key = nil
+  end
+
+  def test_passing_string_to_api_key
     Pillboxr.api_key = "foo"
     assert_equal("foo", Pillboxr::Request.send(:api_key))
   end
+
+  def test_passing_pathname_to_api_key
+    Pillboxr.api_key = Pathname.new("./test/pillboxr/fixtures/api_key.yml")
+    assert_equal("foo", Pillboxr::Request.send(:api_key), "You probably need to create an api_key.yml file in the fixtures directory.")
+  end
+
+  def test_passing_file_to_api_key
+    Pillboxr.api_key = File.open("./test/pillboxr/fixtures/api_key.yml", "r")
+    assert_equal("foo", Pillboxr::Request.send(:api_key), "You probably need to create an api_key.yml file in the fixtures directory.")
+  end
+
+  def test_passing_object_to_api_key
+    Pillboxr.api_key = Object.new.tap { |obj| obj.define_singleton_method(:key) { "foo" } }
+    assert_equal("foo", Pillboxr::Request.send(:api_key))
+  end
+
+  def test_passing_no_argument_to_api_key
+    assert_equal(YAML.load_file("api_key.yml"), Pillboxr::Request.send(:api_key))
+  end
+
+  def test_invalid_object
+    Pillboxr.api_key = Object.new
+    assert_raises(NoMethodError) { Pillboxr::Request.send(:api_key) }
+  end
+
+  def test_passing_hash_to_api_key
+    Pillboxr.api_key = {}
+    assert_raises(ArgumentError) { 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.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors: