acts_as_list 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzM4YWNhZmE0NzViMmFhNDI0OGM0ZDFkM2RkYzAxMDIxODY2M2E2Mg==
-  data.tar.gz: !binary |-
-    MWYwZDU4MzgwNzhjMGQwYmU2YTJmOGZlZTUwODViOTc4NjBmZTlkYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzFmMjljMTNmMjY1ZGU5YTJjMzgzYjc2NjQ1ZjMyOWYyOWUwMmExMmJjMGQ5
-    OGEwYjlhNjQ4YTdiM2RlZmQ3M2IxMzA1N2E3Y2I1MjE0NDE0OWZhNWU1Y2I5
-    NzI1ZjgwZWNiOTE1MGNiZDE5NDBmNDZkNDA3ZjdlMGZjMThmYmM=
-  data.tar.gz: !binary |-
-    YTk3YjgxYThlYzE3MmQxY2QzNGNiN2QyNGZkYjY1ZGVmNzVkM2ZkM2QyNGI4
-    MjI5OTUzZTNhNjY2Nzk1ZWMxYmI4NmZlNTFiMjgyMTI1MWY5ZTk1NzBlYTMz
-    YzljYmY3MzMyZTUxZDk3M2QzNTEyNDJjNmVhODE1YzM0MTNlNTM=
+SHA1:
+  metadata.gz: d5cbf688ac985c43f61b4c0669030f5b6f6c6caa
+  data.tar.gz: aef8fc0d40ed0ee55bf73ff2b7989e14e9c6572e
+SHA512:
+  metadata.gz: de7f8dd3123cb1bf1fd5837517c221d8a6682207c3a75ac99a7457782b5ebf6d3fa995ee12664674cc7dfacaca6bd7e5ffaa484407502856aa8e9932ff066746
+  data.tar.gz: 20d069cc6a4420dd3dd6073f12ab8940cf2bb3c1003bd71faca489ddefe780349159696cd12ef37e65578ac796c0d4686af3c231cff832f3eb2b2a3306f2da62

data/.travis.yml

@@ -3,12 +3,13 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - rbx
 gemfile:
  - gemfiles/rails3/Gemfile
  - gemfiles/rails4/Gemfile
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails4/Gemfile
     - rvm: 1.9.2
       gemfile: gemfiles/rails4/Gemfile

data/Gemfile

@@ -1,5 +1,14 @@
 source "http://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
 # Specify your gem's dependencies in acts_as_list-rails3.gemspec
 gemspec
 

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2007 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -25,7 +25,7 @@ After that you can use `acts_as_list` method in the model:
 
 ```ruby
 class TodoList < ActiveRecord::Base
-  has_many :todo_items, order: :position
+  has_many :todo_items, -> { order("position ASC") }
 end
     
 class TodoItem < ActiveRecord::Base
@@ -82,6 +82,9 @@ 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)
 
+## Workflow Status
+[![WIP Issues](https://badge.waffle.io/swanandp/acts_as_list.png)](http://waffle.io/swanandp/acts_as_list)
+
 ## Roadmap
 
 1. Sort based feature

data/Rakefile

@@ -15,15 +15,21 @@ Rake::TestTask.new(:test) do |t|
   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
+begin
+  # 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')
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "acts_as_list-rails3 #{version}"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError
+  puts 'RDocTask is not supported on this platform.'
+rescue StandardError
+  puts 'RDocTask is not supported on this platform.'
 end
 

data/acts_as_list.gemspec

@@ -13,8 +13,9 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://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.license     = 'MIT'
   s.rubyforge_project = 'acts_as_list'
-
+  s.required_ruby_version = '>= 1.9.2'
 
   # Load Paths...
   s.files         = `git ls-files`.split("\n")
@@ -26,6 +27,4 @@ Gem::Specification.new do |s|
   # Dependencies (installed via 'bundle install')...
   s.add_dependency("activerecord", [">= 3.0"])
   s.add_development_dependency("bundler", [">= 1.0.0"])
-  s.add_development_dependency("rdoc")
-  s.add_development_dependency("sqlite3")
 end

data/gemfiles/rails3/Gemfile

@@ -1,5 +1,14 @@
 source "https://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
 gem 'activerecord', '>= 3.0', '< 4'
 
 # Specify your gem's dependencies in acts_as_list.gemspec

data/gemfiles/rails4/Gemfile

@@ -1,5 +1,15 @@
 source "https://rubygems.org"
 
+gem 'sqlite3', :platforms => [:ruby]
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+  gem 'rubysl-test-unit'
+end
+
+
 gem 'activerecord', '>= 4.0.0', '< 5'
 
 # Specify your gem's dependencies in acts_as_list.gemspec

data/lib/acts_as_list/active_record/acts/list.rb

@@ -112,6 +112,7 @@ module ActiveRecord
             after_destroy :decrement_positions_on_lower_items
             before_update :check_scope
             after_update :update_positions
+            before_validation :check_top_position
 
             scope :in_list, lambda { where("#{table_name}.#{configuration[:column]} IS NOT NULL") }
           EOV
@@ -306,7 +307,7 @@ module ActiveRecord
           # Returns the bottom item
           def bottom_item(except = nil)
             conditions = scope_condition
-            conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
+            conditions = "#{conditions} AND #{self.class.primary_key} != '#{except.id}'" if except
             acts_as_list_class.unscoped.in_list.where(conditions).order("#{acts_as_list_class.table_name}.#{position_column} DESC").first
           end
 
@@ -371,7 +372,7 @@ module ActiveRecord
           # Reorders intermediate items to support moving an item from old_position to new_position.
           def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id = nil)
             return if old_position == new_position
-            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{avoid_id}" : ''
+            avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != '#{avoid_id}'" : ''
             if old_position < new_position
               # Decrement position of intermediate items
               #
@@ -396,6 +397,7 @@ module ActiveRecord
           end
 
           def insert_at_position(position)
+            return set_list_position(position) if new_record?
             if in_list?
               old_position = send(position_column).to_i
               return if position == old_position
@@ -441,6 +443,12 @@ module ActiveRecord
           def reload_position
             self.reload
           end
+
+          def check_top_position
+            if send(position_column) && send(position_column) < acts_as_list_top
+              self[position_column] = acts_as_list_top
+            end
+          end
       end
     end
   end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = "0.3.0"
+      VERSION = '0.4.0'
     end
   end
 end

data/test/helper.rb

@@ -7,8 +7,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
 require 'active_record'
+require 'minitest/autorun'
 require "#{File.dirname(__FILE__)}/../init"
 
 require 'shared'

data/test/shared_zero_based.rb

@@ -24,6 +24,11 @@ module Shared
       assert_equal 0, new.pos
       assert new.first?
       assert new.last?
+
+      new = ZeroBasedMixin.create(parent_id: 1, pos: -500)
+      assert_equal 0, new.pos
+      assert new.first?
+      assert new.last?
     end
 
     def test_reordering

data/test/test_list.rb

@@ -73,6 +73,10 @@ end
 class DefaultScopedWhereMixin < Mixin
   acts_as_list column: "pos"
   default_scope { order('pos ASC').where(active: true) }
+
+  def self.for_active_false_tests
+    unscoped.order('pos ASC').where(active: false)
+  end
 end
 
 class TopAdditionMixin < Mixin
@@ -83,7 +87,7 @@ class NoAdditionMixin < Mixin
   acts_as_list column: "pos", add_new_at: nil, scope: :parent_id
 end
 
-class ActsAsListTestCase < Test::Unit::TestCase
+class ActsAsListTestCase < MiniTest::Unit::TestCase
   # No default test required a this class is abstract.
   # Need for test/unit.
   undef_method :default_test if method_defined?(:default_test)
@@ -282,25 +286,25 @@ class DefaultScopedWhereTest < ActsAsListTestCase
   end
 
   def test_reordering
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 2).first.move_lower
-    assert_equal [1, 3, 2, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.move_lower
+    assert_equal [1, 3, 2, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 2).first.move_higher
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.move_higher
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 1).first.move_to_bottom
-    assert_equal [2, 3, 4, 1], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 1).first.move_to_bottom
+    assert_equal [2, 3, 4, 1], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 1).first.move_to_top
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 1).first.move_to_top
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 2).first.move_to_bottom
-    assert_equal [1, 3, 4, 2], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.move_to_bottom
+    assert_equal [1, 3, 4, 2], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
 
-    DefaultScopedWhereMixin.where(active: false).where(id: 4).first.move_to_top
-    assert_equal [4, 1, 3, 2], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 4).first.move_to_top
+    assert_equal [4, 1, 3, 2], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
   end
 
   def test_insert_at
@@ -339,15 +343,15 @@ class DefaultScopedWhereTest < ActsAsListTestCase
   end
 
   def test_update_position
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
-    DefaultScopedWhereMixin.where(active: false).where(id: 2).first.set_list_position(4)
-    assert_equal [1, 3, 4, 2], DefaultScopedWhereMixin.where(active: false).map(&:id)
-    DefaultScopedWhereMixin.where(active: false).where(id: 2).first.set_list_position(2)
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
-    DefaultScopedWhereMixin.where(active: false).where(id: 1).first.set_list_position(4)
-    assert_equal [2, 3, 4, 1], DefaultScopedWhereMixin.where(active: false).map(&:id)
-    DefaultScopedWhereMixin.where(active: false).where(id: 1).first.set_list_position(1)
-    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.where(active: false).map(&:id)
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.set_list_position(4)
+    assert_equal [1, 3, 4, 2], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 2).first.set_list_position(2)
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 1).first.set_list_position(4)
+    assert_equal [2, 3, 4, 1], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
+    DefaultScopedWhereMixin.for_active_false_tests.where(id: 1).first.set_list_position(1)
+    assert_equal [1, 2, 3, 4], DefaultScopedWhereMixin.for_active_false_tests.map(&:id)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,64 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 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.
@@ -81,6 +53,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - acts_as_list.gemspec
@@ -100,7 +73,8 @@ files:
 - test/shared_zero_based.rb
 - test/test_list.rb
 homepage: http://github.com/swanandp/acts_as_list
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -108,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: acts_as_list
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A gem allowing a active_record model to act_as_list.