pillboxr 0.8.2 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 653e105fbd4add221d54abb8c3e6e8e55d780e97
+  data.tar.gz: 3f6c9a7b8714690398950179823d5d5790ff57f6
+SHA512:
+  metadata.gz: 98f2dbdf7018202d175041a7884c49e0553f839c9e528e83a891495e50731c30eba1a556630a9abfe2228a974834539a32242d702c97f2b9d9d470005ecc9832
+  data.tar.gz: 48c43f42431f74515a826f1fd8abf77bc49539a7547486ebc4d36d792284fa9dd72007e80b1d5da0b102ff6f68cd7712c61cc042432b775e4da0f2467e4fd669

data/.rvmrc

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
+# Only full ruby name is supported here, for short names use:
+#     echo "rvm use 2.0.0" > .rvmrc
+environment_id="ruby-2.0.0-p0@pillboxr"
+
+# Uncomment the following lines if you want to verify rvm version per project
+# rvmrc_rvm_version="1.18.18 (latest)" # 1.10.1 seams as a safe start
+# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
+#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
+#   return 1
+# }
+
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
+  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
+    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
+  if [[ $- == *i* ]] # check for interactive shells
+  then echo "Using: $(tput setaf 2)$GEM_HOME$(tput sgr0)" # show the user the ruby and gemset they are using in green
+  else echo "Using: $GEM_HOME" # don't use colors in non-interactive shells
+  fi
+else
+  # If the environment file has not yet been created, use the RVM CLI to select.
+  rvm --create use  "$environment_id" || {
+    echo "Failed to create RVM environment '${environment_id}'."
+    return 1
+  }
+fi
+
+# If you use bundler, this might be useful to you:
+# if [[ -s Gemfile ]] && {
+#   ! builtin command -v bundle >/dev/null ||
+#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
+# }
+# then
+#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
+#   gem install bundler
+# fi
+# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
+# then
+#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
+# fi

data/Gemfile

@@ -3,8 +3,8 @@ source 'http://rubygems.org'
 gem 'httparty'
 
 group :development do
-  gem 'vcr'
+  gem 'vcr', '~> 2.4.0'
   gem 'webmock'
   gem 'yard'
   gem 'redcarpet'
-end
+end

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     redcarpet (2.1.1)
-    vcr (2.2.4)
+    vcr (2.4.0)
     webmock (1.8.8)
       addressable (~> 2.2.8)
       crack (>= 0.1.7)
@@ -21,6 +21,6 @@ PLATFORMS
 DEPENDENCIES
   httparty
   redcarpet
-  vcr
+  vcr (~> 2.4.0)
   webmock
   yard

data/README.md

@@ -105,18 +105,20 @@ You can activate a console session with the pillboxr library already loaded by t
 The hash passed to the `with` method may include any of the following parameters:
 
 ```ruby
-:color       => Symbol or Array with multiple colors (see http://pillbox.nlm.nih.gov/API-documentation.html)
-:score       => Boolean
-:ingredient  => Symbol or Array with multiple ingredients (returned results include all ingredients)
-:inactive    => Symbol
-:dea         => Symbol or any of 'I, II, III, IV, V'
-:author      => String
-:shape       => Symbol (Shape or Hex)
-:imprint     => Symbol
-:prodcode    => Symbol (Product Code: see http://pillbox.nlm.nih.gov/API-documentation.html)
-:image       => Boolean
-:size        => Integer for size in millimeters (currently this encompasses a range of +/- 2 mm)
-:lower_limit => Integer for which returned record to start at
+:color        => Symbol (see http://pillbox.nlm.nih.gov/API-documentation.html)
+:colors       => Array with multiple colors
+:score        => Boolean
+:ingredient   => Symbol or Array with multiple ingredients (returned results include all ingredients)
+:inactive     => Symbol
+:dea          => Symbol or any of 'I, II, III, IV, V'
+:author       => String
+:shape        => Symbol (Shape or Hex)
+:shapes       => Array with multiple shapes
+:imprint      => Symbol
+:product_code => String (Product Code: see http://pillbox.nlm.nih.gov/API-documentation.html - must include the dash)
+:image        => Boolean
+:size         => Integer for size in millimeters (currently this encompasses a range of +/- 2 mm)
+:lower_limit  => Integer for which returned record to start at
 ```
 
 Please see specific files or the document directory for specific usage examples. Further API documentation available on the  [project homepage](http://pillbox.nlm.nih.gov/NLM_Pillbox_API_documentation_v2_2011.09.27.pdf) (PDF link)
@@ -133,4 +135,4 @@ API provided through the generous support by the FDA in both money and resources
 
 Please contact david.hale at nlm.nih.gov for an api key. There is no bandwidth limit currently.
 
-Data is owned by companies, mandatorily licenced for X purposes.
+Data is owned by companies, mandatorily licenced for X purposes.

data/lib/pillboxr/attributes.rb

@@ -6,7 +6,9 @@ module Pillboxr
   module Attributes
     def attributes # :nodoc:
       { :color                => :splcolor,
+        :colors               => :__color_placeholder__,
         :shape                => :splshape,
+        :shapes               => :__shape_placeholder__,
         :product_code         => :product_code,
         :schedule             => :dea_schedule_code,
         :ingredients          => :ingredients,
@@ -53,7 +55,7 @@ module Pillboxr
         # puts "argument to method = #{color_arg}"
         @color = case color_arg
         when NilClass;  raise ColorError
-        when Array;     color_arg.size > 1 ? Pill::Attributes::Colors.new(color_arg) : COLORS[color_arg[0]]
+        when Array;     color_arg.collect {|c| COLORS.fetch(c) }.join(';')
         when Symbol;    COLORS.fetch(color_arg, color_arg)
         when String;    COLORS.fetch(color_arg.to_sym, color_arg.to_sym)
         else raise "invalid arguments."
@@ -73,7 +75,7 @@ module Pillboxr
         # puts "argument to method = #{shape_arg}"
         @shape = case shape_arg
         when NilClass;              raise ShapeError
-        when Array;                 shape_arg.size > 1 ? Pill::Attributes::Shapes.new(color_arg) : SHAPES[shape_arg[0]]
+        when Array;                 shape_arg.collect {|s| SHAPES.fetch(s) }.join(';')
         when /^([Cc]{1}\d{5})+/;    shape_arg # valid hex
         when Symbol;                SHAPES.fetch(shape_arg, shape_arg)
         when String;                SHAPES.fetch(shape_arg.to_sym, shape_arg.to_sym)

data/lib/pillboxr/pages.rb

@@ -5,7 +5,8 @@ module Pillboxr
   class Pages
     extend Forwardable
     def_delegators :@data, :<<, :size, :each, :include?, :empty?, :count,
-                   :join, :first, :last, :[], :[]=, :all?, :any?, :inject
+                   :join, :first, :last, :[], :[]=, :all?, :any?, :inject,
+                   :map
 
     def initialize(size = 0, obj = nil, &block)
       @data = Array.new(size, &block)

data/lib/pillboxr/pill.rb

@@ -18,11 +18,19 @@ module Pillboxr
     end
 
     def color
-      Pillboxr::Attributes::COLOR_CODES[@color.to_sym]
+      self.colors
+    end
+
+    def colors
+      @color.split(';').map { |str| Pillboxr::Attributes::COLOR_CODES.fetch(str.to_sym) }
     end
 
     def shape
-      Pillboxr::Attributes::SHAPE_CODES[@shape.to_sym]
+      self.shapes
+    end
+
+    def shapes
+      @shape.split(';').map { |str| Pillboxr::Attributes::SHAPE_CODES.fetch(str.to_sym) }
     end
 
     def score
@@ -71,4 +79,4 @@ module Pillboxr
 
     alias_method :scored?, :score?
   end
-end
+end

data/lib/pillboxr/result.rb

@@ -52,10 +52,10 @@ module Pillboxr
 
     alias_method :to_s, :inspect
 
-    # Shortcut method for listing all the pills on the current page of results
+    # Shortcut method for listing all the pills currently retrieved
     # @return [Array] An array of pill objects
     def pills
-      self.pages.current.pills
+      self.pages.map { |page| page.pills }.flatten!
     end
 
     private

data/lib/pillboxr/version.rb

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

data/pillboxr.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "pillboxr"
   s.version     = Pillboxr::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Keith Gautreaux', 'David Hale', 'Darius Roberts']
+  s.authors     = ['Keith Gautreaux', 'David Hale', 'Darius Roberts', 'Mark Silverberg']
   s.email       = ['keith.gautreaux@gmail.com']
   s.homepage    = "http://rubygems.org/gems/pillboxr"
   s.summary     = "Access the NLM Pillbox API using Ruby."
@@ -25,11 +25,11 @@ END
 
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency 'webmock', '~>1.8.8'
-  s.add_development_dependency 'vcr', '~> 2.2.4'
+  s.add_development_dependency 'vcr', '~> 2.4.0'
   s.add_development_dependency 'yard', '~> 0.8.2.1'
   s.add_development_dependency 'redcarpet', '~> 2.1.1'
 
   s.files        = `git ls-files`.split("\n").delete_if { |fn| fn.match(/active(_|)resource/) }
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
-end
+end

data/test/pillboxr/pill_test.rb

@@ -7,9 +7,21 @@ class TestPill < MiniTest::Unit::TestCase
     @scored_pills = Pillboxr.score(3).get.pages.current.pills
   end
 
+  def test_color_returns_array
+    @blue_pills.each do |pill|
+      assert_instance_of(Array, pill.color)
+    end
+  end
+
+  def test_shape_returns_array
+    @scored_pills.each do |pill|
+      assert_instance_of(Array, pill.shape)
+    end
+  end
+
   def test_accessor_methods
     @blue_pills.each do |pill|
-      assert_equal(:blue, pill.color)
+      assert_includes(pill.color, :blue)
       assert_equal(true, pill.image?)
     end
 
@@ -18,4 +30,4 @@ class TestPill < MiniTest::Unit::TestCase
       assert_equal(3, pill.score)
     end
   end
-end
+end

data/test/pillboxr/pillboxr_test.rb

@@ -10,12 +10,12 @@ end
 
 class TestPillboxr < MiniTest::Unit::TestCase
   def setup
-    @num_round_shape_records = 11773
-    @num_blue_color_records = 2059
-    @num_image_records = 748
-    @num_blue_records_with_image = 69
-    @num_5_mm_records = 4724
-    @num_mylan_records = 753
+    @num_round_shape_records = 14275
+    @num_blue_color_records = 3035
+    @num_image_records = 11779
+    @num_blue_records_with_image = 1177
+    @num_5_mm_records = 5511
+    @num_mylan_records = 800
     @request_object = Pillboxr::Request.new(Pillboxr::Params.new([Pillboxr::Attributes::Shape.new(:round)]))
   end
 
@@ -59,6 +59,16 @@ class TestPillboxr < MiniTest::Unit::TestCase
     end
   end
 
+  def test_multiple_colors
+    VCR.use_cassette(:multiple_colors) do
+      r = Pillboxr.with({color: [:blue, :green]}).pages.current.pills
+      r.each do |pill|
+        assert_includes(pill.color, :blue)
+        assert_includes(pill.color, :green)
+      end
+    end
+  end
+
   def test_all_valid_shapes
     VCR.use_cassette(:all_valid_shapes) do
       Pillboxr::Attributes::SHAPES.keys.each do |shape|
@@ -74,6 +84,12 @@ class TestPillboxr < MiniTest::Unit::TestCase
     end
   end
 
+  def test_product_code
+    VCR.use_cassette(:product_code) do
+      assert_equal(1, Pillboxr.with({:product_code => "0078-0176"}).record_count)
+    end
+  end
+
   def test_combination_hash
     VCR.use_cassette(:combination_hash) do
       assert_equal(@num_blue_records_with_image, Pillboxr.with({ :color => "blue", :image => true }).record_count)
@@ -179,4 +195,4 @@ class TestPillboxr < MiniTest::Unit::TestCase
       assert_equal(3, @result.pages.current.number)
     end
   end
-end
+end

metadata

@@ -1,131 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: pillboxr
 version: !ruby/object:Gem::Version
-  version: 0.8.2
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Keith Gautreaux
 - David Hale
 - Darius Roberts
+- Mark Silverberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.8
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.2.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
-description: ! 'Pillboxr is a Ruby wrapper for the National Library of Medicine Pillbox
-  API Service located at http://pillbox.nlm.nih.gov.
-
+description: |
+  Pillboxr is a Ruby wrapper for the National Library of Medicine Pillbox API Service located at http://pillbox.nlm.nih.gov.
 
   The pillbox API provides information from the FDA about various prescription medications.
 
-
-  *Note:* This library is designed for use with Ruby 1.9.3 and above, and will not
-  work with earlier versions of Ruby.
-
-'
+  *Note:* This library is designed for use with Ruby 1.9.3 and above, and will not work with earlier versions of Ruby.
 email:
 - keith.gautreaux@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rvmrc"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -151,27 +135,26 @@ files:
 - test/pillboxr/test_helper.rb
 homepage: http://rubygems.org/gems/pillboxr
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: 1.8.6
 requirements: []
 rubyforge_project: pillboxr
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Access the NLM Pillbox API using Ruby.
 test_files: []
 has_rdoc: