orderable 0.1.1 → 0.2.0

data/Gemfile

@@ -1,13 +1,18 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem "activesupport", ">= 2.3.5"
+gem "activerecord", ">= 2.3.5"
+
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
 end
+
+group :test do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+  gem "rr"
+end

data/Gemfile.lock

@@ -1,20 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.6)
+    arel (2.0.9)
+    builder (2.1.2)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mysql2 (0.2.7)
+    pg (0.10.1)
     rake (0.8.7)
     rcov (0.9.9)
+    rr (1.0.2)
     shoulda (2.11.3)
+    sqlite3 (1.3.3)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 2.3.5)
+  activesupport (>= 2.3.5)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
+  mysql2
+  pg
   rcov
+  rr
   shoulda
+  sqlite3

data/Rakefile

@@ -19,10 +19,10 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Add user defined ordering to ActiveRecord, supports MySQL and PostgreSQL.}
   gem.email = "jebarker@gmail.com"
   gem.authors = ["Darcy Laycock", "John Barker"]
-  gem.add_runtime_dependency 'activesupport'
-  gem.add_runtime_dependency 'activerecord'
-  gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'activerecord'
+  gem.add_runtime_dependency 'activesupport', '>= 2.3.5'
+  gem.add_runtime_dependency 'activerecord', '>= 2.3.5'
+  gem.add_development_dependency 'activesupport', '>= 2.3.5'
+  gem.add_development_dependency 'activerecord', '>= 2.3.5'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/orderable.rb

@@ -19,8 +19,9 @@ module Orderable
       self.orderable_field = field.to_sym
     end
     
-    def update_order(id_array = nil)
-      id_array = Array(id_array).flatten.reject(&:blank?).map(&:to_i).uniq
+    def update_order(*id_array)
+      id_array = Array.wrap(id_array).flatten.reject(&:blank?).map(&:to_i).uniq
+      return if id_array.blank?
       update_all orderable_sql_for_ids(id_array), ['id IN (?)', id_array]
     end
 
@@ -34,11 +35,13 @@ module Orderable
 
     def orderable_sql_for_ids(ids)
       ids = ids.join(",")
-      case Orderable.adapter
+      case adapter = Orderable.adapter
       when /^mysql/
         ["#{quoted_column} = FIND_IN_SET(id, ?)", ids]
       when /^postgres/
         ["#{quoted_column} = STRPOS(?, ','||id||',')", ",#{ids},"]
+      else
+        raise ArgumentError, "The database adapter #{adapter} is not supported by orderable"
       end
     end
 

data/orderable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orderable}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock", "John Barker"]
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
     "orderable.gems",
     "orderable.gemspec",
     "test/helper.rb",
-    "test/test_orderable.rb"
+    "test/test_orderable_mysql.rb",
+    "test/test_orderable_postgres.rb"
   ]
   s.homepage = %q{http://github.com/excepttheweasel/orderable}
   s.licenses = ["MIT"]
@@ -38,40 +39,47 @@ Gem::Specification.new do |s|
   s.summary = %q{Add user defined ordering to ActiveRecord}
   s.test_files = [
     "test/helper.rb",
-    "test/test_orderable.rb"
+    "test/test_orderable_mysql.rb",
+    "test/test_orderable_postgres.rb"
   ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_development_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.3.5"])
     else
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
   end
 end
 

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -9,10 +9,14 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'active_support'
+require 'active_record'
+require 'rr'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'orderable'
 
 class Test::Unit::TestCase
+  include RR::Adapters::TestUnit
 end

data/test/test_orderable_mysql.rb

@@ -0,0 +1,46 @@
+require 'helper'
+
+MySQLRecord = Class.new ActiveRecord::Base
+MySQLRecord.establish_connection(:adapter => 'mysql2', :host => 'localhost', :database => 'orderable_test')
+
+MySQLRecord.connection.drop_table(:items) rescue Mysql2::Error
+MySQLRecord.connection.create_table :items do |t|
+  t.string :name
+  t.integer :order_position
+end
+
+class MySQLItem < MySQLRecord
+  set_table_name 'items'
+  include Orderable
+  orderable_field_is :order_position
+end
+
+class TestOrderableMySQL < Test::Unit::TestCase
+
+  def setup
+    stub(Orderable).adapter.returns 'mysql'
+    @items = [
+      MySQLItem.create(:name => 'item1'),
+      MySQLItem.create(:name => 'item2'),
+      MySQLItem.create(:name => 'item3'),
+      MySQLItem.create(:name => 'item4')]
+  end
+
+  def teardown
+    @items.each(&:delete)
+  end
+
+  def test_default_order
+    assert_equal ['item1', 'item2', 'item3', 'item4'], MySQLItem.in_order.all.map(&:name)
+  end
+
+  def test_updated_order
+    MySQLItem.update_order \
+      @items[3].id,
+      @items[1].id,
+      @items[2].id,
+      @items[0].id
+    assert_equal ['item4', 'item2', 'item3', 'item1'], MySQLItem.in_order.all.map(&:name)
+  end
+
+end

data/test/test_orderable_postgres.rb

@@ -0,0 +1,46 @@
+require 'helper'
+
+PostgreSQLRecord = Class.new ActiveRecord::Base
+PostgreSQLRecord.establish_connection(:adapter => 'postgresql', :host => 'localhost', :database => 'orderable_test')
+
+PostgreSQLRecord.connection.drop_table(:items)
+PostgreSQLRecord.connection.create_table :items do |t|
+  t.string :name
+  t.integer :order_position
+end
+
+class PSQLItem < PostgreSQLRecord
+  set_table_name 'items'
+  include Orderable
+  orderable_field_is :order_position
+end
+
+class TestOrderablePostgres < Test::Unit::TestCase
+
+  def setup
+    stub(Orderable).adapter.returns 'postgres'
+    @items = [
+      PSQLItem.create(:name => 'item1'),
+      PSQLItem.create(:name => 'item2'),
+      PSQLItem.create(:name => 'item3'),
+      PSQLItem.create(:name => 'item4')]
+  end
+
+  def teardown
+    @items.each(&:delete)
+  end
+
+  def test_default_order
+    assert_equal ['item1', 'item2', 'item3', 'item4'], PSQLItem.in_order.all.map(&:name)
+  end
+
+  def test_updated_order
+    PSQLItem.update_order \
+      @items[3].id,
+      @items[1].id,
+      @items[2].id,
+      @items[0].id
+    assert_equal ['item4', 'item2', 'item3', 'item1'], PSQLItem.in_order.all.map(&:name)
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orderable
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -20,8 +20,40 @@ date: 2011-04-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: activesupport
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  prerelease: false
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  prerelease: false
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,10 +64,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id001
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,10 +80,10 @@ dependencies:
         version: 1.0.0
   prerelease: false
   type: :development
-  requirement: *id002
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,10 +96,10 @@ dependencies:
         version: 1.5.2
   prerelease: false
   type: :development
-  requirement: *id003
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,63 +110,71 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id004
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   prerelease: false
   type: :runtime
-  requirement: *id005
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   prerelease: false
   type: :runtime
-  requirement: *id006
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   prerelease: false
   type: :development
-  requirement: *id007
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   prerelease: false
   type: :development
-  requirement: *id008
+  requirement: *id010
 description: Add user defined ordering to ActiveRecord, supports MySQL and PostgreSQL.
 email: jebarker@gmail.com
 executables: []
@@ -157,7 +197,8 @@ files:
 - orderable.gems
 - orderable.gemspec
 - test/helper.rb
-- test/test_orderable.rb
+- test/test_orderable_mysql.rb
+- test/test_orderable_postgres.rb
 has_rdoc: true
 homepage: http://github.com/excepttheweasel/orderable
 licenses: 
@@ -194,4 +235,5 @@ specification_version: 3
 summary: Add user defined ordering to ActiveRecord
 test_files: 
 - test/helper.rb
-- test/test_orderable.rb
+- test/test_orderable_mysql.rb
+- test/test_orderable_postgres.rb

data/test/test_orderable.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestOrderable < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end