primedia-endeca 0.9.1 → 0.9.2

data/endeca.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rein Henrichs", "Andy Stone"]

data/lib/endeca/document.rb

@@ -36,8 +36,9 @@ module Endeca
     def dimensions
       return @dimensions if @dimensions
       @dimensions = {}
-      (raw['Dimensions'] || {}).each do |name, value|
-        @dimensions[name] = Dimension.new(value)
+      (raw['Dimensions'] || {}).each do |name, values|
+        values = [values] unless Array === values
+        @dimensions[name] = values.map(&Dimension)
       end
       @dimensions
     end
@@ -72,7 +73,7 @@ module Endeca
     #   Listing.find(:first, :available => true)
     def self.find(what, query_options={})
       case what
-      when /^[A-Z\d]+$/
+      when Integer, /^[A-Z\d]+$/
         by_id(what, query_options)
       when :first
         first(query_options)
@@ -102,7 +103,7 @@ module Endeca
     private
 
     def self.request(query_options)
-      query_options = transform_query_options(query_options.merge(get_default_params))
+      query_options = transform_query_options(get_default_params.merge(query_options))
       Endeca::Request.perform(get_path, query_options)
     end
   end

data/lib/endeca/readers.rb

@@ -74,22 +74,5 @@ module Endeca
     def boolean_reader(*attrs)
       reader(*attrs) { |value| value == "1" ? true : false }
     end
-
-    def dim_reader(*attrs, &block)
-      hash = {}
-      block ||= lambda {|x| x}
-
-      hash.update(attrs.pop) if Hash === attrs.last
-
-      attrs.each{|attr| hash[attr] = attr}
-
-      hash.each do |variable, method|
-        define_method method do
-          dim = dimensions[variable.to_s]
-          name = dim && dim.name
-          block.call(name)
-        end
-      end
-    end
   end
 end

data/lib/endeca.rb

@@ -18,7 +18,7 @@ require 'endeca/document'
 module Endeca
 
   # :stopdoc:
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
   # :startdoc:
 
   # Returns the version string for the library.

data/spec/endeca/document_spec.rb

@@ -88,14 +88,14 @@ describe Endeca::Document do
 
           @document.
             stub!(:raw).
-            and_return({'Dimensions' => {"key" => dimension_hash}})
+            and_return({'Dimensions' => {"key" => [dimension_hash]}})
 
           Endeca::Dimension.
             should_receive(:new).
             with(dimension_hash).
             and_return(dimension)
 
-          @document.dimensions["key"].should == dimension
+          @document.dimensions["key"].should == [dimension]
         end
       end
     end

data/spec/endeca/readers_spec.rb

@@ -72,35 +72,6 @@ describe Endeca::Readers do
     end
   end
 
-  describe ".dim_reader" do
-    describe "with a symbol" do
-      it "adds a reader that returns the name of that dimension" do
-        @helper.dim_reader(:type)
-        dimensions = {"type" => mock('type', :name => 'a type')}
-        @a_helper.stub!(:dimensions).and_return(dimensions)
-        @a_helper.type.should == 'a type'
-      end
-    end
-
-    describe "with a string" do
-      it "adds a reader that returns the name of that dimension" do
-        @helper.dim_reader('type')
-        dimensions = {"type" => mock('type', :name => 'a type')}
-        @a_helper.stub!(:dimensions).and_return(dimensions)
-        @a_helper.type.should == 'a type'
-      end
-    end
-
-    describe "with a string that has spaces" do
-      it "adds a reader that returns the name of that dimension" do
-        @helper.dim_reader('type a lot' => :type_a_lot)
-        dimensions = {"type a lot" => mock('type', :name => 'a type')}
-        @a_helper.stub!(:dimensions).and_return(dimensions)
-        @a_helper.type_a_lot.should == 'a type'
-      end
-    end
-  end
-
   describe "exception handling" do
     it "should raise an Endeca::Reader error if the call fails" do
       helper = Class.new(Endeca::Document)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-endeca
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Rein Henrichs