primedia-endeca 0.9.18 → 0.9.19

data/endeca.gemspec

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

data/lib/core_ext.rb

@@ -58,6 +58,14 @@ class Hash
       end
     }.join('&').to_params
   end
+  
+  def symbolize_keys
+    inject({}) do |options, (key, value)|
+      options[(key.to_sym rescue key) || key] = value
+      options
+    end
+  end
+  
 end
 
 class NilClass

data/lib/endeca.rb

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

data/lib/endeca/map.rb

@@ -1,8 +1,8 @@
 module Endeca
   class Map
-    def initialize(old_key=nil, new_key=nil)
-      @old_key = old_key
-      @new_key = new_key
+    def initialize(old_key, new_key=nil)
+      @old_key = old_key.to_sym
+      @new_key = new_key || @old_key
       boolean
     end
 
@@ -75,7 +75,7 @@ module Endeca
 
     # Perform the mapping as defined for the current_query
     def perform(current_query)
-      @current_query = current_query.with_indifferent_access
+      @current_query = current_query.symbolize_keys
 
       perform_transformation
       perform_map

data/lib/endeca/transformer.rb

@@ -25,11 +25,12 @@ module Endeca
     # Use the mappings hash to replace domain level query query_options with
     # their Endeca equivalent.
     def transform_query_options(query_options)
-      query = query_options.dup
+      query = query_options.symbolize_keys
       query.each do |key, value|
         if mappings[key]
           new_options = mappings[key].perform(query_options)
           query_options.delete(key)
+          query_options.delete(key.to_s)
           query_options.update(new_options)
         end
       end

data/spec/endeca/document_spec.rb

@@ -241,6 +241,14 @@ describe Endeca::Document do
     after do
       Endeca::Document.mappings = {}
     end
+    
+    describe "when the key to be mapped is a string" do
+      it "maps correctly" do
+        Endeca::Document.map(:apartments => :showapartments)
+        Endeca::Document.transform_query_options("apartments" => true).
+          should == {:showapartments => 1}
+      end
+    end
 
     describe "when there is no mapping for the given key" do
       it "returns the query options without modification" do

data/spec/endeca/map_spec.rb

@@ -48,21 +48,27 @@ describe Endeca::Map do
 
   describe "#perform_into" do
     describe "with an enclosing string" do
-      map = Endeca::Map.new(:foo, :bar)
-      map.into(:bizz).enclose(:AND)
-      map.perform(:foo => :quux).should == {:bizz => 'AND(bar:quux)'}
+      it "wraps the parameter" do
+        map = Endeca::Map.new(:foo, :bar)
+        map.into(:bizz).enclose(:AND)
+        map.perform(:foo => :quux).should == {:bizz => 'AND(bar:quux)'}
+      end
     end
 
     describe "with replace" do
-      map = Endeca::Map.new(:foo, :bar)
-      map.into(:bizz).replace!
-      map.perform(:foo => :quux, :bizz => :foobar).should == {:bizz => 'bar:quux'}
+      it "replaces the existing parameter" do
+        map = Endeca::Map.new(:foo, :bar)
+        map.into(:bizz).replace!
+        map.perform(:foo => :quux, :bizz => :foobar).should == {:bizz => 'bar:quux'}
+      end
     end
 
     describe "with enclose and replace" do
-      map = Endeca::Map.new(:foo, :bar)
-      map.into(:bizz).enclose(:AND).replace!
-      map.perform(:foo => :quux, :bizz => :foobar).should == {:bizz => 'AND(bar:quux)'}
+      it "wraps the parameter and replaces the existing parameter" do
+        map = Endeca::Map.new(:foo, :bar)
+        map.into(:bizz).enclose(:AND).replace!
+        map.perform(:foo => :quux, :bizz => :foobar).should == {:bizz => 'AND(bar:quux)'}
+      end
     end
   end
 
@@ -96,11 +102,11 @@ describe Endeca::Map do
 
   describe "#transform" do
     it "should execute the transformation block on the query"
-    map = Endeca::Map.new(:field_list)
-    map.into(:F).transform do |fields_array|
-      fields_array.collect{|field| "#{field.to_s}:1"}.join('|')
+      map = Endeca::Map.new(:field_list)
+      map.into(:F).transform do |fields_array|
+        fields_array.collect{|field| "#{field.to_s}:1"}.join('|')
+      map.perform(:field_list => [:first_name, :last_name, :email]).
+        should == {:F => "first_name:1|last_name:1|email:1"}
     end
-    map.perform(:field_list => [:first_name, :last_name, :email]).
-      should == {:F => "first_name:1|last_name:1|email:1"}
   end
 end

metadata

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