enumeration 1.1.0 → 1.2.0

data/Gemfile

@@ -1,2 +1,5 @@
 source "http://rubygems.org"
+
 gemspec
+
+gem 'rake', '~>0.9.2'

data/Gemfile.lock

@@ -1,25 +1,21 @@
 PATH
   remote: .
   specs:
-    enumeration (1.0.0)
+    enumeration (1.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    json (1.5.1)
-    kelredd-useful (0.4.1)
-      json
-    leftright (0.9.1)
-    shoulda (2.11.3)
-    test-belt (0.2.1)
-      kelredd-useful (~> 0.4.0)
-      leftright (~> 0.9.0)
-      shoulda (~> 2.11)
+    ansi (1.3.0)
+    assert (0.2.1)
+      ansi (~> 1.3)
+    rake (0.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  assert (~> 0.2.0)
   bundler (~> 1.0)
   enumeration!
-  test-belt (= 0.2.1)
+  rake (~> 0.9.2)

data/Rakefile

@@ -1,7 +1,7 @@
+require 'assert/rake_tasks'
+include Assert::RakeTasks
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'test_belt/rake_tasks'
-TestBelt::RakeTasks.for :test
-
 task :default => :build

data/enumeration.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency("bundler", ["~> 1.0"])
-  s.add_development_dependency("test-belt", ["= 0.2.1"])
+  s.add_development_dependency("assert", ["~> 0.2.0"])
 end

data/lib/enumeration.rb

@@ -47,4 +47,4 @@ module Enumeration
     end
   end
 
-end
+end

data/lib/enumeration/collection.rb

@@ -47,4 +47,4 @@ module Enumeration
     end
 
   end
-end
+end

data/lib/enumeration/version.rb

@@ -1,3 +1,3 @@
 module Enumeration
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/api_test.rb

@@ -0,0 +1,15 @@
+require "assert"
+
+require 'enumeration'
+
+class APITest < Assert::Context
+  desc "Enumeration mixin"
+
+  subject { Thing.new }
+  before do
+    Thing.send :include, Enumeration
+  end
+
+  should have_class_method :enum
+
+end

data/test/collection_test.rb

@@ -1,86 +1,84 @@
-require "test/helper"
+require "assert"
+
 require "enumeration/collection"
 
-class CollectionAPITest < Test::Unit::TestCase
-  context "Enumeration collection" do
-    subject { Enumeration::Collection.new([]) }
-
-    should_have_reader :data
-    should_have_instance_methods :set, :map?, :list?, :[]
-
-    should "only be created from Arrays or Hashes" do
-      assert_raises ArgumentError do
-        Enumeration::Collection.new('stuff')
-      end
-      assert_nothing_raised do
-        Enumeration::Collection.new([])
-        Enumeration::Collection.new({})
-      end
-    end
+class CollectionAPITest < Assert::Context
+  desc "Enumeration collection"
+  subject { Enumeration::Collection.new([]) }
+
+  should have_reader :data
+  should have_instance_methods :set, :map?, :list?, :[]
 
+  should "only be created from Arrays or Hashes" do
+    assert_raises ArgumentError do
+      Enumeration::Collection.new('stuff')
+    end
+    assert_nothing_raised do
+      Enumeration::Collection.new([])
+      Enumeration::Collection.new({})
+    end
   end
-end
 
-class ListCollectionTest < Test::Unit::TestCase
-  context "List collection" do
-    subject { Enumeration::Collection.new(['one', 'two', 'three']) }
+end
 
-    should "be a list" do
-      assert_equal true, subject.list?
-      assert_equal false, subject.map?
-    end
+class ListCollectionTest < Assert::Context
+  desc "List collection"
+  subject { Enumeration::Collection.new(['one', 'two', 'three']) }
 
-    should "know it's data" do
-      assert_equal ['one', 'two', 'three'], subject.data
-    end
+  should "be a list" do
+    assert_equal true, subject.list?
+    assert_equal false, subject.map?
+  end
 
-    should "know it's set" do
-      assert_equal ['one', 'two', 'three'], subject.set
-    end
+  should "know it's data" do
+    assert_equal ['one', 'two', 'three'], subject.data
+  end
 
-    should "lookup value by key" do
-      assert_equal 'two', subject['two']
-    end
+  should "know it's set" do
+    assert_equal ['one', 'two', 'three'], subject.set
+  end
 
-    should "lookup key by value" do
-      assert_equal 'three', subject.key('three')
-    end
+  should "lookup value by key" do
+    assert_equal 'two', subject['two']
+  end
 
+  should "lookup key by value" do
+    assert_equal 'three', subject.key('three')
   end
-end
 
-class MapCollectionTest < Test::Unit::TestCase
-  context "Map collection" do
-    subject { Enumeration::Collection.new({ :one => 1, :two => 2, :three => 3}) }
+end
 
-    should "be a map" do
-      assert_equal true, subject.map?
-      assert_equal false, subject.list?
-    end
+class MapCollectionTest < Assert::Context
+  desc "Map collection"
+  subject { Enumeration::Collection.new({ :one => 1, :two => 2, :three => 3}) }
 
-    should "know it's data" do
-      assert_equal({:one=>1,:two=>2,:three=>3}, subject.data)
-    end
+  should "be a map" do
+    assert_equal true, subject.map?
+    assert_equal false, subject.list?
+  end
 
-    should "know it's set" do
-      [:one, :two, :three].each{|n| assert subject.set.include?(n)}
-    end
+  should "know it's data" do
+    assert_equal({:one=>1,:two=>2,:three=>3}, subject.data)
+  end
 
-    should "lookup value by key" do
-      assert_equal 2, subject[:two]
-    end
+  should "know it's set" do
+    [:one, :two, :three].each{|n| assert subject.set.include?(n)}
+  end
 
-    should "lookup value by value" do
-      assert_equal 2, subject[2]
-    end
+  should "lookup value by key" do
+    assert_equal 2, subject[:two]
+  end
 
-    should "lookup key by value" do
-      assert_equal :two, subject.key(2)
-    end
+  should "lookup value by value" do
+    assert_equal 2, subject[2]
+  end
 
-    should "lookup key by key" do
-      assert_equal :two, subject.key(:two)
-    end
+  should "lookup key by value" do
+    assert_equal :two, subject.key(2)
+  end
 
+  should "lookup key by key" do
+    assert_equal :two, subject.key(:two)
   end
-end
+
+end

data/test/helper.rb

@@ -1,4 +1,7 @@
-require 'rubygems'
-require 'test_belt'
-require 'test/env'
+# this file is automatically required in when you require 'assert'
+# put test helpers here
+
+# add root dir to the load path
+$LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
+
 require 'test/thing'

data/test/irb.rb

@@ -0,0 +1,10 @@
+require 'assert/setup'
+
+# this file is required in when the 'irb' rake test is run.
+# b/c 'assert' is required above, the test helper will be
+# required in.
+
+# put any IRB setup code here
+
+require 'enumeration'
+

data/test/list_enum_test.rb

@@ -1,49 +1,51 @@
-require "test/helper"
+require "assert"
 
-class ListEnumTest < Test::Unit::TestCase
-  context "instance" do
+require 'enumeration'
 
-    subject { Thing.new }
-    before do
-      Thing.send :include, Enumeration
-      Thing.send(:enum, :word, %w{aye bee see})
-    end
+class ListEnumTest < Assert::Context
+  desc "instance"
 
-    should_have_class_methods :word_set, :word_collection
-    should_have_accessor :word
+  subject { @a_thing }
+  before do
+    Thing.send :include, Enumeration
+    Thing.send(:enum, :word, %w{aye bee see})
+    @a_thing = Thing.new
+  end
 
-    should "not have a class level lookup method" do
-      assert_raises NoMethodError do
-        Thing.word
-      end
-    end
+  should have_class_methods :word_set, :word_collection
+  should have_accessor :word
 
-    should "provide class level access to the enum set" do
-      words = Thing.word_set
-      assert words
-      assert_kind_of ::Array, words
-      assert !words.empty?
-      assert_equal 3, words.size
-      assert_equal ['aye', 'bee', 'see'], Thing.word_set
-      assert_equal Thing.word_set, Thing.word_collection
+  should "not have a class level lookup method" do
+    assert_raises NoMethodError do
+      Thing.word
     end
+  end
 
-    should "write a value and read the value" do
-      subject.word = "see"
-      assert_equal "see", subject.word
-    end
+  should "provide class level access to the enum set" do
+    words = Thing.word_set
+    assert words
+    assert_kind_of ::Array, words
+    assert !words.empty?
+    assert_equal 3, words.size
+    assert_equal ['aye', 'bee', 'see'], Thing.word_set
+    assert_equal Thing.word_set, Thing.word_collection
+  end
 
-    should "write a value and read the key" do
-      subject.word = "see"
-      assert_equal "see", subject.word_key
-    end
+  should "write a value and read the value" do
+    subject.word = "see"
+    assert_equal "see", subject.word
+  end
 
-    should "write nil for values that aren't in the enum" do
-      subject.word = "bady-bad"
-      assert_equal nil, subject.word
-      assert_equal nil, subject.word_key
-    end
+  should "write a value and read the key" do
+    subject.word = "see"
+    assert_equal "see", subject.word_key
+  end
 
+  should "write nil for values that aren't in the enum" do
+    subject.word = "bady-bad"
+    assert_equal nil, subject.word
+    assert_equal nil, subject.word_key
   end
+
 end
 

data/test/map_enum_test.rb

@@ -1,63 +1,65 @@
-require "test/helper"
-
-class MapEnumTest < Test::Unit::TestCase
-  context "instance" do
-
-    subject { Thing.new }
-    before do
-      Thing.send :include, Enumeration
-      Thing.send(:enum, :stuff, {
-        :a => "aye",
-        :b => "bee",
-        :c => "see"
-      })
-    end
-
-    should_have_class_methods :stuff, :stuff_set, :stuff_collection
-    should_have_accessor :stuff
-
-    should "provide class level access to the enum set" do
-      stuffs = Thing.stuff_set
-      assert stuffs
-      assert_kind_of ::Array, stuffs
-      assert !stuffs.empty?
-      assert_equal 3, stuffs.size
-      [:a, :b, :c].each{|t| assert Thing.stuff_set.include?(t)}
-      assert_equal({:a=>'aye',:b=>'bee',:c=>'see'}, Thing.stuff_collection)
-    end
-
-    should "provide class level lookup of the enum" do
-      assert_equal "aye", Thing.stuff(:a)
-    end
-
-    should "write a key and read the value and key" do
-      subject.stuff = :b
-      assert_equal "bee", subject.stuff
-      assert_equal :b, subject.stuff_key
-    end
-
-    should "write a value and read the value" do
-      subject.stuff = "see"
-      assert_equal "see", subject.stuff
-      assert_equal :c, subject.stuff_key
-    end
-
-    should "not read keys like you would values" do
-      subject.stuff = :c
-      assert_not_equal :c, subject.stuff
-    end
-
-    should "write nil for keys that aren't in the enum" do
-      subject.stuff = :bad
-      assert_equal nil, subject.stuff
-      assert_equal nil, subject.stuff_key
-    end
-
-    should "write nil for values that aren't in the enum" do
-      subject.stuff = "bady-bad"
-      assert_equal nil, subject.stuff
-      assert_equal nil, subject.stuff_key
-    end
+require "assert"
 
+require 'enumeration'
+
+class MapEnumTest < Assert::Context
+  desc "instance"
+
+  subject { @a_thing }
+  before do
+    Thing.send :include, Enumeration
+    Thing.send(:enum, :stuff, {
+      :a => "aye",
+      :b => "bee",
+      :c => "see"
+    })
+    @a_thing = Thing.new
+  end
+
+  should have_class_methods :stuff, :stuff_set, :stuff_collection
+  should have_accessor :stuff
+
+  should "provide class level access to the enum set" do
+    stuffs = Thing.stuff_set
+    assert stuffs
+    assert_kind_of ::Array, stuffs
+    assert !stuffs.empty?
+    assert_equal 3, stuffs.size
+    [:a, :b, :c].each{|t| assert Thing.stuff_set.include?(t)}
+    assert_equal({:a=>'aye',:b=>'bee',:c=>'see'}, Thing.stuff_collection)
+  end
+
+  should "provide class level lookup of the enum" do
+    assert_equal "aye", Thing.stuff(:a)
+  end
+
+  should "write a key and read the value and key" do
+    subject.stuff = :b
+    assert_equal "bee", subject.stuff
+    assert_equal :b, subject.stuff_key
   end
+
+  should "write a value and read the value" do
+    subject.stuff = "see"
+    assert_equal "see", subject.stuff
+    assert_equal :c, subject.stuff_key
+  end
+
+  should "not read keys like you would values" do
+    subject.stuff = :c
+    assert_not_equal :c, subject.stuff
+  end
+
+  should "write nil for keys that aren't in the enum" do
+    subject.stuff = :bad
+    assert_equal nil, subject.stuff
+    assert_equal nil, subject.stuff_key
+  end
+
+  should "write nil for values that aren't in the enum" do
+    subject.stuff = "bady-bad"
+    assert_equal nil, subject.stuff
+    assert_equal nil, subject.stuff_key
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enumeration
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kelly D. Redding
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -05:00
-default_executable: 
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,23 +30,23 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :development
+  name: bundler
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: test-belt
   prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 23
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
-  type: :development
+        - 0
+        version: 0.2.0
+  name: assert
   version_requirements: *id002
 description: add enumerated value attributes to your ruby classes
 email: 
@@ -68,14 +67,13 @@ files:
 - lib/enumeration.rb
 - lib/enumeration/collection.rb
 - lib/enumeration/version.rb
-- test/api__test.rb
+- test/api_test.rb
 - test/collection_test.rb
-- test/env.rb
 - test/helper.rb
+- test/irb.rb
 - test/list_enum_test.rb
 - test/map_enum_test.rb
 - test/thing.rb
-has_rdoc: true
 homepage: http://github.com/kelredd/enumeration
 licenses: []
 
@@ -105,15 +103,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: add enumerated value attributes to your ruby classes
 test_files: 
-- test/api__test.rb
+- test/api_test.rb
 - test/collection_test.rb
-- test/env.rb
 - test/helper.rb
+- test/irb.rb
 - test/list_enum_test.rb
 - test/map_enum_test.rb
 - test/thing.rb

data/test/api__test.rb

@@ -1,14 +0,0 @@
-require "test/helper"
-
-class APITest < Test::Unit::TestCase
-  context "Enumeration mixin" do
-
-    subject { Thing.new }
-    before do
-      Thing.send :include, Enumeration
-    end
-
-    should_have_class_method :enum
-
-  end
-end

data/test/env.rb

@@ -1,10 +0,0 @@
-# Add test and lib paths to the $LOAD_PATH
-[ File.dirname(__FILE__),
-  File.join(File.dirname(__FILE__), '..', 'lib')
-].each do |path|
-  full_path = File.expand_path(path)
-  $LOAD_PATH.unshift(full_path) unless $LOAD_PATH.include?(full_path)
-end
-
-require 'enumeration'
-