primedia-endeca 0.9.2 → 0.9.3

data/.gitignore

@@ -0,0 +1,7 @@
+*.swp
+.swn
+.swp
+.DS_Store
+coverage/
+pkg/
+doc/

data/endeca.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   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-01-23}
+  s.date = %q{2009-01-26}
   s.description = %q{An Endeca client library for Ruby.}
   s.email = %q{}
-  s.extra_rdoc_files = ["History.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "endeca.gemspec", "example/benchmark.rb", "example/listing.rb", "lib/class_to_proc.rb", "lib/core_ext.rb", "lib/endeca.rb", "lib/endeca/dimension.rb", "lib/endeca/document.rb", "lib/endeca/document_collection.rb", "lib/endeca/map.rb", "lib/endeca/readers.rb", "lib/endeca/refinement.rb", "lib/endeca/request.rb", "lib/endeca/transformer.rb", "spec/core_ext_spec.rb", "spec/endeca/dimension_spec.rb", "spec/endeca/document_collection_spec.rb", "spec/endeca/document_spec.rb", "spec/endeca/map_spec.rb", "spec/endeca/readers_spec.rb", "spec/endeca/refinement_spec.rb", "spec/endeca/request_spec.rb", "spec/endeca/transformer_spec.rb", "spec/endeca_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "lib/.endeca.rb.swp"]
+  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "endeca.gemspec", "example/benchmark.rb", "example/listing.rb", "lib/.endeca.rb.swp", "lib/class_to_proc.rb", "lib/core_ext.rb", "lib/endeca.rb", "lib/endeca/dimension.rb", "lib/endeca/document.rb", "lib/endeca/document_collection.rb", "lib/endeca/map.rb", "lib/endeca/readers.rb", "lib/endeca/refinement.rb", "lib/endeca/request.rb", "lib/endeca/transformer.rb", "spec/core_ext_spec.rb", "spec/endeca/dimension_spec.rb", "spec/endeca/document_collection_spec.rb", "spec/endeca/document_spec.rb", "spec/endeca/map_spec.rb", "spec/endeca/readers_spec.rb", "spec/endeca/refinement_spec.rb", "spec/endeca/request_spec.rb", "spec/endeca/transformer_spec.rb", "spec/endeca_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/primedia/endeca-ruby}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.2.0"])
+      s.add_development_dependency(%q<bones>, [">= 2.3.0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.2.0"])
+      s.add_dependency(%q<bones>, [">= 2.3.0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.2.0"])
+    s.add_dependency(%q<bones>, [">= 2.3.0"])
   end
 end

data/lib/endeca.rb

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

data/lib/endeca/map.rb

@@ -31,6 +31,8 @@ module Endeca
       self
     end
 
+    def into?; @into end
+
     # When mapping multiple key/value pairs to a single parameter value (via
     # +into+), use this character to join a key with a value.
     def with(character)
@@ -45,12 +47,32 @@ module Endeca
       self
     end
 
+    def join?; @join end
+
     # Code block to execute on the original data
     def transform(&block)
       add_transformation block
       self
     end
 
+    # When mapping multiple values, enclose the values in the string provided
+    # to +enclose+.
+    def enclose(str)
+      @enclose = str
+      self
+    end
+
+    def enclose?; @enclose end
+
+    # When mapping multiple key/value pairs, replace existing keys with the new
+    # keys rather than joining.
+    def replace!
+      @replace = true
+      self
+    end
+
+    def replace?; @replace end
+
     # Perform the mapping as defined for the current_query
     def perform(current_query)
       @current_query = current_query
@@ -75,12 +97,18 @@ module Endeca
       @transformations ||= []
     end
 
+    def transformations?
+      !transformations.empty?
+    end
+
     def add_transformation(transformation = nil, &block)
       transformations.push transformation if transformation
       transformations.push block if block_given?
     end
 
     def perform_transformation
+      return unless transformations?
+
       current_value = @current_query[@old_key]
       transformations.each do |transformation|
         current_value = transformation.call(current_value)
@@ -93,18 +121,23 @@ module Endeca
     end
 
     def perform_into
-      return unless @into
+      return unless into?
+
       old_key, old_value = Array(@new_query).flatten
       new_key, new_value = Array(@into).flatten
       if new_value
         @new_query = {new_key => old_key, new_value => old_value}
       else
-        @new_query = {new_key => [old_key, old_value].compact.join(@with)}
+        new_value = [old_key, old_value].compact.join(@with)
+        new_value = "#{@enclose}(#{new_value})" if enclose?
+        @new_query = {new_key => new_value}
       end
     end
 
     def perform_join
-      return unless @join
+      return unless join?
+      return if replace?
+
       @new_query.each do |key, value|
         @new_query[key] = [@current_query[key], value].compact.join(@join)
       end

data/spec/endeca/map_spec.rb

@@ -4,6 +4,7 @@ describe Endeca::Map do
   before do
     @query = {:foo => "bazz", :bizz => "somevalue"}
     @map = Endeca::Map.new :foo, :bizz
+
   end
 
   describe ".perform" do
@@ -41,6 +42,26 @@ describe Endeca::Map do
     end
   end
 
+  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)'}
+    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'}
+    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)'}
+    end
+  end
+
   describe "#with" do
     it "should assign the character to join keys to values with" do
       @map.with('*').instance_variable_get(:@with).should == '*'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-endeca
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Rein Henrichs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: 2.3.0
     version: 
 description: An Endeca client library for Ruby.
 email: ""
@@ -30,8 +30,11 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- Manifest.txt
 - README.rdoc
+- lib/.endeca.rb.swp
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -39,6 +42,7 @@ files:
 - endeca.gemspec
 - example/benchmark.rb
 - example/listing.rb
+- lib/.endeca.rb.swp
 - lib/class_to_proc.rb
 - lib/core_ext.rb
 - lib/endeca.rb