liszt 0.0.7 → 0.1.0

data/test/redis_list_test.rb

@@ -1,168 +1,167 @@
 require 'test_helper'
 
-class RedisListTest < ActiveSupport::TestCase
-  context "the Redis list wrapper" do
-    setup do
+describe Liszt::RedisList do
+  describe "the Redis list wrapper" do
+    before do
       Liszt.redis.flushall
       @list = Liszt::RedisList.new('liszt:test')
     end
 
-    should "clear and populate successfully" do
+    it "clears and populate successfully" do
       @list.clear_and_populate!([1,2,3])
       @list.clear_and_populate!([4,5,6])
       assert_equal @list.to_a, [4,5,6]
     end
 
-    should "not be initialized before it's initialized" do
+    it "isn't initialized before it's initialized" do
       assert !@list.initialized?
     end
 
-    should "be initialized once it's initialized" do
+    it "is initialized once it's initialized" do
       @list.clear_and_populate!([1])
       assert @list.initialized?
     end
 
-    context "given a list with some ids" do
-      setup do
+    describe "given a list with some ids" do
+      before do
         @list.clear_and_populate!([1,5,4,2])
       end
 
-      should "know if the list includes an id" do
+      it "knows if the list includes an id" do
         assert @list.include?(4)
         assert !@list.include?(3)
       end
 
-      should "know the index of an id" do
+      it "knows the index of an id" do
         assert_equal @list.index(1), 0
         assert_equal @list.index(4), 2
         assert_equal @list.index(2), 3
       end
 
-      should "unshift onto the front of the list" do
+      it "unshifts onto the front of the list" do
         @list.unshift(8)
         assert_equal @list.to_a, [8,1,5,4,2]
       end
 
-      should "not unshift if already present" do
+      it "doesn't unshift if already present" do
         @list.unshift(5)
         assert_equal @list.to_a, [1,5,4,2]
       end
 
-      should "unshift! if already present" do
+      it "unshift!s if already present" do
         @list.unshift!(5)
         assert_equal @list.to_a, [5,1,5,4,2]
       end
 
-      should "push onto the end of the list" do
+      it "pushes onto the end of the list" do
         @list.push(8)
         assert_equal @list.to_a, [1,5,4,2,8]
       end
 
-      should "not push if already present" do
+      it "doesn't push if already present" do
         @list.push(5)
         assert_equal @list.to_a, [1,5,4,2]
       end
 
-      should "push! if already present" do
+      it "push!es if already present" do
         @list.push!(5)
         assert_equal @list.to_a, [1,5,4,2,5]
       end
 
-      should "remove an id" do
+      it "removes an id" do
         @list.remove(5)
         assert_equal @list.to_a, [1,4,2]
       end
 
-      should "clear all ids without un-initializing" do
+      it "clears all ids without un-initializing" do
         @list.clear
         assert @list.initialized?
         assert_equal @list.to_a, []
       end
 
-      should "know the length of the list" do
+      it "knows the length of the list" do
         assert_equal @list.length, 4
       end
 
-      should "return nil for length if uninitialized" do
+      it "returns nil for length if uninitialized" do
         @list.uninitialize
         assert_nil @list.length
       end
 
-      should "return all ids (and no marker) for .all/.to_a" do
+      it "returns all ids (and no marker) for .all/.to_a" do
         assert_equal @list.all, [1,5,4,2]
       end
 
-      should "move an id down from the top" do
+      it "moves an id down from the top" do
         @list.move_down(1)
         assert_equal @list.to_a, [5,1,4,2]
       end
 
-      should "move an id down from the middle" do
+      it "moves an id down from the middle" do
         @list.move_down(4)
         assert_equal @list.to_a, [1,5,2,4]
       end
 
-      should "not move an id down from the bottom" do
+      it "doesn't move an id down from the bottom" do
         @list.move_down(2)
         assert_equal @list.to_a, [1,5,4,2]
       end
 
-      should "not move an id up from the top" do
+      it "doesn't move an id up from the top" do
         @list.move_up(1)
         assert_equal @list.to_a, [1,5,4,2]
       end
 
-      should "move an id up from the middle" do
+      it "moves an id up from the middle" do
         @list.move_up(4)
         assert_equal @list.to_a, [1,4,5,2]
       end
 
-      should "move an id up from the bottom" do
+      it "moves an id up from the bottom" do
         @list.move_up(2)
         assert_equal @list.to_a, [1,5,2,4]
       end
 
-      should "not move an id to the top from the top" do
+      it "moves an id to the top from the top" do
         @list.move_to_top(1)
         assert_equal @list.to_a, [1,5,4,2]
       end
 
-      should "move an id to the top" do
+      it "moves an id to the top" do
         @list.move_to_top(4)
         assert_equal @list.to_a, [4,1,5,2]
       end
 
-      should "move an id to the bottom" do
+      it "moves an id to the bottom" do
         @list.move_to_bottom(4)
         assert_equal @list.to_a, [1,5,2,4]
       end
 
-      should "not move an id to the bottom from the bottom" do
+      it "doesn't move an id to the bottom from the bottom" do
         @list.move_to_bottom(2)
         assert_equal @list.to_a, [1,5,4,2]
       end
     end
 
-    context "locking mechanism" do
-      should "get an exclusive lock" do
+    describe "locking mechanism" do
+      it "gets an exclusive lock" do
         assert @list.send(:get_lock)
         assert !@list.send(:get_lock)
         @list.send(:release_lock)
       end
 
-      should "release the lock" do
+      it "releases the lock" do
         @list.send(:get_lock)
         @list.send(:release_lock)
         assert @list.send(:get_lock)
         @list.send(:release_lock)
       end
 
-      should "time out the lock" do
+      it "times out the lock" do
         @list.send(:get_lock, 0)
-        sleep(0.5)
+        sleep(0.1)
         assert @list.send(:get_lock)
       end
     end
   end
 end
-

data/test/test_helper.rb

@@ -1,15 +1,95 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-if ENV["BUNDLE_GEMFILE"] =~ /rails2/
-  require File.expand_path("../dummy_2.3/config/environment.rb",  __FILE__)
-  require 'test_help'
-else
-  require File.expand_path("../dummy_3.1/config/environment.rb",  __FILE__)
-  require "rails/test_help"
+# encoding: UTF-8
+
+if ENV['COVERAGE']
+  require "simplecov"
+  SimpleCov.start
+end
+
+require "minitest/autorun"
+require "minitest/spec"
+require "minitest/pride"
+require "minitest/mock"
+
+require "liszt"
+require "redis"
+require "logger"
+require "pry"
+
+Liszt.redis = Redis.new(:host => "localhost", :port => "10001")
+
+class Array
+  def swap(i1, i2)
+    self[i1], self[i2] = self[i2], self[i1]
+  end
+end
+
+# set up in-memory database
+
+ENV['RAILS_ENV'] ||= 'test'
+
+require "active_record"
+require "active_record/test_case"
+
+ActiveRecord::Base.configurations = {
+  "test" => { "adapter" => "sqlite3", "database" => ":memory:" }
+}
+
+ActiveRecord::Base.establish_connection "test"
+
+ActiveRecord::Schema.define do
+  create_table "groups", :force => true do |t|
+    t.boolean "is_foo"
+    t.boolean "is_bar"
+    t.timestamps
+  end
+
+  create_table "people", :force => true do |t|
+    t.string   "name"
+    t.integer  "group_id"
+    t.boolean  "is_male"
+    t.timestamps
+  end
+end
+
+class Group < ActiveRecord::Base
+  acts_as_liszt :sort_by => lambda { |o| o.id },
+    :conditions => { :is_foo => true, :is_bar => nil },
+    :append_new_items => true
+end
+
+class Person < ActiveRecord::Base
+  acts_as_liszt :scope => [:group_id, :is_male]
 end
 
-if ENV["DEBUG_REDIS"] =~ /y/
+class MiniTest::Spec
+  class << self
+    def setup(symbol = nil, &block)
+      if symbol
+        before { send symbol }
+      else
+        before &block
+      end
+    end
+
+    def teardown(symbol = nil, &block)
+      if symbol
+        after { send symbol }
+      else
+        after &block
+      end
+    end
+  end
+
+  include ActiveRecord::TestFixtures
+
+  self.use_instantiated_fixtures = true
+  self.use_transactional_fixtures = false
+  self.fixture_path = "test/fixtures"
+
+  fixtures :groups, :people
+end
+
+if ENV['DEBUG']
   class Redis
     module Connection
       class Ruby
@@ -33,15 +113,6 @@ if ENV["DEBUG_REDIS"] =~ /y/
       end
     end
   end
-end
 
-class Array
-  def swap(i1, i2)
-    self[i1], self[i2] = self[i2], self[i1]
-  end
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
 end
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,80 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: liszt
 version: !ruby/object:Gem::Version
-  version: 0.0.7
   prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 3.0.0
+    none: false
   type: :runtime
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
-- !ruby/object:Gem::Dependency
+        version: '0'
+    none: false
+  type: :runtime
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
+    none: false
+  type: :development
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  type: :development
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  type: :development
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Liszt is an alternative to acts_as_list and sortable that uses atomic
   Redis operations to maintain scoped ordering information for ActiveRecord objects.
 email:
@@ -86,9 +150,6 @@ files:
 - .gitignore
 - .yardopts
 - Gemfile
-- Gemfile.lock
-- Gemfile.rails2
-- Gemfile.rails2.lock
 - LICENSE
 - Rakefile
 - lib/liszt.rb
@@ -96,68 +157,8 @@ files:
 - lib/liszt/redis_list.rb
 - lib/liszt/version.rb
 - liszt.gemspec
-- test/dummy_2.3/Rakefile
-- test/dummy_2.3/app/controllers/application_controller.rb
-- test/dummy_2.3/app/models/group.rb
-- test/dummy_2.3/app/models/person.rb
-- test/dummy_2.3/config/boot.rb
-- test/dummy_2.3/config/database.yml
-- test/dummy_2.3/config/environment.rb
-- test/dummy_2.3/config/environments/development.rb
-- test/dummy_2.3/config/environments/test.rb
-- test/dummy_2.3/config/initializers/backtrace_silencers.rb
-- test/dummy_2.3/config/initializers/bundler.rb
-- test/dummy_2.3/config/initializers/cookie_verification_secret.rb
-- test/dummy_2.3/config/initializers/inflections.rb
-- test/dummy_2.3/config/initializers/mime_types.rb
-- test/dummy_2.3/config/initializers/new_rails_defaults.rb
-- test/dummy_2.3/config/initializers/session_store.rb
-- test/dummy_2.3/config/locales/en.yml
-- test/dummy_2.3/config/routes.rb
-- test/dummy_2.3/db/migrate/20110922194432_create_people.rb
-- test/dummy_2.3/db/migrate/20110922194512_create_groups.rb
-- test/dummy_2.3/db/schema.rb
-- test/dummy_2.3/db/seeds.rb
-- test/dummy_2.3/script/about
-- test/dummy_2.3/script/console
-- test/dummy_2.3/script/dbconsole
-- test/dummy_2.3/script/destroy
-- test/dummy_2.3/script/generate
-- test/dummy_2.3/script/performance/benchmarker
-- test/dummy_2.3/script/performance/profiler
-- test/dummy_2.3/script/plugin
-- test/dummy_2.3/script/runner
-- test/dummy_2.3/script/server
-- test/dummy_2.3/test/fixtures/groups.yml
-- test/dummy_2.3/test/fixtures/people.yml
-- test/dummy_3.1/Rakefile
-- test/dummy_3.1/app/controllers/application_controller.rb
-- test/dummy_3.1/app/models/.gitkeep
-- test/dummy_3.1/app/models/group.rb
-- test/dummy_3.1/app/models/person.rb
-- test/dummy_3.1/config.ru
-- test/dummy_3.1/config/application.rb
-- test/dummy_3.1/config/boot.rb
-- test/dummy_3.1/config/database.yml
-- test/dummy_3.1/config/environment.rb
-- test/dummy_3.1/config/environments/development.rb
-- test/dummy_3.1/config/environments/test.rb
-- test/dummy_3.1/config/initializers/backtrace_silencers.rb
-- test/dummy_3.1/config/initializers/inflections.rb
-- test/dummy_3.1/config/initializers/mime_types.rb
-- test/dummy_3.1/config/initializers/secret_token.rb
-- test/dummy_3.1/config/initializers/session_store.rb
-- test/dummy_3.1/config/initializers/wrap_parameters.rb
-- test/dummy_3.1/config/locales/en.yml
-- test/dummy_3.1/config/routes.rb
-- test/dummy_3.1/db/migrate/20110922194058_create_people.rb
-- test/dummy_3.1/db/migrate/20110922194126_create_groups.rb
-- test/dummy_3.1/db/schema.rb
-- test/dummy_3.1/lib/assets/.gitkeep
-- test/dummy_3.1/log/.gitkeep
-- test/dummy_3.1/script/rails
-- test/dummy_3.1/test/fixtures/groups.yml
-- test/dummy_3.1/test/fixtures/people.yml
+- test/fixtures/groups.yml
+- test/fixtures/people.yml
 - test/liszt_test.rb
 - test/redis.conf
 - test/redis_list_test.rb
@@ -169,93 +170,28 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -755035515866164015
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -755035515866164015
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveRecord sorting using Redis lists
 test_files:
-- test/dummy_2.3/Rakefile
-- test/dummy_2.3/app/controllers/application_controller.rb
-- test/dummy_2.3/app/models/group.rb
-- test/dummy_2.3/app/models/person.rb
-- test/dummy_2.3/config/boot.rb
-- test/dummy_2.3/config/database.yml
-- test/dummy_2.3/config/environment.rb
-- test/dummy_2.3/config/environments/development.rb
-- test/dummy_2.3/config/environments/test.rb
-- test/dummy_2.3/config/initializers/backtrace_silencers.rb
-- test/dummy_2.3/config/initializers/bundler.rb
-- test/dummy_2.3/config/initializers/cookie_verification_secret.rb
-- test/dummy_2.3/config/initializers/inflections.rb
-- test/dummy_2.3/config/initializers/mime_types.rb
-- test/dummy_2.3/config/initializers/new_rails_defaults.rb
-- test/dummy_2.3/config/initializers/session_store.rb
-- test/dummy_2.3/config/locales/en.yml
-- test/dummy_2.3/config/routes.rb
-- test/dummy_2.3/db/migrate/20110922194432_create_people.rb
-- test/dummy_2.3/db/migrate/20110922194512_create_groups.rb
-- test/dummy_2.3/db/schema.rb
-- test/dummy_2.3/db/seeds.rb
-- test/dummy_2.3/script/about
-- test/dummy_2.3/script/console
-- test/dummy_2.3/script/dbconsole
-- test/dummy_2.3/script/destroy
-- test/dummy_2.3/script/generate
-- test/dummy_2.3/script/performance/benchmarker
-- test/dummy_2.3/script/performance/profiler
-- test/dummy_2.3/script/plugin
-- test/dummy_2.3/script/runner
-- test/dummy_2.3/script/server
-- test/dummy_2.3/test/fixtures/groups.yml
-- test/dummy_2.3/test/fixtures/people.yml
-- test/dummy_3.1/Rakefile
-- test/dummy_3.1/app/controllers/application_controller.rb
-- test/dummy_3.1/app/models/.gitkeep
-- test/dummy_3.1/app/models/group.rb
-- test/dummy_3.1/app/models/person.rb
-- test/dummy_3.1/config.ru
-- test/dummy_3.1/config/application.rb
-- test/dummy_3.1/config/boot.rb
-- test/dummy_3.1/config/database.yml
-- test/dummy_3.1/config/environment.rb
-- test/dummy_3.1/config/environments/development.rb
-- test/dummy_3.1/config/environments/test.rb
-- test/dummy_3.1/config/initializers/backtrace_silencers.rb
-- test/dummy_3.1/config/initializers/inflections.rb
-- test/dummy_3.1/config/initializers/mime_types.rb
-- test/dummy_3.1/config/initializers/secret_token.rb
-- test/dummy_3.1/config/initializers/session_store.rb
-- test/dummy_3.1/config/initializers/wrap_parameters.rb
-- test/dummy_3.1/config/locales/en.yml
-- test/dummy_3.1/config/routes.rb
-- test/dummy_3.1/db/migrate/20110922194058_create_people.rb
-- test/dummy_3.1/db/migrate/20110922194126_create_groups.rb
-- test/dummy_3.1/db/schema.rb
-- test/dummy_3.1/lib/assets/.gitkeep
-- test/dummy_3.1/log/.gitkeep
-- test/dummy_3.1/script/rails
-- test/dummy_3.1/test/fixtures/groups.yml
-- test/dummy_3.1/test/fixtures/people.yml
+- test/fixtures/groups.yml
+- test/fixtures/people.yml
 - test/liszt_test.rb
 - test/redis.conf
 - test/redis_list_test.rb
 - test/test_helper.rb
+has_rdoc: