endeca_on_demand 1.1.0 → 1.2.0

data/endeca_on_demand.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'builder'
   s.add_dependency 'activesupport', '~> 3.1'
   s.add_dependency 'i18n'
+  s.add_dependency 'facets'
 end

data/lib/endeca_on_demand.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash'
+require 'facets/hash/recurse'
 
 require 'endeca_on_demand/pp'
 require 'endeca_on_demand/proxy'

data/lib/endeca_on_demand/client.rb

@@ -9,7 +9,7 @@ class EndecaOnDemand::Client
   attr_reader :api, :default_options, :query
 
   def initialize(api, default_options = {})
-    @api, @default_options = api, default_options.dup.with_indifferent_access
+    @api, @default_options = api, default_options.dup.recurse(&:symbolize_keys)
   end
 
   ## associations ##

data/lib/endeca_on_demand/query.rb

@@ -9,7 +9,7 @@ class EndecaOnDemand::Query
   attr_reader :body, :client, :errors, :http, :options, :response, :uri, :xml
 
   def initialize(client, options = {})
-    @client, @options = client, options.dup.with_indifferent_access
+    @client, @options = client, options.dup.recurse(&:symbolize_keys)
 
     process_options!
   end
@@ -77,11 +77,11 @@ class EndecaOnDemand::Query
   ### data ###
 
   def flags
-    @flags ||= options[:flags] = (options[:flags] || {}).inject({}.with_indifferent_access) do |hash,(key,value)|
+    @flags ||= options[:flags] = (options[:flags] || {}).inject({}) do |hash,(key,value)|
         hash.tap do
           hash[key.to_s.underscore] = value
         end
-      end
+      end.symbolize_keys
   end
 
   def searches
@@ -109,11 +109,11 @@ class EndecaOnDemand::Query
   end
 
   def advanced_parameters
-    @advanced_parameters ||= options[:advanced] = (options[:advanced] || {}).inject({}.with_indifferent_access) do |hash,(key,value)|
+    @advanced_parameters ||= options[:advanced] = (options[:advanced] || {}).inject({}) do |hash,(key,value)|
         hash.tap do
           hash[key.to_s.underscore] = value
         end
-      end
+      end.symbolize_keys
   end
 
   ###
@@ -132,8 +132,8 @@ class EndecaOnDemand::Query
     xml.tag!(:Searches) do
       searches.each do |key,term|
         xml.tag!(:Search) do
-          xml.tag!('search-key',  key)
-          xml.tag!('search-term', term)
+          xml.tag!('search-key',  key.to_s)
+          xml.tag!('search-term', term.to_s)
         end
       end
     end
@@ -160,7 +160,7 @@ class EndecaOnDemand::Query
     xml.tag!(:Sorts) do
       sorts.each do |key,direction|
         xml.tag!(:Sort) do
-          xml.tag!('sort-key',       key)
+          xml.tag!('sort-key',       key.to_s)
           xml.tag!('sort-direction', direction.to_s.capitalize)
         end
       end
@@ -178,8 +178,16 @@ class EndecaOnDemand::Query
   end
 
   def process_options!
-    default_options = client.default_options[:query] || {}
-    @options = default_options.dup.merge(options)
+    new_options = (client.default_options[:query] || {}).dup
+
+    (new_options[:flags]      ||= {}).merge!(options[:flags]    || {}).recurse(&:symbolize_keys) if options[:flags].present?
+    (new_options[:paging]     ||= {}).merge!(options[:paging]   || {}).recurse(&:symbolize_keys) if options[:paging].present?
+    (new_options[:searches]   ||= {}).merge!(options[:searches] || {}).recurse(&:symbolize_keys) if options[:searches].present?
+    (new_options[:sorts]      ||= {}).merge!(options[:sorts]    || {}).recurse(&:symbolize_keys) if options[:sorts].present?
+    (new_options[:dimensions] = [*new_options[:dimensions]]).concat [*options[:dimensions]]      if options[:dimensions].present?
+    new_options[:category]    = options[:category] if options[:category].present?
+
+    @options = new_options
   end
 
   ##

data/lib/endeca_on_demand/response/applied_filters/keyword_redirect.rb

@@ -23,11 +23,11 @@ class EndecaOnDemand::Response::AppliedFilters::KeywordRedirect < EndecaOnDemand
   ## data ##
 
   def options
-    @options ||= xml.children.inject({}.with_indifferent_access) do |hash,child|
-      hash.tap do
-        hash[child.name] = child.content
-      end
-    end
+    @options ||= xml.children.inject({}) do |hash,child|
+        hash.tap do
+          hash[child.name] = child.content
+        end
+      end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/applied_filters/search_report.rb

@@ -31,11 +31,11 @@ class EndecaOnDemand::Response::AppliedFilters::SearchReport < EndecaOnDemand::P
   ## data ##
 
   def options
-    @options ||= xml.xpath('child::node()[not(local-name() = "Search")]').inject({}.with_indifferent_access) do |hash,child|
-      hash.tap do
-        hash[child.name] = child.content
-      end
-    end
+    @options ||= xml.xpath('child::node()[not(local-name() = "Search")]').inject({}) do |hash,child|
+        hash.tap do
+          hash[child.name] = child.content
+        end
+      end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/applied_filters/search_report/search.rb

@@ -23,11 +23,11 @@ class EndecaOnDemand::Response::AppliedFilters::SearchReport::Search < EndecaOnD
   ## data ##
 
   def options
-    @options ||= xml.children.inject({}.with_indifferent_access) do |hash,child|
-      hash.tap do
-        hash[child.name] = child.content
-      end
-    end
+    @options ||= xml.children.inject({}) do |hash,child|
+        hash.tap do
+          hash[child.name] = child.content
+        end
+      end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/breadcrumb.rb

@@ -7,6 +7,7 @@ class EndecaOnDemand::Response::Breadcrumb < EndecaOnDemand::Proxy
   ## fields ##
 
   attr_reader :response
+  attr_accessor :breads
 
   def initialize(response, xml)
     @response, @xml = response, xml
@@ -18,10 +19,6 @@ class EndecaOnDemand::Response::Breadcrumb < EndecaOnDemand::Proxy
     EndecaOnDemand::Response::Breadcrumb
   end
 
-  # def inspection
-  #   [ "breads: #{breads.inspect}" ]
-  # end
-
   ##
 
   ## associations ##

data/lib/endeca_on_demand/response/breadcrumb/bread.rb

@@ -23,11 +23,11 @@ class EndecaOnDemand::Response::Breadcrumb::Bread < EndecaOnDemand::Proxy
   ## data ##
 
   def options
-    xml.children.inject({}.with_indifferent_access) do |hash,child|
+    xml.children.inject({}) do |hash,child|
       hash.tap do
         hash[child.name] = child.content
       end
-    end
+    end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/business_rules_result/business_rule.rb

@@ -35,11 +35,11 @@ class EndecaOnDemand::Response::BusinessRulesResult::BusinessRule < EndecaOnDema
   ## data ##
 
   def options
-    xml.xpath('child::node()[not(local-name() = "properties" or local-name() = "RecordsSet")]').inject({}.with_indifferent_access) do |hash,child|
+    xml.xpath('child::node()[not(local-name() = "properties" or local-name() = "RecordsSet")]').inject({}) do |hash,child|
       hash.tap do
         hash[child.name] = child.content
       end
-    end
+    end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/dimension.rb

@@ -31,11 +31,11 @@ class EndecaOnDemand::Response::Dimension < EndecaOnDemand::Proxy
   ## data ##
 
   def options
-    xml.xpath('child::node()[not(local-name() = "DimensionValues")]').inject({}.with_indifferent_access) do |hash,child|
+    xml.xpath('child::node()[not(local-name() = "DimensionValues")]').inject({}) do |hash,child|
       hash.tap do
         hash[child.name] = child.content
       end
-    end
+    end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/dimension/dimension_value.rb

@@ -31,11 +31,11 @@ class EndecaOnDemand::Response::Dimension::DimensionValue < EndecaOnDemand::Prox
   ## data ##
 
   def options
-    xml.children.inject({}.with_indifferent_access) do |hash,child|
+    xml.children.inject({}) do |hash,child|
       hash.tap do
         hash[child.name] = child.content
       end
-    end
+    end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/records_set.rb

@@ -31,11 +31,11 @@ class EndecaOnDemand::Response::RecordsSet < EndecaOnDemand::Proxy
   ## data ##
 
   def options
-    xml.xpath('child::node()[not(local-name() = "Record")]').inject({}.with_indifferent_access) do |hash,child|
+    xml.xpath('child::node()[not(local-name() = "Record")]').inject({}) do |hash,child|
       hash.tap do
         hash[child.name] = child.content
       end
-    end
+    end.symbolize_keys
   end
 
   ##

data/lib/endeca_on_demand/response/records_set/record.rb

@@ -10,6 +10,8 @@ class EndecaOnDemand::Response::RecordsSet::Record < EndecaOnDemand::Proxy
 
   def initialize(records_set, xml)
     @records_set, @xml = records_set, xml
+
+    properties
   end
 
   ## override proxy ##
@@ -35,7 +37,7 @@ class EndecaOnDemand::Response::RecordsSet::Record < EndecaOnDemand::Proxy
   end
 
   def serializable_hash
-    properties.inject({}.with_indifferent_access) { |hash,property| hash.tap { hash[property.name] = property } }
+    properties.inject({}) { |hash,property| hash.tap { hash[property.name] = property } }.symbolize_keys
   end
   alias :to_hash :serializable_hash
 
@@ -45,9 +47,11 @@ class EndecaOnDemand::Response::RecordsSet::Record < EndecaOnDemand::Proxy
 
   def method_missing(method, *args, &block)
     if @properties.present? and (property = properties.where(label: method.to_s).first || properties.where(name: method.to_s).first).present?
-      return property
+      return property.value
     end
     super(method, *args, &block)
+  rescue NoMethodError
+    ''
   end
 
 end

data/lib/endeca_on_demand/version.rb

@@ -1,3 +1,3 @@
-class EndecaOnDemand
-  VERSION = "1.1.0"
+module EndecaOnDemand
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: endeca_on_demand
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70127698146980 !ruby/object:Gem::Requirement
+  requirement: &70144082452440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127698146980
+  version_requirements: *70144082452440
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70127698146080 !ruby/object:Gem::Requirement
+  requirement: &70144082452020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127698146080
+  version_requirements: *70144082452020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70127698145060 !ruby/object:Gem::Requirement
+  requirement: &70144082451580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127698145060
+  version_requirements: *70144082451580
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70127698143600 !ruby/object:Gem::Requirement
+  requirement: &70144082451040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127698143600
+  version_requirements: *70144082451040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70127698141200 !ruby/object:Gem::Requirement
+  requirement: &70144082443940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70127698141200
+  version_requirements: *70144082443940
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70127698134580 !ruby/object:Gem::Requirement
+  requirement: &70144082443100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127698134580
+  version_requirements: *70144082443100
+- !ruby/object:Gem::Dependency
+  name: facets
+  requirement: &70144082442160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70144082442160
 description: EndecaOnDemand will take a query-string and construct an XML query and
   send it to an hosted Endeca On-Demand Cluster. It will then parse the response and
   expose an API for using the response data.