From a7e8e4b5e5983442547979c8973698612e75b06f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 9 Jan 2017 17:17:07 -0800
Subject: [PATCH 01/66] WIP on mango queries for couch2

---
 lib/dolly/document.rb    |  6 ++-
 lib/dolly/mango_query.rb | 83 ++++++++++++++++++++++++++++++++++++++++
 lib/dolly/scopes.rb      | 18 +++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 lib/dolly/mango_query.rb
 create mode 100644 lib/dolly/scopes.rb

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 6ad2641..734e9b4 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -9,7 +9,7 @@ class Document
     extend Dolly::Timestamps
 
     attr_accessor :rows, :doc, :key
-    class_attribute :properties
+    class_attribute :properties, :scopes
     cattr_accessor :timestamps do
       {}
     end
@@ -149,6 +149,10 @@ def self.property *ary
       end
     end
 
+    def self.scope name, scope
+      name = name.to_sym
+    end
+
     private
     #TODO: create a PropertiesSet service object, to do all this
     def self.write_methods name
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
new file mode 100644
index 0000000..ace11ca
--- /dev/null
+++ b/lib/dolly/mango_query.rb
@@ -0,0 +1,83 @@
+module Dolly
+  class MangoQuery
+
+    attr_reader :query
+
+    SELECT_OPERATOR_MAP = {
+      eq: ->(name, value) { build_equal_selector name, value },
+      in:    ->(name, value) { build_inclusion_selector name, value },
+      gt:    ->(name, value) { build_greater_than_selector name, value },
+      lt:    ->(name, value) { build_less_than_selector name, value },
+    }.freeze
+
+    def initialize class
+      @query = Hash.new
+    end
+
+    def select name, operator, value
+      @query.deep_merge! SELECT_OPERATOR_MAP[operator].call(name, value)
+      return self
+    end
+
+    def limit value
+      @query["limit"] = value
+      return self
+    end
+
+    def sort name, operator
+      @query["sort"] ||= []
+      @query["sort"] << {name => operator}
+      return self
+    end
+
+    def fields *fields
+      @query['fields'] ||= []
+      fields.each { |field| @query['fields'] << field }
+      return self
+    end
+
+    class << self
+      def build_equal_selector name, value
+        {
+          'selector' =>
+          {
+            name => value
+          },
+        }
+      end
+
+      def build_inclusion_selector name, value
+        {
+          'selector' =>
+          {
+            name => {
+              "$in" => value
+            }
+          }
+        }
+      end
+
+      def build_greater_than_selector name, value
+        {
+          'selector' =>
+          {
+            name => {
+              "$gt" => value
+            }
+          }
+        }
+      end
+
+      def build_less_than_selector name, value
+        {
+          'selector' =>
+          {
+            name => {
+              "$lt" => value
+            }
+          }
+        }
+      end
+    end
+  end
+end
diff --git a/lib/dolly/scopes.rb b/lib/dolly/scopes.rb
new file mode 100644
index 0000000..bcb39fc
--- /dev/null
+++ b/lib/dolly/scopes.rb
@@ -0,0 +1,18 @@
+module Dolly
+  module Scopes
+    extend ActiveSupport::Concern
+
+    included do
+      def scope name, options ={ }
+
+      end
+    end
+
+    class Scope
+      attr_reader :proxy_scope, :proxy_options
+      def initialize proxy_scope, options
+        @proxy_scope, @proxy_options = proxy_scope, proxy_options
+      end
+    end
+  end
+end

From 470afe35f3200fc71a5831a5f669997e123708f2 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Tue, 10 Jan 2017 10:51:52 -0800
Subject: [PATCH 02/66] more WIP

---
 lib/dolly/document.rb    | 13 +++++-
 lib/dolly/mango_query.rb | 93 ++++++++++++++++++++++------------------
 2 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 6e737d9..1261b81 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -1,6 +1,7 @@
 require "dolly/query"
 require "dolly/property"
 require 'dolly/timestamps'
+require "dolly/mango_query"
 
 module Dolly
   class Document
@@ -149,8 +150,16 @@ def self.property *ary
       end
     end
 
-    def self.scope name, scope
-      name = name.to_sym
+    def self.scope scope_name, scope
+      name = scope_name.to_sym
+      singleton_class.send(:define_method, name) do |*args|
+        if binding.receiver.is_a? self.class
+          query = Dolly::MangoQuery.new { scope.call *args }
+
+        else binding.receiver.is?(Dolly::MangoQuery)
+          binding.receiver.instance_exec { scope.call *args}
+        end
+      end
     end
 
     private
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index ace11ca..cd85188 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -3,81 +3,92 @@ class MangoQuery
 
     attr_reader :query
 
-    SELECT_OPERATOR_MAP = {
-      eq: ->(name, value) { build_equal_selector name, value },
-      in:    ->(name, value) { build_inclusion_selector name, value },
-      gt:    ->(name, value) { build_greater_than_selector name, value },
-      lt:    ->(name, value) { build_less_than_selector name, value },
-    }.freeze
+    SELECTOR = 'selector'.freeze
+    IN_OPERATOR = '$in'.freeze
+    GT_OPERATOR = '$gt'.freeze
+    LT_OPERATOR = '$lt'.freeze
+    FIELDS_KEY = 'fields'.freeze
+    SORT_KEY = 'sort'.freeze
+    LIMIT_KEY = 'limit'.freeze
 
-    def initialize class
+    def select_operator_map
+      {
+        eq:    ->(name, value) { build_equal_selector name, value },
+        in:    ->(name, value) { build_inclusion_selector name, value },
+        gt:    ->(name, value) { build_greater_than_selector name, value },
+        lt:    ->(name, value) { build_less_than_selector name, value },
+      }.freeze
+    end
+
+    def initialize
       @query = Hash.new
+      instance_eval { yield }
     end
 
     def select name, operator, value
-      @query.deep_merge! SELECT_OPERATOR_MAP[operator].call(name, value)
+      @query.deep_merge! select_operator_map[operator].call(name, value)
       return self
     end
 
     def limit value
-      @query["limit"] = value
+      @query[LIMIT_KEY] = value
       return self
     end
 
     def sort name, operator
-      @query["sort"] ||= []
-      @query["sort"] << {name => operator}
+      @query[SORT_KEY] ||= []
+      @query[SORT_KEY] << {name => operator}
       return self
     end
 
     def fields *fields
-      @query['fields'] ||= []
-      fields.each { |field| @query['fields'] << field }
+      @query[FIELDS_KEY] ||= []
+      fields.each { |field| @query[FIELDS_KEY] << field }
       return self
     end
 
-    class << self
-      def build_equal_selector name, value
+    private
+
+    def build_equal_selector name, value
+      {
+        SELECTOR =>
         {
-          'selector' =>
-          {
-            name => value
-          },
+          name => value
         }
-      end
+      }
+    end
 
-      def build_inclusion_selector name, value
+    def build_inclusion_selector name, value
+      {
+        SELECTOR =>
         {
-          'selector' =>
-          {
-            name => {
-              "$in" => value
-            }
+          name => {
+            IN_OPERATOR => value
           }
         }
-      end
+      }
+    end
 
-      def build_greater_than_selector name, value
+    def build_greater_than_selector name, value
+      {
+        SELECTOR =>
         {
-          'selector' =>
-          {
-            name => {
-              "$gt" => value
-            }
+          name => {
+            GT_OPERATOR => value
           }
         }
-      end
+      }
+    end
 
-      def build_less_than_selector name, value
+    def build_less_than_selector name, value
+      {
+        SELECTOR =>
         {
-          'selector' =>
-          {
-            name => {
-              "$lt" => value
-            }
+          name => {
+            LT_OPERATOR => value
           }
         }
-      end
+      }
     end
   end
 end

From 99392468649cfa176041c03587226114bfd27081 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Tue, 10 Jan 2017 13:00:20 -0800
Subject: [PATCH 03/66] WIP

---
 lib/dolly/document.rb       | 19 ++++++++++++-------
 lib/dolly/mango_query.rb    |  4 ++--
 lib/dolly/scopes.rb         | 18 ------------------
 test/mango_document_test.rb | 25 +++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 27 deletions(-)
 delete mode 100644 lib/dolly/scopes.rb
 create mode 100644 test/mango_document_test.rb

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 1261b81..d5a1f46 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -150,14 +150,19 @@ def self.property *ary
       end
     end
 
-    def self.scope scope_name, scope
-      name = scope_name.to_sym
-      singleton_class.send(:define_method, name) do |*args|
-        if binding.receiver.is_a? self.class
-          query = Dolly::MangoQuery.new { scope.call *args }
+    class << self
+      def scope scope_name, scope
+        name = scope_name.to_sym
+        singleton_class.send(:define_method, name) do |*args|
+          scope.call *args
+        end
+      end
 
-        else binding.receiver.is?(Dolly::MangoQuery)
-          binding.receiver.instance_exec { scope.call *args}
+      def select name, operator, value
+        if binding.receiver.is_a? self.class
+          Dolly::MangoQuery.new(self).select name, operator, value
+        else
+          binding.receiver.select name, operator, value
         end
       end
     end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index cd85188..23f18f8 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -20,9 +20,9 @@ def select_operator_map
       }.freeze
     end
 
-    def initialize
+    def initialize proxy_class
+      @proxy_class = proxy_class
       @query = Hash.new
-      instance_eval { yield }
     end
 
     def select name, operator, value
diff --git a/lib/dolly/scopes.rb b/lib/dolly/scopes.rb
deleted file mode 100644
index bcb39fc..0000000
--- a/lib/dolly/scopes.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Dolly
-  module Scopes
-    extend ActiveSupport::Concern
-
-    included do
-      def scope name, options ={ }
-
-      end
-    end
-
-    class Scope
-      attr_reader :proxy_scope, :proxy_options
-      def initialize proxy_scope, options
-        @proxy_scope, @proxy_options = proxy_scope, proxy_options
-      end
-    end
-  end
-end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
new file mode 100644
index 0000000..99d1352
--- /dev/null
+++ b/test/mango_document_test.rb
@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class MangoDoc < Dolly::Document
+  property :year, :title
+
+  scope :by_year, ->(year) { select('year', :eq, year) }
+  scope :by_title, ->(title) { select('title', :eq, title) }
+end
+
+class MangoDocumentTest < ActiveSupport::TestCase
+  test 'responds to the scoped method' do
+    assert MangoDoc.respond_to? :by_year
+  end
+
+  test 'calling the scope builds the select query' do
+    expected = {"selector"=>{"year"=>2000}}
+    assert_equal expected, MangoDoc.by_year(2000).query
+  end
+
+  test 'the scopes are chainable' do
+    query = MangoDoc.by_title('A').by_year(2000).query
+    expected = {}
+    assert_equal expected, query
+  end
+end

From fffd31300d5da916624327506ca0f7738de5c120 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Tue, 10 Jan 2017 13:50:54 -0800
Subject: [PATCH 04/66] update test

---
 test/mango_document_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 99d1352..870b778 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -19,7 +19,7 @@ class MangoDocumentTest < ActiveSupport::TestCase
 
   test 'the scopes are chainable' do
     query = MangoDoc.by_title('A').by_year(2000).query
-    expected = {}
+    {"selector"=>{"year"=>2000, "title"=>"A"}}
     assert_equal expected, query
   end
 end

From c7e5002dd680faeebefbc396d36668d6aa5ab50f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 11 Jan 2017 11:12:21 -0800
Subject: [PATCH 05/66] change implementation to make scopes chainable

---
 lib/dolly/document.rb       | 16 +++++++---------
 test/mango_document_test.rb | 14 +++++++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index d5a1f46..5a1f7d4 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -2,6 +2,7 @@
 require "dolly/property"
 require 'dolly/timestamps'
 require "dolly/mango_query"
+require 'dolly/scope'
 
 module Dolly
   class Document
@@ -152,17 +153,14 @@ def self.property *ary
 
     class << self
       def scope scope_name, scope
+        self.scopes ||= {}
         name = scope_name.to_sym
-        singleton_class.send(:define_method, name) do |*args|
-          scope.call *args
-        end
-      end
+        self.scopes[name] = lambda { |proxy_scope| Dolly::Scope.new(proxy_scope, scope)}
 
-      def select name, operator, value
-        if binding.receiver.is_a? self.class
-          Dolly::MangoQuery.new(self).select name, operator, value
-        else
-          binding.receiver.select name, operator, value
+        (class << self; self end).instance_eval do
+          define_method name do |*args|
+            self.scopes[name].call(self)
+          end
         end
       end
     end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 870b778..b0a3203 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -5,21 +5,29 @@ class MangoDoc < Dolly::Document
 
   scope :by_year, ->(year) { select('year', :eq, year) }
   scope :by_title, ->(title) { select('title', :eq, title) }
+  scope :by_char, ->(char) { select('char', :eq, char) }
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
   test 'responds to the scoped method' do
     assert MangoDoc.respond_to? :by_year
+    assert MangoDoc.respond_to? :by_title
   end
 
   test 'calling the scope builds the select query' do
     expected = {"selector"=>{"year"=>2000}}
-    assert_equal expected, MangoDoc.by_year(2000).query
+    assert_equal expected, MangoDoc.by_year(2000)
   end
 
   test 'the scopes are chainable' do
-    query = MangoDoc.by_title('A').by_year(2000).query
-    {"selector"=>{"year"=>2000, "title"=>"A"}}
+    query = MangoDoc.by_title('A').by_year(2000)
+    expected = {"selector"=>{"year"=>2000, "title"=>"A"}}
+    assert_equal expected, query
+  end
+
+  test 'the scopes are chainable2' do
+    query = MangoDoc.by_title('A').by_year(2000).by_char('B')
+    expected = {"selector"=>{"year"=>2000, "title"=>"A"}}
     assert_equal expected, query
   end
 end

From c17b0265185e07c35a14ea60a8e95725d217ea94 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 11 Jan 2017 11:26:11 -0800
Subject: [PATCH 06/66] update tests

---
 test/mango_document_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index b0a3203..2181213 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -15,19 +15,19 @@ class MangoDocumentTest < ActiveSupport::TestCase
   end
 
   test 'calling the scope builds the select query' do
-    expected = {"selector"=>{"year"=>2000}}
+    expected = Object.new #currently using tests to see the scope composition.
     assert_equal expected, MangoDoc.by_year(2000)
   end
 
   test 'the scopes are chainable' do
     query = MangoDoc.by_title('A').by_year(2000)
-    expected = {"selector"=>{"year"=>2000, "title"=>"A"}}
+    expected = Object.new #currently using tests to see the scope composition.
     assert_equal expected, query
   end
 
   test 'the scopes are chainable2' do
     query = MangoDoc.by_title('A').by_year(2000).by_char('B')
-    expected = {"selector"=>{"year"=>2000, "title"=>"A"}}
+    expected = Object.new #currently using tests to see the scope composition.
     assert_equal expected, query
   end
 end

From 2aa8c5888833adf3c1fcbd8be0fc4f87f45265d7 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 11 Jan 2017 11:27:45 -0800
Subject: [PATCH 07/66] update doc

---
 lib/dolly/scope.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 lib/dolly/scope.rb

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
new file mode 100644
index 0000000..47d16e0
--- /dev/null
+++ b/lib/dolly/scope.rb
@@ -0,0 +1,17 @@
+module Dolly
+  class Scope
+    attr_reader :proxy_scope, :scope
+
+    def initialize proxy_scope, scope
+      @proxy_scope, @scope = proxy_scope, scope
+    end
+
+    def method_missing(method, *args, &block)
+      if proxy_scope.scopes.include?(method)
+        proxy_scope.scopes[method].call(self)
+      else
+        proxy_scope.send(method, *args)
+      end
+    end
+  end
+end

From a1859be0358d70593bb7078fc4363d0b344989cd Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 11 Jan 2017 16:07:17 -0800
Subject: [PATCH 08/66] pass query object amongst scope tree

---
 lib/dolly/document.rb       | 4 ++--
 lib/dolly/mango_query.rb    | 3 +--
 lib/dolly/scope.rb          | 8 ++++----
 test/mango_document_test.rb | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 5a1f7d4..d328b35 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -155,11 +155,11 @@ class << self
       def scope scope_name, scope
         self.scopes ||= {}
         name = scope_name.to_sym
-        self.scopes[name] = lambda { |proxy_scope| Dolly::Scope.new(proxy_scope, scope)}
+        self.scopes[name] = lambda { |proxy_scope, query_object| Dolly::Scope.new(proxy_scope, query_object, scope)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.scopes[name].call(self)
+            self.scopes[name].call(self, Dolly::MangoQuery.new)
           end
         end
       end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 23f18f8..9ec8758 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -20,8 +20,7 @@ def select_operator_map
       }.freeze
     end
 
-    def initialize proxy_class
-      @proxy_class = proxy_class
+    def initialize
       @query = Hash.new
     end
 
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 47d16e0..2cf384e 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -1,14 +1,14 @@
 module Dolly
   class Scope
-    attr_reader :proxy_scope, :scope
+    attr_reader :proxy_scope, :query_object, :scope
 
-    def initialize proxy_scope, scope
-      @proxy_scope, @scope = proxy_scope, scope
+    def initialize proxy_scope, query_object, scope
+      @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
     end
 
     def method_missing(method, *args, &block)
       if proxy_scope.scopes.include?(method)
-        proxy_scope.scopes[method].call(self)
+        proxy_scope.scopes[method].call(self, query_object)
       else
         proxy_scope.send(method, *args)
       end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 2181213..1711d9e 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class MangoDoc < Dolly::Document
-  property :year, :title
+  property :year, :title, :char
 
   scope :by_year, ->(year) { select('year', :eq, year) }
   scope :by_title, ->(title) { select('title', :eq, title) }

From 9bb1007ee62acc09143bb376825e39fc6d80d25a Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 11:18:50 -0800
Subject: [PATCH 09/66] update code wip

---
 lib/dolly/document.rb       |  4 ++--
 lib/dolly/mango_query.rb    |  4 ++--
 lib/dolly/scope.rb          | 15 ++++++++++++---
 test/mango_document_test.rb |  9 +++++----
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index d328b35..40cdff1 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -155,11 +155,11 @@ class << self
       def scope scope_name, scope
         self.scopes ||= {}
         name = scope_name.to_sym
-        self.scopes[name] = lambda { |proxy_scope, query_object| Dolly::Scope.new(proxy_scope, query_object, scope)}
+        self.scopes[name] = lambda { |proxy_scope, query_object, args| Dolly::Scope.new(proxy_scope, query_object, scope, args)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.scopes[name].call(self, Dolly::MangoQuery.new)
+            self.scopes[name].call(self, Dolly::MangoQuery.new, *args)
           end
         end
       end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 9ec8758..43a24e2 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -24,7 +24,7 @@ def initialize
       @query = Hash.new
     end
 
-    def select name, operator, value
+    def selector name, operator, value
       @query.deep_merge! select_operator_map[operator].call(name, value)
       return self
     end
@@ -42,7 +42,7 @@ def sort name, operator
 
     def fields *fields
       @query[FIELDS_KEY] ||= []
-      fields.each { |field| @query[FIELDS_KEY] << field }
+      @query[FIELDS_KEY].push *fields
       return self
     end
 
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 2cf384e..2ff837c 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -1,14 +1,23 @@
 module Dolly
   class Scope
-    attr_reader :proxy_scope, :query_object, :scope
+    attr_reader :proxy_scope, :query_object, :scope, :args
 
-    def initialize proxy_scope, query_object, scope
+    def initialize proxy_scope, query_object, scope, args
       @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
+      @args = args
+
+      scope.binding.local_variable_set(:self, @query_object)
+
+      puts scope.binding.eval('self')
+
+      query_object.instance_exec { scope.call *@args }
     end
 
     def method_missing(method, *args, &block)
       if proxy_scope.scopes.include?(method)
-        proxy_scope.scopes[method].call(self, query_object)
+        proxy_scope.scopes[method].call(self, query_object, args).tap do |s|
+          query_object.instance_exec { s.scope.call *args }
+        end
       else
         proxy_scope.send(method, *args)
       end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 1711d9e..0bc6d1b 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -3,9 +3,9 @@
 class MangoDoc < Dolly::Document
   property :year, :title, :char
 
-  scope :by_year, ->(year) { select('year', :eq, year) }
-  scope :by_title, ->(title) { select('title', :eq, title) }
-  scope :by_char, ->(char) { select('char', :eq, char) }
+  scope :by_year, ->(year) { selector('year', :eq, year) }
+  scope :by_title, ->(title) { selector('title', :eq, title) }
+  scope :by_char, ->(char) { selector('char', :eq, char) }
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
@@ -20,7 +20,8 @@ class MangoDocumentTest < ActiveSupport::TestCase
   end
 
   test 'the scopes are chainable' do
-    query = MangoDoc.by_title('A').by_year(2000)
+    query = MangoDoc.by_title('A')
+                    .by_year(2000)
     expected = Object.new #currently using tests to see the scope composition.
     assert_equal expected, query
   end

From cc4701b68f41696916df20aec057528453183f5e Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 11:21:16 -0800
Subject: [PATCH 10/66] try to bind query object as self

---
 lib/dolly/scope.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 2ff837c..75dbb95 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -6,11 +6,9 @@ def initialize proxy_scope, query_object, scope, args
       @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
       @args = args
 
-      scope.binding.local_variable_set(:self, @query_object)
+      scope.binding.local_variable_set('self', @query_object)
 
       puts scope.binding.eval('self')
-
-      query_object.instance_exec { scope.call *@args }
     end
 
     def method_missing(method, *args, &block)

From f9e261982383a18676b01a4fa574f48c8d2126ad Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 11:57:28 -0800
Subject: [PATCH 11/66] composed query object

---
 lib/dolly/scope.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 75dbb95..986d105 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -6,16 +6,12 @@ def initialize proxy_scope, query_object, scope, args
       @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
       @args = args
 
-      scope.binding.local_variable_set('self', @query_object)
-
-      puts scope.binding.eval('self')
+      query_object.instance_exec(*args, &scope)
     end
 
     def method_missing(method, *args, &block)
       if proxy_scope.scopes.include?(method)
-        proxy_scope.scopes[method].call(self, query_object, args).tap do |s|
-          query_object.instance_exec { s.scope.call *args }
-        end
+        proxy_scope.scopes[method].call(self, query_object, args)
       else
         proxy_scope.send(method, *args)
       end

From 3cff807a3362640a168ebfe32e5df7e819e0106f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 12:00:10 -0800
Subject: [PATCH 12/66] passing tests

---
 lib/dolly/scope.rb          |  2 ++
 test/mango_document_test.rb | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 986d105..7fb509e 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -2,6 +2,8 @@ module Dolly
   class Scope
     attr_reader :proxy_scope, :query_object, :scope, :args
 
+    delegate :query, to: :query_object
+
     def initialize proxy_scope, query_object, scope, args
       @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
       @args = args
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 0bc6d1b..78ecfc4 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -15,20 +15,21 @@ class MangoDocumentTest < ActiveSupport::TestCase
   end
 
   test 'calling the scope builds the select query' do
-    expected = Object.new #currently using tests to see the scope composition.
-    assert_equal expected, MangoDoc.by_year(2000)
+    expected = {"selector"=>{"year"=>2000}}
+    assert_equal expected, MangoDoc.by_year(2000).query
   end
 
   test 'the scopes are chainable' do
     query = MangoDoc.by_title('A')
                     .by_year(2000)
-    expected = Object.new #currently using tests to see the scope composition.
+                    .query
+    expected = {"selector"=>{"title"=>"A", "year"=>2000}}
     assert_equal expected, query
   end
 
   test 'the scopes are chainable2' do
-    query = MangoDoc.by_title('A').by_year(2000).by_char('B')
-    expected = Object.new #currently using tests to see the scope composition.
+    query = MangoDoc.by_title('A').by_year(2000).by_char('B').query
+    expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}
     assert_equal expected, query
   end
 end

From 893703ee93699718177bf044336379385c289df2 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 12:00:50 -0800
Subject: [PATCH 13/66] format tests better

---
 test/mango_document_test.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 78ecfc4..03c1ff5 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -15,21 +15,23 @@ class MangoDocumentTest < ActiveSupport::TestCase
   end
 
   test 'calling the scope builds the select query' do
+    query = MangoDoc.by_year(2000).query
     expected = {"selector"=>{"year"=>2000}}
-    assert_equal expected, MangoDoc.by_year(2000).query
+
+    assert_equal expected, query
   end
 
   test 'the scopes are chainable' do
-    query = MangoDoc.by_title('A')
-                    .by_year(2000)
-                    .query
+    query = MangoDoc.by_title('A').by_year(2000).query
     expected = {"selector"=>{"title"=>"A", "year"=>2000}}
+
     assert_equal expected, query
   end
 
   test 'the scopes are chainable2' do
     query = MangoDoc.by_title('A').by_year(2000).by_char('B').query
     expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}
+
     assert_equal expected, query
   end
 end

From 952e422df66cdfe5216e6b76b3704af21ae96397 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 12:38:08 -0800
Subject: [PATCH 14/66] update tests

---
 lib/dolly/mango_query.rb | 10 ++++------
 test/document_test.rb    | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 43a24e2..8076cf6 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -1,8 +1,6 @@
 module Dolly
   class MangoQuery
 
-    attr_reader :query
-
     SELECTOR = 'selector'.freeze
     IN_OPERATOR = '$in'.freeze
     GT_OPERATOR = '$gt'.freeze
@@ -26,24 +24,24 @@ def initialize
 
     def selector name, operator, value
       @query.deep_merge! select_operator_map[operator].call(name, value)
-      return self
     end
 
     def limit value
       @query[LIMIT_KEY] = value
-      return self
     end
 
     def sort name, operator
       @query[SORT_KEY] ||= []
       @query[SORT_KEY] << {name => operator}
-      return self
     end
 
     def fields *fields
       @query[FIELDS_KEY] ||= []
       @query[FIELDS_KEY].push *fields
-      return self
+    end
+
+    def query
+      @query
     end
 
     private
diff --git a/test/document_test.rb b/test/document_test.rb
index f1c9cfe..2f5d0a9 100644
--- a/test/document_test.rb
+++ b/test/document_test.rb
@@ -62,6 +62,7 @@ def setup
     all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
 
     view_resp   = build_view_response [data]
+
     empty_resp  =  build_view_response []
     not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]
     @multi_resp = build_view_response all_docs
@@ -72,17 +73,17 @@ def setup
     build_request [["foo_bar","1"],["foo_bar","2"]], @multi_resp
 
     #TODO: Mock Dolly::Request to return helper with expected response. request builder can be tested by itself.
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&descending=true&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%22%2C%7B%7D&limit=2&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=2&descending=true&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%5D&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", body: not_found_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Ferror%22%5D&include_docs=true", body: 'error', status: ["500", "Error"]
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true", body: build_view_response([data.merge(other_property: 'other')]).to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&include_docs=true", body: view_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=1&descending=true&include_docs=true", body: view_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%22%2C%7B%7D&limit=2&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%22&limit=2&descending=true&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%5D&include_docs=true", body: view_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", body: not_found_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Ferror%22%5D&include_docs=true", body: 'error', status: ["500", "Error"], content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true", body: build_view_response([data.merge(other_property: 'other')]).to_json, content_type: "application/json"
   end
 
   test 'new in memory document' do
@@ -182,7 +183,7 @@ def setup
   test 'reload reloads the doc attribute from database' do
     assert foo = FooBar.find('1')
     expected_doc = foo.doc.dup
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json, content_type: "application/json"
     assert foo.foo = 1
     assert_not_equal expected_doc, foo.doc
     assert foo.reload
@@ -196,7 +197,7 @@ def setup
     assert foo.foo = 1
     assert foo.save
     assert expected_doc = foo.doc
-    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F0%22%5D&include_docs=true", body: build_view_response([expected_doc]).to_json, content_type: "application/json"
     assert foo.reload
     assert_equal 1, foo.foo
   end

From 925d3eb16f19e8a51996ea2f6ee017bcc3366703 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 14:53:57 -0800
Subject: [PATCH 15/66] update

---
 lib/dolly/request.rb        |  1 +
 test/mango_document_test.rb | 39 ++++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/dolly/request.rb b/lib/dolly/request.rb
index d6ddaaf..9c5ca31 100644
--- a/lib/dolly/request.rb
+++ b/lib/dolly/request.rb
@@ -54,6 +54,7 @@ def protocol
     end
 
     def uuids opts = {}
+      puts tools("_uuids", opts)["uuids"]
       tools("_uuids", opts)["uuids"]
     end
 
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 03c1ff5..a084b97 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -9,29 +9,32 @@ class MangoDoc < Dolly::Document
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
-  test 'responds to the scoped method' do
-    assert MangoDoc.respond_to? :by_year
-    assert MangoDoc.respond_to? :by_title
-  end
 
-  test 'calling the scope builds the select query' do
-    query = MangoDoc.by_year(2000).query
-    expected = {"selector"=>{"year"=>2000}}
+  class QueryIsBuiltTest < MangoDocumentTest
+    test 'responds to the scoped method' do
+      assert MangoDoc.respond_to? :by_year
+      assert MangoDoc.respond_to? :by_title
+    end
 
-    assert_equal expected, query
-  end
+    test 'calling the scope builds the select query' do
+      query = MangoDoc.by_year(2000).query
+      expected = {"selector"=>{"year"=>2000}}
 
-  test 'the scopes are chainable' do
-    query = MangoDoc.by_title('A').by_year(2000).query
-    expected = {"selector"=>{"title"=>"A", "year"=>2000}}
+      assert_equal expected, query
+    end
 
-    assert_equal expected, query
-  end
+    test 'the scopes are chainable' do
+      query = MangoDoc.by_title('A').by_year(2000).query
+      expected = {"selector"=>{"title"=>"A", "year"=>2000}}
+
+      assert_equal expected, query
+    end
 
-  test 'the scopes are chainable2' do
-    query = MangoDoc.by_title('A').by_year(2000).by_char('B').query
-    expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}
+    test 'the scopes are chainable2' do
+      query = MangoDoc.by_title('A').by_year(2000).by_char('B').query
+      expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}
 
-    assert_equal expected, query
+      assert_equal expected, query
+    end
   end
 end

From f9152b5179fb74f0dc8d73c681cee42a945d9a14 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 15:12:34 -0800
Subject: [PATCH 16/66] passing tests

---
 lib/dolly/request.rb  |  3 +--
 test/document_test.rb | 15 ++-------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/lib/dolly/request.rb b/lib/dolly/request.rb
index 9c5ca31..311278d 100644
--- a/lib/dolly/request.rb
+++ b/lib/dolly/request.rb
@@ -54,8 +54,7 @@ def protocol
     end
 
     def uuids opts = {}
-      puts tools("_uuids", opts)["uuids"]
-      tools("_uuids", opts)["uuids"]
+      JSON.parse(tools("_uuids", opts))['uuids']
     end
 
     def all_docs data = {}
diff --git a/test/document_test.rb b/test/document_test.rb
index 2f5d0a9..23cc5a2 100644
--- a/test/document_test.rb
+++ b/test/document_test.rb
@@ -62,6 +62,7 @@ def setup
     all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
 
     view_resp   = build_view_response [data]
+    uuid_resp   = {"uuids":["ec68ef07faf8157e568b0913e74b0e1a"]}
 
     empty_resp  =  build_view_response []
     not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]
@@ -84,6 +85,7 @@ def setup
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json, content_type: "application/json"
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true", body: build_view_response([data.merge(other_property: 'other')]).to_json, content_type: "application/json"
+    FakeWeb.register_uri :get, "http://localhost:5984/_uuids", body: uuid_resp.to_json
   end
 
   test 'new in memory document' do
@@ -306,19 +308,6 @@ def setup
     assert_equal "foo_bar/b", bar.id
   end
 
-  test 'new document with no id' do
-    foo = FooBar.new
-    uuid = %r{
-      \A
-      foo_bar /
-      \h{8}    # 8 hex chars
-      (?: - \h{4} ){3}  # 3 groups of 4 hex chars (hyphen sep)
-      - \h{12}  # 12 hex chars (hyphen sep again)
-      \Z
-    }x
-    assert foo.id.match(uuid)
-  end
-
   test 'update document properties' do
     foo = FooBar.new 'id' => 'a', foo: 'ab', bar: 'ba'
     assert_equal 'ab', foo.foo

From 9997a31343de47ca28f0d32be4f6248cdd0d186e Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 15:22:56 -0800
Subject: [PATCH 17/66] clean up code

---
 lib/dolly/document.rb    |  4 ++--
 lib/dolly/mango_query.rb |  5 ++++-
 lib/dolly/request.rb     |  5 +++++
 lib/dolly/scope.rb       | 13 +++++++------
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 40cdff1..1a1f568 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -155,11 +155,11 @@ class << self
       def scope scope_name, scope
         self.scopes ||= {}
         name = scope_name.to_sym
-        self.scopes[name] = lambda { |proxy_scope, query_object, args| Dolly::Scope.new(proxy_scope, query_object, scope, args)}
+        self.scopes[name] = lambda { |query_object, args| Dolly::Scope.new(query_object, scope, args)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.scopes[name].call(self, Dolly::MangoQuery.new, *args)
+            self.scopes[name].call(Dolly::MangoQuery.new(self), *args)
           end
         end
       end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 8076cf6..c68a1f0 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -9,6 +9,8 @@ class MangoQuery
     SORT_KEY = 'sort'.freeze
     LIMIT_KEY = 'limit'.freeze
 
+    attr_reader :proxy_class
+
     def select_operator_map
       {
         eq:    ->(name, value) { build_equal_selector name, value },
@@ -18,7 +20,8 @@ def select_operator_map
       }.freeze
     end
 
-    def initialize
+    def initialize proxy_class
+      @proxy_class = proxy_class
       @query = Hash.new
     end
 
diff --git a/lib/dolly/request.rb b/lib/dolly/request.rb
index 311278d..9d09d46 100644
--- a/lib/dolly/request.rb
+++ b/lib/dolly/request.rb
@@ -7,6 +7,7 @@ class Request
     include HTTParty
     DEFAULT_HOST = 'localhost'
     DEFAULT_PORT = '5984'
+    MANGO_QUERY = '_find'.freeze
 
     attr_accessor :database_name, :host, :port, :bulk_document
 
@@ -44,6 +45,10 @@ def delete resource
       request :delete, full_path(resource), {}
     end
 
+    def mango data
+      request :post, full_path(MANGO_QUERY), {body: data}
+    end
+
     def attach resource, attachment_name, data, headers = {}
       data = StringIO.new(data) if data.is_a?(String)
       request :put, attachment_path(resource, attachment_name), {body: data, headers: headers}
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 7fb509e..db61d82 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -2,20 +2,21 @@ module Dolly
   class Scope
     attr_reader :proxy_scope, :query_object, :scope, :args
 
-    delegate :query, to: :query_object
+    delegate :query, :proxy_class, to: :query_object
 
-    def initialize proxy_scope, query_object, scope, args
-      @proxy_scope, @query_object, @scope = proxy_scope, query_object, scope
+    def initialize query_object, scope, args
+      @query_object, @scope = query_object, scope
       @args = args
 
       query_object.instance_exec(*args, &scope)
     end
 
     def method_missing(method, *args, &block)
-      if proxy_scope.scopes.include?(method)
-        proxy_scope.scopes[method].call(self, query_object, args)
+      if proxy_class.scopes.include?(method)
+        proxy_class.scopes[method].call(query_object, args)
       else
-        proxy_scope.send(method, *args)
+        collection = proxy_class.database.mango query.to_json
+        collection.send(method, *args, &block)
       end
     end
   end

From a3464a6e0cf96ff6b3b7bd2884d665ef22a7cd3f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 15:25:55 -0800
Subject: [PATCH 18/66] fix test for travis

---
 test/document_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/document_test.rb b/test/document_test.rb
index 23cc5a2..e838ebf 100644
--- a/test/document_test.rb
+++ b/test/document_test.rb
@@ -62,7 +62,7 @@ def setup
     all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
 
     view_resp   = build_view_response [data]
-    uuid_resp   = {"uuids":["ec68ef07faf8157e568b0913e74b0e1a"]}
+    uuid_resp   = {"uuids" => ["ec68ef07faf8157e568b0913e74b0e1a"]}
 
     empty_resp  =  build_view_response []
     not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]

From 37cd35e50e2b53a76e09b87c052046028d200a78 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 16:15:25 -0800
Subject: [PATCH 19/66] change args so as not to conflict with method missing
 args

---
 lib/dolly/scope.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index db61d82..b533f2b 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -1,14 +1,14 @@
 module Dolly
   class Scope
-    attr_reader :proxy_scope, :query_object, :scope, :args
+    attr_reader :query_object, :scope, :scope_args
 
     delegate :query, :proxy_class, to: :query_object
 
-    def initialize query_object, scope, args
+    def initialize query_object, scope, scope_args
       @query_object, @scope = query_object, scope
-      @args = args
+      @scope_args = scope_args
 
-      query_object.instance_exec(*args, &scope)
+      query_object.instance_exec(*scope_args, &scope)
     end
 
     def method_missing(method, *args, &block)

From 5d2b941655b8f83ab45ff8f72f6439f9c9b3178b Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 12 Jan 2017 17:13:39 -0800
Subject: [PATCH 20/66] add more tests to flesh out the api

---
 test/mango_document_test.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index a084b97..e5106bb 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -2,10 +2,13 @@
 
 class MangoDoc < Dolly::Document
   property :year, :title, :char
+  timestamps!
 
   scope :by_year, ->(year) { selector('year', :eq, year) }
   scope :by_title, ->(title) { selector('title', :eq, title) }
   scope :by_char, ->(char) { selector('char', :eq, char) }
+  scope :recent, -> { selector('created_at', :gt, 1.year.ago.to_s )}
+  scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
@@ -36,5 +39,19 @@ class QueryIsBuiltTest < MangoDocumentTest
 
       assert_equal expected, query
     end
+
+    test 'greater than selector builds query correctly' do
+      query = MangoDoc.by_title('A').recent.query
+      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$gt"=>1.year.ago.to_s}}}
+
+      assert_equal expected, query
+    end
+
+    test 'less than selector builds query correctly' do
+      query = MangoDoc.by_title('A').old.query
+      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$lt"=>1.year.ago.to_s}}}
+
+      assert_equal expected, query
+    end
   end
 end

From 4c8a7f004e02b7057b3b54071267a1ec3affea02 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 13 Jan 2017 09:53:00 -0800
Subject: [PATCH 21/66] more dynamic test

---
 test/mango_document_test.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index e5106bb..ac8302a 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -15,8 +15,9 @@ class MangoDocumentTest < ActiveSupport::TestCase
 
   class QueryIsBuiltTest < MangoDocumentTest
     test 'responds to the scoped method' do
-      assert MangoDoc.respond_to? :by_year
-      assert MangoDoc.respond_to? :by_title
+      MangoDoc.scopes.keys.each do |k|
+        assert MangoDoc.respond_to? k
+      end
     end
 
     test 'calling the scope builds the select query' do

From 58db538eba824ec2bc2d8c733bff85bd42a22d5a Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 13 Jan 2017 10:51:26 -0800
Subject: [PATCH 22/66] respond to comments, add some tests, and refactor

---
 lib/dolly/request.rb        |  2 +-
 lib/dolly/scope.rb          | 26 ++++++++++++++++++++++++--
 test/document_test.rb       |  2 +-
 test/mango_document_test.rb |  8 ++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/lib/dolly/request.rb b/lib/dolly/request.rb
index 9d09d46..9caa5b7 100644
--- a/lib/dolly/request.rb
+++ b/lib/dolly/request.rb
@@ -59,7 +59,7 @@ def protocol
     end
 
     def uuids opts = {}
-      JSON.parse(tools("_uuids", opts))['uuids']
+      tools("_uuids", opts)["uuids"]
     end
 
     def all_docs data = {}
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index b533f2b..bb31439 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -2,22 +2,44 @@ module Dolly
   class Scope
     attr_reader :query_object, :scope, :scope_args
 
-    delegate :query, :proxy_class, to: :query_object
+    delegate :proxy_class, to: :query_object
 
     def initialize query_object, scope, scope_args
       @query_object, @scope = query_object, scope
       @scope_args = scope_args
+    end
+
+    def not
+
+    end
+
+    def and
 
-      query_object.instance_exec(*scope_args, &scope)
+    end
+
+    def or
+
+    end
+
+    def query
+      evaluate_scope
     end
 
     def method_missing(method, *args, &block)
       if proxy_class.scopes.include?(method)
+        evaluate_scope
         proxy_class.scopes[method].call(query_object, args)
       else
+        evaluate_scope
         collection = proxy_class.database.mango query.to_json
         collection.send(method, *args, &block)
       end
     end
+
+    private
+
+    def evaluate_scope
+      query_object.instance_exec(*scope_args, &scope)
+    end
   end
 end
diff --git a/test/document_test.rb b/test/document_test.rb
index e838ebf..fbfda93 100644
--- a/test/document_test.rb
+++ b/test/document_test.rb
@@ -85,7 +85,7 @@ def setup
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json, content_type: "application/json"
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json, content_type: "application/json"
     FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Fbig_doc%22%5D&include_docs=true", body: build_view_response([data.merge(other_property: 'other')]).to_json, content_type: "application/json"
-    FakeWeb.register_uri :get, "http://localhost:5984/_uuids", body: uuid_resp.to_json
+    FakeWeb.register_uri :get, "http://localhost:5984/_uuids", body: uuid_resp.to_json, content_type: "application/json"
   end
 
   test 'new in memory document' do
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index ac8302a..2497a09 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -2,6 +2,7 @@
 
 class MangoDoc < Dolly::Document
   property :year, :title, :char
+  property :visible_to, class_name: Hash, default: Hash.new
   timestamps!
 
   scope :by_year, ->(year) { selector('year', :eq, year) }
@@ -9,6 +10,7 @@ class MangoDoc < Dolly::Document
   scope :by_char, ->(char) { selector('char', :eq, char) }
   scope :recent, -> { selector('created_at', :gt, 1.year.ago.to_s )}
   scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
+  scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
@@ -54,5 +56,11 @@ class QueryIsBuiltTest < MangoDocumentTest
 
       assert_equal expected, query
     end
+
+    test 'selector can handle nested json object querys' do
+      query = MangoDoc.by_visible_to_schools('some_id').query
+      expected = {"selector"=>{"visible_to.schools"=>"some_id"}}
+      assert_equal expected, query
+    end
   end
 end

From c9f330e77a3e564066357f608fecf735a3f72173 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 13 Jan 2017 10:56:11 -0800
Subject: [PATCH 23/66] remove some additional changes

---
 lib/dolly/mango_query.rb |  6 +-----
 lib/dolly/scope.rb       | 19 +------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index c68a1f0..2ea78bb 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -9,7 +9,7 @@ class MangoQuery
     SORT_KEY = 'sort'.freeze
     LIMIT_KEY = 'limit'.freeze
 
-    attr_reader :proxy_class
+    attr_reader :proxy_class, :query
 
     def select_operator_map
       {
@@ -43,10 +43,6 @@ def fields *fields
       @query[FIELDS_KEY].push *fields
     end
 
-    def query
-      @query
-    end
-
     private
 
     def build_equal_selector name, value
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index bb31439..0c5da44 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -2,35 +2,18 @@ module Dolly
   class Scope
     attr_reader :query_object, :scope, :scope_args
 
-    delegate :proxy_class, to: :query_object
+    delegate :proxy_class, :query, to: :query_object
 
     def initialize query_object, scope, scope_args
       @query_object, @scope = query_object, scope
       @scope_args = scope_args
-    end
-
-    def not
-
-    end
-
-    def and
-
-    end
-
-    def or
-
-    end
-
-    def query
       evaluate_scope
     end
 
     def method_missing(method, *args, &block)
       if proxy_class.scopes.include?(method)
-        evaluate_scope
         proxy_class.scopes[method].call(query_object, args)
       else
-        evaluate_scope
         collection = proxy_class.database.mango query.to_json
         collection.send(method, *args, &block)
       end

From dfbfb3d3bfca03677c7aa36f6700a9b9c96d30aa Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 13 Jan 2017 14:55:43 -0800
Subject: [PATCH 24/66] add a autovivifying hash to simplify query building
 methods

---
 lib/dolly/mango_query.rb    | 54 +++++++++++++++----------------------
 test/mango_document_test.rb | 34 ++++++++++++++---------
 2 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 2ea78bb..5289f6a 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -2,9 +2,11 @@ module Dolly
   class MangoQuery
 
     SELECTOR = 'selector'.freeze
+    EQ_OPERATOR = '$eq'
     IN_OPERATOR = '$in'.freeze
     GT_OPERATOR = '$gt'.freeze
     LT_OPERATOR = '$lt'.freeze
+    EM_OPERATOR = '$elemMatch'.freeze
     FIELDS_KEY = 'fields'.freeze
     SORT_KEY = 'sort'.freeze
     LIMIT_KEY = 'limit'.freeze
@@ -17,16 +19,20 @@ def select_operator_map
         in:    ->(name, value) { build_inclusion_selector name, value },
         gt:    ->(name, value) { build_greater_than_selector name, value },
         lt:    ->(name, value) { build_less_than_selector name, value },
+        em:    ->(name, value) { build_element_match_selector name, value },
+        [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value}
       }.freeze
     end
 
     def initialize proxy_class
       @proxy_class = proxy_class
-      @query = Hash.new
+      @query = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
+      @query.compare_by_identity
     end
 
-    def selector name, operator, value
-      @query.deep_merge! select_operator_map[operator].call(name, value)
+    def selector name, *operator, value
+      operator = operator.count > 1 ? operator : operator.first
+      select_operator_map[operator].call(name, value)
     end
 
     def limit value
@@ -46,45 +52,27 @@ def fields *fields
     private
 
     def build_equal_selector name, value
-      {
-        SELECTOR =>
-        {
-          name => value
-        }
-      }
+      @query[SELECTOR][name] = value
+    end
+
+    def build_element_match_selector name, value
+      @query[SELECTOR][name][EM_OPERATOR] = value
+    end
+
+    def build_element_match_greater_than_selector name, value
+      @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
     end
 
     def build_inclusion_selector name, value
-      {
-        SELECTOR =>
-        {
-          name => {
-            IN_OPERATOR => value
-          }
-        }
-      }
+      @query[SELECTOR][name][IN_OPERATOR] = value
     end
 
     def build_greater_than_selector name, value
-      {
-        SELECTOR =>
-        {
-          name => {
-            GT_OPERATOR => value
-          }
-        }
-      }
+      @query[SELECTOR][name][GT_OPERATOR] = value
     end
 
     def build_less_than_selector name, value
-      {
-        SELECTOR =>
-        {
-          name => {
-            LT_OPERATOR => value
-          }
-        }
-      }
+      @query[SELECTOR][name][LT_OPERATOR] = value
     end
   end
 end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 2497a09..8503d0e 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -3,6 +3,7 @@
 class MangoDoc < Dolly::Document
   property :year, :title, :char
   property :visible_to, class_name: Hash, default: Hash.new
+  property :default_collection, class_name: Array, default: Array.new
   timestamps!
 
   scope :by_year, ->(year) { selector('year', :eq, year) }
@@ -11,6 +12,7 @@ class MangoDoc < Dolly::Document
   scope :recent, -> { selector('created_at', :gt, 1.year.ago.to_s )}
   scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
   scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
+  scope :collection_items_greater_than, -> (item) { selector('default_collection', :em, :gt, item)}
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
@@ -18,48 +20,54 @@ class MangoDocumentTest < ActiveSupport::TestCase
   class QueryIsBuiltTest < MangoDocumentTest
     test 'responds to the scoped method' do
       MangoDoc.scopes.keys.each do |k|
-        assert MangoDoc.respond_to? k
+        assert_respond_to MangoDoc, k
       end
     end
 
     test 'calling the scope builds the select query' do
-      query = MangoDoc.by_year(2000).query
-      expected = {"selector"=>{"year"=>2000}}
+      query = MangoDoc.by_year(2000).query.to_json
+      expected = {"selector"=>{"year"=>2000}}.to_json
 
       assert_equal expected, query
     end
 
     test 'the scopes are chainable' do
-      query = MangoDoc.by_title('A').by_year(2000).query
-      expected = {"selector"=>{"title"=>"A", "year"=>2000}}
+      query = MangoDoc.by_title('A').by_year(2000).query.to_json
+      expected = {"selector"=>{"title"=>"A", "year"=>2000}}.to_json
 
       assert_equal expected, query
     end
 
     test 'the scopes are chainable2' do
-      query = MangoDoc.by_title('A').by_year(2000).by_char('B').query
-      expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}
+      query = MangoDoc.by_title('A').by_year(2000).by_char('B').query.to_json
+      expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}.to_json
 
       assert_equal expected, query
     end
 
     test 'greater than selector builds query correctly' do
-      query = MangoDoc.by_title('A').recent.query
-      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$gt"=>1.year.ago.to_s}}}
+      query = MangoDoc.by_title('A').recent.query.to_json
+      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$gt"=>1.year.ago.to_s}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'less than selector builds query correctly' do
-      query = MangoDoc.by_title('A').old.query
-      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$lt"=>1.year.ago.to_s}}}
+      query = MangoDoc.by_title('A').old.query.to_json
+      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$lt"=>1.year.ago.to_s}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'selector can handle nested json object querys' do
-      query = MangoDoc.by_visible_to_schools('some_id').query
-      expected = {"selector"=>{"visible_to.schools"=>"some_id"}}
+      query = MangoDoc.by_visible_to_schools('some_id').query.to_json
+      expected = {"selector"=>{"visible_to.schools"=>"some_id"}}.to_json
+      assert_equal expected, query
+    end
+
+    test 'selector can handle multiple operators' do
+      query = MangoDoc.collection_items_greater_than(1).query.to_json
+      expected = {"selector"=>{"default_collection"=>{"$elemMatch"=>{"$gt"=>1}}}}.to_json
       assert_equal expected, query
     end
   end

From b6490c40a4072dbe4a9b59ce1ef601d1c92c33fb Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 13 Jan 2017 16:33:58 -0800
Subject: [PATCH 25/66] better defined tests

---
 lib/dolly/mango/selector.rb |  7 +++++++
 lib/dolly/mango_query.rb    |  2 +-
 test/mango_document_test.rb | 27 +++++++++++++++++----------
 3 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 lib/dolly/mango/selector.rb

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
new file mode 100644
index 0000000..fc64330
--- /dev/null
+++ b/lib/dolly/mango/selector.rb
@@ -0,0 +1,7 @@
+module Dolly
+  module Mango
+    module Selector
+
+    end
+  end
+end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 5289f6a..3e1da68 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -52,7 +52,7 @@ def fields *fields
     private
 
     def build_equal_selector name, value
-      @query[SELECTOR][name] = value
+      @query[SELECTOR][name][EQ_OPERATOR] = value
     end
 
     def build_element_match_selector name, value
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 8503d0e..ac392a7 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -25,43 +25,50 @@ class QueryIsBuiltTest < MangoDocumentTest
     end
 
     test 'calling the scope builds the select query' do
-      query = MangoDoc.by_year(2000).query.to_json
-      expected = {"selector"=>{"year"=>2000}}.to_json
+      value = 2000
+      query = MangoDoc.by_year(value).query.to_json
+      expected = {"selector"=>{"year"=>{"$eq"=>value}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'the scopes are chainable' do
-      query = MangoDoc.by_title('A').by_year(2000).query.to_json
-      expected = {"selector"=>{"title"=>"A", "year"=>2000}}.to_json
+      title_value = 'A'
+      year_value = 2000
+      query = MangoDoc.by_title(title_value).by_year(year_value).query.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>title_value}, "year"=>{"$eq"=>year_value}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'the scopes are chainable2' do
-      query = MangoDoc.by_title('A').by_year(2000).by_char('B').query.to_json
-      expected = {"selector"=>{"title"=>"A", "year"=>2000, "char"=>"B"}}.to_json
+      title_value = 'A'
+      year_value = 2000
+      char_value = 'B'
+      query = MangoDoc.by_title(title_value).by_year(year_value).by_char(char_value).query.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>title_value}, "year"=>{"$eq"=>year_value}, "char"=>{"$eq"=>char_value}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'greater than selector builds query correctly' do
       query = MangoDoc.by_title('A').recent.query.to_json
-      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$gt"=>1.year.ago.to_s}}}.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>"A"}, "created_at"=>{"$gt"=>1.year.ago.to_s}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'less than selector builds query correctly' do
       query = MangoDoc.by_title('A').old.query.to_json
-      expected = {"selector"=>{"title"=>"A", "created_at"=>{"$lt"=>1.year.ago.to_s}}}.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>"A"}, "created_at"=>{"$lt"=>1.year.ago.to_s}}}.to_json
 
       assert_equal expected, query
     end
 
     test 'selector can handle nested json object querys' do
-      query = MangoDoc.by_visible_to_schools('some_id').query.to_json
-      expected = {"selector"=>{"visible_to.schools"=>"some_id"}}.to_json
+      value = "some_id"
+      query = MangoDoc.by_visible_to_schools(value).query.to_json
+      expected = {"selector"=>{"visible_to.schools"=>{"$eq"=>value}}}.to_json
       assert_equal expected, query
     end
 

From 09b174687f5d3425c5e0cef24e2791686eea06c7 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Tue, 17 Jan 2017 10:41:00 -0800
Subject: [PATCH 26/66] change macro method to mango_scope from scope

---
 lib/dolly/document.rb       | 10 +++++-----
 lib/dolly/scope.rb          |  4 ++--
 test/mango_document_test.rb | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 1a1f568..52cf5db 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -11,7 +11,7 @@ class Document
     extend Dolly::Timestamps
 
     attr_accessor :rows, :doc, :key
-    class_attribute :properties, :scopes
+    class_attribute :properties, :mango_scopes
     cattr_accessor :timestamps do
       {}
     end
@@ -152,14 +152,14 @@ def self.property *ary
     end
 
     class << self
-      def scope scope_name, scope
-        self.scopes ||= {}
+      def mango_scope scope_name, scope
+        self.mango_scopes ||= {}
         name = scope_name.to_sym
-        self.scopes[name] = lambda { |query_object, args| Dolly::Scope.new(query_object, scope, args)}
+        self.mango_scopes[name] = lambda { |query_object, args| Dolly::Scope.new(query_object, scope, args)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.scopes[name].call(Dolly::MangoQuery.new(self), *args)
+            self.mango_scopes[name].call(Dolly::MangoQuery.new(self), *args)
           end
         end
       end
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 0c5da44..fd1dac7 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -11,8 +11,8 @@ def initialize query_object, scope, scope_args
     end
 
     def method_missing(method, *args, &block)
-      if proxy_class.scopes.include?(method)
-        proxy_class.scopes[method].call(query_object, args)
+      if proxy_class.mango_scopes.include?(method)
+        proxy_class.mango_scopes[method].call(query_object, args)
       else
         collection = proxy_class.database.mango query.to_json
         collection.send(method, *args, &block)
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index ac392a7..66412f3 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -6,20 +6,20 @@ class MangoDoc < Dolly::Document
   property :default_collection, class_name: Array, default: Array.new
   timestamps!
 
-  scope :by_year, ->(year) { selector('year', :eq, year) }
-  scope :by_title, ->(title) { selector('title', :eq, title) }
-  scope :by_char, ->(char) { selector('char', :eq, char) }
-  scope :recent, -> { selector('created_at', :gt, 1.year.ago.to_s )}
-  scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
-  scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
-  scope :collection_items_greater_than, -> (item) { selector('default_collection', :em, :gt, item)}
+  mango_scope :by_year, ->(year) { selector('year', :eq, year) }
+  mango_scope :by_title, ->(title) { selector('title', :eq, title) }
+  mango_scope :by_char, ->(char) { selector('char', :eq, char) }
+  mango_scope :recent, -> { selector('created_at', :gt, 1.year.ago.to_s )}
+  mango_scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
+  mango_scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
+  mango_scope :collection_items_greater_than, -> (item) { selector('default_collection', :em, :gt, item)}
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
 
   class QueryIsBuiltTest < MangoDocumentTest
     test 'responds to the scoped method' do
-      MangoDoc.scopes.keys.each do |k|
+      MangoDoc.mango_scopes.keys.each do |k|
         assert_respond_to MangoDoc, k
       end
     end

From 42fa49c1cd9ed4eb6b783e848406697faad5b5e3 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 09:30:36 -0800
Subject: [PATCH 27/66] add more combination selectors

---
 lib/dolly/mango_query.rb    | 27 +++++++++++++---------
 test/mango_document_test.rb | 45 +++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 3e1da68..0709f87 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -1,15 +1,17 @@
 module Dolly
   class MangoQuery
 
-    SELECTOR = 'selector'.freeze
-    EQ_OPERATOR = '$eq'
-    IN_OPERATOR = '$in'.freeze
-    GT_OPERATOR = '$gt'.freeze
-    LT_OPERATOR = '$lt'.freeze
-    EM_OPERATOR = '$elemMatch'.freeze
-    FIELDS_KEY = 'fields'.freeze
-    SORT_KEY = 'sort'.freeze
-    LIMIT_KEY = 'limit'.freeze
+    SELECTOR     = 'selector'.freeze
+    EQ_OPERATOR  = '$eq'
+    IN_OPERATOR  = '$in'.freeze
+    GT_OPERATOR  = '$gt'.freeze
+    LT_OPERATOR  = '$lt'.freeze
+    OR_OPERATOR  = '$or'.freeze
+    AND_OPERATOR = '$and'.freeze
+    EM_OPERATOR  = '$elemMatch'.freeze
+    FIELDS_KEY   = 'fields'.freeze
+    SORT_KEY     = 'sort'.freeze
+    LIMIT_KEY    = 'limit'.freeze
 
     attr_reader :proxy_class, :query
 
@@ -20,7 +22,8 @@ def select_operator_map
         gt:    ->(name, value) { build_greater_than_selector name, value },
         lt:    ->(name, value) { build_less_than_selector name, value },
         em:    ->(name, value) { build_element_match_selector name, value },
-        [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value}
+        [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value },
+        [:em, :or] => ->(name, value) { build_element_match_or_selector name, value }
       }.freeze
     end
 
@@ -63,6 +66,10 @@ def build_element_match_greater_than_selector name, value
       @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
     end
 
+    def build_element_match_or_selector name, value
+      @query[SELECTOR][name][EM_OPERATOR][OR_OPERATOR] = value
+    end
+
     def build_inclusion_selector name, value
       @query[SELECTOR][name][IN_OPERATOR] = value
     end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 66412f3..5af7dfc 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -13,6 +13,10 @@ class MangoDoc < Dolly::Document
   mango_scope :old, -> { selector('created_at', :lt, 1.year.ago.to_s )}
   mango_scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
   mango_scope :collection_items_greater_than, -> (item) { selector('default_collection', :em, :gt, item)}
+
+  mango_scope :id_greater_than, ->(id) { selector('_id', :gt, id) }
+  mango_scope :support_date_greater_than, ->(date) { selector('support_date', :gt, date)}
+  mango_scope :generic_elematch_or, ->(field, item) { selector(field, :em, :or, item) }
 end
 
 class MangoDocumentTest < ActiveSupport::TestCase
@@ -77,5 +81,46 @@ class QueryIsBuiltTest < MangoDocumentTest
       expected = {"selector"=>{"default_collection"=>{"$elemMatch"=>{"$gt"=>1}}}}.to_json
       assert_equal expected, query
     end
+
+    test 'complex selector can be built' do
+      expected_query = {
+        "selector" => {
+          "_id" => {
+            "$gt" => nil
+          },
+          "support_type_date" => {
+            "$gt" => Date.today.to_s(:db)
+          },
+          "visible_to.schools" => {
+            "$elemMatch" => {
+              "$or" => ([] << "")
+            }
+          },
+          "visible_to.countries" => {
+            "$elemMatch" => {
+              "$or" => ([] << "")
+            }
+          },
+          "visible_to.programs" => {
+            "$elemMatch" => {
+              "$or" => ([] << "")
+            }
+          },
+          "visible_to.grades" => {
+            "$elemMatch" => {
+              "$or": ([] << "")
+            }
+          }
+        }
+      }.to_json
+      query = MangoDoc
+                .id_greater_than("")
+                .support_date_greater_than(Date.today.to_s(:db))
+                .generic_elematch_or('visible_to.schools', [] << "")
+                .generic_elematch_or('visible_to.countries', [] << "")
+                .generic_elematch_or('visible_to.programs', [] << "")
+                .generic_elematch_or('visible_to.grades', [] << "").query.to_json
+      assert expected_query, query
+    end
   end
 end

From 87aa9bfa832cf413d4251396fd0054f85abbf9c2 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 09:34:16 -0800
Subject: [PATCH 28/66] fix syntax error

---
 test/mango_document_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 5af7dfc..0f684c1 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -108,7 +108,7 @@ class QueryIsBuiltTest < MangoDocumentTest
           },
           "visible_to.grades" => {
             "$elemMatch" => {
-              "$or": ([] << "")
+              "$or" => ([] << "")
             }
           }
         }

From 179469d6cad77305887913b6c0f3e8566d72df93 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 09:39:32 -0800
Subject: [PATCH 29/66] reorganize mango query class with a selector module

---
 lib/dolly/mango/selector.rb | 58 +++++++++++++++++++++++++++++++++++++
 lib/dolly/mango_query.rb    | 56 ++---------------------------------
 2 files changed, 60 insertions(+), 54 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index fc64330..d9246a6 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -2,6 +2,64 @@ module Dolly
   module Mango
     module Selector
 
+      SELECTOR     = 'selector'.freeze
+      EQ_OPERATOR  = '$eq'
+      IN_OPERATOR  = '$in'.freeze
+      GT_OPERATOR  = '$gt'.freeze
+      LT_OPERATOR  = '$lt'.freeze
+      OR_OPERATOR  = '$or'.freeze
+      AND_OPERATOR = '$and'.freeze
+      EM_OPERATOR  = '$elemMatch'.freeze
+      FIELDS_KEY   = 'fields'.freeze
+      SORT_KEY     = 'sort'.freeze
+      LIMIT_KEY    = 'limit'.freeze
+
+      def select_operator_map
+        {
+          eq:    ->(name, value) { build_equal_selector name, value },
+          in:    ->(name, value) { build_inclusion_selector name, value },
+          gt:    ->(name, value) { build_greater_than_selector name, value },
+          lt:    ->(name, value) { build_less_than_selector name, value },
+          em:    ->(name, value) { build_element_match_selector name, value },
+          [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value },
+          [:em, :or] => ->(name, value) { build_element_match_or_selector name, value },
+          [:em, :and] => ->(name, value) { build_element_match_and_selector}
+        }.freeze
+      end
+
+      private
+
+      def build_equal_selector name, value
+        @query[SELECTOR][name][EQ_OPERATOR] = value
+      end
+
+      def build_element_match_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR] = value
+      end
+
+      def build_element_match_greater_than_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
+      end
+
+      def build_element_match_or_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][OR_OPERATOR] = value
+      end
+
+      def build_element_match_and_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][AND_OPERATOR] = value
+      end
+
+      def build_inclusion_selector name, value
+        @query[SELECTOR][name][IN_OPERATOR] = value
+      end
+
+      def build_greater_than_selector name, value
+        @query[SELECTOR][name][GT_OPERATOR] = value
+      end
+
+      def build_less_than_selector name, value
+        @query[SELECTOR][name][LT_OPERATOR] = value
+      end
     end
   end
 end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 0709f87..ff83b8b 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -1,32 +1,10 @@
+require 'dolly/mango/selector'
 module Dolly
   class MangoQuery
-
-    SELECTOR     = 'selector'.freeze
-    EQ_OPERATOR  = '$eq'
-    IN_OPERATOR  = '$in'.freeze
-    GT_OPERATOR  = '$gt'.freeze
-    LT_OPERATOR  = '$lt'.freeze
-    OR_OPERATOR  = '$or'.freeze
-    AND_OPERATOR = '$and'.freeze
-    EM_OPERATOR  = '$elemMatch'.freeze
-    FIELDS_KEY   = 'fields'.freeze
-    SORT_KEY     = 'sort'.freeze
-    LIMIT_KEY    = 'limit'.freeze
+    include Dolly::Mango::Selector
 
     attr_reader :proxy_class, :query
 
-    def select_operator_map
-      {
-        eq:    ->(name, value) { build_equal_selector name, value },
-        in:    ->(name, value) { build_inclusion_selector name, value },
-        gt:    ->(name, value) { build_greater_than_selector name, value },
-        lt:    ->(name, value) { build_less_than_selector name, value },
-        em:    ->(name, value) { build_element_match_selector name, value },
-        [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value },
-        [:em, :or] => ->(name, value) { build_element_match_or_selector name, value }
-      }.freeze
-    end
-
     def initialize proxy_class
       @proxy_class = proxy_class
       @query = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
@@ -51,35 +29,5 @@ def fields *fields
       @query[FIELDS_KEY] ||= []
       @query[FIELDS_KEY].push *fields
     end
-
-    private
-
-    def build_equal_selector name, value
-      @query[SELECTOR][name][EQ_OPERATOR] = value
-    end
-
-    def build_element_match_selector name, value
-      @query[SELECTOR][name][EM_OPERATOR] = value
-    end
-
-    def build_element_match_greater_than_selector name, value
-      @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
-    end
-
-    def build_element_match_or_selector name, value
-      @query[SELECTOR][name][EM_OPERATOR][OR_OPERATOR] = value
-    end
-
-    def build_inclusion_selector name, value
-      @query[SELECTOR][name][IN_OPERATOR] = value
-    end
-
-    def build_greater_than_selector name, value
-      @query[SELECTOR][name][GT_OPERATOR] = value
-    end
-
-    def build_less_than_selector name, value
-      @query[SELECTOR][name][LT_OPERATOR] = value
-    end
   end
 end

From d3c840079850cd84d1dcc0ad502cddc1782304ab Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 10:00:06 -0800
Subject: [PATCH 30/66] add more selectors to the selector table

---
 lib/dolly/mango/selector.rb | 29 ++++++++++++++++++++++++++---
 lib/dolly/mango_query.rb    |  4 ++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index d9246a6..4064045 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -3,12 +3,15 @@ module Mango
     module Selector
 
       SELECTOR     = 'selector'.freeze
-      EQ_OPERATOR  = '$eq'
+      EQ_OPERATOR  = '$eq'.freeze
+      NE_OPERATOR  = '$ne'.freeze
       IN_OPERATOR  = '$in'.freeze
       GT_OPERATOR  = '$gt'.freeze
       LT_OPERATOR  = '$lt'.freeze
       OR_OPERATOR  = '$or'.freeze
       AND_OPERATOR = '$and'.freeze
+      GTE_OPERATOR = '$gte'.freeze
+      LTE_OPERATOR = '$lte'.freeze
       EM_OPERATOR  = '$elemMatch'.freeze
       FIELDS_KEY   = 'fields'.freeze
       SORT_KEY     = 'sort'.freeze
@@ -17,11 +20,15 @@ module Selector
       def select_operator_map
         {
           eq:    ->(name, value) { build_equal_selector name, value },
+          ne:    ->(name, value) { build_not_equal_selector name, value },
           in:    ->(name, value) { build_inclusion_selector name, value },
           gt:    ->(name, value) { build_greater_than_selector name, value },
           lt:    ->(name, value) { build_less_than_selector name, value },
           em:    ->(name, value) { build_element_match_selector name, value },
-          [:em, :gt] => ->(name, value) { build_element_match_greater_than_selector name, value },
+          [:em, :gt] => ->(name, value) { build_element_match_gt_selector name, value },
+          [:em, :gte] => ->(name, value) { build_element_match_gte_selector name, value },
+          [:em, :lt] => ->(name, value) { build_element_match_lt_selector name, value },
+          [:em, :lte] => ->(name, value) { build_element_match_lte_selector name, value },
           [:em, :or] => ->(name, value) { build_element_match_or_selector name, value },
           [:em, :and] => ->(name, value) { build_element_match_and_selector}
         }.freeze
@@ -33,14 +40,30 @@ def build_equal_selector name, value
         @query[SELECTOR][name][EQ_OPERATOR] = value
       end
 
+      def build_not_equal_selector name, value
+        @query[SELECTOR][name][NE_OPERATOR] = value
+      end
+
       def build_element_match_selector name, value
         @query[SELECTOR][name][EM_OPERATOR] = value
       end
 
-      def build_element_match_greater_than_selector name, value
+      def build_element_match_gt_selector name, value
         @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
       end
 
+      def build_element_match_gte_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][GTE_OPERATOR] = value
+      end
+
+      def build_element_match_lt_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][LT_OPERATOR] = value
+      end
+
+      def build_element_match_lte_selector name, value
+        @query[SELECTOR][name][EM_OPERATOR][LTE_OPERATOR] = value
+      end
+
       def build_element_match_or_selector name, value
         @query[SELECTOR][name][EM_OPERATOR][OR_OPERATOR] = value
       end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index ff83b8b..a848253 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -3,6 +3,10 @@ module Dolly
   class MangoQuery
     include Dolly::Mango::Selector
 
+    FIELDS_KEY   = 'fields'.freeze
+    SORT_KEY     = 'sort'.freeze
+    LIMIT_KEY    = 'limit'.freeze
+
     attr_reader :proxy_class, :query
 
     def initialize proxy_class

From 2701fd35fddd019b1c5d4fcb241d004ae7eb4746 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 10:00:39 -0800
Subject: [PATCH 31/66] add more selectors to the selector table

---
 lib/dolly/mango/selector.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 4064045..28e1fbf 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -13,9 +13,6 @@ module Selector
       GTE_OPERATOR = '$gte'.freeze
       LTE_OPERATOR = '$lte'.freeze
       EM_OPERATOR  = '$elemMatch'.freeze
-      FIELDS_KEY   = 'fields'.freeze
-      SORT_KEY     = 'sort'.freeze
-      LIMIT_KEY    = 'limit'.freeze
 
       def select_operator_map
         {

From 4c7ca065867eabe989045a6fc0c7a54418b0307f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 10:41:07 -0800
Subject: [PATCH 32/66] add more selector options

---
 lib/dolly/mango/selector.rb | 38 ++++++++++++++++++++++++++-----------
 test/mango_document_test.rb |  4 ++--
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 28e1fbf..6a0f008 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -9,6 +9,7 @@ module Selector
       GT_OPERATOR  = '$gt'.freeze
       LT_OPERATOR  = '$lt'.freeze
       OR_OPERATOR  = '$or'.freeze
+      NOT_SELECTOR = '$not'.freeze
       AND_OPERATOR = '$and'.freeze
       GTE_OPERATOR = '$gte'.freeze
       LTE_OPERATOR = '$lte'.freeze
@@ -16,17 +17,20 @@ module Selector
 
       def select_operator_map
         {
-          eq:    ->(name, value) { build_equal_selector name, value },
-          ne:    ->(name, value) { build_not_equal_selector name, value },
-          in:    ->(name, value) { build_inclusion_selector name, value },
-          gt:    ->(name, value) { build_greater_than_selector name, value },
-          lt:    ->(name, value) { build_less_than_selector name, value },
-          em:    ->(name, value) { build_element_match_selector name, value },
-          [:em, :gt] => ->(name, value) { build_element_match_gt_selector name, value },
+          eq:            ->(name, value) { build_equal_selector name, value },
+          ne:            ->(name, value) { build_not_equal_selector name, value },
+          in:            ->(name, value) { build_inclusion_selector name, value },
+          not:           ->(name, value) { build_not_selector name, value },
+          gt:            ->(name, value) { build_gt_selector name, value },
+          gte:           ->(name, value) { build_gte_selector name, value },
+          lt:            ->(name, value) { build_lt_selector name, value },
+          lte:           ->(name, value) { build_lte_selector name, value },
+          em:            ->(name, value) { build_element_match_selector name, value },
+          [:em, :gt] =>  ->(name, value) { build_element_match_gt_selector name, value },
           [:em, :gte] => ->(name, value) { build_element_match_gte_selector name, value },
-          [:em, :lt] => ->(name, value) { build_element_match_lt_selector name, value },
+          [:em, :lt] =>  ->(name, value) { build_element_match_lt_selector name, value },
           [:em, :lte] => ->(name, value) { build_element_match_lte_selector name, value },
-          [:em, :or] => ->(name, value) { build_element_match_or_selector name, value },
+          [:em, :or] =>  ->(name, value) { build_element_match_or_selector name, value },
           [:em, :and] => ->(name, value) { build_element_match_and_selector}
         }.freeze
       end
@@ -41,6 +45,10 @@ def build_not_equal_selector name, value
         @query[SELECTOR][name][NE_OPERATOR] = value
       end
 
+      def build_not_selector name, value
+        @query[SELECTOR][NOT_SELECTOR][name] = value
+      end
+
       def build_element_match_selector name, value
         @query[SELECTOR][name][EM_OPERATOR] = value
       end
@@ -73,13 +81,21 @@ def build_inclusion_selector name, value
         @query[SELECTOR][name][IN_OPERATOR] = value
       end
 
-      def build_greater_than_selector name, value
+      def build_gt_selector name, value
         @query[SELECTOR][name][GT_OPERATOR] = value
       end
 
-      def build_less_than_selector name, value
+      def build_gte_selector name, value
+        @query[SELECTOR][name][GTE_OPERATOR] = value
+      end
+
+      def build_lt_selector name, value
         @query[SELECTOR][name][LT_OPERATOR] = value
       end
+
+      def build_lte_selector name, value
+        @query[SELECTOR][name][LTE_OPERATOR] = value
+      end
     end
   end
 end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 0f684c1..5570c25 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -14,7 +14,7 @@ class MangoDoc < Dolly::Document
   mango_scope :by_visible_to_schools, -> (school_id) { selector('visible_to.schools', :eq, school_id) }
   mango_scope :collection_items_greater_than, -> (item) { selector('default_collection', :em, :gt, item)}
 
-  mango_scope :id_greater_than, ->(id) { selector('_id', :gt, id) }
+  mango_scope :id_greater_than, ->(id=nil) { selector('_id', :gt, id) }
   mango_scope :support_date_greater_than, ->(date) { selector('support_date', :gt, date)}
   mango_scope :generic_elematch_or, ->(field, item) { selector(field, :em, :or, item) }
 end
@@ -114,7 +114,7 @@ class QueryIsBuiltTest < MangoDocumentTest
         }
       }.to_json
       query = MangoDoc
-                .id_greater_than("")
+                .id_greater_than(nil)
                 .support_date_greater_than(Date.today.to_s(:db))
                 .generic_elematch_or('visible_to.schools', [] << "")
                 .generic_elematch_or('visible_to.countries', [] << "")

From f91d4a9a83df3a2076e3467fbf1461b475de508e Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 18 Jan 2017 15:43:39 -0800
Subject: [PATCH 33/66] add more tests and more selectors

---
 lib/dolly/mango/selector.rb |  6 ++++++
 test/mango_document_test.rb | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 6a0f008..0c2dfd6 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -10,6 +10,7 @@ module Selector
       LT_OPERATOR  = '$lt'.freeze
       OR_OPERATOR  = '$or'.freeze
       NOT_SELECTOR = '$not'.freeze
+      NOR_SELECTOR = '$nor'.freeze
       AND_OPERATOR = '$and'.freeze
       GTE_OPERATOR = '$gte'.freeze
       LTE_OPERATOR = '$lte'.freeze
@@ -21,6 +22,7 @@ def select_operator_map
           ne:            ->(name, value) { build_not_equal_selector name, value },
           in:            ->(name, value) { build_inclusion_selector name, value },
           not:           ->(name, value) { build_not_selector name, value },
+          nor:           ->(name, value) { build_nor_selector name, value},
           gt:            ->(name, value) { build_gt_selector name, value },
           gte:           ->(name, value) { build_gte_selector name, value },
           lt:            ->(name, value) { build_lt_selector name, value },
@@ -49,6 +51,10 @@ def build_not_selector name, value
         @query[SELECTOR][NOT_SELECTOR][name] = value
       end
 
+      def build_nor_selector name, value
+        @query[SELECTOR][NOR_SELECTOR][name] = value
+      end
+
       def build_element_match_selector name, value
         @query[SELECTOR][name][EM_OPERATOR] = value
       end
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 5570c25..99779e9 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -19,15 +19,26 @@ class MangoDoc < Dolly::Document
   mango_scope :generic_elematch_or, ->(field, item) { selector(field, :em, :or, item) }
 end
 
+class SecondMangoDoc < Dolly::Document
+  property :name
+
+  mango_scope :by_name, ->(name) { selector('name', :eq, name) }
+end
+
 class MangoDocumentTest < ActiveSupport::TestCase
+  class ScopeInterfaceTest < MangoDocumentTest
+    test 'SecondMangoDoc does not have the scopes of MangoDoc' do
+      assert_not_same MangoDoc.mango_scopes.keys, SecondMangoDoc.mango_scopes.keys
+    end
 
-  class QueryIsBuiltTest < MangoDocumentTest
     test 'responds to the scoped method' do
       MangoDoc.mango_scopes.keys.each do |k|
         assert_respond_to MangoDoc, k
       end
     end
+  end
 
+  class QueryIsBuiltTest < MangoDocumentTest
     test 'calling the scope builds the select query' do
       value = 2000
       query = MangoDoc.by_year(value).query.to_json

From 45f7c393756789774b612afb07a5f96f5d9051ff Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 19 Jan 2017 14:04:06 -0800
Subject: [PATCH 34/66] add args to lambda in selector_operator_map

---
 lib/dolly/mango/selector.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 0c2dfd6..7e548ba 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -33,7 +33,7 @@ def select_operator_map
           [:em, :lt] =>  ->(name, value) { build_element_match_lt_selector name, value },
           [:em, :lte] => ->(name, value) { build_element_match_lte_selector name, value },
           [:em, :or] =>  ->(name, value) { build_element_match_or_selector name, value },
-          [:em, :and] => ->(name, value) { build_element_match_and_selector}
+          [:em, :and] => ->(name, value) { build_element_match_and_selector name, value }
         }.freeze
       end
 

From ccfcb42165c02fc6a36504c467f4d61b42792d51 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 19 Jan 2017 15:12:54 -0800
Subject: [PATCH 35/66] inline variable assignment in dolly scope initialize

---
 lib/dolly/scope.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index fd1dac7..36c7fd4 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -5,8 +5,7 @@ class Scope
     delegate :proxy_class, :query, to: :query_object
 
     def initialize query_object, scope, scope_args
-      @query_object, @scope = query_object, scope
-      @scope_args = scope_args
+      @query_object, @scope, @scope_args = query_object, scope, scope_args
       evaluate_scope
     end
 

From c03f4ccf175c7f4a706b0ae05c1608926aab504d Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 19 Jan 2017 16:16:49 -0800
Subject: [PATCH 36/66] DRY up selector query creation

---
 lib/dolly/mango/selector.rb | 97 +++++++++----------------------------
 1 file changed, 23 insertions(+), 74 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 7e548ba..133e851 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -18,89 +18,38 @@ module Selector
 
       def select_operator_map
         {
-          eq:            ->(name, value) { build_equal_selector name, value },
-          ne:            ->(name, value) { build_not_equal_selector name, value },
-          in:            ->(name, value) { build_inclusion_selector name, value },
-          not:           ->(name, value) { build_not_selector name, value },
-          nor:           ->(name, value) { build_nor_selector name, value},
-          gt:            ->(name, value) { build_gt_selector name, value },
-          gte:           ->(name, value) { build_gte_selector name, value },
-          lt:            ->(name, value) { build_lt_selector name, value },
-          lte:           ->(name, value) { build_lte_selector name, value },
-          em:            ->(name, value) { build_element_match_selector name, value },
-          [:em, :gt] =>  ->(name, value) { build_element_match_gt_selector name, value },
-          [:em, :gte] => ->(name, value) { build_element_match_gte_selector name, value },
-          [:em, :lt] =>  ->(name, value) { build_element_match_lt_selector name, value },
-          [:em, :lte] => ->(name, value) { build_element_match_lte_selector name, value },
-          [:em, :or] =>  ->(name, value) { build_element_match_or_selector name, value },
-          [:em, :and] => ->(name, value) { build_element_match_and_selector name, value }
+          eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
+          ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
+          in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
+          not:           ->(name, value) { build_exclusive_selector name, value, NOT_SELECTOR },
+          nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR},
+          gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
+          gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR},
+          lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
+          lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
+          em:            ->(name, value) { build_equality_selector name, value, EM_OPERATOR },
+          [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
+          [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
+          [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
+          [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
+          [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
+          [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR }
         }.freeze
       end
 
       private
 
-      def build_equal_selector name, value
-        @query[SELECTOR][name][EQ_OPERATOR] = value
+      def build_equality_selector name, value, operator
+        @query[SELECTOR][name][operator] = value
       end
 
-      def build_not_equal_selector name, value
-        @query[SELECTOR][name][NE_OPERATOR] = value
+      def build_exclusive_selector name, value, operator
+        @query[SELECTOR][operator][name] = value
       end
 
-      def build_not_selector name, value
-        @query[SELECTOR][NOT_SELECTOR][name] = value
-      end
-
-      def build_nor_selector name, value
-        @query[SELECTOR][NOR_SELECTOR][name] = value
-      end
-
-      def build_element_match_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR] = value
-      end
-
-      def build_element_match_gt_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][GT_OPERATOR] = value
-      end
-
-      def build_element_match_gte_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][GTE_OPERATOR] = value
-      end
-
-      def build_element_match_lt_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][LT_OPERATOR] = value
-      end
-
-      def build_element_match_lte_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][LTE_OPERATOR] = value
-      end
-
-      def build_element_match_or_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][OR_OPERATOR] = value
-      end
-
-      def build_element_match_and_selector name, value
-        @query[SELECTOR][name][EM_OPERATOR][AND_OPERATOR] = value
-      end
-
-      def build_inclusion_selector name, value
-        @query[SELECTOR][name][IN_OPERATOR] = value
-      end
-
-      def build_gt_selector name, value
-        @query[SELECTOR][name][GT_OPERATOR] = value
-      end
-
-      def build_gte_selector name, value
-        @query[SELECTOR][name][GTE_OPERATOR] = value
-      end
-
-      def build_lt_selector name, value
-        @query[SELECTOR][name][LT_OPERATOR] = value
-      end
-
-      def build_lte_selector name, value
-        @query[SELECTOR][name][LTE_OPERATOR] = value
+      def build_composite_selector name, value, *operators
+        first, second = operators
+        @query[SELECTOR][name][first][second] = value
       end
     end
   end

From 73c47f08a25212e172d66f6b8bb2e04c4892de95 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 09:32:46 -0800
Subject: [PATCH 37/66] add skip method to mango query

---
 lib/dolly/mango_query.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index a848253..50e77e3 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -4,8 +4,9 @@ class MangoQuery
     include Dolly::Mango::Selector
 
     FIELDS_KEY   = 'fields'.freeze
-    SORT_KEY     = 'sort'.freeze
     LIMIT_KEY    = 'limit'.freeze
+    SKIP_KEY     = 'skip'.freeze
+    SORT_KEY     = 'sort'.freeze
 
     attr_reader :proxy_class, :query
 
@@ -33,5 +34,9 @@ def fields *fields
       @query[FIELDS_KEY] ||= []
       @query[FIELDS_KEY].push *fields
     end
+
+    def skip integer
+      @query[SKIP_KEY] = integer.to_i
+    end
   end
 end

From f41e3ee693a3c77a9146044c958e15d1d787f3bc Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 10:10:30 -0800
Subject: [PATCH 38/66] add more of the selector api by adding more operators
 and compiste selectors

---
 lib/dolly/mango/selector.rb | 51 ++++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 133e851..a423c25 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -3,37 +3,66 @@ module Mango
     module Selector
 
       SELECTOR     = 'selector'.freeze
+
+      # Equality Operators
       EQ_OPERATOR  = '$eq'.freeze
       NE_OPERATOR  = '$ne'.freeze
-      IN_OPERATOR  = '$in'.freeze
       GT_OPERATOR  = '$gt'.freeze
       LT_OPERATOR  = '$lt'.freeze
+      GTE_OPERATOR = '$gte'.freeze
+      LTE_OPERATOR = '$lte'.freeze
+
+      # Object Operators
+      EXISTS_OPERATOR = '$exists'.freeze
+      TYPE_OPERATOR   = '$type'.freeze
+
+      # Array Operators
+      IN_OPERATOR  = '$in'.freeze
+      NIN_OPERATOR = '$nin'.freeze
+      SIZE_OPERATOR = '$size'.freeze
+
+      # Combination Operators
       OR_OPERATOR  = '$or'.freeze
       NOT_SELECTOR = '$not'.freeze
       NOR_SELECTOR = '$nor'.freeze
       AND_OPERATOR = '$and'.freeze
-      GTE_OPERATOR = '$gte'.freeze
-      LTE_OPERATOR = '$lte'.freeze
+      ALL_OPERATOR = '$all'.freeze
       EM_OPERATOR  = '$elemMatch'.freeze
 
       def select_operator_map
         {
           eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
           ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
-          in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
-          not:           ->(name, value) { build_exclusive_selector name, value, NOT_SELECTOR },
-          nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR},
           gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
-          gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR},
+          gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR },
           lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
           lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
-          em:            ->(name, value) { build_equality_selector name, value, EM_OPERATOR },
+
+          exists:        ->(name, value=true) { build_equality_selector name, value, EXISTS_OPERATOR },
+          type:          ->(name, value) { build_equality_selector name, value, TYPE_OPERATOR },
+
+          in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
+          nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
+          size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
+
+          nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
+          all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
+          and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
+          or:            ->(name, value) { build_exclusive_selector name, value, OR_OPERATOR },
+
           [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
           [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
           [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
           [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
           [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
-          [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR }
+          [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR },
+
+          [:not, :gt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GT_OPERATOR },
+          [:not, :gte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GTE_OPERATOR },
+          [:not, :lt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LT_OPERATOR },
+          [:not, :lte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LTE_OPERATOR },
+          [:not, :or] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, OR_OPERATOR },
+          [:not, :and] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, AND_OPERATOR }
         }.freeze
       end
 
@@ -51,6 +80,10 @@ def build_composite_selector name, value, *operators
         first, second = operators
         @query[SELECTOR][name][first][second] = value
       end
+
+      def operator_value_validation operator, value
+
+      end
     end
   end
 end

From caabc1930a823fc802ce1a55b28c850eb54ac583 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 10:38:40 -0800
Subject: [PATCH 39/66] add modulus and regex oeprators

---
 lib/dolly/mango/selector.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index a423c25..3ec6ff1 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -21,6 +21,10 @@ module Selector
       NIN_OPERATOR = '$nin'.freeze
       SIZE_OPERATOR = '$size'.freeze
 
+      # Miscellaneous Operators
+      MOD_OPERATOR   = '$mod'.freeze
+      REGEX_OPERATOR =
+
       # Combination Operators
       OR_OPERATOR  = '$or'.freeze
       NOT_SELECTOR = '$not'.freeze
@@ -45,6 +49,10 @@ def select_operator_map
           nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
           size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
 
+          mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
+          regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
+
+
           nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
           all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
           and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },

From e1730791f40e990d4ea1c35be0cbe7923f0dcaae Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 11:21:47 -0800
Subject: [PATCH 40/66] add operator value type checking in order to aid
 developers

---
 lib/dolly/mango/selector.rb | 60 ++++++++++++++++++++++++++++++++-----
 lib/dolly/mango_query.rb    | 14 ++++-----
 lib/exceptions/dolly.rb     | 18 +++++++++++
 3 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 3ec6ff1..f788d7c 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -12,18 +12,33 @@ module Selector
       GTE_OPERATOR = '$gte'.freeze
       LTE_OPERATOR = '$lte'.freeze
 
+      EQUALITY_OPERATORS = [
+                             EQ_OPERATOR,
+                             NE_OPERATOR,
+                             GT_OPERATOR,
+                             LT_OPERATOR,
+                             GTE_OPERATOR,
+                             LTE_OPERATOR,
+                           ].freeze
+
       # Object Operators
       EXISTS_OPERATOR = '$exists'.freeze
       TYPE_OPERATOR   = '$type'.freeze
 
+      OBJECT_OPERATORS = [EXISTS_OPERATOR, TYPE_OPERATOR].freeze
+
       # Array Operators
       IN_OPERATOR  = '$in'.freeze
       NIN_OPERATOR = '$nin'.freeze
       SIZE_OPERATOR = '$size'.freeze
 
+      ARRAY_OPERATORS = [IN_OPERATOR, NIN_OPERATOR].freeze
+
       # Miscellaneous Operators
       MOD_OPERATOR   = '$mod'.freeze
-      REGEX_OPERATOR =
+      REGEX_OPERATOR = '$regex'.freeze
+
+      MISC_OPERATORS = [MOD_OPERATOR, REGEX_OPERATOR].freeze
 
       # Combination Operators
       OR_OPERATOR  = '$or'.freeze
@@ -33,6 +48,26 @@ module Selector
       ALL_OPERATOR = '$all'.freeze
       EM_OPERATOR  = '$elemMatch'.freeze
 
+      COMBINATION_OPERATORS = [
+                                OR_OPERATOR,
+                                NOT_SELECTOR,
+                                NOR_SELECTOR,
+                                AND_OPERATOR,
+                                ALL_OPERATOR,
+                                EM_OPERATOR
+                              ]
+
+      POSSIBLE_TYPE_VALUES = %w/null boolean number string array object/.freeze
+
+      ALL_OPERATORS = [
+                        EQUALITY_OPERATORS,
+                        OBJECT_OPERATORS,
+                        ARRAY_OPERATORS,
+                        SIZE_OPERATOR,
+                        MISC_OPERATORS,
+                        COMBINATION_OPERATORS
+                      ].flatten.freeze
+
       def select_operator_map
         {
           eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
@@ -52,7 +87,6 @@ def select_operator_map
           mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
           regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
 
-
           nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
           all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
           and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
@@ -77,20 +111,32 @@ def select_operator_map
       private
 
       def build_equality_selector name, value, operator
-        @query[SELECTOR][name][operator] = value
+        operator_value_type_check(operator, value)
+        query[SELECTOR][name][operator] = value
       end
 
       def build_exclusive_selector name, value, operator
-        @query[SELECTOR][operator][name] = value
+        operator_value_type_check(operator, value)
+        query[SELECTOR][operator][name] = value
       end
 
       def build_composite_selector name, value, *operators
         first, second = operators
-        @query[SELECTOR][name][first][second] = value
-      end
+        operator_value_type_check(second, value)
 
-      def operator_value_validation operator, value
+        query[SELECTOR][name][first][second] = value
+      end
 
+      def operator_value_type_check operator, value
+        raise Dolly::UnrecognizedOperator.new(operator) unless ALL_OPERATORS.include? operator
+        return if EQUALITY_OPERATORS.include? operator
+        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == EXISTS_OPERATOR && ![true, false].include?(value)
+        raise Dolly::BadQueryArguement.new(operator, POSSIBLE_TYPE_VALUES.join(', ')) if operator == TYPE_OPERATOR && !POSSIBLE_TYPE_VALUES.include?(value)
+        raise Dolly::BadQueryArguement.new(operator, Array) if ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == SIZE_OPERATOR && !value.is_a?(Integer)
+        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
+        raise Dolly::BadQueryArguement.new(operator, String) if operator == REGEX_OPERATOR && !value.is_a?(String)
+        raise Dolly::BadQueryArguement.new(operator, Array) if COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
       end
     end
   end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 50e77e3..9016d28 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -13,7 +13,7 @@ class MangoQuery
     def initialize proxy_class
       @proxy_class = proxy_class
       @query = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
-      @query.compare_by_identity
+      query.compare_by_identity
     end
 
     def selector name, *operator, value
@@ -22,21 +22,21 @@ def selector name, *operator, value
     end
 
     def limit value
-      @query[LIMIT_KEY] = value
+      query[LIMIT_KEY] = value
     end
 
     def sort name, operator
-      @query[SORT_KEY] ||= []
-      @query[SORT_KEY] << {name => operator}
+      query[SORT_KEY] ||= []
+      query[SORT_KEY] << {name => operator}
     end
 
     def fields *fields
-      @query[FIELDS_KEY] ||= []
-      @query[FIELDS_KEY].push *fields
+      query[FIELDS_KEY] ||= []
+      query[FIELDS_KEY].push *fields
     end
 
     def skip integer
-      @query[SKIP_KEY] = integer.to_i
+      query[SKIP_KEY] = integer.to_i
     end
   end
 end
diff --git a/lib/exceptions/dolly.rb b/lib/exceptions/dolly.rb
index 46e70a2..a387131 100644
--- a/lib/exceptions/dolly.rb
+++ b/lib/exceptions/dolly.rb
@@ -35,4 +35,22 @@ def to_s
   end
   class DocumentInvalidError < RuntimeError; end
   class MissingPropertyError < RuntimeError; end
+  class BadQueryArugement < RuntimeError
+    def initialize operator, expected_type
+      @operator, @expected_type = operator, expected_type
+    end
+
+    def to_s
+      "The operator #{@operator} only accepts a(n) #{@expected_type}"
+    end
+  end
+  class UnrecognizedOperator < RuntimeError
+    def initialize operator
+      @operator = operator
+    end
+
+    def to_s
+      "The operator #{@operator} is unrecognized"
+    end
+  end
 end

From d6a6b8afec3ce50175bfd23cc9874392cc66f1c6 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 11:36:35 -0800
Subject: [PATCH 41/66] make select operator map private

---
 lib/dolly/mango/selector.rb | 8 ++++++--
 lib/dolly/mango_query.rb    | 5 -----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index f788d7c..62aea99 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -67,6 +67,12 @@ module Selector
                         MISC_OPERATORS,
                         COMBINATION_OPERATORS
                       ].flatten.freeze
+      def selector name, *operator, value
+        operator = operator.count > 1 ? operator : operator.first
+        select_operator_map[operator].call(name, value)
+      end
+
+      private
 
       def select_operator_map
         {
@@ -108,8 +114,6 @@ def select_operator_map
         }.freeze
       end
 
-      private
-
       def build_equality_selector name, value, operator
         operator_value_type_check(operator, value)
         query[SELECTOR][name][operator] = value
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 9016d28..5d34107 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -16,11 +16,6 @@ def initialize proxy_class
       query.compare_by_identity
     end
 
-    def selector name, *operator, value
-      operator = operator.count > 1 ? operator : operator.first
-      select_operator_map[operator].call(name, value)
-    end
-
     def limit value
       query[LIMIT_KEY] = value
     end

From d1e544e95285c53ba809b0e654274bec4ae25a95 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 14:13:36 -0800
Subject: [PATCH 42/66] create an object for operator and value type validation

---
 lib/dolly/mango.rb                 |  8 +++++++
 lib/dolly/mango/query_validator.rb | 30 +++++++++++++++++++++++
 lib/dolly/mango/selector.rb        | 38 ++++--------------------------
 lib/dolly/mango_query.rb           |  2 +-
 4 files changed, 44 insertions(+), 34 deletions(-)
 create mode 100644 lib/dolly/mango.rb
 create mode 100644 lib/dolly/mango/query_validator.rb

diff --git a/lib/dolly/mango.rb b/lib/dolly/mango.rb
new file mode 100644
index 0000000..6654d50
--- /dev/null
+++ b/lib/dolly/mango.rb
@@ -0,0 +1,8 @@
+require 'dolly/mango/query_validator'
+require 'dolly/mango/selector'
+
+module Dolly
+  module Mango
+
+  end
+end
diff --git a/lib/dolly/mango/query_validator.rb b/lib/dolly/mango/query_validator.rb
new file mode 100644
index 0000000..11d3707
--- /dev/null
+++ b/lib/dolly/mango/query_validator.rb
@@ -0,0 +1,30 @@
+module Dolly
+  module Mango
+    class QueryValidator
+
+      def initialize operator, value
+        @operator, @value = operator, value
+      end
+
+      def validate!
+        raise Dolly::UnrecognizedOperator.new(operator) unless operator_base_klass::ALL_OPERATORS.include? operator
+        return if operator_base_klass::EQUALITY_OPERATORS.include? operator
+        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == operator_base_klass::EXISTS_OPERATOR && ![true, false].include?(value)
+        raise Dolly::BadQueryArguement.new(operator, operator_base_klass::POSSIBLE_TYPE_VALUES.join(', ')) if operator == operator_base_klass::TYPE_OPERATOR && !operator_base_klass::POSSIBLE_TYPE_VALUES.include?(value)
+        raise Dolly::BadQueryArguement.new(operator, Array) if operator_base_klass::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == operator_base_klass::SIZE_OPERATOR && !value.is_a?(Integer)
+        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == operator_base_klass::MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
+        raise Dolly::BadQueryArguement.new(operator, String) if operator == operator_base_klass::REGEX_OPERATOR && !value.is_a?(String)
+        raise Dolly::BadQueryArguement.new(operator, Array) if operator_base_klass::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+      end
+
+      private
+
+      attr_reader :operator, :value
+
+      def operator_base_klass
+        Dolly::Mango::Selector
+      end
+    end
+  end
+end
diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 62aea99..b49408b 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -12,14 +12,7 @@ module Selector
       GTE_OPERATOR = '$gte'.freeze
       LTE_OPERATOR = '$lte'.freeze
 
-      EQUALITY_OPERATORS = [
-                             EQ_OPERATOR,
-                             NE_OPERATOR,
-                             GT_OPERATOR,
-                             LT_OPERATOR,
-                             GTE_OPERATOR,
-                             LTE_OPERATOR,
-                           ].freeze
+      EQUALITY_OPERATORS = [ EQ_OPERATOR, NE_OPERATOR, GT_OPERATOR, LT_OPERATOR, GTE_OPERATOR, LTE_OPERATOR ].freeze
 
       # Object Operators
       EXISTS_OPERATOR = '$exists'.freeze
@@ -48,25 +41,12 @@ module Selector
       ALL_OPERATOR = '$all'.freeze
       EM_OPERATOR  = '$elemMatch'.freeze
 
-      COMBINATION_OPERATORS = [
-                                OR_OPERATOR,
-                                NOT_SELECTOR,
-                                NOR_SELECTOR,
-                                AND_OPERATOR,
-                                ALL_OPERATOR,
-                                EM_OPERATOR
-                              ]
+      COMBINATION_OPERATORS = [ OR_OPERATOR, NOT_SELECTOR, NOR_SELECTOR, AND_OPERATOR, ALL_OPERATOR, EM_OPERATOR ].freeze
 
       POSSIBLE_TYPE_VALUES = %w/null boolean number string array object/.freeze
 
-      ALL_OPERATORS = [
-                        EQUALITY_OPERATORS,
-                        OBJECT_OPERATORS,
-                        ARRAY_OPERATORS,
-                        SIZE_OPERATOR,
-                        MISC_OPERATORS,
-                        COMBINATION_OPERATORS
-                      ].flatten.freeze
+      ALL_OPERATORS = [ EQUALITY_OPERATORS, OBJECT_OPERATORS, ARRAY_OPERATORS, SIZE_OPERATOR, MISC_OPERATORS, COMBINATION_OPERATORS ].flatten.freeze
+
       def selector name, *operator, value
         operator = operator.count > 1 ? operator : operator.first
         select_operator_map[operator].call(name, value)
@@ -132,15 +112,7 @@ def build_composite_selector name, value, *operators
       end
 
       def operator_value_type_check operator, value
-        raise Dolly::UnrecognizedOperator.new(operator) unless ALL_OPERATORS.include? operator
-        return if EQUALITY_OPERATORS.include? operator
-        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == EXISTS_OPERATOR && ![true, false].include?(value)
-        raise Dolly::BadQueryArguement.new(operator, POSSIBLE_TYPE_VALUES.join(', ')) if operator == TYPE_OPERATOR && !POSSIBLE_TYPE_VALUES.include?(value)
-        raise Dolly::BadQueryArguement.new(operator, Array) if ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
-        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == SIZE_OPERATOR && !value.is_a?(Integer)
-        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
-        raise Dolly::BadQueryArguement.new(operator, String) if operator == REGEX_OPERATOR && !value.is_a?(String)
-        raise Dolly::BadQueryArguement.new(operator, Array) if COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+        Dolly::Mango::QueryValidator.new(operator, value).validate!
       end
     end
   end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
index 5d34107..56c7f41 100644
--- a/lib/dolly/mango_query.rb
+++ b/lib/dolly/mango_query.rb
@@ -1,4 +1,4 @@
-require 'dolly/mango/selector'
+require 'dolly/mango'
 module Dolly
   class MangoQuery
     include Dolly::Mango::Selector

From e865c8c2017079a9e5129165ce3d37a6c84d90af Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 14:17:36 -0800
Subject: [PATCH 43/66] allow for one off scopes to be chained to defined
 scopes, and vice versa

---
 lib/dolly/scope.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 36c7fd4..6c63837 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -18,6 +18,31 @@ def method_missing(method, *args, &block)
       end
     end
 
+    def selector name, *operator, value
+      query_object.selector name, *operator, value
+      return self
+    end
+
+    def limit value
+      query_object.limit value
+      return self
+    end
+
+    def sort name, operator
+      query_object.sort name, operator
+      return self
+    end
+
+    def fields *fields
+      query_object.fields *fields
+      return self
+    end
+
+    def skip interger
+      query_object.skip interger
+      return self
+    end
+
     private
 
     def evaluate_scope

From 0b334d0a473928e0f2a3bc5c132849caf5de9da3 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Fri, 20 Jan 2017 14:41:44 -0800
Subject: [PATCH 44/66] improve and DRY anonymous scope chaining using method
 missing

---
 lib/dolly/scope.rb          | 28 +++-------------------------
 test/mango_document_test.rb |  8 ++++++++
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
index 6c63837..f743db7 100644
--- a/lib/dolly/scope.rb
+++ b/lib/dolly/scope.rb
@@ -12,37 +12,15 @@ def initialize query_object, scope, scope_args
     def method_missing(method, *args, &block)
       if proxy_class.mango_scopes.include?(method)
         proxy_class.mango_scopes[method].call(query_object, args)
+      elsif query_object.respond_to? :method
+        query_object.send(method, *args, &block)
+        return self
       else
         collection = proxy_class.database.mango query.to_json
         collection.send(method, *args, &block)
       end
     end
 
-    def selector name, *operator, value
-      query_object.selector name, *operator, value
-      return self
-    end
-
-    def limit value
-      query_object.limit value
-      return self
-    end
-
-    def sort name, operator
-      query_object.sort name, operator
-      return self
-    end
-
-    def fields *fields
-      query_object.fields *fields
-      return self
-    end
-
-    def skip interger
-      query_object.skip interger
-      return self
-    end
-
     private
 
     def evaluate_scope
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index 99779e9..f9582f0 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -93,6 +93,14 @@ class QueryIsBuiltTest < MangoDocumentTest
       assert_equal expected, query
     end
 
+    test 'selector can chain anonymous selectors' do
+      year = 2000
+      title = 'Bond'
+      query = MangoDoc.by_year(year).selector('title', :eq, title).query.to_json
+      expected = {"selector"=>{"year"=>{"$eq"=>2000}, "title"=>{"$eq"=>"Bond"}}}.to_json
+      assert_equal expected, query
+    end
+
     test 'complex selector can be built' do
       expected_query = {
         "selector" => {

From b0cbe0d8620b3e8bdb1e588977237f6fac755dba Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 23 Jan 2017 10:07:14 -0800
Subject: [PATCH 45/66] reorganize with module namespacing

---
 lib/dolly/document.rb    |  7 +++----
 lib/dolly/mango.rb       |  2 ++
 lib/dolly/mango/query.rb | 38 ++++++++++++++++++++++++++++++++++++++
 lib/dolly/mango/scope.rb | 32 ++++++++++++++++++++++++++++++++
 lib/dolly/mango_query.rb | 37 -------------------------------------
 lib/dolly/scope.rb       | 30 ------------------------------
 6 files changed, 75 insertions(+), 71 deletions(-)
 create mode 100644 lib/dolly/mango/query.rb
 create mode 100644 lib/dolly/mango/scope.rb
 delete mode 100644 lib/dolly/mango_query.rb
 delete mode 100644 lib/dolly/scope.rb

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 52cf5db..ed534dc 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -1,8 +1,7 @@
 require "dolly/query"
 require "dolly/property"
 require 'dolly/timestamps'
-require "dolly/mango_query"
-require 'dolly/scope'
+require "dolly/mango"
 
 module Dolly
   class Document
@@ -155,11 +154,11 @@ class << self
       def mango_scope scope_name, scope
         self.mango_scopes ||= {}
         name = scope_name.to_sym
-        self.mango_scopes[name] = lambda { |query_object, args| Dolly::Scope.new(query_object, scope, args)}
+        self.mango_scopes[name] = lambda { |query_object, args| Dolly::Mango::Scope.new(query_object, scope, args)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.mango_scopes[name].call(Dolly::MangoQuery.new(self), *args)
+            self.mango_scopes[name].call(Dolly::Mango::Query.new(self), *args)
           end
         end
       end
diff --git a/lib/dolly/mango.rb b/lib/dolly/mango.rb
index 6654d50..1efe106 100644
--- a/lib/dolly/mango.rb
+++ b/lib/dolly/mango.rb
@@ -1,5 +1,7 @@
 require 'dolly/mango/query_validator'
 require 'dolly/mango/selector'
+require 'dolly/mango/query'
+require 'dolly/mango/scope'
 
 module Dolly
   module Mango
diff --git a/lib/dolly/mango/query.rb b/lib/dolly/mango/query.rb
new file mode 100644
index 0000000..9fa1df4
--- /dev/null
+++ b/lib/dolly/mango/query.rb
@@ -0,0 +1,38 @@
+module Dolly
+  module Mango
+    class Query
+      include Dolly::Mango::Selector
+
+      FIELDS_KEY   = 'fields'.freeze
+      LIMIT_KEY    = 'limit'.freeze
+      SKIP_KEY     = 'skip'.freeze
+      SORT_KEY     = 'sort'.freeze
+
+      attr_reader :proxy_class, :query
+
+      def initialize proxy_class
+        @proxy_class = proxy_class
+        @query = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
+        query.compare_by_identity
+      end
+
+      def limit value
+        query[LIMIT_KEY] = value
+      end
+
+      def sort name, operator
+        query[SORT_KEY] ||= []
+        query[SORT_KEY] << {name => operator}
+      end
+
+      def fields *fields
+        query[FIELDS_KEY] ||= []
+        query[FIELDS_KEY].push *fields
+      end
+
+      def skip integer
+        query[SKIP_KEY] = integer.to_i
+      end
+    end
+  end
+end
diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
new file mode 100644
index 0000000..8a0f027
--- /dev/null
+++ b/lib/dolly/mango/scope.rb
@@ -0,0 +1,32 @@
+module Dolly
+  module Mango
+    class Scope
+      attr_reader :query_object, :scope, :scope_args
+
+      delegate :proxy_class, :query, to: :query_object
+
+      def initialize query_object, scope, scope_args
+        @query_object, @scope, @scope_args = query_object, scope, scope_args
+        evaluate_scope
+      end
+
+      def method_missing(method, *args, &block)
+        if proxy_class.mango_scopes.include?(method)
+          proxy_class.mango_scopes[method].call(query_object, args)
+        elsif query_object.respond_to? :method
+          query_object.send(method, *args, &block)
+          return self
+        else
+          collection = proxy_class.database.mango query.to_json
+          collection.send(method, *args, &block)
+        end
+      end
+
+      private
+
+      def evaluate_scope
+        query_object.instance_exec(*scope_args, &scope)
+      end
+    end
+  end
+end
diff --git a/lib/dolly/mango_query.rb b/lib/dolly/mango_query.rb
deleted file mode 100644
index 56c7f41..0000000
--- a/lib/dolly/mango_query.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'dolly/mango'
-module Dolly
-  class MangoQuery
-    include Dolly::Mango::Selector
-
-    FIELDS_KEY   = 'fields'.freeze
-    LIMIT_KEY    = 'limit'.freeze
-    SKIP_KEY     = 'skip'.freeze
-    SORT_KEY     = 'sort'.freeze
-
-    attr_reader :proxy_class, :query
-
-    def initialize proxy_class
-      @proxy_class = proxy_class
-      @query = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
-      query.compare_by_identity
-    end
-
-    def limit value
-      query[LIMIT_KEY] = value
-    end
-
-    def sort name, operator
-      query[SORT_KEY] ||= []
-      query[SORT_KEY] << {name => operator}
-    end
-
-    def fields *fields
-      query[FIELDS_KEY] ||= []
-      query[FIELDS_KEY].push *fields
-    end
-
-    def skip integer
-      query[SKIP_KEY] = integer.to_i
-    end
-  end
-end
diff --git a/lib/dolly/scope.rb b/lib/dolly/scope.rb
deleted file mode 100644
index f743db7..0000000
--- a/lib/dolly/scope.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module Dolly
-  class Scope
-    attr_reader :query_object, :scope, :scope_args
-
-    delegate :proxy_class, :query, to: :query_object
-
-    def initialize query_object, scope, scope_args
-      @query_object, @scope, @scope_args = query_object, scope, scope_args
-      evaluate_scope
-    end
-
-    def method_missing(method, *args, &block)
-      if proxy_class.mango_scopes.include?(method)
-        proxy_class.mango_scopes[method].call(query_object, args)
-      elsif query_object.respond_to? :method
-        query_object.send(method, *args, &block)
-        return self
-      else
-        collection = proxy_class.database.mango query.to_json
-        collection.send(method, *args, &block)
-      end
-    end
-
-    private
-
-    def evaluate_scope
-      query_object.instance_exec(*scope_args, &scope)
-    end
-  end
-end

From 6a3d8b7d34cd90fccba9335fb197a8624bf4ca42 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 23 Jan 2017 10:28:38 -0800
Subject: [PATCH 46/66] allow for anonymous selectors on the class

---
 lib/dolly/document.rb       |  7 +++++++
 test/mango_document_test.rb | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index ed534dc..cb0bd29 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -162,6 +162,13 @@ def mango_scope scope_name, scope
           end
         end
       end
+
+      def selector name, *operator, value
+        scope = -> { selector(name, *operator, value) }
+        query_object = Dolly::Mango::Query.new(self)
+        args = nil
+        Dolly::Mango::Scope.new query_object, scope, args
+      end
     end
 
     private
diff --git a/test/mango_document_test.rb b/test/mango_document_test.rb
index f9582f0..3e31c08 100644
--- a/test/mango_document_test.rb
+++ b/test/mango_document_test.rb
@@ -93,7 +93,7 @@ class QueryIsBuiltTest < MangoDocumentTest
       assert_equal expected, query
     end
 
-    test 'selector can chain anonymous selectors' do
+    test 'an anonymous selector may be chained to a scope' do
       year = 2000
       title = 'Bond'
       query = MangoDoc.by_year(year).selector('title', :eq, title).query.to_json
@@ -101,6 +101,21 @@ class QueryIsBuiltTest < MangoDocumentTest
       assert_equal expected, query
     end
 
+    test 'an anonymous selector may be chained to the class' do
+      title = 'Bond'
+      query = MangoDoc.selector('title', :eq, title).query.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>"Bond"}}}.to_json
+      assert_equal expected, query
+    end
+
+    test 'an mango_scope can be chained to an anonymous selector' do
+      year = 2000
+      title = 'Bond'
+      query = MangoDoc.selector('title', :eq, title).by_year(year).query.to_json
+      expected = {"selector"=>{"title"=>{"$eq"=>"Bond"}, "year"=>{"$eq"=>2000}}}.to_json
+      assert_equal expected, query
+    end
+
     test 'complex selector can be built' do
       expected_query = {
         "selector" => {

From 04b96e4206a613fbe61682dcbc22e096d52ca74f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 23 Jan 2017 10:32:15 -0800
Subject: [PATCH 47/66] more PIE variable names

---
 lib/dolly/document.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index cb0bd29..c0b4fc9 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -164,10 +164,10 @@ def mango_scope scope_name, scope
       end
 
       def selector name, *operator, value
-        scope = -> { selector(name, *operator, value) }
+        anonymous_scope = -> { selector(name, *operator, value) }
         query_object = Dolly::Mango::Query.new(self)
         args = nil
-        Dolly::Mango::Scope.new query_object, scope, args
+        Dolly::Mango::Scope.new query_object, anonymous_scope, args
       end
     end
 

From fdb96258e4f05a97064830e2b97b2b39b5b88dd5 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 23 Jan 2017 17:36:12 -0800
Subject: [PATCH 48/66] clean up namespace

---
 lib/dolly/document.rb              |  8 ++++----
 lib/dolly/mango/query_validator.rb | 23 +++++++++--------------
 lib/dolly/mango/selector.rb        |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index c0b4fc9..fc6beab 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -154,20 +154,20 @@ class << self
       def mango_scope scope_name, scope
         self.mango_scopes ||= {}
         name = scope_name.to_sym
-        self.mango_scopes[name] = lambda { |query_object, args| Dolly::Mango::Scope.new(query_object, scope, args)}
+        self.mango_scopes[name] = lambda { |query_object, args| Mango::Scope.new(query_object, scope, args)}
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
-            self.mango_scopes[name].call(Dolly::Mango::Query.new(self), *args)
+            self.mango_scopes[name].call(Mango::Query.new(self), *args)
           end
         end
       end
 
       def selector name, *operator, value
         anonymous_scope = -> { selector(name, *operator, value) }
-        query_object = Dolly::Mango::Query.new(self)
+        query_object = Mango::Query.new(self)
         args = nil
-        Dolly::Mango::Scope.new query_object, anonymous_scope, args
+        Mango::Scope.new query_object, anonymous_scope, args
       end
     end
 
diff --git a/lib/dolly/mango/query_validator.rb b/lib/dolly/mango/query_validator.rb
index 11d3707..cadacf9 100644
--- a/lib/dolly/mango/query_validator.rb
+++ b/lib/dolly/mango/query_validator.rb
@@ -7,24 +7,19 @@ def initialize operator, value
       end
 
       def validate!
-        raise Dolly::UnrecognizedOperator.new(operator) unless operator_base_klass::ALL_OPERATORS.include? operator
-        return if operator_base_klass::EQUALITY_OPERATORS.include? operator
-        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == operator_base_klass::EXISTS_OPERATOR && ![true, false].include?(value)
-        raise Dolly::BadQueryArguement.new(operator, operator_base_klass::POSSIBLE_TYPE_VALUES.join(', ')) if operator == operator_base_klass::TYPE_OPERATOR && !operator_base_klass::POSSIBLE_TYPE_VALUES.include?(value)
-        raise Dolly::BadQueryArguement.new(operator, Array) if operator_base_klass::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
-        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == operator_base_klass::SIZE_OPERATOR && !value.is_a?(Integer)
-        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == operator_base_klass::MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
-        raise Dolly::BadQueryArguement.new(operator, String) if operator == operator_base_klass::REGEX_OPERATOR && !value.is_a?(String)
-        raise Dolly::BadQueryArguement.new(operator, Array) if operator_base_klass::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise UnrecognizedOperator.new(operator) unless Selector::ALL_OPERATORS.include? operator
+        return if Selector::EQUALITY_OPERATORS.include? operator
+        raise BadQueryArguement.new(operator, 'Boolean') if operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
+        raise BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
+        raise BadQueryArguement.new(operator, Array) if Selector::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise BadQueryArguement.new(operator, Integer) if operator == Selector::SIZE_OPERATOR && !value.is_a?(Integer)
+        raise BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == Selector::MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
+        raise BadQueryArguement.new(operator, String) if operator == Selector::REGEX_OPERATOR && !value.is_a?(String)
+        raise BadQueryArguement.new(operator, Array) if Selector::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
       end
 
       private
-
       attr_reader :operator, :value
-
-      def operator_base_klass
-        Dolly::Mango::Selector
-      end
     end
   end
 end
diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index b49408b..da45371 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -112,7 +112,7 @@ def build_composite_selector name, value, *operators
       end
 
       def operator_value_type_check operator, value
-        Dolly::Mango::QueryValidator.new(operator, value).validate!
+        QueryValidator.new(operator, value).validate!
       end
     end
   end

From 45ad32c39289b934cfafa86d760129d34d23d60b Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 25 Jan 2017 11:15:29 -0800
Subject: [PATCH 49/66] change lambda style

---
 lib/dolly/document.rb              | 4 ++--
 test/mango/query_validator_test.rb | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 test/mango/query_validator_test.rb

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index fc6beab..7dca8e8 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -154,7 +154,7 @@ class << self
       def mango_scope scope_name, scope
         self.mango_scopes ||= {}
         name = scope_name.to_sym
-        self.mango_scopes[name] = lambda { |query_object, args| Mango::Scope.new(query_object, scope, args)}
+        self.mango_scopes[name] = ->(query_object, args) { Mango::Scope.new(query_object, scope, args) }
 
         (class << self; self end).instance_eval do
           define_method name do |*args|
@@ -164,7 +164,7 @@ def mango_scope scope_name, scope
       end
 
       def selector name, *operator, value
-        anonymous_scope = -> { selector(name, *operator, value) }
+        anonymous_scope = ->{ selector(name, *operator, value) }
         query_object = Mango::Query.new(self)
         args = nil
         Mango::Scope.new query_object, anonymous_scope, args
diff --git a/test/mango/query_validator_test.rb b/test/mango/query_validator_test.rb
new file mode 100644
index 0000000..f4c04f5
--- /dev/null
+++ b/test/mango/query_validator_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class QueryTestDoc < Dolly::Document; end
+
+class QueryValidatorTest < ActiveSupport::TestCase
+  setup do
+    @query_object = Dolly::Mango::Query.new
+  end
+end

From 59ecaf6053b7613115faa7bf5c4e2ab1c6a4ca1d Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 30 Jan 2017 13:57:02 -0800
Subject: [PATCH 50/66] add accepted value tests to query validator test

---
 test/mango/query_validator_test.rb | 41 +++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/test/mango/query_validator_test.rb b/test/mango/query_validator_test.rb
index f4c04f5..e5e7747 100644
--- a/test/mango/query_validator_test.rb
+++ b/test/mango/query_validator_test.rb
@@ -4,6 +4,45 @@ class QueryTestDoc < Dolly::Document; end
 
 class QueryValidatorTest < ActiveSupport::TestCase
   setup do
-    @query_object = Dolly::Mango::Query.new
+    @query_object = Dolly::Mango::Query.new(QueryTestDoc)
+  end
+
+  class AcceptedValuesTest < QueryValidatorTest
+    test 'nothing is raised if an equality operator is invoked' do
+      assert_nothing_raised do
+        @query_object.selector('field', :eq, "value")
+        @query_object.selector('ne_field', :ne, 1)
+        @query_object.selector('gt_field', :gt, ["value"])
+        @query_object.selector('gte_field', :gte, 2008)
+        @query_object.selector('lt_field', :lt, "value")
+        @query_object.selector('lte_field', :lte, {'key'=>'value'})
+      end
+    end
+
+    test 'nothing is raised if exists operator is invoked with a boolean' do
+      assert_nothing_raised do
+        @query_object.selector('field', :exists, true)
+        @query_object.selector('field', :exists, false)
+      end
+    end
+
+    test 'nothing is raised if type operator is invoked with null, boolean, number, string, array or and object' do
+      assert_nothing_raised do
+        @query_object.selector('field', :type, 'null')
+        @query_object.selector('field', :type, 'boolean')
+        @query_object.selector('field', :type, 'number')
+        @query_object.selector('field', :type, 'string')
+        @query_object.selector('field', :type, 'array')
+        @query_object.selector('field', :type, 'object')
+      end
+    end
+
+    test 'nothing is raised if an array operator is invoked with the correct values' do
+      assert_nothing_raised do
+        @query_object.selector('field', :in, ['value'])
+        @query_object.selector('field', :nin, ['value'])
+        @query_object.selector('field', :size, 1)
+      end
+    end
   end
 end

From 177fd28cc82b80b233dfde6dc9d8c57dfaeacb77 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 30 Jan 2017 14:09:15 -0800
Subject: [PATCH 51/66] add accepted value tests to query validator test

---
 lib/dolly/mango/query_validator.rb | 16 ++++++++--------
 lib/exceptions/dolly.rb            |  2 +-
 test/mango/query_validator_test.rb | 11 +++++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/dolly/mango/query_validator.rb b/lib/dolly/mango/query_validator.rb
index cadacf9..ad852d6 100644
--- a/lib/dolly/mango/query_validator.rb
+++ b/lib/dolly/mango/query_validator.rb
@@ -7,15 +7,15 @@ def initialize operator, value
       end
 
       def validate!
-        raise UnrecognizedOperator.new(operator) unless Selector::ALL_OPERATORS.include? operator
+        raise Dolly::UnrecognizedOperator.new(operator) unless Selector::ALL_OPERATORS.include? operator
         return if Selector::EQUALITY_OPERATORS.include? operator
-        raise BadQueryArguement.new(operator, 'Boolean') if operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
-        raise BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
-        raise BadQueryArguement.new(operator, Array) if Selector::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
-        raise BadQueryArguement.new(operator, Integer) if operator == Selector::SIZE_OPERATOR && !value.is_a?(Integer)
-        raise BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == Selector::MOD_OPERATOR && value.is_a?(Array) && value.count == 2 && value.all? {|el| el.is_a? Integer }
-        raise BadQueryArguement.new(operator, String) if operator == Selector::REGEX_OPERATOR && !value.is_a?(String)
-        raise BadQueryArguement.new(operator, Array) if Selector::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
+        raise Dolly::BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
+        raise Dolly::BadQueryArguement.new(operator, Array) if Selector::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == Selector::SIZE_OPERATOR && !value.is_a?(Integer)
+        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == Selector::MOD_OPERATOR && (!value.is_a?(Array) || value.count != 2 || value.none? {|el| el.is_a? Integer })
+        raise Dolly::BadQueryArguement.new(operator, String) if operator == Selector::REGEX_OPERATOR && !value.is_a?(String)
+        raise Dolly::BadQueryArguement.new(operator, Array) if Selector::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
       end
 
       private
diff --git a/lib/exceptions/dolly.rb b/lib/exceptions/dolly.rb
index a387131..c810bcd 100644
--- a/lib/exceptions/dolly.rb
+++ b/lib/exceptions/dolly.rb
@@ -35,7 +35,7 @@ def to_s
   end
   class DocumentInvalidError < RuntimeError; end
   class MissingPropertyError < RuntimeError; end
-  class BadQueryArugement < RuntimeError
+  class BadQueryArguement < RuntimeError
     def initialize operator, expected_type
       @operator, @expected_type = operator, expected_type
     end
diff --git a/test/mango/query_validator_test.rb b/test/mango/query_validator_test.rb
index e5e7747..f291b76 100644
--- a/test/mango/query_validator_test.rb
+++ b/test/mango/query_validator_test.rb
@@ -44,5 +44,16 @@ class AcceptedValuesTest < QueryValidatorTest
         @query_object.selector('field', :size, 1)
       end
     end
+
+    test 'nothing is raised if a misc operator is invoked with the correct values' do
+      assert_nothing_raised do
+        @query_object.selector('field', :mod, [3,1])
+        @query_object.selector('field', :regex, /[a-zA-Z]{1}/.to_s)
+      end
+    end
+  end
+
+  class UnacceptedValuesTest < QueryValidatorTest
+
   end
 end

From 2da630724500990572310bfb3ca357843a152f78 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 30 Jan 2017 15:38:50 -0800
Subject: [PATCH 52/66] move operator validation to proper place

---
 lib/dolly/mango/query_validator.rb | 1 -
 lib/dolly/mango/selector.rb        | 4 +++-
 test/mango/query_validator_test.rb | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/dolly/mango/query_validator.rb b/lib/dolly/mango/query_validator.rb
index ad852d6..6c09783 100644
--- a/lib/dolly/mango/query_validator.rb
+++ b/lib/dolly/mango/query_validator.rb
@@ -7,7 +7,6 @@ def initialize operator, value
       end
 
       def validate!
-        raise Dolly::UnrecognizedOperator.new(operator) unless Selector::ALL_OPERATORS.include? operator
         return if Selector::EQUALITY_OPERATORS.include? operator
         raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
         raise Dolly::BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index da45371..96c8220 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -48,14 +48,16 @@ module Selector
       ALL_OPERATORS = [ EQUALITY_OPERATORS, OBJECT_OPERATORS, ARRAY_OPERATORS, SIZE_OPERATOR, MISC_OPERATORS, COMBINATION_OPERATORS ].flatten.freeze
 
       def selector name, *operator, value
+        proxy_operator = operator.last
         operator = operator.count > 1 ? operator : operator.first
+        raise Dolly::UnrecognizedOperator.new(proxy_operator) unless select_operator_map.keys.include? proxy_operator
         select_operator_map[operator].call(name, value)
       end
 
       private
 
       def select_operator_map
-        {
+        @select_operator_map ||= {
           eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
           ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
           gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
diff --git a/test/mango/query_validator_test.rb b/test/mango/query_validator_test.rb
index f291b76..314bfc2 100644
--- a/test/mango/query_validator_test.rb
+++ b/test/mango/query_validator_test.rb
@@ -7,6 +7,14 @@ class QueryValidatorTest < ActiveSupport::TestCase
     @query_object = Dolly::Mango::Query.new(QueryTestDoc)
   end
 
+  class UnrecognizedOperatorTest < QueryValidatorTest
+    test 'Dolly::UnrecognizedOperator is raised if the operator is unknown' do
+      assert_raise Dolly::UnrecognizedOperator do
+        @query_object.selector('field', :operator, "value")
+      end
+    end
+  end
+
   class AcceptedValuesTest < QueryValidatorTest
     test 'nothing is raised if an equality operator is invoked' do
       assert_nothing_raised do

From b302059bdc4794a28d90e5b0547338c5ff5548e6 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 30 Jan 2017 16:05:46 -0800
Subject: [PATCH 53/66] get tests to pass

---
 lib/dolly/mango/selector.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index 96c8220..ec05607 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -49,8 +49,8 @@ module Selector
 
       def selector name, *operator, value
         proxy_operator = operator.last
+        operator_check! proxy_operator
         operator = operator.count > 1 ? operator : operator.first
-        raise Dolly::UnrecognizedOperator.new(proxy_operator) unless select_operator_map.keys.include? proxy_operator
         select_operator_map[operator].call(name, value)
       end
 
@@ -97,23 +97,27 @@ def select_operator_map
       end
 
       def build_equality_selector name, value, operator
-        operator_value_type_check(operator, value)
+        operator_value_type_check!(operator, value)
         query[SELECTOR][name][operator] = value
       end
 
       def build_exclusive_selector name, value, operator
-        operator_value_type_check(operator, value)
+        operator_value_type_check!(operator, value)
         query[SELECTOR][operator][name] = value
       end
 
       def build_composite_selector name, value, *operators
         first, second = operators
-        operator_value_type_check(second, value)
+        operator_value_type_check!(second, value)
 
         query[SELECTOR][name][first][second] = value
       end
 
-      def operator_value_type_check operator, value
+      def operator_check! operator
+        raise Dolly::UnrecognizedOperator.new(operator) unless select_operator_map.keys.include? operator
+      end
+
+      def operator_value_type_check! operator, value
         QueryValidator.new(operator, value).validate!
       end
     end

From b8f2e2a25aa191718679f726991459a7e4b8afd9 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Mon, 30 Jan 2017 16:18:42 -0800
Subject: [PATCH 54/66] add more tests for unacceptable values

---
 lib/dolly/mango/query_validator.rb | 42 +++++++++++++++++++++++++-----
 test/mango/query_validator_test.rb | 12 ++++++++-
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/lib/dolly/mango/query_validator.rb b/lib/dolly/mango/query_validator.rb
index 6c09783..e5ff95d 100644
--- a/lib/dolly/mango/query_validator.rb
+++ b/lib/dolly/mango/query_validator.rb
@@ -8,17 +8,45 @@ def initialize operator, value
 
       def validate!
         return if Selector::EQUALITY_OPERATORS.include? operator
-        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
-        raise Dolly::BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
-        raise Dolly::BadQueryArguement.new(operator, Array) if Selector::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
-        raise Dolly::BadQueryArguement.new(operator, Integer) if operator == Selector::SIZE_OPERATOR && !value.is_a?(Integer)
-        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if operator == Selector::MOD_OPERATOR && (!value.is_a?(Array) || value.count != 2 || value.none? {|el| el.is_a? Integer })
-        raise Dolly::BadQueryArguement.new(operator, String) if operator == Selector::REGEX_OPERATOR && !value.is_a?(String)
-        raise Dolly::BadQueryArguement.new(operator, Array) if Selector::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+        raise Dolly::BadQueryArguement.new(operator, 'Boolean') if boolean_op?
+        raise Dolly::BadQueryArguement.new(operator, Selector::POSSIBLE_TYPE_VALUES.join(', ')) if type_op?
+        raise Dolly::BadQueryArguement.new(operator, Array) if array_op?
+        raise Dolly::BadQueryArguement.new(operator, Integer) if int_op?
+        raise Dolly::BadQueryArguement.new(operator, '[Divisor, Remainder] Array of Integers') if mod_op?
+        raise Dolly::BadQueryArguement.new(operator, String) if regex_op?
+        raise Dolly::BadQueryArguement.new(operator, Array) if combination_op?
       end
 
       private
       attr_reader :operator, :value
+
+      def boolean_op?
+        operator == Selector::EXISTS_OPERATOR && ![true, false].include?(value)
+      end
+
+      def type_op?
+        operator == Selector::TYPE_OPERATOR && !Selector::POSSIBLE_TYPE_VALUES.include?(value)
+      end
+
+      def array_op?
+        Selector::ARRAY_OPERATORS.include?(operator) && !value.is_a?(Array)
+      end
+
+      def int_op?
+        operator == Selector::SIZE_OPERATOR && !value.is_a?(Integer)
+      end
+
+      def mod_op?
+        operator == Selector::MOD_OPERATOR && (!value.is_a?(Array) || value.count != 2 || value.none? {|el| el.is_a? Integer })
+      end
+
+      def regex_op?
+        operator == Selector::REGEX_OPERATOR && !value.is_a?(String)
+      end
+
+      def combination_op?
+        Selector::COMBINATION_OPERATORS.include?(operator) && !value.is_a?(Array)
+      end
     end
   end
 end
diff --git a/test/mango/query_validator_test.rb b/test/mango/query_validator_test.rb
index 314bfc2..481aab1 100644
--- a/test/mango/query_validator_test.rb
+++ b/test/mango/query_validator_test.rb
@@ -62,6 +62,16 @@ class AcceptedValuesTest < QueryValidatorTest
   end
 
   class UnacceptedValuesTest < QueryValidatorTest
-
+    test 'Dolly::BadQueryArguement is raised when an operatore is invoked with the wrong arguements' do
+      assert_raise Dolly::BadQueryArguement do
+        @query_object.selector('field', :exists, 1)
+        @query_object.selector('field', :type, 1)
+        @query_object.selector('field', :in, 1)
+        @query_object.selector('field', :nin, 1)
+        @query_object.selector('field', :size, 'value')
+        @query_object.selector('field', :mod, [3,"1"])
+        @query_object.selector('field', :regex, [""])
+      end
+    end
   end
 end

From 7bd26d70337346e71e0624633bee99d5738452f9 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:09:38 -0800
Subject: [PATCH 55/66] update

---
 lib/dolly/document.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/document.rb b/lib/dolly/document.rb
index 7dca8e8..868848b 100644
--- a/lib/dolly/document.rb
+++ b/lib/dolly/document.rb
@@ -154,7 +154,7 @@ class << self
       def mango_scope scope_name, scope
         self.mango_scopes ||= {}
         name = scope_name.to_sym
-        self.mango_scopes[name] = ->(query_object, args) { Mango::Scope.new(query_object, scope, args) }
+        self.mango_scopes[name] = ->(query_object, args=nil) { Mango::Scope.new(query_object, scope, args) }
 
         (class << self; self end).instance_eval do
           define_method name do |*args|

From f9a64a5f86e86698acf688d74f38b6a899148c7e Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:13:11 -0800
Subject: [PATCH 56/66] update

---
 lib/dolly/mango/selector.rb | 76 +++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index ec05607..e57a02c 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -47,6 +47,44 @@ module Selector
 
       ALL_OPERATORS = [ EQUALITY_OPERATORS, OBJECT_OPERATORS, ARRAY_OPERATORS, SIZE_OPERATOR, MISC_OPERATORS, COMBINATION_OPERATORS ].flatten.freeze
 
+      SELECTOR_OPERATOR_MAP = {
+        eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
+        ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
+        gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
+        gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR },
+        lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
+        lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
+
+        exists:        ->(name, value=true) { build_equality_selector name, value, EXISTS_OPERATOR },
+        type:          ->(name, value) { build_equality_selector name, value, TYPE_OPERATOR },
+
+        in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
+        nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
+        size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
+
+        mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
+        regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
+
+        nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
+        all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
+        and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
+        or:            ->(name, value) { build_exclusive_selector name, value, OR_OPERATOR },
+
+        [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
+        [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
+        [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
+        [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
+        [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
+        [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR },
+
+        [:not, :gt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GT_OPERATOR },
+        [:not, :gte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GTE_OPERATOR },
+        [:not, :lt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LT_OPERATOR },
+        [:not, :lte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LTE_OPERATOR },
+        [:not, :or] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, OR_OPERATOR },
+        [:not, :and] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, AND_OPERATOR }
+      }.freeze
+
       def selector name, *operator, value
         proxy_operator = operator.last
         operator_check! proxy_operator
@@ -57,43 +95,7 @@ def selector name, *operator, value
       private
 
       def select_operator_map
-        @select_operator_map ||= {
-          eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
-          ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
-          gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
-          gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR },
-          lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
-          lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
-
-          exists:        ->(name, value=true) { build_equality_selector name, value, EXISTS_OPERATOR },
-          type:          ->(name, value) { build_equality_selector name, value, TYPE_OPERATOR },
-
-          in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
-          nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
-          size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
-
-          mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
-          regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
-
-          nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
-          all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
-          and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
-          or:            ->(name, value) { build_exclusive_selector name, value, OR_OPERATOR },
-
-          [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
-          [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
-          [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
-          [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
-          [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
-          [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR },
-
-          [:not, :gt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GT_OPERATOR },
-          [:not, :gte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GTE_OPERATOR },
-          [:not, :lt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LT_OPERATOR },
-          [:not, :lte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LTE_OPERATOR },
-          [:not, :or] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, OR_OPERATOR },
-          [:not, :and] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, AND_OPERATOR }
-        }.freeze
+        SELECTOR_OPERATOR_MAP
       end
 
       def build_equality_selector name, value, operator

From 4e3e4d07996713de05950ede93afe84ca428b657 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:24:34 -0800
Subject: [PATCH 57/66] update

---
 lib/dolly/mango/selector.rb | 76 ++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/lib/dolly/mango/selector.rb b/lib/dolly/mango/selector.rb
index e57a02c..64cb260 100644
--- a/lib/dolly/mango/selector.rb
+++ b/lib/dolly/mango/selector.rb
@@ -47,44 +47,6 @@ module Selector
 
       ALL_OPERATORS = [ EQUALITY_OPERATORS, OBJECT_OPERATORS, ARRAY_OPERATORS, SIZE_OPERATOR, MISC_OPERATORS, COMBINATION_OPERATORS ].flatten.freeze
 
-      SELECTOR_OPERATOR_MAP = {
-        eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
-        ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
-        gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
-        gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR },
-        lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
-        lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
-
-        exists:        ->(name, value=true) { build_equality_selector name, value, EXISTS_OPERATOR },
-        type:          ->(name, value) { build_equality_selector name, value, TYPE_OPERATOR },
-
-        in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
-        nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
-        size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
-
-        mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
-        regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
-
-        nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
-        all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
-        and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
-        or:            ->(name, value) { build_exclusive_selector name, value, OR_OPERATOR },
-
-        [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
-        [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
-        [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
-        [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
-        [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
-        [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR },
-
-        [:not, :gt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GT_OPERATOR },
-        [:not, :gte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GTE_OPERATOR },
-        [:not, :lt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LT_OPERATOR },
-        [:not, :lte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LTE_OPERATOR },
-        [:not, :or] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, OR_OPERATOR },
-        [:not, :and] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, AND_OPERATOR }
-      }.freeze
-
       def selector name, *operator, value
         proxy_operator = operator.last
         operator_check! proxy_operator
@@ -95,7 +57,43 @@ def selector name, *operator, value
       private
 
       def select_operator_map
-        SELECTOR_OPERATOR_MAP
+        {
+          eq:            ->(name, value) { build_equality_selector name, value, EQ_OPERATOR },
+          ne:            ->(name, value) { build_equality_selector name, value, NE_OPERATOR },
+          gt:            ->(name, value) { build_equality_selector name, value, GT_OPERATOR },
+          gte:           ->(name, value) { build_equality_selector name, value, GTE_OPERATOR },
+          lt:            ->(name, value) { build_equality_selector name, value, LT_OPERATOR },
+          lte:           ->(name, value) { build_equality_selector name, value, LTE_OPERATOR },
+
+          exists:        ->(name, value=true) { build_equality_selector name, value, EXISTS_OPERATOR },
+          type:          ->(name, value) { build_equality_selector name, value, TYPE_OPERATOR },
+
+          in:            ->(name, value) { build_equality_selector name, value, IN_OPERATOR },
+          nin:           ->(name, value) { build_equality_selector name, value, NIN_OPERATOR },
+          size:          ->(name, value) { build_equality_selector name, value, SIZE_OPERATOR },
+
+          mod:           ->(name, value) { build_equality_selector name, value, MOD_OPERATOR },
+          regex:         ->(name, value) { build_equality_selector name, value, REGEX_OPERATOR },
+
+          nor:           ->(name, value) { build_exclusive_selector name, value, NOR_SELECTOR} ,
+          all:           ->(name, value) { build_exclusive_selector name, value, ALL_OPERATOR },
+          and:           ->(name, value) { build_exclusive_selector name, value, AND_OPERATOR },
+          or:            ->(name, value) { build_exclusive_selector name, value, OR_OPERATOR },
+
+          [:em, :gt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GT_OPERATOR },
+          [:em, :gte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, GTE_OPERATOR },
+          [:em, :lt] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LT_OPERATOR },
+          [:em, :lte] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, LTE_OPERATOR },
+          [:em, :or] =>  ->(name, value) { build_composite_selector name, value, EM_OPERATOR, OR_OPERATOR },
+          [:em, :and] => ->(name, value) { build_composite_selector name, value, EM_OPERATOR, AND_OPERATOR },
+
+          [:not, :gt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GT_OPERATOR },
+          [:not, :gte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, GTE_OPERATOR },
+          [:not, :lt] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LT_OPERATOR },
+          [:not, :lte] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, LTE_OPERATOR },
+          [:not, :or] =>  ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, OR_OPERATOR },
+          [:not, :and] => ->(name, value) { build_composite_selector name, value, NOT_OPERATOR, AND_OPERATOR }
+        }.freeze
       end
 
       def build_equality_selector name, value, operator

From efe016cc43c5165c110dba9d605a4b220f8cf3db Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:26:29 -0800
Subject: [PATCH 58/66] use variable

---
 lib/dolly/mango/scope.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
index 8a0f027..46b0a21 100644
--- a/lib/dolly/mango/scope.rb
+++ b/lib/dolly/mango/scope.rb
@@ -13,7 +13,7 @@ def initialize query_object, scope, scope_args
       def method_missing(method, *args, &block)
         if proxy_class.mango_scopes.include?(method)
           proxy_class.mango_scopes[method].call(query_object, args)
-        elsif query_object.respond_to? :method
+        elsif query_object.respond_to? method
           query_object.send(method, *args, &block)
           return self
         else

From 0aeb3f7f2e56b4564b13573e6e2465cf027263f1 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:28:09 -0800
Subject: [PATCH 59/66] inspect collection

---
 lib/dolly/mango/scope.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
index 46b0a21..1da3e2e 100644
--- a/lib/dolly/mango/scope.rb
+++ b/lib/dolly/mango/scope.rb
@@ -18,6 +18,7 @@ def method_missing(method, *args, &block)
           return self
         else
           collection = proxy_class.database.mango query.to_json
+          puts collection.inspect
           collection.send(method, *args, &block)
         end
       end

From 02ec1b676ecce3203beac0e2c659cadd8a9b73d9 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:46:37 -0800
Subject: [PATCH 60/66] return a collection with mango scopes

---
 lib/dolly/mango/scope.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
index 1da3e2e..58551b0 100644
--- a/lib/dolly/mango/scope.rb
+++ b/lib/dolly/mango/scope.rb
@@ -17,8 +17,8 @@ def method_missing(method, *args, &block)
           query_object.send(method, *args, &block)
           return self
         else
-          collection = proxy_class.database.mango query.to_json
-          puts collection.inspect
+          resp = proxy_class.database.mango query.to_json
+          collection = Dolly::Collection.new(resp, proxy_class)
           collection.send(method, *args, &block)
         end
       end

From dbe9e4e8f95c9e07ee372507f284c040bb4161ce Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:49:24 -0800
Subject: [PATCH 61/66] return a collection with mango scopes

---
 lib/dolly/mango/scope.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
index 58551b0..7053e9c 100644
--- a/lib/dolly/mango/scope.rb
+++ b/lib/dolly/mango/scope.rb
@@ -18,7 +18,7 @@ def method_missing(method, *args, &block)
           return self
         else
           resp = proxy_class.database.mango query.to_json
-          collection = Dolly::Collection.new(resp, proxy_class)
+          collection = Dolly::Collection.new(resp.parsed_response, proxy_class)
           collection.send(method, *args, &block)
         end
       end

From 9434871c55e36f1aee3d16e59d617ce8e2e3b02f Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 10:52:26 -0800
Subject: [PATCH 62/66] properly return http response for collection

---
 lib/dolly/mango/scope.rb | 2 +-
 lib/dolly/query.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dolly/mango/scope.rb b/lib/dolly/mango/scope.rb
index 7053e9c..1dfb174 100644
--- a/lib/dolly/mango/scope.rb
+++ b/lib/dolly/mango/scope.rb
@@ -18,7 +18,7 @@ def method_missing(method, *args, &block)
           return self
         else
           resp = proxy_class.database.mango query.to_json
-          collection = Dolly::Collection.new(resp.parsed_response, proxy_class)
+          collection = Dolly::Collection.new(resp.response.body, proxy_class)
           collection.send(method, *args, &block)
         end
       end
diff --git a/lib/dolly/query.rb b/lib/dolly/query.rb
index 609b7fc..2f36f18 100644
--- a/lib/dolly/query.rb
+++ b/lib/dolly/query.rb
@@ -56,7 +56,7 @@ def build_collection q
 
       def find_with doc, view_name, opts = {}
         res = view "_design/#{doc}/_view/#{view_name}", opts
-        Collection.new res.parsed_response, name_for_class
+        Collection.new res.response.body, name_for_class
       end
 
       #TODO: new implementation for collection returning

From 4a18549425ba0f1e2ea1fbe8500b5389fa73f662 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Wed, 15 Feb 2017 11:34:16 -0800
Subject: [PATCH 63/66] add a way to parse the response from mango, which does
 not include rows

---
 lib/dolly/collection.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/dolly/collection.rb b/lib/dolly/collection.rb
index 3dc7dfa..0bdecc6 100644
--- a/lib/dolly/collection.rb
+++ b/lib/dolly/collection.rb
@@ -56,9 +56,20 @@ def rows= ary
       end
     end
 
+    def doc_rows= ary
+      ary.each do |doc|
+        id = doc.delete '_id'
+        rev = doc.delete '_rev' if doc['_rev']
+        document = (docs_class || doc_class(id)).new doc
+        document.doc = doc.merge({'_id' => id, '_rev' => rev})
+        self << document
+      end
+    end
+
     def load
       parsed = JSON::parse json
-      self.rows = parsed['rows']
+      self.rows = parsed['rows'] if parsed['rows']
+      self.doc_rows = parsed['docs'] if parsed['docs']
     end
 
     def to_json options = {}

From a8c24b930e81d01c29c8cbe970ad3fdebfbe7840 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 16 Feb 2017 15:27:15 -0800
Subject: [PATCH 64/66] use parsed response

---
 lib/dolly/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/query.rb b/lib/dolly/query.rb
index 2f36f18..609b7fc 100644
--- a/lib/dolly/query.rb
+++ b/lib/dolly/query.rb
@@ -56,7 +56,7 @@ def build_collection q
 
       def find_with doc, view_name, opts = {}
         res = view "_design/#{doc}/_view/#{view_name}", opts
-        Collection.new res.response.body, name_for_class
+        Collection.new res.parsed_response, name_for_class
       end
 
       #TODO: new implementation for collection returning

From a70c133456de3fc5bf2c9a9166189157914cc873 Mon Sep 17 00:00:00 2001
From: seancookr <seanc@amcoonline.net>
Date: Thu, 16 Feb 2017 16:47:54 -0800
Subject: [PATCH 65/66] change build_collection as well

---
 lib/dolly/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dolly/query.rb b/lib/dolly/query.rb
index 609b7fc..15cc9ea 100644
--- a/lib/dolly/query.rb
+++ b/lib/dolly/query.rb
@@ -51,7 +51,7 @@ def last limit = 1
 
       def build_collection q
         res = database.all_docs(q)
-        Collection.new res.response.body, name_for_class
+        Collection.new res.parsed_response, name_for_class
       end
 
       def find_with doc, view_name, opts = {}

From fcd171b974ffbde0d05225e6a9894f04a21b2606 Mon Sep 17 00:00:00 2001
From: javierg <javierg@amcoonline.net>
Date: Tue, 3 Apr 2018 14:12:05 -0700
Subject: [PATCH 66/66] use parsed for all

---
 lib/dolly/query.rb   | 2 +-
 lib/dolly/request.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dolly/query.rb b/lib/dolly/query.rb
index 609b7fc..3135e05 100644
--- a/lib/dolly/query.rb
+++ b/lib/dolly/query.rb
@@ -51,7 +51,7 @@ def last limit = 1
 
       def build_collection q
         res = database.all_docs(q)
-        Collection.new res.response.body, name_for_class
+        Collection.new res.parsed_response.to_json, name_for_class
       end
 
       def find_with doc, view_name, opts = {}
diff --git a/lib/dolly/request.rb b/lib/dolly/request.rb
index 9d09d46..2289d81 100644
--- a/lib/dolly/request.rb
+++ b/lib/dolly/request.rb
@@ -64,7 +64,7 @@ def uuids opts = {}
 
     def all_docs data = {}
       data =  values_to_json data.merge( include_docs: true )
-      request :get, full_path('_all_docs'), {query: data}
+      request(:get, full_path('_all_docs'), { query: data })
     end
 
     def request method, resource, data = nil