primedia-endeca 0.9.19 → 0.9.20

data/endeca.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "0.9.19"
+  s.version = "0.9.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rein Henrichs", "Andy Stone"]
-  s.date = %q{2009-02-06}
+  s.date = %q{2009-02-09}
   s.description = %q{An Endeca client library for Ruby.}
   s.email = %q{}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]

data/lib/endeca/map.rb

@@ -1,7 +1,7 @@
 module Endeca
   class Map
     def initialize(old_key, new_key=nil)
-      @old_key = old_key.to_sym
+      @old_key = old_key
       @new_key = new_key || @old_key
       boolean
     end
@@ -26,6 +26,7 @@ module Endeca
     #     ?ntk=propercity&ntt=>Atlanta
     def into(hash)
       @into = hash
+      @into = @into.symbolize_keys if @into.respond_to?(:symbolize_keys)
       @with ||= ':'
       @join ||= '|'
       self
@@ -76,6 +77,7 @@ module Endeca
     # Perform the mapping as defined for the current_query
     def perform(current_query)
       @current_query = current_query.symbolize_keys
+      @current_value = @current_query[@old_key]
 
       perform_transformation
       perform_map
@@ -108,8 +110,7 @@ module Endeca
 
     def perform_transformation
       return unless transformations?
-
-      current_value = @current_query[@old_key]
+      current_value = @current_value
       transformations.each do |transformation|
         current_value = transformation.call(current_value)
       end
@@ -117,12 +118,12 @@ module Endeca
     end
 
     def perform_map
-      @new_query = {@new_key => @current_value}
+      @new_query = {@new_key => @current_value}.symbolize_keys
     end
 
     def perform_into
       return unless into?
-
+      
       old_key, old_value = Array(@new_query).flatten
       new_key, new_value = Array(@into).flatten
       if new_value

data/lib/endeca/transformer.rb

@@ -11,6 +11,7 @@ module Endeca
     #   map(:new_name)
     def map(mapping = {})
       mapping = {mapping => mapping} if Symbol === mapping
+      mapping = mapping.symbolize_keys
 
       if mapping.length > 1
         raise ArgumentError, "map only accepts one key=>value pair" 
@@ -25,16 +26,17 @@ module Endeca
     # Use the mappings hash to replace domain level query query_options with
     # their Endeca equivalent.
     def transform_query_options(query_options)
+      # {"apartments" => true}
       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)
+      # {:apartments => true}
+      query.each do |key, _|
+        if mapping = mappings[key]
+          new_options = mapping.perform(query)
+          query.delete(key)
+          query.update(new_options)
         end
       end
-      query_options
+      query
     end
  
   end

data/lib/endeca.rb

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

data/spec/endeca/document_spec.rb

@@ -249,6 +249,17 @@ describe Endeca::Document do
           should == {:showapartments => 1}
       end
     end
+    
+    describe "with multiple keys that are joined" do
+      it "should include all the keys" do
+        require 'pp'
+        Endeca::Document.map(:apartments => :showapartments).into('Ntt' => 'Ntk')
+        Endeca::Document.map(:colleges => :showcolleges).into('Ntt' => 'Ntk')
+        ntt = Endeca::Document.transform_query_options('apartments' => '1', 'colleges' => '2')[:Ntt]
+        ntt.should include('showapartments')
+        ntt.should include('showcolleges')
+      end
+    end
 
     describe "when there is no mapping for the given key" do
       it "returns the query options without modification" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-endeca
 version: !ruby/object:Gem::Version 
-  version: 0.9.19
+  version: 0.9.20
 platform: ruby
 authors: 
 - Rein Henrichs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-06 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency