mongoid-list 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d6d233c11d01fef19a74b49979cd597c6b4c9f3
-  data.tar.gz: 62117736d0330d0a57263bf544cfe2c21aec54ec
+  metadata.gz: 940d829ee5548d99991b72e14e1c7d196fc80b11
+  data.tar.gz: 7c2672f1c043e6934670ad6f6c940ac5c3aeb330
 SHA512:
-  metadata.gz: 24249d8cfa2b9f68858115e941348ef43cbbe95f05e07ddab99498b23e23a95689c1940a93f878f5bd5683a97f77b8be5d71753722ef49cc851989394198e7b4
-  data.tar.gz: 49b9feaa21091ee4cb4eba631fe28ab0ffd6b1317536be7e8cfdc756e9e5f58febaf35311f0b9daf989da8d3557328606361c4b23bffa1d8aca97a9f9ed2aac5
+  metadata.gz: 84f72b562c0e919091cb6ab5420e58d4f3afaab03ee6bad26e0ae041eb7c6bad17ef895f97df3b96dc8d5eafc5905df631794ba8010e0695f3269283332e1838
+  data.tar.gz: 67bb545e021632e14a738ec55182b1604eee04df64caad4490e7e7267dff7bfa4b75fd215a18c09b6a74e290aecf36f1c7fa8bc74a7aa5cf70ab79a63f013090

data/Guardfile

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

data/README.md

@@ -22,8 +22,8 @@ class CrowTRobot
   include Mongoid::Document
   include Mongoid::List
 
-  field :title
-  slug :title
+  lists
+
 end
 ```
 
@@ -61,14 +61,14 @@ doc.list_scope_conditions	# Additional query conditions for scoped lists.
 Scoping
 -------
 
-To scope the list, pass `:scope` on field definition:
+To scope the list, pass `:scope` on lists definition:
 
 ```ruby
 class TomServo
   include Mongoid::Document
-  include Mongoid::Slug
+  include Mongoid::List
 
-  field :position, type: Integer, scope: :satellite_of_love_id
+  lists scope: :satellite_of_love_id
   belongs_to :satellite_of_love
 
 end

data/lib/mongoid/list.rb

@@ -1,8 +1,10 @@
+require "mongoid/list"
+
 module Mongoid
 
-  Fields.option :scope do |model, field, value|
+  # Fields.option :scope do |model, field, value|
 
-  end
+  # end
 
   module List
 
@@ -12,15 +14,21 @@ module Mongoid
     autoload :Embedded,   'mongoid/list/embedded'
 
     included do
-      field :position, type: Integer
+      attr_accessor   :_scope_list_update_to_previous
+      class_attribute :mongoid_list_settings
+
+      self.mongoid_list_settings = { scoped: false, scope: nil }
+
+      before_create   :set_initial_position_in_list
 
-      validates :position, numericality: true, on: :update
+      before_update   :reset_position_between_scopes, if: :list_scope_changing?
 
-      before_create  :set_initial_position_in_list
-      before_update  :mark_for_update_processing_of_list, if: :position_changed?
-      after_update   :update_positions_in_list!, if: :_process_list_change
-      before_destroy :mark_for_removal_processing_from_list
-      after_destroy  :update_positions_in_list!, if: :_process_list_change
+      before_update   :mark_for_update_processing_of_list, if: ->(d){ d.position_changed? && !d.list_scope_changing? }
+      before_destroy  :mark_for_removal_processing_from_list
+
+      after_update    :clear_list_scope_changing_state
+      after_update    :update_positions_in_list!, if: :_process_list_change
+      after_destroy   :update_positions_in_list!, if: :_process_list_change
 
       scope :ordered, -> { asc(:position) }
     end
@@ -28,6 +36,18 @@ module Mongoid
 
     module ClassMethods
 
+      def lists(opts={})
+
+        field     :position, type: Integer
+
+        if opts[:scope].present?
+          self.mongoid_list_settings[:scoped] = true
+          self.mongoid_list_settings[:scope]  = opts[:scope]
+        end
+
+        validates :position, numericality: true, on: :update
+      end
+
       def update_positions_in_list!(elements, binding=nil)
         embedded? ? Embedded.update_positions!(binding, elements) : Collection.update_positions!(self, elements)
       end
@@ -39,11 +59,11 @@ module Mongoid
 
 
     def list_scoped?
-      fields["position"].options.has_key?(:scope)
+      self.class.mongoid_list_settings[:scoped]
     end
 
     def list_scope_field
-      fields["position"].options[:scope]
+      self.class.mongoid_list_settings[:scope]
     end
 
     def list_scope_value
@@ -54,6 +74,14 @@ module Mongoid
       list_scoped? ? { list_scope_field.to_sym => list_scope_value } : {}
     end
 
+    def list_scope_changing_conditions
+      { list_scope_field.to_sym => _scope_list_update_to_previous }
+    end
+
+    def list_scope_changing?
+      @_list_scope_changing ||= (list_scoped? && changes.keys.include?(list_scope_field.to_s))
+    end
+
 
   private
 
@@ -62,6 +90,10 @@ module Mongoid
       self.position = list_count + 1
     end
 
+    def set_initial_scope_change_position_in_list
+      self.position = list_count
+    end
+
     def mark_for_update_processing_of_list
       self._process_list_change = if position_moving_up?
         { min: position_was, max: position, by: -1 }
@@ -70,6 +102,10 @@ module Mongoid
       end
     end
 
+    def clear_processing_of_list
+      self._process_list_change = nil
+    end
+
     def position_moving_up?
       position > position_was
     end
@@ -86,6 +122,34 @@ module Mongoid
       embedded? ? Embedded.new(self).count : Collection.new(self).count
     end
 
+    def reset_position_between_scopes
+      set_list_scoping_to_previous_value
+      move_list_to_new_scope!
+      mark_for_removal_processing_from_list
+      update_positions_in_list!
+      clear_processing_of_list
+      clear_list_scoping_from_previous_value
+      set_initial_scope_change_position_in_list
+      true
+    end
+
+    def move_list_to_new_scope!
+      self.set({ list_scope_field => list_scope_value })
+    end
+
+    def set_list_scoping_to_previous_value
+      self._scope_list_update_to_previous = changes[list_scope_field.to_s].first
+    end
+
+    def clear_list_scoping_from_previous_value
+      self._scope_list_update_to_previous = nil
+    end
+
+    def clear_list_scope_changing_state
+      remove_instance_variable(:@_list_scope_changing)
+      true
+    end
+
   end
 
 end

data/lib/mongoid/list/abstract.rb

@@ -14,7 +14,11 @@ module Mongoid
 
 
       def conditions
-        obj.list_scope_conditions
+        if obj._scope_list_update_to_previous
+          obj.list_scope_changing_conditions
+        else
+          obj.list_scope_conditions
+        end
       end
 
     end

data/lib/mongoid/list/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module List
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/spec/mongoid/list_spec.rb

@@ -448,8 +448,51 @@ describe Mongoid::List do
   end
 
 
-  describe "Initializing in multiple scopes" do
+  describe "#list_scope_changing_conditions" do
+
+    subject { Scoped.new }
+
+    it "uses value in :_scope_list_update_to_previous" do
+      subject._scope_list_update_to_previous = "this-is-something-eh"
+      subject.list_scope_changing_conditions.should eq \
+        ({ group: "this-is-something-eh" })
+    end
+
+  end
+
+
+  describe "#list_scope_changing?" do
+
+    context "when unscoped" do
+
+      subject { Simple.create }
+      specify { subject.list_scope_changing?.should be_false }
+
+    end
+
+    context "when Scoped" do
+
+      subject { Scoped.create(group: "A") }
+
+      context "but no change to :group" do
+
+        specify { subject.list_scope_changing?.should be_false }
 
+      end
+
+      context "with change to :group" do
+
+        before  { subject.group = "B" }
+        specify { subject.list_scope_changing?.should be_true }
+
+      end
+
+    end
+
+  end
+
+
+  describe "Initializing in multiple scopes" do
 
     context "on a Collection" do
 
@@ -651,6 +694,70 @@ describe Mongoid::List do
 
     end
 
+    context "changing Scope" do
+
+      let!(:group1_1) { Scoped.create(group: 1) }
+      let!(:group1_2) { Scoped.create(group: 1) }
+      let!(:group2_1) { Scoped.create(group: 2) }
+      let!(:group2_2) { Scoped.create(group: 2) }
+      let!(:group2_3) { Scoped.create(group: 2) }
+
+      before do
+        lambda {
+          group2_2.update_attributes(group: 1)
+        }.should change(group2_2, :position).from(2).to(3)
+      end
+
+      specify "@group1_1 :position is unchanged" do
+        group1_1.position.should eq 1
+        group1_1.reload.position.should eq 1
+      end
+
+      specify "@group1_2 :position is unchanged" do
+        group1_2.position.should eq 2
+        group1_2.reload.position.should eq 2
+      end
+
+      specify "@group2_1 :position is unchanged" do
+        group2_1.position.should eq 1
+        group2_1.reload.position.should eq 1
+      end
+
+      specify "@group2_3 :position changes to 2" do
+        group2_3.position.should eq 3
+        group2_3.reload.position.should eq 2
+      end
+
+    end
+
+    context "missing Scope" do
+
+      let!(:doc1) { Scoped.create(group: 1) }
+      let!(:doc2) { Scoped.create(group: 1) }
+      let!(:doc3) { Scoped.create() }
+
+      specify "initial positions" do
+        doc1.position.should eq 1
+        doc2.position.should eq 2
+        doc3.position.should eq 1
+      end
+
+    end
+
+    context "removing Scope" do
+
+      let!(:doc1) { Scoped.create(group: 1) }
+      let!(:doc2) { Scoped.create(group: 1) }
+      let!(:doc3) { Scoped.create() }
+
+      it "moves to null scope" do
+        lambda { doc1.update_attributes(group: nil); doc1.reload }.should change(doc1, :position).from(1).to(2)
+        lambda { doc1.update_attributes(group: nil); doc2.reload }.should change(doc2, :position).from(2).to(1)
+        lambda { doc1.update_attributes(group: nil); doc3.reload }.should_not change(doc3, :position)
+      end
+
+    end
+
   end
 
 

data/spec/spec_helper.rb

@@ -20,6 +20,9 @@ Spork.prefork do
 
     config.color_enabled = true
 
+    config.filter_run focus: true
+    config.run_all_when_everything_filtered = true
+
     config.before(:suite) do
       Mongoid.load!("mongoid.yml", :test)
       DatabaseCleaner[:mongoid].strategy = :truncation

data/spec/support/models/custom.rb

@@ -1,6 +1,10 @@
 class Custom
+
   include Mongoid::Document
   include Mongoid::List
+
   field :_id,   type: String, default: -> { slug }
   field :slug,  type: String
+  lists
+
 end

data/spec/support/models/embedded.rb

@@ -3,6 +3,8 @@ class Embedded
   include Mongoid::Document
   include Mongoid::List
 
+  lists
+
   embedded_in :container
   embeds_many :items, class_name: 'EmbeddedDeeply'
 

data/spec/support/models/embedded_deeply.rb

@@ -3,6 +3,8 @@ class EmbeddedDeeply
   include Mongoid::Document
   include Mongoid::List
 
+  lists
+
   embedded_in :embedded
 
 end

data/spec/support/models/scoped.rb

@@ -4,6 +4,6 @@ class Scoped
   include Mongoid::List
 
   field :group, type: String
-  field :position, type: Integer, scope: :group
+  lists scope: :group
 
 end

data/spec/support/models/scoped_embedded.rb

@@ -6,6 +6,8 @@ class ScopedEmbedded
   embedded_in :container
 
   field :group, type: String
-  field :position, type: Integer, scope: :group
+  # field :position, type: Integer, scope: :group
+
+  lists scope: :group
 
 end

data/spec/support/models/simple.rb

@@ -1,4 +1,8 @@
 class Simple
+
   include Mongoid::Document
   include Mongoid::List
+
+  lists
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-list
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dave Krupinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid