CloudSesame 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb16f03166129357dbb2c3d61aa46e067c762ca6
-  data.tar.gz: bad1d714a6ede119d4e2b0ec84e2517d09c7d8af
+  metadata.gz: 64e3bd3d865b5e88973e645777b5eb239ecba731
+  data.tar.gz: aacdce5cf520442a2ddb233fa7f1e32aa53cfa21
 SHA512:
-  metadata.gz: 2ec7397589a39078db6410f3b40c11aa55b53acb78678cf5a25fe219bc901a668d530b6042c1a6a2e14702e878e2e8abcefa7e1ce3b8874cab232490f7244a77
-  data.tar.gz: 43198f172b96b766e808a4cfb47ab3320efe368cd6eeb30c8dbde6813707c1f3751e7bbd349a0cda4ba9fdaed048a6b101ccfa17280b542a9f0e43aef6b71f2b
+  metadata.gz: 318149aaa04d9cb4ecd2d62452c880351029c0d4a4e5194e943e72480707295c9a993bccdb5f6522bfccb9deafc5bbe1cd4ad98438b5898b0df302c1019dd169
+  data.tar.gz: 89e95869db7307f10b161ee28a0b6afd582bcdc2079f34dead7054f32fb412e2019927c4de282eac8b6db7d56cdaf2fb40646af968f4d6d9b9638e31f30ed43f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    CloudSesame (0.1.1)
+    CloudSesame (0.1.2)
       aws-sdk (~> 2)
 
 GEM

data/cloud_sesame.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.date        = '2016-01-13'
   s.summary     = "AWS CloudSearch Query Interface"
   s.description = "AWS CloudSearch Query Interface"

data/lib/cloud_sesame/query/node/filter_query.rb

@@ -4,7 +4,7 @@ module CloudSesame
       class FilterQuery < Abstract
 
         def compile
-          { filter_query: compiled } unless (compiled = root.compile).empty?
+          { filter_query: root.compile }
         end
 
         def root

data/lib/cloud_sesame/query/node/request.rb

@@ -49,7 +49,11 @@ module CloudSesame
 						compiled.merge!(node.compile || {})
 					end
 
-					convert_to_structured_query(compiled) if compiled[:query].empty?
+					if compiled[:filter_query].empty?
+						compiled.delete(:filter_query)
+					elsif compiled[:query].empty?
+						convert_to_structured_query(compiled)
+					end
 
 					compiled
 				end

data/spec/cloud_sesame/query/node/request_spec.rb

@@ -12,14 +12,14 @@ module CloudSesame
             it 'should return an default request' do
               expect(request.compile).to include(
                 query: "",
-                query_parser: "structured",
+                query_parser: "simple",
                 start: 0,
                 size: 10
               )
               expect(request.compile).to_not include(:query_options, :filter_query, :sort)
             end
-            it 'should set query_parser to structured' do
-              expect(request.compile).to include(query_parser: 'structured')
+            it 'should set query_parser to simple' do
+              expect(request.compile).to include(query_parser: 'simple')
             end
           end
           context 'when theres query' do

data/spec/cloud_sesame_spec.rb

@@ -2,57 +2,57 @@ require 'spec_helper'
 
 describe CloudSesame, focus: true do
 
-	# # AWS initializer
-	# require 'yaml'
-	# YAML.load_file('aws.yml').each do |key, value|
-	# 	ENV["AWS_#{ key }"] = value
-	# end
+	# AWS initializer
+	require 'yaml'
+	YAML.load_file('aws.yml').each do |key, value|
+		ENV["AWS_#{ key }"] = value
+	end
 
-	# # Domain Initializer /config/initializers/cloudsearch.rb
-	# CloudSesame::Domain::Client.configure do |config|
-	# 	config.access_key = ENV['AWS_ACCESS_KEY_ID']
-	# 	config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
-	# end
+	# Domain Initializer /config/initializers/cloudsearch.rb
+	CloudSesame::Domain::Client.configure do |config|
+		config.access_key = ENV['AWS_ACCESS_KEY_ID']
+		config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
+	end
 
-	# # Usage Example
-	# class Product
-	# 	include CloudSesame
+	# Usage Example
+	class Product
+		include CloudSesame
 
-	# 	define_cloudsearch do
+		define_cloudsearch do
 
-	# 		# Product CloudSesame Config
-	# 		config.endpoint = ENV['AWS_ENDPOINT']
-	# 		config.region 	= ENV['AWS_REGION']
+			# Product CloudSesame Config
+			config.endpoint = ENV['AWS_ENDPOINT']
+			config.region 	= ENV['AWS_REGION']
 
-	# 		default_size 100
+			default_size 100
 
-	# 		field :searchable_text, 		query: { weight: 2 }
-	# 		field :description, 				query: true
-	# 		field :tags
+			field :searchable_text, 		query: { weight: 2 }
+			field :description, 				query: true
+			field :tags
 
-	# 		field :affiliate_advertiser_ext_id, facet: { size: 50 }
-	# 		field :currency, 						facet: true
-	# 		field :discount_percentage, facet: { buckets: %w([10,100] [25,100] [50,100] [70,100]), method: 'interval' }
-	# 		field :manufacturer_name, 	facet: { size: 50 }
-	# 		field :price, 							facet: { buckets: %w([0,25] [25,50] [50,100] [100,200] [200,}), method: 'interval' }
-	# 		field :category_string, 		facet: { sort: 'bucket', size: 10_000 }
-	# 		field :created_at
+			field :affiliate_advertiser_ext_id, facet: { size: 50 }
+			field :currency, 						facet: true
+			field :discount_percentage, facet: { buckets: %w([10,100] [25,100] [50,100] [70,100]), method: 'interval' }
+			field :manufacturer_name, 	facet: { size: 50 }
+			field :price, 							facet: { buckets: %w([0,25] [25,50] [50,100] [100,200] [200,}), method: 'interval' }
+			field :category_string, 		facet: { sort: 'bucket', size: 10_000 }
+			field :created_at
 
-	# 		scope :men_tag, -> { tags "men" }
-	# 		scope :and_mens, -> { and! { tags "men"} }
+			scope :men_tag, -> { tags "men" }
+			scope :and_mens, -> { and! { tags "men"} }
 
-	# 	end
+		end
 
-	# end
+	end
 
-	# result = Product.cloudsearch.query("shoes")
-	# .page(3)
-	# .or {
-	# 	tags.not.start_with 'home', 'outdoor'
-	# 	price.start_with(100)
-	# }
+	result = Product.cloudsearch.query("shoes")
+	.page(3)
+	.or {
+		tags.not.start_with 'home', 'outdoor'
+		price.start_with(100)
+	}
 
-	# # result.included?(price: 100)
+	# result.included?(price: 100)
 	# binding.pry
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Scott Chu