CloudSesame 0.4.6 → 0.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Scott Chu
@@ -15,104 +15,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: AWS CloudSearch Query DSL
@@ -121,8 +121,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -137,7 +137,6 @@ files:
 - lib/cloud_sesame/domain/config.rb
 - lib/cloud_sesame/domain/context.rb
 - lib/cloud_sesame/query/ast/and.rb
-- lib/cloud_sesame/query/ast/block_chaining_relation.rb
 - lib/cloud_sesame/query/ast/date_value.rb
 - lib/cloud_sesame/query/ast/field_array.rb
 - lib/cloud_sesame/query/ast/literal.rb
@@ -155,11 +154,12 @@ files:
 - 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/base.rb
-- lib/cloud_sesame/query/dsl/block_chaining_methods.rb
+- lib/cloud_sesame/query/domain/block.rb
+- lib/cloud_sesame/query/domain/chaining_block.rb
+- lib/cloud_sesame/query/domain/literal.rb
 - lib/cloud_sesame/query/dsl/block_methods.rb
+- lib/cloud_sesame/query/dsl/field_accessors.rb
 - lib/cloud_sesame/query/dsl/field_array_methods.rb
-- lib/cloud_sesame/query/dsl/field_methods.rb
 - lib/cloud_sesame/query/dsl/filter_query_methods.rb
 - lib/cloud_sesame/query/dsl/operator_methods.rb
 - lib/cloud_sesame/query/dsl/page_methods.rb
@@ -167,11 +167,12 @@ files:
 - lib/cloud_sesame/query/dsl/range_methods.rb
 - lib/cloud_sesame/query/dsl/response_methods.rb
 - lib/cloud_sesame/query/dsl/return_methods.rb
-- lib/cloud_sesame/query/dsl/scope_methods.rb
+- lib/cloud_sesame/query/dsl/scope_accessors.rb
 - lib/cloud_sesame/query/dsl/sort_methods.rb
 - lib/cloud_sesame/query/error/invalid_syntax.rb
 - lib/cloud_sesame/query/error/missing_operator_symbol.rb
 - lib/cloud_sesame/query/error/missing_query.rb
+- lib/cloud_sesame/query/error/scope_not_defined.rb
 - lib/cloud_sesame/query/node/abstract.rb
 - lib/cloud_sesame/query/node/facet.rb
 - lib/cloud_sesame/query/node/filter_query.rb
@@ -184,22 +185,20 @@ files:
 - lib/cloud_sesame/query/node/request.rb
 - lib/cloud_sesame/query/node/return.rb
 - lib/cloud_sesame/query/node/sort.rb
+- lib/cloud_sesame/query/scope.rb
 - profiler.rb
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_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/builder_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
+- spec/cloud_sesame/query/dsl/field_accessors_spec.rb
 - spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
-- spec/cloud_sesame/query/dsl/field_methods_spec.rb
 - spec/cloud_sesame/query/dsl_spec.rb
 - spec/cloud_sesame/query/node/abstract_spec.rb
 - spec/cloud_sesame/query/node/facet_spec.rb
@@ -223,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AWS CloudSearch Query DSL
@@ -241,18 +240,15 @@ test_files:
 - spec/abstract_object_spec.rb
 - spec/cloud_sesame/domain/base_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/builder_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
+- spec/cloud_sesame/query/dsl/field_accessors_spec.rb
 - spec/cloud_sesame/query/dsl/field_array_methods_spec.rb
-- spec/cloud_sesame/query/dsl/field_methods_spec.rb
 - spec/cloud_sesame/query/dsl_spec.rb
 - spec/cloud_sesame/query/node/abstract_spec.rb
 - spec/cloud_sesame/query/node/facet_spec.rb

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

@@ -1,30 +0,0 @@
-module CloudSesame
-	module Query
-		module AST
-			class BlockChainingRelation
-				include DSL::BlockChainingMethods
-
-				attr_reader :orphan_node
-
-				def initialize(dsl_scope, dsl_return, orphan_node)
-					@dsl_scope = dsl_scope
-					@dsl_return = dsl_return
-					@orphan_node = orphan_node
-				end
-
-				def dsl_scope
-					@dsl_scope
-				end
-
-				def dsl_context
-					dsl_scope.context
-				end
-
-				def dsl_return(node = nil)
-					@dsl_scope.is_a?(Root) || !node ? @dsl_return : node
-				end
-
-			end
-		end
-	end
-end

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

@@ -1,27 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module Base
-
-				private
-
-				def dsl_scope
-					self
-				end
-
-				def dsl_context
-					dsl_scope.context
-				end
-
-				def dsl_caller
-					dsl_context[:caller]
-				end
-
-				def dsl_return(node = nil)
-					node || dsl_scope
-				end
-
-			end
-		end
-	end
-end

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

@@ -1,26 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module BlockChainingMethods
-
-				# CLAUSE: NOT
-				# =========================================
-				def not(options = {}, &block)
-					raise missing_block unless block_given?
-					node = AST::Not.new(dsl_context, options)
-					orphan_node.instance_eval &block
-					node << orphan_node
-					dsl_scope << node
-				  dsl_return node
-				end
-
-				private
-
-				def missing_block
-					Error::InvalidSyntax.new("#{ orphan_node.class::SYMBOL }.not requires a block")
-				end
-
-			end
-		end
-	end
-end

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

@@ -1,16 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module FieldMethods
-
-				def literal(name, *values)
-					name = name.to_sym
-			  	dsl_scope.children.field = name
-			  	dsl_scope.children.dsl_return = dsl_return
-			  	dsl_scope.children.insert values
-				end
-
-			end
-		end
-	end
-end

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

@@ -1,33 +0,0 @@
-module CloudSesame
-	module Query
-		module DSL
-			module ScopeMethods
-
-				def scopes(name = nil, *args)
-					if (name && context_scopes && (callback = context_scopes[name])) || name.nil?
-						instance_exec(*args, &callback) if callback
-						dsl_return
-					else
-						raise NoMethodError, "scope[#{ name }] does not exist"
-					end
-				end
-
-				private
-
-				def context_scopes
-					dsl_context[:scopes]
-				end
-
-				def method_missing(name, *args, &block)
-					if context_scopes && (callback = context_scopes[name])
-						instance_exec *args, &callback
-					  dsl_return
-					else
-						super
-					end
-				end
-
-			end
-		end
-	end
-end

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

@@ -1,44 +0,0 @@
-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/dsl/base_spec.rb

@@ -1,31 +0,0 @@
-module CloudSesame
-  module Query
-    module DSL
-      describe Base do
-
-        class TestClass
-          include Base
-        end
-
-        subject { TestClass.new }
-
-        shared_examples 'return self instance' do
-          it 'should return itself' do
-            expect(result).to eq subject
-          end
-        end
-
-        describe '#method_return' do
-          let(:result) { subject.send(:dsl_return) }
-          include_examples 'return self instance'
-        end
-
-        describe '#method_scope' do
-          let(:result) { subject.send(:dsl_scope) }
-          include_examples 'return self instance'
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-module CloudSesame
-	module Query
-		module DSL
-			describe BlockChainingMethods do
-
-				# Setup Test Class
-				class Product
-					include CloudSesame
-					define_cloudsearch {}
-				end
-
-				subject(:cloudsearch) { Product.cloudsearch.builder }
-
-				# NOT
-				# =======================================
-				describe '#not' do
-					let(:node_class) { AST::Not }
-
-					context 'when not called after an operator' do
-						it 'should raise an error' do
-							expect{ subject.not }.to raise_error NoMethodError
-						end
-					end
-					context 'when called after an multi expression operator method call' do
-						context 'and not block is given' do
-							it 'should raise an error' do
-								expect{ subject.or.not }.to raise_error Error::InvalidSyntax
-							end
-						end
-						context 'and block is given' do
-							it 'should create a NOT node' do
-								expect(node_class).to receive(:new).and_call_original
-								subject.and.not {}
-							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)
-							end
-							it 'should belong to the dsl scope' do
-								expect{ subject.and.not {} }.to change{ subject.request.filter_query.root.children[0] }.from(nil).to be_kind_of(node_class)
-							end
-							context 'from root' do
-								it 'should return the cloudsearch domain' do
-									expect(subject.and.not {}).to eq subject
-								end
-							end
-							context 'from inside of nested block' do
-								it 'should return the Not node itself' do
-									node = nil
-									subject.and { node = or!.not {} }
-									expect(node).to be_kind_of(node_class)
-								end
-							end
-						end
-					end
-
-				end
-
-			end
-		end
-	end
-end