mongoid-list 0.1.8 → 0.2.0

data/Guardfile

@@ -1,12 +1,8 @@
-guard 'spork' do
+guard 'spork', wait: 20 do
   watch('Gemfile')
-  watch('Gemfile.lock')
-  watch('test/test_helper.rb')
 end
 
-guard 'minitest' do
-  watch(%r|^test/test_(.*)\.rb|)
-  watch(%r|^test/(.*)_test\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r|^test/test_helper\.rb|)    { "test" }
+guard :rspec, version: 2 do
+  watch('spec/spec_helper.rb')            { "spec" }
+  watch(%r{^spec/.+_spec\.rb})
 end

data/lib/mongoid/list.rb

@@ -1,5 +1,9 @@
 module Mongoid
 
+  Fields.option :scope do |model, field, value|
+
+  end
+
   module List
 
     extend ActiveSupport::Concern
@@ -18,7 +22,7 @@ module Mongoid
       before_destroy :mark_for_removal_processing_from_list
       after_destroy  :update_positions_in_list!, if: :_process_list_change
 
-      scope :ordered, order_by: :position.asc
+      scope :ordered, asc(:position)
     end
 
 

data/lib/mongoid/list/collection.rb

@@ -9,7 +9,7 @@ module Mongoid
         def update_positions!(klass, elements)
           elements.each_with_index do |element, idx|
             id = element.kind_of?(Hash) ? element['id'] : element
-            klass.collection.update({ _id: id }, { '$set' => { position: (idx + 1) } })
+            klass.collection.find({ _id: id }).update({ '$set' => { position: (idx + 1) } })
           end
         end
 
@@ -17,10 +17,8 @@ module Mongoid
 
 
       def update_positions!
-        obj.class.collection.update(
-          criteria,
-          { '$inc' => { position: changes[:by] } },
-          multi: true
+        obj.class.collection.find(criteria).update_all(
+          { '$inc' => { position: changes[:by] } }
         )
       end
 

data/lib/mongoid/list/embedded.rb

@@ -8,8 +8,7 @@ module Mongoid
 
         def update_positions!(binding, elements)
           load_list_elements(binding, elements).each_with_index do |element, idx|
-            (binding.base._parent || binding.base).collection.update(
-              element.atomic_selector,
+            (binding.base._parent || binding.base).collection.find(element.atomic_selector).update(
               { "$set" => { "#{element.atomic_path}.$.position" => (idx+1) } }
             )
           end
@@ -32,7 +31,7 @@ module Mongoid
           next unless should_operate_on_item?(item)
           criteria  = item.atomic_selector
           updates   = { '$inc' => { "#{item.atomic_path}.$.position" => changes[:by] } }
-          item._root.class.collection.update(criteria, updates)
+          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.1.8"
+    VERSION = "0.2.0"
   end
 end

data/mongoid-list.gemspec

@@ -13,20 +13,20 @@ Gem::Specification.new do |s|
   s.summary       = 'Simple list behavior for Mongoid'
   s.homepage      = 'https://github.com/davekrupinski/mongoid-list'
 
-  s.add_dependency('mongoid', [ '>= 2.4.0' ])
-
-  s.add_development_dependency('bson_ext')
-  s.add_development_dependency('minitest', [ '>= 2.11.0' ])
-  s.add_development_dependency('mini_shoulda', [ '>= 0.4.0' ])
-  s.add_development_dependency('spork', [ '>= 1.0.0.rc' ])
-  s.add_development_dependency('spork-testunit', [ '>= 0.0.8' ])
-  s.add_development_dependency('guard-minitest', [ '>= 0.5.0' ])
-  s.add_development_dependency('guard-spork', [ '>= 0.5.2' ])
-  s.add_development_dependency('turn', [ '>= 0.9.4' ])
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency('mongoid', [ '>= 3.0.0' ])
+
+  s.add_development_dependency('rspec', [ '>= 2.13.0' ])
+  s.add_development_dependency('guard', [ '>= 1.8.0' ])
+  s.add_development_dependency('guard-rspec', [ '>= 2.5.0' ])
+  s.add_development_dependency('guard-spork', [ '>= 1.5.0' ])
+  s.add_development_dependency('listen', [ '>= 1.0.0' ])
+  s.add_development_dependency('database_cleaner', [ '~> 0.9.0 ' ])
+
+  s.add_development_dependency('rspecify')
+
 end

data/mongoid.yml

@@ -0,0 +1,12 @@
+test:
+  sessions:
+    default:
+      database: mongoid-list_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong
+        # In the test environment we lower the retries and retry interval to
+        # low amounts for fast failures.
+        max_retries: 1
+        retry_interval: 0

data/spec/mongoid/list/collection_spec.rb

@@ -0,0 +1,147 @@
+require "spec_helper"
+
+describe Mongoid::List::Collection do
+
+  describe "#initialization" do
+
+    let(:simple) do
+      Simple.create
+    end
+
+    let(:collection) do
+      Mongoid::List::Collection.new(simple)
+    end
+
+    it "should assign simple to :obj" do
+      collection.obj.should eq simple
+    end
+
+  end
+
+
+  describe "#count" do
+
+    context "when unscoped" do
+      let(:collection) do
+        Mongoid::List::Collection.new(Simple.new)
+      end
+
+      before do
+        5.times do
+          Simple.create
+        end
+      end
+
+      it "should be 5" do
+        collection.count.should eq 5
+      end
+
+    end
+
+    context "when scoped" do
+
+      before do
+        4.times do
+          Scoped.create(group: "airplane 1")
+        end
+
+        3.times do
+          Scoped.create(group: "airplane 2")
+        end
+
+      end
+
+      context "group 1" do
+
+        let(:collection) do
+          Mongoid::List::Collection.new(Scoped.new(group: "airplane 1"))
+        end
+
+        it "should be 4" do
+          collection.count.should eq 4
+        end
+
+      end
+
+      context "group 2" do
+
+        let(:collection) do
+          Mongoid::List::Collection.new(Scoped.new(group: "airplane 2"))
+        end
+
+        it "should be 3" do
+          collection.count.should eq 3
+        end
+
+      end
+
+    end
+
+  end
+
+
+  describe "#update_positions_in_list!" do
+
+    context "unscoped" do
+
+      let!(:obj1) { Simple.create }
+      let!(:obj2) { Simple.create }
+      let!(:obj3) { Simple.create }
+
+      before do
+        Simple.update_positions_in_list!([obj2.id, obj1.id, obj3.id])
+      end
+
+      it "should change obj1 from :position of 1 to 2" do
+        obj1.position.should eq 1
+        obj1.reload.position.should eq 2
+      end
+
+      it "should change obj2 from :position of 2 to 1" do
+        obj2.position.should eq 2
+        obj2.reload.position.should eq 1
+      end
+
+      it "should not change obj3 from :position of 3" do
+        obj3.position.should eq 3
+        obj3.reload.position.should eq 3
+      end
+
+    end
+
+    context "scoped" do
+
+      let!(:obj1) { Scoped.create(group: "hell's angels") }
+      let!(:obj2) { Scoped.create(group: "hell's angels") }
+      let!(:obj3) { Scoped.create(group: "hell's angels") }
+      let!(:other) { Scoped.create(group: "charlie's angels") }
+
+      before do
+        Scoped.update_positions_in_list!([obj3.id, obj2.id, obj1.id])
+      end
+
+      it "should change obj1 from :position of 1 to 3" do
+        obj1.position.should eq 1
+        obj1.reload.position.should eq 3
+      end
+
+      it "should not change obj2 from :position of 2" do
+        obj2.position.should eq 2
+        obj2.reload.position.should eq 2
+      end
+
+      it "should change obj3 from :position of 3 to 1" do
+        obj3.position.should eq 3
+        obj3.reload.position.should eq 1
+      end
+
+      it "should not have touched other scoped" do
+        other.position.should eq 1
+        other.reload.position.should eq 1
+      end
+
+    end
+
+  end
+
+end

data/spec/mongoid/list/embedded_spec.rb

@@ -0,0 +1,181 @@
+require "spec_helper"
+
+describe Mongoid::List::Embedded do
+
+  describe "#initialization" do
+
+    let(:container) do
+      Container.create
+    end
+
+    let(:item) do
+      container.items.create
+    end
+
+    let(:embedded) do
+      Mongoid::List::Embedded.new(item)
+    end
+
+    it "should assign item to :obj" do
+      embedded.obj.should eq item
+    end
+
+  end
+
+
+  describe "#count" do
+
+    context "when unscoped" do
+
+      let(:container) do
+        Container.create!
+      end
+
+      let(:container2) do
+        Container.create!
+      end
+
+      let(:item) do
+        container.items.build
+      end
+
+      let(:embedded) do
+        Mongoid::List::Embedded.new(item)
+      end
+
+      before do
+        3.times do
+          container.items.create!
+        end
+        2.times do
+          container2.items.create!
+        end
+      end
+
+      it "should be 3" do
+        embedded.count.should eq 3
+      end
+
+    end
+
+    context "when scoped" do
+
+      let(:container) do
+        Container.create!
+      end
+
+      before do
+        3.times do
+          container.scoped_items.create!(group: "alien")
+        end
+        2.times do
+          container.scoped_items.create!(group: "aliens")
+        end
+      end
+
+      context "group 1" do
+
+        let(:item) do
+          container.scoped_items.build(group: "alien")
+        end
+
+        let(:embedded) do
+          Mongoid::List::Embedded.new(item)
+        end
+
+        it "should be 3" do
+          embedded.count.should eq 3
+        end
+
+      end
+
+      context "group 2" do
+
+        let(:item) do
+          container.scoped_items.build(group: "aliens")
+        end
+
+        let(:embedded) do
+          Mongoid::List::Embedded.new(item)
+        end
+
+        it "should be 2" do
+          embedded.count.should eq 2
+        end
+
+      end
+
+    end
+
+  end
+
+
+  describe "#update_positions_in_list!" do
+
+    let(:container) do
+      Container.create!
+    end
+
+    context "unscoped" do
+
+      let!(:obj1) { container.items.create! }
+      let!(:obj2) { container.items.create! }
+      let!(:obj3) { container.items.create! }
+
+      before do
+        container.items.update_positions_in_list!([obj2.id, obj1.id, obj3.id])
+      end
+
+      it "should change obj1 from :position of 1 to 2" do
+        obj1.position.should eq 1
+        obj1.reload.position.should eq 2
+      end
+
+      it "should change obj2 from :position of 2 to 1" do
+        obj2.position.should eq 2
+        obj2.reload.position.should eq 1
+      end
+
+      it "should not change obj3 from :position of 3" do
+        obj3.position.should eq 3
+        obj3.reload.position.should eq 3
+      end
+
+    end
+
+    context "scoped" do
+
+      let!(:obj1) { container.scoped_items.create!(group: "hell's angels") }
+      let!(:obj2) { container.scoped_items.create!(group: "hell's angels") }
+      let!(:obj3) { container.scoped_items.create!(group: "hell's angels") }
+      let!(:other) { container.scoped_items.create!(group: "charlie's angels") }
+
+      before do
+        container.scoped_items.update_positions_in_list!([obj3.id, obj2.id, obj1.id])
+      end
+
+      it "should change obj1 from :position of 1 to 3" do
+        obj1.position.should eq 1
+        obj1.reload.position.should eq 3
+      end
+
+      it "should not change obj2 from :position of 2" do
+        obj2.position.should eq 2
+        obj2.reload.position.should eq 2
+      end
+
+      it "should change obj3 from :position of 3 to 1" do
+        obj3.position.should eq 3
+        obj3.reload.position.should eq 1
+      end
+
+      it "should not have touched other scoped" do
+        other.position.should eq 1
+        other.reload.position.should eq 1
+      end
+
+    end
+
+  end
+
+end