sortifiable 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+*0.2.4 (June 18th, 2011)
+
+* Typecast the list of primary keys return by lock_list! correctly as
+  the postgresql and mysql adapters return strings by default. [Reinier de Lange]
+
+* Check for existence of foreign key attribute with symbol scope option
+
+
 *0.2.3 (May 3rd, 2011)
 
 * Rails 3.1 has added Model.foreign_{key,type} to association reflections

data/README.md

@@ -38,5 +38,6 @@ pull request and I will review it and respond as quickly as possible.
 Thanks to the following people for their contributions:
 
 * Manuel Meurer
+* Reinier de Lange
 
 Copyright (c) 2011 Andrew White, released under the MIT license

data/Rakefile

@@ -10,7 +10,7 @@ task :default => :test
 
 desc 'Test the sortifiable gem.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs += %w[lib test]
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
@@ -22,3 +22,33 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+namespace :test do
+  desc 'Test using the mysql connection adapter'
+  task :mysql do
+    sh 'rake test DB=mysql'
+  end
+
+  desc 'Test using the mysql2 connection adapter'
+  task :mysql2 do
+    sh 'rake test DB=mysql2'
+  end
+
+  desc 'Test using the postgresql connection adapter'
+  task :postgresql do
+    sh 'rake test DB=postgresql'
+  end
+
+  desc 'Test using the sqlite3 connection adapter'
+  task :sqlite3 do
+    sh 'rake test DB=sqlite3'
+  end
+
+  desc 'Test all connection adapters'
+  task :all do
+    sh 'rake test DB=mysql'
+    sh 'rake test DB=mysql2'
+    sh 'rake test DB=postgresql'
+    sh 'rake test DB=sqlite3'
+  end
+end

data/lib/sortifiable.rb

@@ -58,7 +58,8 @@ module Sortifiable
             raise ArgumentError, "Only belongs_to associations can be used as a scope"
           end
         elsif options[:scope].to_s !~ /_id$/
-          options[:scope] = "#{options[:scope]}_id".to_sym
+          scope_name = "#{options[:scope]}_id"
+          options[:scope] = scope_name.to_sym if column_names.include?(scope_name)
         end
       end
 
@@ -438,7 +439,11 @@ module Sortifiable
       end
 
       def lock_list! #:nodoc:
-        connection.select_values(list_scope.select(list_class.primary_key).lock(true).to_sql)
+        sql = list_scope.select(list_class.primary_key).lock(true).to_sql
+        column = list_class.columns_hash[list_class.primary_key]
+        connection.select_values(sql).map do |value|
+          column.type_cast(value)
+        end
       end
 
       def lower_scope(position) #:nodoc:

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/sortifiable.gemspec

@@ -38,5 +38,8 @@ EOF
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "activerecord", ">= 3.0"
   s.add_development_dependency "bundler", ">= 1.0.10"
-  s.add_development_dependency "sqlite3", ">= 1.3.3"
+  s.add_development_dependency "mysql", "~> 2.8.1"
+  s.add_development_dependency "mysql2", "~> 0.2.7"
+  s.add_development_dependency "pg", "~> 0.9.0"
+  s.add_development_dependency "sqlite3", "~> 1.3.3"
 end

data/test/sortifiable_test.rb

@@ -1,86 +1,6 @@
-require 'test/unit'
-require 'rubygems'
-require 'active_record'
-require 'active_support/core_ext/kernel/reporting'
-require 'sortifiable'
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-
-def setup_db
-  silence_stream(STDOUT) do
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :mixins do |t|
-        t.column :type, :string
-        t.column :pos, :integer
-        t.column :parent_id, :integer
-        t.column :parent_type, :string
-        t.column :created_at, :datetime
-        t.column :updated_at, :datetime
-      end
-    end
-  end
-end
+require 'test_helper'
 
-def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
-  end
-end
-
-setup_db
-
-class Mixin < ActiveRecord::Base
-end
-
-class ListMixin < ActiveRecord::Base
-  acts_as_list :column => "pos", :scope => :parent
-  set_table_name "mixins"
-  default_scope order(:pos)
-end
-
-class ListMixinSub1 < ListMixin
-end
-
-class ListMixinSub2 < ListMixin
-end
-
-class ListWithStringScopeMixin < ActiveRecord::Base
-  acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}'
-  set_table_name "mixins"
-  default_scope order(:pos)
-end
-
-class ArrayScopeListMixin < ActiveRecord::Base
-  acts_as_list :column => "pos", :scope => [:parent_id, :parent_type]
-  set_table_name "mixins"
-  default_scope order(:pos)
-end
-
-class AssociationScopeListMixin < ActiveRecord::Base
-  belongs_to :parent
-  acts_as_list :column => "pos", :scope => :parent
-  set_table_name "mixins"
-  default_scope order(:pos)
-end
-
-class PolymorphicAssociationScopeListMixin < ActiveRecord::Base
-  belongs_to :parent, :polymorphic => true
-  acts_as_list :column => "pos", :scope => :parent
-  set_table_name "mixins"
-  default_scope order(:pos)
-end
-
-teardown_db
-
-class NonListTest < Test::Unit::TestCase
-
-  def setup
-    setup_db
-  end
-
-  def teardown
-    teardown_db
-  end
+class NonListTest < ActiveSupport::TestCase
 
   def test_callbacks_are_not_added_to_all_models
     Mixin.create! :pos => 1, :parent_id => 5
@@ -97,10 +17,9 @@ class NonListTest < Test::Unit::TestCase
 
 end
 
-class ListTest < Test::Unit::TestCase
+class ListTest < ActiveSupport::TestCase
 
   def setup
-    setup_db
     [5, 6].each do |parent_id|
       (1..4).each do |i|
         ListMixin.create! :pos => i, :parent_id => parent_id
@@ -108,10 +27,6 @@ class ListTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    teardown_db
-  end
-
   def test_reordering
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
 
@@ -257,7 +172,7 @@ class ListTest < Test::Unit::TestCase
 
     ListMixin.find(2).remove_from_list
 
-    assert_equal [2, 1, 3, 4], ListMixin.where(:parent_id => 5).map(&:id)
+    assert_equal [1, 3, 4], ListMixin.where(:parent_id => 5).where('pos IS NOT NULL').map(&:id)
 
     assert_equal 1,   ListMixin.find(1).pos
     assert_equal nil, ListMixin.find(2).pos
@@ -378,10 +293,9 @@ class ListTest < Test::Unit::TestCase
 
 end
 
-class ListWithStringScopeTest < Test::Unit::TestCase
+class ListWithStringScopeTest < ActiveSupport::TestCase
 
   def setup
-    setup_db
     [5, 6].each do |parent_id|
       (1..4).each do |i|
         ListWithStringScopeMixin.create! :parent_id => parent_id
@@ -389,10 +303,6 @@ class ListWithStringScopeTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    teardown_db
-  end
-
   def test_insert
     new = ListWithStringScopeMixin.create(:parent_id => 500)
     assert_equal 1, new.pos
@@ -444,20 +354,15 @@ class ListWithStringScopeTest < Test::Unit::TestCase
 
 end
 
-class ListSubTest < Test::Unit::TestCase
+class ListSubTest < ActiveSupport::TestCase
 
   def setup
-    setup_db
     (1..4).each do |i|
       klass = ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2)
       klass.create! :pos => i, :parent_id => 5000
     end
   end
 
-  def teardown
-    teardown_db
-  end
-
   def test_sti_class
     assert_instance_of ListMixinSub1, ListMixin.find(1)
     assert_instance_of ListMixinSub2, ListMixin.find(2)
@@ -588,10 +493,9 @@ class ListSubTest < Test::Unit::TestCase
 
 end
 
-class ArrayScopeListTest < Test::Unit::TestCase
+class ArrayScopeListTest < ActiveSupport::TestCase
 
   def setup
-    setup_db
     ['ParentClass', 'bananas'].each do |parent_type|
       [5, 6].each do |parent_id|
         (1..4).each do |i|
@@ -605,10 +509,6 @@ class ArrayScopeListTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    teardown_db
-  end
-
   def conditions(options = {})
     { :parent_id => 5, :parent_type => 'ParentClass' }.merge(options)
   end
@@ -807,7 +707,7 @@ class ArrayScopeListTest < Test::Unit::TestCase
   end
 
   def test_move_to_new_list_by_updating_complete_scope_should_append
-    assert_equal [ 1,  2,  3,  4], ArrayScopeListMixin.where(conditions).map(&:id)
+    assert_equal [1,  2,  3,  4], ArrayScopeListMixin.where(conditions).map(&:id)
     assert_equal [13, 14, 15, 16], ArrayScopeListMixin.where(:parent_id => 6, :parent_type => 'bananas').map(&:id)
 
     ArrayScopeListMixin.find(2).update_attributes! :parent_id => 6, :parent_type => 'bananas'
@@ -834,7 +734,7 @@ class ArrayScopeListTest < Test::Unit::TestCase
 
     ArrayScopeListMixin.find(2).remove_from_list
 
-    assert_equal [2, 1, 3, 4], ArrayScopeListMixin.where(conditions).map(&:id)
+    assert_equal [1, 3, 4], ArrayScopeListMixin.where(conditions).where('pos IS NOT NULL').map(&:id)
 
     assert_equal 1,   ArrayScopeListMixin.find(1).pos
     assert_equal nil, ArrayScopeListMixin.find(2).pos
@@ -867,10 +767,9 @@ class ArrayScopeListTest < Test::Unit::TestCase
 
 end
 
-class AssociationScopeListTest < Test::Unit::TestCase
+class AssociationScopeListTest < ActiveSupport::TestCase
 
   def setup
-    setup_db
     (1..4).each do |i|
       AssociationScopeListMixin.create!(
         :pos => i,
@@ -887,10 +786,6 @@ class AssociationScopeListTest < Test::Unit::TestCase
     end
   end
 
-  def teardown
-    teardown_db
-  end
-
   def test_association_scope_is_configured
     assert_equal :parent_id,
       AssociationScopeListMixin.acts_as_list_options[:scope]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sortifiable
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Andrew White
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +01:00
+date: 2011-06-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,12 +65,60 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: mysql
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 2
+        - 7
+        version: 0.2.7
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 29
         segments: 
@@ -79,7 +127,7 @@ dependencies:
         - 3
         version: 1.3.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
 description: |
   This gem provides an acts_as_list compatible capability for sorting
   and reordering a number of objects in a list. The class that has this
@@ -137,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Sort your models