enumeration 1.2.1 → 1.3.1

data/Gemfile.lock

@@ -1,21 +1,25 @@
 PATH
   remote: .
   specs:
-    enumeration (1.2.1)
+    enumeration (1.3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ansi (1.3.0)
-    assert (0.2.1)
+    ansi (1.4.1)
+    assert (0.7.3)
+      assert-view (~> 0.5)
+    assert-view (0.5.0)
       ansi (~> 1.3)
+      undies (~> 2.0)
     rake (0.9.2)
+    undies (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  assert (~> 0.2.0)
+  assert (~> 0.7)
   bundler (~> 1.0)
   enumeration!
   rake (~> 0.9.2)

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("assert", ["~> 0.2.0"])
+  s.add_development_dependency("assert", ["~> 0.7"])
 end

data/lib/enumeration/assert_macros.rb

@@ -0,0 +1,57 @@
+module Enumeration; end
+module Enumeration::AssertMacros
+
+  # a set of Assert macros to help write enum definition and
+  # regression tests in Assert (https://github.com/teaminsight/assert)
+
+  def self.included(receiver)
+    receiver.class_eval do
+      extend MacroMethods
+    end
+  end
+
+  module MacroMethods
+
+    def have_enum(name, *args)
+      values = [*args].flatten
+      type = nil
+      if values.first.kind_of?(::Hash)
+        values = values.first
+        type = 'map'
+      elsif !values.empty?
+        type = 'list'
+      end
+
+      called_from = caller.first
+      macro_name =  "have the"
+      macro_name += " #{type}" if type
+      macro_name += " enum '#{name}'"
+      macro_name += " with #{values.inspect} values" if !values.empty?
+
+      Assert::Macro.new(macro_name) do
+        should have_accessor name, [called_from]
+
+        should have_class_method "#{name}_collection", [called_from]
+
+        if type == 'map'
+          should have_class_method name, [called_from]
+        end
+
+        if !values.empty?
+          should "know its '#{name}' enum values", called_from do
+            assert_equal values, subject.class.send("#{name}_collection")
+          end
+
+          if type == 'map'
+            should "map the '#{name}' enum values at the class level", called_from do
+              values.each {|k,v| assert_equal v, subject.class.send(name, k)}
+            end
+          end
+        end
+
+      end
+    end
+
+  end
+
+end

data/lib/enumeration/collection.rb

@@ -1,50 +1,49 @@
-module Enumeration
-  class Collection
+module Enumeration; end
+class Enumeration::Collection
 
-    attr_reader :data
+  attr_reader :data
 
-    def initialize(map_or_list)
-      unless map_or_list.kind_of?(::Hash) || map_or_list.kind_of?(::Array)
-        raise ArgumentError, "please specify the enum collection as a Hash or Array"
-      end
-      @data = map_or_list
-    end
-
-    # lookup collection value by a key
-    def [](key)
-      if self.map? && @data.has_key?(key)
-        @data[key]
-      elsif (self.map?  && @data.has_value?(key)) ||
-            (self.list? && @data.include?(key))
-        key
-      else
-        nil
-      end
+  def initialize(map_or_list)
+    unless map_or_list.kind_of?(::Hash) || map_or_list.kind_of?(::Array)
+      raise ArgumentError, "please specify the enum collection as a Hash or Array"
     end
+    @data = map_or_list
+  end
 
-    # lookup collection key by a value
-    def key(value)
-      if self.map? && @data.has_value?(value)
-        @data.invert[value]
-      elsif (self.map?  && @data.has_key?(value)) ||
-            (self.list? && @data.include?(value))
-        value
-      else
-        nil
-      end
+  # lookup collection value by a key
+  def [](key)
+    if self.map? && @data.has_key?(key)
+      @data[key]
+    elsif (self.map?  && @data.has_value?(key)) ||
+          (self.list? && @data.include?(key))
+      key
+    else
+      nil
     end
+  end
 
-    def list?
-      @data.kind_of?(::Array)
+  # lookup collection key by a value
+  def key(value)
+    if self.map? && @data.has_value?(value)
+      @data.invert[value]
+    elsif (self.map?  && @data.has_key?(value)) ||
+          (self.list? && @data.include?(value))
+      value
+    else
+      nil
     end
+  end
 
-    def map?
-      @data.kind_of?(::Hash)
-    end
+  def list?
+    @data.kind_of?(::Array)
+  end
 
-    def set
-      self.map? ? @data.keys : @data
-    end
+  def map?
+    @data.kind_of?(::Hash)
+  end
 
+  def set
+    self.map? ? @data.keys : @data
   end
+
 end

data/lib/enumeration/version.rb

@@ -1,3 +1,3 @@
 module Enumeration
-  VERSION = "1.2.1"
+  VERSION = "1.3.1"
 end

data/test/assert_macros_test.rb

@@ -0,0 +1,33 @@
+require 'assert'
+
+require 'enumeration'
+require 'enumeration/assert_macros'
+
+module Enumeration::AssertMacros
+
+  class BaseTests < Assert::Context
+    desc "Enumeration::AssertMacros"
+    include Enumeration::AssertMacros
+
+    before do
+      Thing.send :include, Enumeration
+      Thing.send(:enum, :list, %w{aye bee see})
+      Thing.send(:enum, :map, {
+        :a => "aye",
+        :b => "bee",
+        :c => "see"
+      })
+      @a_thing = Thing.new
+    end
+    subject { @a_thing }
+
+    should have_enum :list
+    should have_enum :list, ['aye', 'bee', 'see']
+    should have_enum :list, 'aye', 'bee', 'see'
+
+    should have_enum :map
+    should have_enum :map, :a => "aye", :b => "bee", :c => "see"
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enumeration
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 1
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Kelly D. Redding
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,24 +30,23 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: bundler
   version_requirements: *id001
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 5
         segments: 
         - 0
-        - 2
-        - 0
-        version: 0.2.0
-  name: assert
+        - 7
+        version: "0.7"
   version_requirements: *id002
+  name: assert
 description: add enumerated value attributes to your ruby classes
 email: 
 - kelly@kelredd.com
@@ -65,9 +64,11 @@ files:
 - Rakefile
 - enumeration.gemspec
 - lib/enumeration.rb
+- lib/enumeration/assert_macros.rb
 - lib/enumeration/collection.rb
 - lib/enumeration/version.rb
 - test/api_test.rb
+- test/assert_macros_test.rb
 - test/collection_test.rb
 - test/helper.rb
 - test/irb.rb
@@ -103,12 +104,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: add enumerated value attributes to your ruby classes
 test_files: 
 - test/api_test.rb
+- test/assert_macros_test.rb
 - test/collection_test.rb
 - test/helper.rb
 - test/irb.rb