mongoid-list 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee70af388cbaca26fbeeee305a1d39680c68c8aa
-  data.tar.gz: 2ea617436993882c21f6d96dd6b45608888f3a23
+  metadata.gz: 1bc8db58867c8a657789d5531ea6d521a0e03538
+  data.tar.gz: 3612c5394262ee8c7edf085d68dd74e8a15cbbbb
 SHA512:
-  metadata.gz: 6f6a3c4f8b0f92606549c534c92eb045c74caca1aafbdc09345c1ffd5a9282f4b9d2bffab687edcf307d6e5bac99ceafd0b65f6d652b77f18c6aab2cc8894a16
-  data.tar.gz: 16ec2fc27a2c01f6a8e52a9cda91191fca53b4bd31a2655ebb7f5776e69474f97e6260b1f3778eeb8666d14fddbf11ae9cedaec3f3a1664de0b322f7f4c626cd
+  metadata.gz: e7284c34aa95047c45d4e3cd793cf49be0bd87d4f337b31a0e14b087e8dcf9ad5f8430dd83ef287f58197f92007f8aa97e40d1a2e54a64cf77efcf3b6e9ecf4b
+  data.tar.gz: 28bd66e603e0e81c6eef973e03f4ff97f33ca41249431c902218863c64310faa5585b18de1a285ea4995a6734528f8f13e1a332b72429f371b0815463af88418

data/.rspec

@@ -0,0 +1 @@
+--color

data/Guardfile

@@ -2,7 +2,7 @@ guard 'spork', wait: 20 do
   watch('Gemfile')
 end
 
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec" do
   watch('spec/spec_helper.rb')    { "spec" }
   watch(%r{^lib/(.+)\.rb$})       { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^spec/.+_spec\.rb})

data/lib/mongoid/list/embedded.rb

@@ -7,13 +7,20 @@ module Mongoid
       class << self
 
         def update_positions!(binding, elements)
+          root_doc = binding_root(binding)
           load_list_elements(binding, elements).each_with_index do |element, idx|
-            (binding.base._parent || binding.base).collection.find(element.atomic_selector).update(
-              { "$set" => { "#{element.atomic_path}.$.position" => (idx+1) } }
+            # element.set(position: idx+1)
+            root_doc.collection.find(element.atomic_selector).update(
+              { "$set" => { "#{element.atomic_position}.position" => (idx+1) } }
             )
           end
         end
 
+        def binding_root(binding)
+          binding.base._parent || binding.base
+        end
+
+
       private
 
         def load_list_elements(binding, elements)
@@ -27,10 +34,10 @@ module Mongoid
 
 
       def update_positions!
-        items.each do |item|
+        items.each_with_index do |item, idx|
           next unless should_operate_on_item?(item)
           criteria  = item.atomic_selector
-          updates   = { '$inc' => { "#{item.atomic_path}.$.position" => changes[:by] } }
+          updates   = { '$inc' => { "#{item.atomic_path}.#{idx}.position" => changes[:by] } }
           item._root.class.collection.find(criteria).update(updates)
         end
       end

data/lib/mongoid/list/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module List
-    VERSION = "0.5.3"
+    VERSION = "0.6.0"
   end
 end

data/mongoid-list.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency('mongoid', [ '~> 4.0.0' ])
 
-  s.add_development_dependency('rspec', [ '>= 2.l4.0' ])
-  s.add_development_dependency('guard', [ '>= 2.4.0' ])
+  s.add_development_dependency('rspec', [ '>= 3.1.0' ])
+  s.add_development_dependency('guard', [ '>= 2.8.0' ])
   s.add_development_dependency('guard-rspec', [ '>= 4.2.0' ])
-  s.add_development_dependency('guard-spork', [ '>= 1.5.0' ])
-  s.add_development_dependency('listen', [ '>= 2.5.0' ])
-  s.add_development_dependency('database_cleaner', [ '~> 1.2.0' ])
+  s.add_development_dependency('guard-spork', [ '>= 2.0.0' ])
+  s.add_development_dependency('listen', [ '>= 2.8.0' ])
+  s.add_development_dependency('database_cleaner', [ '~> 1.3.0' ])
 
 end

data/spec/mongoid/list/embedded_spec.rb

@@ -2,6 +2,41 @@ require "spec_helper"
 
 describe Mongoid::List::Embedded do
 
+  describe ".binding_root" do
+
+    subject do
+      Mongoid::List::Embedded
+    end
+
+    let(:root) do
+      Container.create!
+    end
+
+    let(:embedded) do
+      root.items.create!
+    end
+
+    context "w/ Child Embed" do
+
+      it "returns @root" do
+        expect(subject.binding_root(root.items)).to eq root
+      end
+
+    end
+
+    context "w/ Deeply Embedded" do
+
+      let!(:deeply_embedded) { embedded.items.create! }
+
+      it "returns @root" do
+        expect(subject.binding_root(embedded.items)).to eq root
+      end
+
+    end
+
+  end
+
+
   describe "#initialization" do
 
     let(:container) do

data/spec/mongoid/list_spec.rb

@@ -376,8 +376,8 @@ describe Mongoid::List do
       end
 
       it "should have moved last items up" do
-        container.items.first.items.find(item1.id).position.should eq 1
-        container.items.first.items.find(item3.id).position.should eq 2
+        expect(item1.reload.position).to eq 1
+        expect(item3.reload.position).to eq 2
       end
 
     end
@@ -466,7 +466,7 @@ describe Mongoid::List do
     context "when unscoped" do
 
       subject { Simple.create }
-      specify { subject.list_scope_changing?.should be_false }
+      specify { subject.list_scope_changing?.should be_falsey }
 
     end
 
@@ -476,14 +476,14 @@ describe Mongoid::List do
 
       context "but no change to :group" do
 
-        specify { subject.list_scope_changing?.should be_false }
+        specify { subject.list_scope_changing?.should be_falsey }
 
       end
 
       context "with change to :group" do
 
         before  { subject.group = "B" }
-        specify { subject.list_scope_changing?.should be_true }
+        specify { subject.list_scope_changing?.should be_truthy }
 
       end
 
@@ -856,18 +856,18 @@ describe Mongoid::List do
       end
 
       it "should change doc1 from :position of 1 to 2" do
-        doc1.position.should eq 1
-        doc1.reload.position.should eq 2
+        expect(doc1.position).to eq 1
+        expect(doc1.reload.position).to eq 2
       end
 
       it "should change doc2 from :position of 2 to 1" do
-        doc2.position.should eq 2
-        doc2.reload.position.should eq 1
+        expect(doc2.position).to eq 2
+        expect(doc2.reload.position).to eq 1
       end
 
       it "should not change doc3 from :position of 3" do
-        doc3.position.should eq 3
-        doc3.reload.position.should eq 3
+        expect(doc3.position).to eq 3
+        expect(doc3.reload.position).to eq 3
       end
 
     end
@@ -885,24 +885,25 @@ describe Mongoid::List do
       end
 
       it "should change doc1 from :position of 1 to 2" do
-        doc1.position.should eq 1
-        doc1.reload.position.should eq 2
+        expect(doc1.position).to eq 1
+        expect(doc1.reload.position).to eq 2
       end
 
       it "should change doc2 from :position of 2 to 1" do
-        doc2.position.should eq 2
-        doc2.reload.position.should eq 1
+        expect(doc2.position).to eq 2
+        expect(doc2.reload.position).to eq 1
       end
 
       it "should change doc3 from :position of 3 to 4" do
-        doc3.position.should eq 3
-        doc3.reload.position.should eq 4
+        expect(doc3.position).to eq 3
+        expect(doc3.reload.position).to eq 4
       end
 
       it "should change doc4 from :position of 4 to 3" do
-        doc4.position.should eq 4
-        doc4.reload.position.should eq 3
+        expect(doc4.position).to eq 4
+        expect(doc4.reload.position).to eq 3
       end
+
     end
 
     context "on a Deeply Embedded Collection" do
@@ -925,23 +926,23 @@ describe Mongoid::List do
       end
 
       it "should change doc1 from :position of 1 to 3" do
-        doc1.position.should eq 1
-        doc1.reload.position.should eq 3
+        expect(doc1.position).to eq 1
+        expect(doc1.reload.position).to eq 3
       end
 
       it "should change @doc2 from :position of 2 to 4" do
-        doc2.position.should eq 2
-        doc2.reload.position.should eq 4
+        expect(doc2.position).to eq 2
+        expect(doc2.reload.position).to eq 4
       end
 
       it "should change @doc3 from :position of 3 to 1" do
-        doc3.position.should eq 3
-        doc3.reload.position.should eq 1
+        expect(doc3.position).to eq 3
+        expect(doc3.reload.position).to eq 1
       end
 
       it "should change @doc4 from :position of 4 to 2" do
-        doc4.position.should eq 4
-        doc4.reload.position.should eq 2
+        expect(doc4.position).to eq 4
+        expect(doc4.reload.position).to eq 2
       end
 
     end

data/spec/spec_helper.rb

@@ -18,8 +18,6 @@ Spork.prefork do
 
   RSpec.configure do |config|
 
-    config.color_enabled = true
-
     config.filter_run focus: true
     config.run_all_when_everything_filtered = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-list
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Dave Krupinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.l4.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.l4.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 description: 
 email: dave@davekrupinski.com
 executables: []
@@ -115,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Simple list behavior for Mongoid