1.) Always return an array for the color attribute.

2.) Allow searching by multiple colors by passing an array of color symbols to the color key in the hash passed to the  method. (This actually breaks the symmetry between using with and chaining attribute methods)

Author: kgautreaux

lib/pillboxr/attributes.rb

@@ -55,6 +55,7 @@ def initialize(color_arg) # :nodoc:
         # puts "argument to method = #{color_arg}"
         @color = case color_arg
         when NilClass;  raise ColorError
+        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."
@@ -67,29 +68,14 @@ def to_param # :nodoc:
       end
     end
 
-    class Colors
-      attr_accessor :colors
-
-      def initialize(color_arg)
-        @colors = []
-        color_arg.each do |c|
-          @colors << Pillboxr::Attributes::Color.new(c)
-        end
-        return self
-      end
-
-      def to_param
-        @colors.collect(&:to_param).join
-      end
-    end
-
     class Shape
       attr_accessor :shape
 
       def initialize(shape_arg) # :nodoc:
         # puts "argument to method = #{shape_arg}"
         @shape = case shape_arg
         when NilClass;              raise ShapeError
+        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)
@@ -103,23 +89,6 @@ def to_param # :nodoc:
       end
     end
 
-    class Shapes
-      attr_accessor :shapes
-
-      def initialize(shape_arg)
-        @shapes = []
-        
-        shape_arg.each do |s|
-          @shapes << Pillboxr::Attributes::Shape.new(s)
-        end
-        return self
-      end
-
-      def to_param
-        @shapes.collect(&:to_param).join
-      end
-    end
-
     class Productcode
       attr_accessor :product_code
 

lib/pillboxr/pill.rb

@@ -18,19 +18,19 @@ def initialize(params_hash)
     end
 
     def color
-      Pillboxr::Attributes::COLOR_CODES.fetch(@color.to_sym) { self.colors }
+      self.colors
     end
 
     def colors
-      @color.split(';').map { |str| Pillboxr::Attributes::COLOR_CODES[str.to_sym] }
+      @color.split(';').map { |str| Pillboxr::Attributes::COLOR_CODES.fetch(str.to_sym) }
     end
 
     def shape
-      Pillboxr::Attributes::SHAPE_CODES.fetch(@shape.to_sym) { self.shapes }
+      self.shapes
     end
 
     def shapes
-      @shape.split(';').map { |str| Pillboxr::Attributes::SHAPE_CODES[str.to_sym] }
+      @shape.split(';').map { |str| Pillboxr::Attributes::SHAPE_CODES.fetch(str.to_sym) }
     end
 
     def score

test/pillboxr/pill_test.rb

@@ -7,9 +7,21 @@ def setup
     @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_includes(Array(pill.color), :blue)
+      assert_includes(pill.color, :blue)
       assert_equal(true, pill.image?)
     end
 

test/pillboxr/pillboxr_test.rb

@@ -59,6 +59,16 @@ def test_all_valid_colors
     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|