mongoid_orderable 1.0.0 → 1.1.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.2@mongoid_orderable --create
+rvm use 1.9.3@mongoid_orderable --create

data/.travis.yml

@@ -0,0 +1,11 @@
+script: "bundle exec rake spec"
+
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  #- rbx-19mode
+
+env:
+  - MONGOID_VERSION=2
+  - MONGOID_VERSION='~> 3.0.0.rc'

data/Gemfile

@@ -2,3 +2,10 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in mongoid_orderable.gemspec
 gemspec
+
+case version = ENV['MONGOID_VERSION'] || "~> 3.0.0.rc"
+when /2/
+  gem "mongoid", "~> 2.4.0"
+else
+  gem "mongoid", version
+end

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/pyromaniac/mongoid_orderable.png)](http://travis-ci.org/pyromaniac/mongoid_orderable)
+
 # What?
 
 Mongoid::Orderable is a ordered list implementation for your mongoid models.
@@ -7,6 +9,7 @@ Mongoid::Orderable is a ordered list implementation for your mongoid models.
 * It uses native mongo batch increment feature
 * It supports assignable api
 * It proper assingns position while moving document between scopes
+* It supports both mongoid 2 and 3
 
 # How?
 

data/lib/mongoid/orderable.rb

@@ -13,15 +13,22 @@ module Mongoid::Orderable
       configuration[:scope] = "#{configuration[:scope]}_id".to_sym if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
 
       field configuration[:column], :type => Integer
-      index configuration[:column] if configuration[:index]
+      if configuration[:index]
+        if MongoidOrderable.mongoid2?
+          index configuration[:column]
+        else
+          index(configuration[:column] => 1)
+        end
+      end
 
       case configuration[:scope]
       when Symbol then
-        scope :orderable_scope, lambda { |document| where(configuration[:scope] => document.send(configuration[:scope])) }
+        scope :orderable_scope, lambda { |document|
+          where(configuration[:scope] => document.send(configuration[:scope])) }
       when Proc then
         scope :orderable_scope, configuration[:scope]
       else
-        scope :orderable_scope, lambda { |document| where }
+        scope :orderable_scope, lambda { |document| where({}) }
       end
 
       define_method :orderable_column do
@@ -86,7 +93,7 @@ module Mongoid::Orderable
   end
 
   def remove_from_list
-    orderable_scoped.where(orderable_column.gt => orderable_position).inc(orderable_column => -1)
+    orderable_scoped.where(orderable_column.gt => orderable_position).inc(orderable_column, -1)
   end
 
 private
@@ -113,7 +120,7 @@ private
 
   def apply_position target_position
     if persisted? && !embedded? && orderable_scope_changed?
-      self.class.find(_id).remove_from_list
+      self.class.unscoped.find(_id).remove_from_list
       self.orderable_position = nil
     end
 
@@ -122,10 +129,10 @@ private
     target_position = target_position_to_position target_position
 
     unless in_list?
-      orderable_scoped.where(orderable_column.gte => target_position).inc(orderable_column => 1)
+      orderable_scoped.where(orderable_column.gte => target_position).inc(orderable_column, 1)
     else
-      orderable_scoped.where(orderable_column.gte => target_position, orderable_column.lt => orderable_position).inc(orderable_column => 1) if target_position < orderable_position
-      orderable_scoped.where(orderable_column.gt => orderable_position, orderable_column.lte => target_position).inc(orderable_column => -1) if target_position > orderable_position
+      orderable_scoped.where(orderable_column.gte => target_position, orderable_column.lt => orderable_position).inc(orderable_column, 1) if target_position < orderable_position
+      orderable_scoped.where(orderable_column.gt => orderable_position, orderable_column.lte => target_position).inc(orderable_column, -1) if target_position > orderable_position
     end
 
     self.orderable_position = target_position
@@ -148,7 +155,7 @@ private
 
   def bottom_orderable_position
     @bottom_orderable_position = begin
-      max = orderable_scoped.max(orderable_column).to_i
+      max = orderable_scoped.distinct(orderable_column).map(&:to_i).max.to_i
       in_list? ? max : max.next
     end
   end

data/lib/mongoid_orderable.rb

@@ -1,11 +1,18 @@
+module MongoidOrderable
+  def self.mongoid2?
+    Mongoid.const_defined? :Contexts
+  end
+end
+
 require 'mongoid'
 require 'mongoid_orderable/version'
-require 'mongoid_orderable/mongoid/contexts/mongo'
-require 'mongoid_orderable/mongoid/contexts/enumerable'
-require 'mongoid_orderable/mongoid/criteria'
-
-require 'mongoid/orderable'
 
-module MongoidOrderable
-  
+if MongoidOrderable.mongoid2?
+  require 'mongoid_orderable/mongoid/contexts/mongo'
+  require 'mongoid_orderable/mongoid/contexts/enumerable'
+  require 'mongoid_orderable/mongoid/criteria'
+else
+  require 'mongoid_orderable/mongoid/contextual/memory'
 end
+
+require 'mongoid/orderable'

data/lib/mongoid_orderable/mongoid/contexts/enumerable.rb

@@ -2,11 +2,9 @@ module MongoidOrderable #:nodoc:
   module Mongoid #:nodoc:
     module Contexts #:nodoc:
       module Enumerable #:nodoc:
-        def inc attributes = {}
+        def inc attribute, value
           iterate do |doc|
-            attributes.each do |attribute, value|
-              doc.inc(attribute, value)
-            end
+            doc.inc(attribute, value)
           end
         end
       end

data/lib/mongoid_orderable/mongoid/contexts/mongo.rb

@@ -2,10 +2,10 @@ module MongoidOrderable #:nodoc:
   module Mongoid #:nodoc:
     module Contexts #:nodoc:
       module Mongo #:nodoc:
-        def inc attributes = {}
+        def inc attribute, value
           klass.collection.update(
             selector,
-            { "$inc" => attributes },
+            { "$inc" => {attribute => value} },
             :multi => true,
             :safe => ::Mongoid.persist_in_safe_mode
           )

data/lib/mongoid_orderable/mongoid/contextual/memory.rb

@@ -0,0 +1,15 @@
+module MongoidOrderable #:nodoc:
+  module Mongoid #:nodoc:
+    module Contextual #:nodoc:
+      module Memory #:nodoc:
+        def inc attribute, value
+          each do |document|
+            document.inc(attribute, value)
+          end
+        end
+      end
+    end
+  end
+end
+
+Mongoid::Contextual::Memory.send :include, MongoidOrderable::Mongoid::Contextual::Memory

data/lib/mongoid_orderable/version.rb

@@ -1,3 +1,3 @@
 module MongoidOrderable
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/mongoid_orderable.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_runtime_dependency "mongoid"
 end

data/spec/mongoid/orderable_spec.rb

@@ -61,7 +61,7 @@ describe Mongoid::Orderable do
     end
 
     def positions
-      SimpleOrderable.order_by(:position, :asc).map(&:position)
+      SimpleOrderable.all.map(&:position).sort
     end
 
     it 'should have proper position column' do
@@ -70,7 +70,11 @@ describe Mongoid::Orderable do
     end
 
     it 'should have index on position column' do
-      SimpleOrderable.index_options[:position].should_not be_nil
+      if MongoidOrderable.mongoid2?
+        SimpleOrderable.index_options[:position].should_not be_nil
+      else
+        SimpleOrderable.index_options[{:position => 1}].should_not be_nil
+      end
     end
 
     it 'should set proper position while creation' do
@@ -261,7 +265,7 @@ describe Mongoid::Orderable do
     end
 
     def positions
-      EmbedsOrderable.order_by(:position).all.map { |eo| eo.embedded_orderables.order_by(:position).map(&:position) }
+      EmbedsOrderable.order_by(:position => 1).all.map { |eo| eo.embedded_orderables.map(&:position).sort }
     end
 
     it 'should set proper position while creation' do

data/spec/spec_helper.rb

@@ -1,13 +1,19 @@
 require 'bundler'
 Bundler.require
 
-DATABASE_ID = Process.pid
+DATABASE_NAME = "mongoid_#{Process.pid}"
 
-Mongoid.configure do |config|
-  database = Mongo::Connection.new.db("mongoid_#{DATABASE_ID}")
-  database.add_user("mongoid", "test")
-  config.master = database
-  config.logger = nil
+if MongoidOrderable.mongoid2?
+  Mongoid.configure do |config|
+    # database = Mongo::Connection.new.db DATABASE_NAME
+    # database.add_user "mongoid", "test"
+    config.master = Mongo::Connection.new.db DATABASE_NAME
+    config.logger = nil
+  end
+else
+  Mongoid.configure do |config|
+    config.connect_to DATABASE_NAME
+  end
 end
 
 RSpec.configure do |config|
@@ -22,6 +28,10 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    Mongoid.master.connection.drop_database("mongoid_#{DATABASE_ID}")
+    if MongoidOrderable.mongoid2?
+      Mongoid.master.connection.drop_database DATABASE_NAME
+    else
+      Mongoid.default_session.drop
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_orderable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092185456800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092185456800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70092185456320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70092185456320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem allows mongoid model behave as orderable list
 email:
 - kinwizard@gmail.com
@@ -43,6 +69,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -50,6 +77,7 @@ files:
 - lib/mongoid_orderable.rb
 - lib/mongoid_orderable/mongoid/contexts/enumerable.rb
 - lib/mongoid_orderable/mongoid/contexts/mongo.rb
+- lib/mongoid_orderable/mongoid/contextual/memory.rb
 - lib/mongoid_orderable/mongoid/criteria.rb
 - lib/mongoid_orderable/version.rb
 - mongoid_orderable.gemspec
@@ -75,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid_orderable
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Acts as list mongoid implementation