CloudSesame 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e496630f0f95249813a64396a44c5afb138ac417
-  data.tar.gz: 8b1ea78470d4452d2328fc3f64b7966064028e3e
+  metadata.gz: 0fd4bf461eb1ac6ec180ec34cd4a9cdd9a2589c1
+  data.tar.gz: 75c0a8253a052232ed8b0416ba5f9081462a7894
 SHA512:
-  metadata.gz: a9fda75e99cc51ab852b0b08603d661c6ae9b554af033c6dbd1ecace4768a9f3d2067ff5ad31d138be426095d4222b697d2436c6e998fb31879932d97c3b5f3a
-  data.tar.gz: 398c9345b3d76df8114c2d83077749ed8923f22f4a8f21112b58fed691ca3a8b58d1e430923481e08632434ac3711723a5ae1437ecf77e2630e52e5b1e6da34c
+  metadata.gz: 83a2fc53241e5dd037f1b88738ad8128f43fa88161f6f2207ed64e29c01cb90220d01bf67519d1b4c1e873dc3404bb198960c7011f864121934e8c607209f97e
+  data.tar.gz: 48b0b4138dd446f4c59f2de92eaca2660938f23f30774c36147d675cc8956041ac64e356f488502c4bb585ff58a455af9bd10c94cc8dc7b59aee97ef6a520d66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    CloudSesame (0.5.0)
+    CloudSesame (0.5.1)
       activesupport (~> 3.2)
       aws-sdk (~> 2)
 
@@ -82,6 +82,3 @@ DEPENDENCIES
   pry (~> 0)
   rspec (~> 3)
   ruby-prof
-
-BUNDLED WITH
-   1.11.2

data/cloud_sesame.gemspec

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

data/lib/cloud_sesame.rb

@@ -18,17 +18,21 @@ require 'cloud_sesame/query/error/scope_not_defined'
 
 # Query DSL Methods
 # ===============================================
-require 'cloud_sesame/query/dsl/block_methods'
-require 'cloud_sesame/query/dsl/field_array_methods'
+require 'cloud_sesame/query/dsl/applied_filter_query'
+require 'cloud_sesame/query/dsl/bind_caller'
+require 'cloud_sesame/query/dsl/block_styled_operators'
 require 'cloud_sesame/query/dsl/field_accessors'
-require 'cloud_sesame/query/dsl/filter_query_methods'
-require 'cloud_sesame/query/dsl/operator_methods'
+require 'cloud_sesame/query/dsl/scope_accessors'
+require 'cloud_sesame/query/dsl/operators'
+require 'cloud_sesame/query/dsl/field_array_methods'
+
+require 'cloud_sesame/query/dsl/range_helper'
 require 'cloud_sesame/query/dsl/page_methods'
 require 'cloud_sesame/query/dsl/query_methods'
-require 'cloud_sesame/query/dsl/range_methods'
+
 require 'cloud_sesame/query/dsl/response_methods'
 require 'cloud_sesame/query/dsl/return_methods'
-require 'cloud_sesame/query/dsl/scope_accessors'
+
 require 'cloud_sesame/query/dsl/sort_methods'
 
 # Query Query Domain Objects

data/lib/cloud_sesame/query/builder.rb

@@ -3,15 +3,15 @@ module CloudSesame
 		class Builder
 			include DSL::QueryMethods
 			include DSL::ResponseMethods
-			include DSL::BlockMethods
+			include DSL::BlockStyledOperators
 			include DSL::FieldAccessors
-			include DSL::FilterQueryMethods
 			include DSL::ScopeAccessors
+			include DSL::AppliedFilterQuery
 			include DSL::PageMethods
 			include DSL::SortMethods
 			include DSL::ReturnMethods
 
-			attr_reader :context
+			attr_reader :context, :searchable
 
 			def initialize(context, searchable)
 				@context = Context.new.duplicate context

data/lib/cloud_sesame/query/domain/block.rb

@@ -2,12 +2,13 @@ module CloudSesame
 	module Query
 		module Domain
 			class Block
-				include DSL::BlockMethods
+				include DSL::AppliedFilterQuery
+				include DSL::BlockStyledOperators
 				include DSL::FieldAccessors
-				include DSL::ScopeAccessors
-        include DSL::OperatorMethods
-        include DSL::RangeMethods
-				include DSL::FilterQueryMethods
+        include DSL::Operators
+        include DSL::RangeHelper
+        include DSL::ScopeAccessors
+        include DSL::BindCaller
 
 				attr_reader :_caller, :_context, :_scopes
 
@@ -16,11 +17,7 @@ module CloudSesame
 					@_context = _context
 					@_scopes = []
 
-					@_caller.instance_variables.each do |name|
-						value = @_caller.instance_variable_get name
-						instance_variable_set name, value
-					end
-
+					_bind_caller_instance_variables
 				end
 
 				def _eval(node, _scope, _return = _scope, &block)
@@ -49,16 +46,6 @@ module CloudSesame
 					self
 				end
 
-				private
-
-				# ACCESS CALLER'S METHODS
-				# =========================================
-				def method_missing(name, *args, &block)
-					_caller.send(name, *args, &block)
-				rescue NoMethodError
-					super
-				end
-
 			end
 		end
 	end

data/lib/cloud_sesame/query/domain/literal.rb

@@ -2,7 +2,8 @@ module CloudSesame
 	module Query
 		module Domain
 			class Literal
-				include DSL::RangeMethods
+				include DSL::BindCaller
+				include DSL::RangeHelper
 
 				attr_reader :_name, :_options, :_caller
 
@@ -11,10 +12,7 @@ module CloudSesame
 					@_options = _options
 					@_caller = _caller
 
-					_caller.instance_variables.each do |name|
-						value = _caller.instance_variable_get name
-						instance_variable_set name, value
-					end
+					_bind_caller_instance_variables
 				end
 
 				def _eval(&block)
@@ -23,16 +21,6 @@ module CloudSesame
 					end
 				end
 
-				private
-
-				# ACCESS CALLER'S METHODS
-				# =========================================
-				def method_missing(name, *args, &block)
-					_caller.send(name, *args, &block)
-				rescue NoMethodError
-					super
-				end
-
 			end
 		end
 	end

data/lib/cloud_sesame/query/dsl/{filter_query_methods.rb → applied_filter_query.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
 	module Query
 		module DSL
-			module FilterQueryMethods
+			module AppliedFilterQuery
 
 				def included?(field, value = nil)
 					!!(

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

@@ -0,0 +1,26 @@
+module CloudSesame
+	module Query
+		module DSL
+			module BindCaller
+
+				private
+
+				def _bind_caller_instance_variables
+					_caller.instance_variables.each do |name|
+						value = _caller.instance_variable_get name
+						instance_variable_set name, value
+					end
+				end
+
+				# ACCESS CALLER'S METHODS
+				# =========================================
+				def method_missing(name, *args, &block)
+					_caller.send(name, *args, &block)
+				rescue NoMethodError
+					super
+				end
+
+			end
+		end
+	end
+end

data/lib/cloud_sesame/query/dsl/{block_methods.rb → block_styled_operators.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
 	module Query
 		module DSL
-			module BlockMethods
+			module BlockStyledOperators
 
 				# CLAUSE: AND
 				# =========================================

data/lib/cloud_sesame/query/dsl/{operator_methods.rb → operators.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
 	module Query
 		module DSL
-			module OperatorMethods
+			module Operators
 
 				# NEAR: creates a single NEAR node
 				# =======================================

data/lib/cloud_sesame/query/dsl/{range_methods.rb → range_helper.rb}

@@ -1,7 +1,7 @@
 module CloudSesame
 	module Query
 		module DSL
-			module RangeMethods
+			module RangeHelper
 
 				def gt(input)
 					AST::RangeValue.new.gt input

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

@@ -4,8 +4,9 @@ module CloudSesame
 			module ScopeAccessors
 
 				def scopes(name = nil, *args)
-					defined_scopes = _scope.context[:scopes]
 					return _return if name.nil?
+
+					defined_scopes = _scope.context[:scopes]
 					if defined_scopes && (block = defined_scopes[name.to_sym])
 						instance_exec *args, &block
 						_return

data/spec/cloud_sesame/query/domain/block_spec.rb

@@ -0,0 +1,124 @@
+module CloudSesame
+	module Query
+		module Domain
+			describe Block do
+
+				class Caller
+
+					def initialize
+						@test = "hello"
+					end
+
+					def test_method
+						return "test method!!!"
+					end
+				end
+
+				subject { Block.new(Caller.new, {}) }
+
+				# expect modules to be included
+				[
+					DSL::BlockStyledOperators,
+					DSL::FieldAccessors,
+					DSL::ScopeAccessors,
+					DSL::Operators,
+					DSL::BindCaller
+				].each do |included_module|
+					it "should include #{ included_module }" do
+						expect(Block.included_modules).to include included_module
+					end
+				end
+
+				context 'given a caller' do
+
+					it 'should have access to caller\'s instance variables' do
+						expect(subject.instance_variable_get(:@test)).to eq "hello"
+					end
+
+					it 'should have access to caller\'s methods' do
+						expect(subject.test_method).to eq "test method!!!"
+					end
+
+				end
+
+				describe '#_scopes' do
+					it 'should be default to an empty array' do
+						expect(subject._scopes).to eq []
+					end
+					it 'should not be able to get overrided' do
+						expect{ subject._scopes = [] }.to raise_error(NoMethodError)
+					end
+				end
+
+				describe '#_scope' do
+					context 'when scopes is not empty' do
+						before { subject._scopes << 1 << 2 }
+						it 'should return the last item from _scopes' do
+							expect(subject._scope).to eq 2
+						end
+					end
+					context 'when scopes is empty' do
+						it 'should return nil' do
+							expect(subject._scope).to eq nil
+						end
+					end
+				end
+
+				# def _eval(node, _scope, _return = _scope, &block)
+				# 	_scopes.push node
+				# 	instance_eval &block
+				# 	_scope << node
+				# 	_scopes.pop
+				# 	_scope.is_a?(AST::Root) ? _return : node
+				# end
+				describe '#_eval' do
+
+					let(:node) { AST::And.new({}, {}) }
+					let(:scope) { AST::And.new({}, {}) }
+
+					context 'when block is not given' do
+						it 'should raise an error ' do
+							expect{ subject._eval(node, scope) }.to raise_error(ArgumentError)
+						end
+					end
+
+					context 'when a block is given' do
+
+						subject { Block.new(self, {}) }
+
+						it 'should use itself to evalute the block' do
+							subject._eval(node, scope) { expect(self).to eq subject }
+						end
+
+						it 'should change the _scope in the block to the node passed in' do
+							subject._eval(node, scope) { expect(_scope).to eq node }
+						end
+
+						it 'should set the _scope back to previous scope after _eval' do
+							subject._scopes << :first_scope
+							subject._eval(node, scope) {}
+							expect(subject._scope).to eq :first_scope
+						end
+
+						context 'when _scope is not a root node' do
+							it 'should return the node it self' do
+								expect(subject._eval(node, scope) {}).to eq node
+							end
+						end
+
+						context 'when _scope is a root node' do
+							it 'should return the _return' do
+								scope = AST::Root.new({}, {})
+								expect(subject._eval(node, scope, :return_object) { }).to eq :return_object
+							end
+						end
+
+					end
+
+
+				end
+
+			end
+		end
+	end
+end

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

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
 module CloudSesame
 	module Query
 		module DSL
-			describe BlockMethods do
+			describe BlockStyledOperators do
 
 				# Setup
 				# =================================================

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CloudSesame
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Scott Chu
@@ -21,98 +21,98 @@ dependencies:
   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
@@ -157,14 +157,15 @@ files:
 - 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/applied_filter_query.rb
+- lib/cloud_sesame/query/dsl/bind_caller.rb
+- lib/cloud_sesame/query/dsl/block_styled_operators.rb
 - lib/cloud_sesame/query/dsl/field_accessors.rb
 - lib/cloud_sesame/query/dsl/field_array_methods.rb
-- lib/cloud_sesame/query/dsl/filter_query_methods.rb
-- lib/cloud_sesame/query/dsl/operator_methods.rb
+- lib/cloud_sesame/query/dsl/operators.rb
 - lib/cloud_sesame/query/dsl/page_methods.rb
 - lib/cloud_sesame/query/dsl/query_methods.rb
-- lib/cloud_sesame/query/dsl/range_methods.rb
+- lib/cloud_sesame/query/dsl/range_helper.rb
 - lib/cloud_sesame/query/dsl/response_methods.rb
 - lib/cloud_sesame/query/dsl/return_methods.rb
 - lib/cloud_sesame/query/dsl/scope_accessors.rb
@@ -196,6 +197,7 @@ files:
 - 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/domain/block_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
@@ -222,17 +224,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.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: AWS CloudSearch Query DSL
@@ -246,6 +248,7 @@ test_files:
 - 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/domain/block_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