CloudSesame 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2f110af5801dc881dfc3066166ad65481bc9db
-  data.tar.gz: 981fc6f70346fb0f0cc89842d34c0ab27a0bf918
+  metadata.gz: 3459d29078ee48b4320364769b91bbe66f7fbece
+  data.tar.gz: e77c9b2917e402329afa7206512d51f77fe973aa
 SHA512:
-  metadata.gz: 52fbacfb8507b86e22fb01dd10440249ef38ba4305ce83c2aaa348b5f1d447af093b1f5f0184868e22f07e583f6552108a5792ea749520171def79496380b61a
-  data.tar.gz: 082924caf18ca846469bf1e9957a0dbb27b192c2445db8f001724e9137b74cbef7aa323a3ce5def4d4e954f4352c9c099342f1e5e49e792183cafcf2f19b7e97
+  metadata.gz: 3d8586b977026307c6ef5027cf98f76c9fea091d75e99bfad83a67d446f53b8b469b92c56537b38e6eec0ca8fd81f8c07ab644c668fcc45e83159f6bdcf6b653
+  data.tar.gz: 9f66a716cf04f1713dca9a59fd6ef633c5d71432661d78af41110e164d51527721d1bb09d63bd464a25c00116e2308de9647a644c301e1fb22ba502b5b10caea

data/Gemfile.lock

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

data/cloud_sesame.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'CloudSesame'
-  s.version     = '0.2.4'
+  s.version     = '0.2.5'
   s.date        = '2016-01-14'
   s.summary     = "AWS CloudSearch Query DSL"
   s.description = "AWS CloudSearch Query DSL"

data/lib/cloud_sesame/query/ast/operator.rb

@@ -9,17 +9,13 @@ module CloudSesame
         def initialize(context, options = {}, &block)
           @context = context
           @options = options
-          evaluate &block if block_given?
+          instance_eval &block if block_given?
         end
 
         def boost
           " boost=#{ options[:boost] }" if options[:boost]
         end
 
-        def evaluate(&block)
-          instance_eval &block
-        end
-
       end
     end
   end

data/lib/cloud_sesame/query/ast/single_expression_operator.rb

@@ -10,11 +10,11 @@ module CloudSesame
         attr_accessor :child
 
         def is_for(field, field_options)
-          child.is_for field, field_options
+          child.is_for field, field_options if child
         end
 
         def is_excluded
-          child.is_excluded
+          child.is_excluded if child
         end
 
         def <<(object)

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

@@ -8,7 +8,7 @@ module CloudSesame
 				def not(options = {}, &block)
 					raise missing_block unless block_given?
 					node = AST::Not.new(dsl_context, options)
-					orphan_node.evaluate &block
+					orphan_node.instance_eval &block
 					node << orphan_node
 					dsl_scope << node
 				  dsl_return node

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

@@ -8,7 +8,20 @@ module CloudSesame
         end
 
         def root
-          @root ||= CloudSesame::Query::AST::Root.new context
+          @root ||= create_root_with_default_values
+        end
+
+        private
+
+        def create_root_with_default_values
+          root = CloudSesame::Query::AST::Root.new context
+          context[:fields].each do |field, options|
+            if options && (block = options[:default])
+              value = root.instance_exec &block
+              root << AST::Literal.new(field, value, options)
+            end
+          end if context[:fields]
+          root
         end
 
       end

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

@@ -0,0 +1,17 @@
+module CloudSesame
+  module Query
+    module AST
+      describe And do
+
+        it 'should be a type of operator' do
+          expect(And.ancestors).to include(MultiExpressionOperator)
+        end
+
+        it 'should have symbol :and' do
+          expect(And::SYMBOL).to eq :and
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module CloudSesame
+  module Query
+    module AST
+      describe BlockChainingRelation do
+        let(:context) { {} }
+        let(:dsl_scope) { OpenStruct.new context: context }
+        let(:dsl_return) { OpenStruct.new context: context }
+        let(:orphan_node) { OpenStruct.new }
+        subject { BlockChainingRelation.new dsl_scope, dsl_return, orphan_node }
+
+        describe '#dsl_context' do
+          it 'should return dsl_scope context' do
+            expect(subject.dsl_scope).to receive(:context)
+            subject.dsl_context
+          end
+        end
+
+        describe '#dsl_return' do
+          context 'when dsl return is a root node' do
+            let(:dsl_scope) { Root.new(context) }
+            it 'should return the root' do
+              expect(subject.dsl_return).to eq dsl_return
+            end
+          end
+          context 'when dsl return is not a root node' do
+            context 'and node is passed in' do
+              let(:node) { OpenStruct.new }
+              it 'should return the node' do
+                expect(subject.dsl_return node).to eq node
+              end
+            end
+            context 'and node is not passed in' do
+              it 'should return the node' do
+                expect(subject.dsl_return).to eq dsl_return
+              end
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,76 @@
+module CloudSesame
+  module Query
+    module AST
+      describe MultiExpressionOperator do
+
+        let(:context) { {} }
+        let(:options) { {} }
+        let(:block) { Proc.new {} }
+
+        subject { MultiExpressionOperator.new(context, options, &block) }
+
+        it 'should be a type of operator' do
+          expect(MultiExpressionOperator.ancestors).to include(Operator)
+        end
+
+        describe '#children' do
+          it 'should be empty by default' do
+            expect(subject.children).to be_empty
+          end
+          it 'should be an Field Array' do
+            expect(subject.children).to be_a AST::FieldArray
+          end
+        end
+
+        describe '#compile' do
+          context 'when theres children' do
+            let(:child) { OpenStruct.new(compile: "compiled") }
+            before { subject.children << child }
+
+            it 'should compile to children' do
+              expect(subject.children).to receive(:compile)
+              subject.compile
+            end
+
+            context 'and boost options is given' do
+              before { subject.options[:boost] = 2 }
+              it 'should return compiled string with boost' do
+                expect(subject.compile).to eq "( boost=2 compiled)"
+              end
+            end
+            context 'and boost options is not given' do
+              it 'should return compiled string with boost' do
+                expect(subject.compile).to eq "( compiled)"
+              end
+            end
+          end
+          context 'when theres no children' do
+            it 'should return nothing' do
+              expect(subject.compile).to eq nil
+            end
+          end
+        end
+
+        describe '#<<' do
+          it 'should push object into the children' do
+            object = :hello
+            expect(subject.children).to receive(:<<).with(object)
+            subject << object
+          end
+        end
+
+        describe '#is_excluded' do
+          let(:child) { OpenStruct.new(is_excluded: nil) }
+          before { subject.children << child.dup << child.dup << child.dup }
+          it 'should broadcast down this method to it\'s children' do
+            subject.children.each do |child|
+              expect(child).to receive(:is_excluded)
+            end
+            subject.is_excluded
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module CloudSesame
+  module Query
+    module AST
+      describe Operator do
+        let(:context) {{}}
+        let(:options) {{}}
+        let(:block) { Proc.new {} }
+        subject { Operator.new(context, options, &block) }
+
+        describe '#initialize' do
+          context 'given a block' do
+            let(:block) { Proc.new { context[:name] = :test } }
+            it 'should evalute the block' do
+              expect(subject.context[:name]).to eq :test
+            end
+          end
+        end
+
+        describe '#boost' do
+          context 'given boost option' do
+            let(:options) {{ boost: 2 }}
+            it 'should return an compiled boost value' do
+              expect(subject.boost).to eq " boost=2"
+            end
+          end
+          context 'given no boost option' do
+            it 'should return nothing' do
+              expect(subject.boost).to eq nil
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module CloudSesame
+  module Query
+    module AST
+      describe Or do
+
+        it 'should be a type of operator' do
+          expect(Or.ancestors).to include(MultiExpressionOperator)
+        end
+
+        it 'should have symbol :or' do
+          expect(Or::SYMBOL).to eq :or
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+module CloudSesame
+  module Query
+    module AST
+      describe SingleExpressionOperator do
+
+        let(:context) { {} }
+        let(:options) { {} }
+        let(:block) { Proc.new {} }
+
+        subject { SingleExpressionOperator.new(context, options, &block) }
+
+        it 'should be a type of operator' do
+          expect(MultiExpressionOperator.ancestors).to include(Operator)
+        end
+
+        describe '#child' do
+          it 'should be nil by default' do
+            expect(subject.child).to be_nil
+          end
+        end
+
+        describe '#is_for' do
+          it 'should forward the field and field options to it\'s child' do
+            subject.child = OpenStruct.new is_for: ""
+            expect(subject.child).to receive(:is_for).with(:test, :options)
+            subject.is_for :test, :options
+          end
+        end
+
+        describe '#is_excluded' do
+          context 'when child exist' do
+            it 'should call #is_excluded on it\'s child' do
+              subject.child = OpenStruct.new is_excluded: ""
+              expect(subject.child).to receive(:is_excluded)
+              subject.is_excluded
+            end
+          end
+          context 'when child not exist' do
+            it 'should call #is_excluded on it\'s child' do
+              expect(subject.child).to_not receive(:is_excluded)
+              subject.is_excluded
+            end
+          end
+        end
+
+        describe '#<<' do
+          it 'should set the object as child' do
+            child = OpenStruct.new()
+            expect { subject << child }.to change{ subject.child }.from(nil).to(child)
+          end
+        end
+
+        describe '#compile' do
+          before {
+            subject.child = OpenStruct.new compile: ""
+            allow(subject.child).to receive(:compile)
+          }
+          it 'should compile it\'s child and detailed set to false' do
+            expect(subject.child).to receive(:compile).with(SingleExpressionOperator::DETAILED)
+            subject.compile
+          end
+          context 'when theres boost options' do
+            it 'should include boost value in the compiled value' do
+              subject.options[:boost] = 1
+              expect(subject.compile).to include("boost=1")
+            end
+          end
+          context 'when theres no boost options' do
+            it 'should not include boost value in the compiled value' do
+              expect(subject.compile).to_not include("boost=")
+            end
+          end
+          context 'when theres a symbol' do
+            before { SingleExpressionOperator::SYMBOL = "test_symbol"}
+            it 'should include the symbol in the compiled value' do
+              expect(subject.compile).to include "(test_symbol"
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -36,13 +36,6 @@ module CloudSesame
 								expect(node_class).to receive(:new).and_call_original
 								subject.and.not {}
 							end
-							it 'should create a operator node with the block passed to not' do
-								proc = -> { }
-								expect_any_instance_of(AST::And).to receive(:evaluate) { |context, options, &block|
-									expect(block).to eq(proc)
-								}
-								subject.and.not &proc
-							end
 							it 'should have the operator node as child' do
 								subject.and.not {}
 								expect(subject.request.filter_query.root.children[0].child ).to be_kind_of(AST::And)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Scott Chu
@@ -156,6 +156,13 @@ files:
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb
 - spec/cloud_sesame/domain/context_spec.rb
+- spec/cloud_sesame/query/ast/and_spec.rb
+- spec/cloud_sesame/query/ast/block_chaining_relation_spec.rb
+- spec/cloud_sesame/query/ast/multi_expression_operator_spec.rb
+- spec/cloud_sesame/query/ast/operator_spec.rb
+- spec/cloud_sesame/query/ast/or_spec.rb
+- spec/cloud_sesame/query/ast/root_spec.rb
+- spec/cloud_sesame/query/ast/single_expression_operator_spec.rb
 - spec/cloud_sesame/query/dsl/base_spec.rb
 - spec/cloud_sesame/query/dsl/block_chaining_methods_spec.rb
 - spec/cloud_sesame/query/dsl/block_methods_spec.rb
@@ -202,6 +209,13 @@ test_files:
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_spec.rb
 - spec/cloud_sesame/domain/context_spec.rb
+- spec/cloud_sesame/query/ast/and_spec.rb
+- spec/cloud_sesame/query/ast/block_chaining_relation_spec.rb
+- spec/cloud_sesame/query/ast/multi_expression_operator_spec.rb
+- spec/cloud_sesame/query/ast/operator_spec.rb
+- spec/cloud_sesame/query/ast/or_spec.rb
+- spec/cloud_sesame/query/ast/root_spec.rb
+- spec/cloud_sesame/query/ast/single_expression_operator_spec.rb
 - spec/cloud_sesame/query/dsl/base_spec.rb
 - spec/cloud_sesame/query/dsl/block_chaining_methods_spec.rb
 - spec/cloud_sesame/query/dsl/block_methods_spec.rb