CloudSesame 0.1.5 → 0.1.6

data/spec/cloud_sesame/query/ast/multi_branch_spec.rb

@@ -55,7 +55,7 @@ module CloudSesame
 
         describe 'Query DSL' do
           it 'should be included' do
-            expect(node).to respond_to(:and, :or, :literal)
+            expect(node).to respond_to(:and, :or)
           end
         end
 

data/spec/cloud_sesame/query/ast/multi_expression_operator_spec.rb

@@ -9,10 +9,6 @@ module CloudSesame
         before { MultiExpressionOperator.symbol = :symbol }
 
         describe '#compile' do
-          it 'should raise an error if operator symbol has not being set' do
-            MultiExpressionOperator.symbol = nil
-            expect{ operator.compile }.to raise_error(Error::MissingOperatorSymbol)
-          end
 
           it 'should return nil if children are empty' do
             expect(operator.compile).to eq(nil)

data/spec/cloud_sesame/query/dsl/filter_query_spec.rb

@@ -9,7 +9,7 @@ module CloudSesame
           def initialize
           end
           def children
-            @children ||= AST::CompoundArray.new.set_scope(self)
+            @children ||= AST::CompoundArray.new.scope_to self
           end
           def context
             @context ||= {}
@@ -46,73 +46,24 @@ module CloudSesame
           end
         end
 
-        describe 'literal' do
-
-          it 'should create a literal node' do
-            expect(AST::Literal).to receive(:new).with('description', '123', Hash)
-            subject.literal('description', '123')
-          end
-          it 'should add the literal node to it\'s children' do
-            expect{ subject.literal('description', '123') }.to change{ subject.children.size }.by(1)
-          end
-          it 'should return the literal node' do
-            expect(subject.literal('description', '123')).to be_kind_of(AST::Literal)
-          end
-
-          context 'when field is define in context' do
-            before { subject.context[:fields] = { description: {} } }
-            # it 'should be triggered by calling the field name as a method' do
-            #   expect(subject).to receive(:literal).with(:description, '123', {})
-            #   subject.description "123"
-            # end
-            # it 'should accept multiple values' do
-            #   expect(subject).to receive(:literal).exactly(3).times
-            #   subject.description "123", "456", "789"
-            # end
-
-            it 'should return literal nodes in an array' do
-              result = subject.description("123", "456", "789")
-              expect(result).to include(AST::Literal)
-            end
-          end
-
-          context 'when field is not defined' do
-            it 'should raise method missing error when calling the field name as a method' do
-              expect{ subject.not_defined() }.to raise_error(NoMethodError)
-            end
-          end
-        end
-
-        # describe 'prefix' do
-        #   it 'should set the literal prefix option to true' do
-        #     literals = (1..3).map { |i| AST::Literal.new(:int, i) }
-        #     subject.prefix(literals)
-
-        #     literals.each do |literal|
-        #       expect(literal.options).to include(prefix: true)
-        #     end
-
-        #   end
-        # end
-
         describe 'included?' do
           before { subject.context[:fields] = { tags: {}, description: {} } }
           context 'when there is a field and no value' do
             it 'should return true if the request contains the field in the filter query' do
-              subject.and{tags('women')}
+              subject.and { tags 'women' }
               expect(subject.included?(:tags)).to be_truthy
             end
 
             it 'should return false if the request does not contain the field in the filter query' do
-              subject.and{tags.not('women')}
+              subject.and { tags.not 'women' }
               expect(subject.included?(:tags)).to be_falsey
             end
 
           end
           context 'when there is a field and a value' do
             it 'should return true if the request contains the field and the value in the filter query' do
-              subject.and{tags('women')}
-              expect(subject.included?(:tags, 'women')).to be_truthy
+              subject.and { tags("women") }
+              expect(subject.included?(:tags, "women")).to be_truthy
             end
 
             it 'should return false if the request does not contain the field or the value in the filter query' do
@@ -123,12 +74,11 @@ module CloudSesame
           end
         end
 
-
         describe 'excluded?' do
           before { subject.context[:fields] = { tags: {}, description: {} } }
           context 'when there is a field and no value' do
             it 'should return true if the request excludes the field in the filter query' do
-              subject.and{tags('women')}
+              subject.and { tags 'women' }
               expect(subject.excluded?(:tags)).to be_falsey
             end
 

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

@@ -4,7 +4,7 @@ module CloudSesame
   module Query
     module Node
       describe Request do
-        let(:context) { Domain::Context.new }
+        let(:context) { Domain::Context.new(filter_query: { fields: { tags: {} } }) }
         let(:request) { Request.new(context) }
 
         describe '#compile' do
@@ -38,7 +38,7 @@ module CloudSesame
             end
           end
           context 'when theres filter query' do
-            before { request.filter_query.root.and{ literal(:tags, "sale") } }
+            before { request.filter_query.root.and { tags "sale" } }
             let(:compiled) { request.filter_query.compile }
             context 'with query' do
               before { request.query.query = "hello" }

data/spec/cloud_sesame_spec.rb

@@ -9,6 +9,8 @@ describe CloudSesame do
 	# end
 
 	# # Domain Initializer /config/initializers/cloudsearch.rb
+	# require 'cloud_sesame'
+
 	# CloudSesame::Domain::Client.configure do |config|
 	# 	config.access_key = ENV['AWS_ACCESS_KEY_ID']
 	# 	config.secret_key = ENV['AWS_SECRET_ACCESS_KEY']
@@ -24,6 +26,13 @@ describe CloudSesame do
 	# 		config.region 	= ENV['AWS_REGION']
 
 	# 		default_size 100
+
+	# 		# describe_fuzziness do
+	# 		# 	max_fuzziness 3
+	# 		# 	min_word_length 6
+	# 		# 	fuzzy_percentage 0.17
+	# 		# end
+
 	# 		field :searchable_text, 		query: { weight: 2 }
 	# 		field :description, 				query: true
 	# 		field :tags
@@ -36,8 +45,11 @@ describe CloudSesame do
 	# 		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, ->(date) { created_at date }
+	# 		scope :and_mens do
+	# 			and! { tags "men"}
+	# 		end
+	# 		scope :men_stuff, -> { query("men").sort().page }
 
 	# 	end
 
@@ -48,14 +60,17 @@ describe CloudSesame do
 
 	# 	define_cloudsearch do
 	# 		field :searchable_text, 		query: { weight: 4 }
+	# 		field :name, as: :text1
 	# 	end
 	# end
+
+
+
+
 	# # Example Query
-	# result = Product.cloudsearch.query("shoes")
-	# .or {
-	# 	created_at "[#{ d(Date.today - 3) },}"
-	# 	created_at r.gte(d(Date.today - 3))
-	# }
+	# query = Product.cloudsearch.query("nike pants").create_at(Date.today)
+
+
 	# binding.pry
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Scott Chu
@@ -98,6 +98,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- README.md
 - cloud_sesame.gemspec
 - lib/abstract_object.rb
 - lib/cloud_sesame.rb
@@ -116,24 +117,27 @@ files:
 - lib/cloud_sesame/query/ast/near.rb
 - lib/cloud_sesame/query/ast/not.rb
 - lib/cloud_sesame/query/ast/or.rb
+- lib/cloud_sesame/query/ast/phrase.rb
 - lib/cloud_sesame/query/ast/prefix.rb
 - lib/cloud_sesame/query/ast/range_value.rb
 - lib/cloud_sesame/query/ast/root.rb
 - lib/cloud_sesame/query/ast/single_branch.rb
 - lib/cloud_sesame/query/ast/single_expression_operator.rb
+- lib/cloud_sesame/query/ast/term.rb
 - lib/cloud_sesame/query/ast/value.rb
 - lib/cloud_sesame/query/builder.rb
 - lib/cloud_sesame/query/dsl/and.rb
 - lib/cloud_sesame/query/dsl/base.rb
+- lib/cloud_sesame/query/dsl/boost.rb
 - lib/cloud_sesame/query/dsl/filter_query.rb
 - lib/cloud_sesame/query/dsl/literal.rb
-- lib/cloud_sesame/query/dsl/literal_helper.rb
 - lib/cloud_sesame/query/dsl/or.rb
 - lib/cloud_sesame/query/dsl/page.rb
 - lib/cloud_sesame/query/dsl/query.rb
-- lib/cloud_sesame/query/dsl/range.rb
+- lib/cloud_sesame/query/dsl/return.rb
 - lib/cloud_sesame/query/dsl/scope.rb
 - lib/cloud_sesame/query/dsl/sort.rb
+- lib/cloud_sesame/query/dsl/value.rb
 - lib/cloud_sesame/query/error/missing_operator_symbol.rb
 - lib/cloud_sesame/query/error/missing_query.rb
 - lib/cloud_sesame/query/node/abstract.rb
@@ -145,6 +149,7 @@ files:
 - lib/cloud_sesame/query/node/query_options_field.rb
 - lib/cloud_sesame/query/node/query_parser.rb
 - lib/cloud_sesame/query/node/request.rb
+- lib/cloud_sesame/query/node/return.rb
 - lib/cloud_sesame/query/node/sort.rb
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb

data/lib/cloud_sesame/query/dsl/literal_helper.rb

@@ -1,17 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module LiteralHelper
-
-				def d(date)
-					AST::DateValue.new date
-				end
-
-				def r
-					AST::RangeValue.new
-				end
-
-			end
-		end
-	end
-end

data/lib/cloud_sesame/query/dsl/range.rb

@@ -1,41 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module Range
-
-				def >(value)
-					return self
-				end
-
-				def >=(value)
-					return self
-				end
-
-				def <(value)
-					return self
-				end
-
-				def <=(value)
-					return self
-				end
-
-				def gt(value)
-					return self
-				end
-
-				def gte(value)
-					return self
-				end
-
-				def lt(value)
-					return self
-				end
-
-				def lte(value)
-					return self
-				end
-
-			end
-		end
-	end
-end