mongoid_embed_finder 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecbb38b95a0203aecd5993d79c10dbb28ee06f5c
-  data.tar.gz: 7fbf881de4a588a8676920cfb6625fc9e2699b10
+  metadata.gz: 60b96e46d3a830bd20085827c827774bc342fb0f
+  data.tar.gz: 2d9232aeb1e78e8d4710369f08ebe2acd5937ad8
 SHA512:
-  metadata.gz: 6db36b453e52cb4b3343db6b3e19ac60e032eee512ef5c8811ca8b5a8af618e320d5e9b7454d3ee00b04471eac8f5c1aa6bb861bb1751ed5cc8b7adb0d03e98c
-  data.tar.gz: beeaf658226886300e6b0f0ef5b6dd69f5634db2435fa4509cbcf842f92f09e8cd5f8092f948698f23d7a577ec05902d21ad4f71b9b5d813dcb1eb03d553925d
+  metadata.gz: 2bd177968c36476571030f5fd90e35389e9000957c957266962adfe4b6b876c83bb2ebcd991bc84ff681d976906ac2e025525e0ac370db29d9ebea700a1945b3
+  data.tar.gz: 52269e3d0f7a87c1541e7e9c47ae3ce07893e58eb16978b97a188a2b81eba92b697d25d22decc6e15d6bb17a0159628b612b81920bac319d403a378c5e51e066

data/lib/mongoid_embed_finder/nested_query.rb

@@ -0,0 +1,23 @@
+module MongoidEmbedFinder
+  class NestedQuery
+    attr_reader :parent_criteria, :child_criteria
+
+    def initialize(parent_criteria, child_criteria)
+      @parent_criteria = parent_criteria
+      @child_criteria  = child_criteria
+    end
+
+    def scope_parent(conditions = {})
+      @parent_criteria = @parent_criteria.where(conditions)
+    end
+
+    def scope_child(conditions = {})
+      @child_criteria = @child_criteria.where(conditions)
+    end
+
+    def execute
+      parent_criteria.collection
+        .find(parent_criteria.selector)
+    end
+  end
+end

data/lib/mongoid_embed_finder/projectors/base.rb

@@ -1,8 +1,13 @@
 module MongoidEmbedFinder
   module Projectors
-    class Base < Struct.new(:relation, :criteria)
+    class Base < Struct.new(:query, :relation)
       def projection
-        { relation.key => { operator => criteria.selector }}
+        { relation.key => { operator => query.child_criteria.selector }}
+      end
+
+      def project
+        query.scope_parent(projection)
+        query.execute.select(projection)
       end
 
       def operator

data/lib/mongoid_embed_finder/runner.rb

@@ -1,6 +1,6 @@
-require "mongoid_embed_finder/projectors/base"
-require "mongoid_embed_finder/projectors/single"
+require "mongoid_embed_finder/nested_query"
 require "mongoid_embed_finder/nested_builder"
+require "mongoid_embed_finder/projectors/single"
 require "mongoid_embed_finder/relation_discovery"
 
 module MongoidEmbedFinder
@@ -19,26 +19,22 @@ module MongoidEmbedFinder
     private
 
     def find_first(attrs = {}, parent: {})
-      scope_parent(parent)
-      project(attrs, with: Projectors::Single)
-      execute_query.first
+      query = build_nested_query(attrs, parent: parent)
+      project_query(query, Projectors::Single).first
     end
 
-    def scope_parent(attrs = {})
-      @parent_criteria ||= relations.parent_class.criteria
-      @parent_criteria.selector.merge!(attrs)
-    end
+    def build_nested_query(attrs = {}, parent: {})
+      parent_criteria = relations.parent_class.criteria
+      child_criteria  = relations.child_class.criteria
 
-    def project(attrs = {}, with: Projectors::Base)
-      child_criteria  = relations.child_class.criteria.where(attrs)
-      @projector = with.new(relations.children, child_criteria)
-      scope_parent(@projector.projection)
+      NestedQuery.new(parent_criteria, child_criteria).tap do |query|
+        query.scope_parent(parent)
+        query.scope_child(attrs)
+      end
     end
 
-    def execute_query
-      relations.parent_class.collection
-        .find(@parent_criteria.selector)
-        .select(@projector.projection)
+    def project_query(query, projector_class)
+      projector_class.new(query, relations.children).project
     end
 
     def build_child_with_parent(nested_attrs)

data/lib/mongoid_embed_finder/version.rb

@@ -1,3 +1,3 @@
 module MongoidEmbedFinder
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/mongoid_embed_finder/projectors/base_spec.rb

@@ -3,10 +3,15 @@ require "mongoid_embed_finder/projectors/base"
 
 describe MongoidEmbedFinder::Projectors::Base do
   describe "#projection" do
+    let(:query) do
+      double(
+        scope_parent: nil,
+        execute: double(select: []),
+        child_criteria: double(selector: {}))
+    end
     let(:relation) { double(key: "children") }
-    let(:criteria) { double(selector: { "name" => "Child Name 0" }) }
 
-    subject { described_class.new(relation, criteria) }
+    subject { described_class.new(query, relation) }
 
     it "relies on methods to be implemented" do
       expect { subject.projection }.to raise_error(NotImplementedError)

data/spec/mongoid_embed_finder/projectors/single_spec.rb

@@ -2,12 +2,36 @@ require "spec_helper"
 require "mongoid_embed_finder/projectors/single"
 
 describe MongoidEmbedFinder::Projectors::Single do
-  describe "#projection" do
-    let(:relation) { double(key: "children") }
-    let(:criteria) { double(selector: { "name" => "Child Name 0" }) }
+  let(:relation) { double(key: "children") }
+  let(:criteria) { double(selector: { "name" => "Child Name 0" }) }
+  let(:projection_result) { [] }
+  let(:query) do
+    double(
+      scope_parent: nil,
+      execute: double(select: projection_result),
+      child_criteria: criteria)
+  end
 
-    subject { described_class.new(relation, criteria) }
+  subject { described_class.new(query, relation) }
 
+  describe "#projection" do
     its(:projection) { should eq(relation.key => { "$elemMatch" => criteria.selector }) }
   end
+
+  describe "#project" do
+    it "extend parent's criteria" do
+      subject.project
+      expect(query).to have_received(:scope_parent).with(subject.projection)
+    end
+
+    it "projects query" do
+      subject.project
+      expect(query).to have_received(:execute)
+      expect(query.execute).to have_received(:select).with(subject.projection)
+    end
+
+    it "returns projection result" do
+      expect(subject.project).to eq projection_result
+    end
+  end
 end

data/spec/mongoid_embed_finder/relation_discovery_spec.rb

@@ -3,14 +3,14 @@ require "mongoid_embed_finder/relation_discovery"
 
 describe MongoidEmbedFinder::RelationDiscovery do
   describe "#relations" do
-    subject { described_class.new(Child, :parent).relations }
+    subject { described_class.new(Door, :car).relations }
 
-    its(:child_class)  { should eq Child }
-    its(:parent_class) { should eq Parent }
+    its(:child_class)  { should eq Door }
+    its(:parent_class) { should eq Car }
 
-    its('children.key')        { should eq "children" }
-    its('children.class_name') { should eq "Child" }
+    its('children.key')        { should eq "doors" }
+    its('children.class_name') { should eq "Door" }
 
-    its('parent.setter') { should eq "parent=" }
+    its('parent.setter') { should eq "car=" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_embed_finder
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Artur Hebda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -112,6 +112,7 @@ files:
 - Rakefile
 - lib/mongoid_embed_finder.rb
 - lib/mongoid_embed_finder/nested_builder.rb
+- lib/mongoid_embed_finder/nested_query.rb
 - lib/mongoid_embed_finder/projectors/base.rb
 - lib/mongoid_embed_finder/projectors/single.rb
 - lib/mongoid_embed_finder/relation_discovery.rb
@@ -119,7 +120,6 @@ files:
 - lib/mongoid_embed_finder/version.rb
 - mongoid_embed_finder.gemspec
 - spec/mongoid_embed_finder/nested_builder_spec.rb
-- spec/mongoid_embed_finder/projector_spec.rb
 - spec/mongoid_embed_finder/projectors/base_spec.rb
 - spec/mongoid_embed_finder/projectors/single_spec.rb
 - spec/mongoid_embed_finder/relation_discovery_spec.rb
@@ -151,7 +151,6 @@ specification_version: 4
 summary: Find mongoid embedded documents easily.
 test_files:
 - spec/mongoid_embed_finder/nested_builder_spec.rb
-- spec/mongoid_embed_finder/projector_spec.rb
 - spec/mongoid_embed_finder/projectors/base_spec.rb
 - spec/mongoid_embed_finder/projectors/single_spec.rb
 - spec/mongoid_embed_finder/relation_discovery_spec.rb

data/spec/mongoid_embed_finder/projector_spec.rb

@@ -1,15 +0,0 @@
-require "spec_helper"
-require "mongoid_embed_finder/projector"
-
-describe MongoidEmbedFinder::Projector do
-  describe "#to_projection" do
-    let(:relation) { double(key: "children") }
-    let(:criteria) { double(selector: { "name" => "Child Name 0" }) }
-
-    subject { described_class.new(relation, criteria) }
-
-    it "needs to be implemented in derived classes" do
-      expect { subject.to_projection }.to raise_error(NotImplementedError)
-    end
-  end
-end