Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/acts_as_list/active_record/acts/list.rb
	test/list_test.rb

Author: markus

.gemtest

@@ -0,0 +1,6 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+.rvmrc
+*.tmproj

.gitignore

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

.travis.yml

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in acts_as_list-rails3.gemspec
+gemspec
+
+gem 'rake'

Gemfile

@@ -0,0 +1,94 @@
+# ActsAsList
+
+## Description
+
+This `acts_as` extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a `position` column defined as an integer on the mapped database table.
+
+## Installation
+
+In your Gemfile:
+
+    gem 'acts_as_list'
+
+Or, from the command line:
+
+    gem install acts_as_list
+
+## Example
+
+```ruby
+class TodoList < ActiveRecord::Base
+  has_many :todo_items, :order => "position"
+end
+    
+class TodoItem < ActiveRecord::Base
+  belongs_to :todo_list
+  acts_as_list :scope => :todo_list
+end
+    
+todo_list.first.move_to_bottom
+todo_list.last.move_higher
+```
+
+## Instance Methods Added To ActiveRecord Models
+
+You'll have a number of methods added to each instance of the ActiveRecord model that to which `acts_as_list` is added. 
+
+In `acts_as_list`, "higher" means further up the list (a lower `position`), and "lower" means further down the list (a higher `position`). That can be confusing, so it might make sense to add tests that validate that you're using the right method given your context.
+
+### Methods That Change Position and Reorder List
+
+- `list_item.insert_at(2)`
+- `list_item.move_lower` will do nothing if the item is the lowest item
+- `list_item.move_higher` will do nothing if the item is the highest item
+- `list_item.move_to_bottom`
+- `list_item.move_to_top`
+- `list_item.remove_from_list`
+
+### Methods That Change Position Without Reordering List
+
+- `list_item.increment_position`
+- `list_item.decrement_position`
+- `list_item.set_list_position(3)`
+
+### Methods That Return Attributes of the Item's List Position
+- `list_item.first?`
+- `list_item.last?`
+- `list_item.in_list?`
+- `list_item.not_in_list?`
+- `list_item.default_position?`
+- `list_item.higher_item`
+- `list_item.lower_item`
+
+## Notes
+If the `position` column has a default value, then there is a slight change in behavior, i.e if you have 4 items in the list, and you insert 1, with a default position 0, it would be pushed to the bottom of the list. Please look at the tests for this and some recent pull requests for discussions related to this.
+
+All `position` queries (select, update, etc.) inside gem methods are executed without the default scope (i.e. `Model.unscoped`), this will prevent nasty issues when the default scope is different from `acts_as_list` scope.
+
+The `position` column is set after validations are called, so you should not put a `presence` validation on the `position` column.
+
+## Versions
+All versions `0.1.5` onwards require Rails 3.0.x and higher.
+
+## Build Status
+[![Build Status](https://secure.travis-ci.org/swanandp/acts_as_list.png)](https://secure.travis-ci.org/swanandp/acts_as_list)
+
+## Roadmap
+
+1. Sort based feature
+2. Rails 4 compatibility and bye bye Rails 2! Older versions would of course continue to work with Rails 2, but there won't be any support on those.
+
+## Contributing to `acts_as_list`
+ 
+- Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+- Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+- Fork the project
+- Start a feature/bugfix branch
+- Commit and push until you are happy with your contribution
+- Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+- Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+- I would recommend using Rails 3.1.x and higher for testing the build before a pull request. The current test harness does not quite work with 3.0.x. The plugin itself works, but the issue lies with testing infrastructure.
+
+## Copyright
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license

README

@@ -1,12 +1,29 @@
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+#require 'rake'
 require 'rake/testtask'
 
+# Run the test with 'rake' or 'rake test'
 desc 'Default: run acts_as_list unit tests.'
 task :default => :test
 
-desc 'Test the acts_as_ordered_tree plugin.'
+desc 'Test the acts_as_list plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/test_*.rb'
+  t.verbose = false
 end
+
+# Run the rdoc task to generate rdocs for this gem
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
+  require "acts_as_list/version"
+  version = ActiveRecord::Acts::List::VERSION
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "acts_as_list-rails3 #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+

README.md

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'acts_as_list/version'
+
+Gem::Specification.new do |s|
+
+  # Description Meta...
+  s.name        = 'acts_as_list'
+  s.version     = ActiveRecord::Acts::List::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['David Heinemeier Hansson', 'Swanand Pagnis', 'Quinn Chaffee']
+  s.email       = ['swanand.pagnis@gmail.com']
+  s.homepage    = 'https://github.com/swanandp/acts_as_list'
+  s.summary     = %q{A gem allowing a active_record model to act_as_list.}
+  s.description = %q{This "acts_as" extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a "position" column defined as an integer on the mapped database table.}
+  s.rubyforge_project = 'acts_as_list'
+
+
+  # Load Paths...
+  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']
+
+
+  # Dependencies (installed via 'bundle install')...
+  s.add_development_dependency("bundler", [">= 1.0.0"])
+  s.add_development_dependency("activerecord", [">= 1.15.4.7794"])
+  s.add_development_dependency("rdoc")
+  s.add_development_dependency("sqlite3")
+end

Rakefile

@@ -1,3 +1,4 @@
 $:.unshift "#{File.dirname(__FILE__)}/lib"
-require 'active_record/acts/list'
-ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List }
+require 'acts_as_list'
+
+ActsAsList::Railtie.insert

acts_as_list.gemspec

@@ -0,0 +1,24 @@
+require 'acts_as_list/active_record/acts/list'
+
+module ActsAsList
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      initializer 'acts_as_list.insert_into_active_record' do
+        ActiveSupport.on_load :active_record do
+          ActsAsList::Railtie.insert
+        end
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.send(:include, ActiveRecord::Acts::List)
+      end
+    end
+  end
+end
+
+ActsAsList::Railtie.insert