typesafe_enum 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 800a98f8fc3e4892ea6896c30f60c0dc55ac12a3
-  data.tar.gz: dcbfc9d5140cc25869efedfbf84e4a62f61872bf
+  metadata.gz: 6dca44bfdc19636b439aea18d0a5bbb195150fcf
+  data.tar.gz: ae8b31bcd16f05536e1bb2ffd9346fbd395465e7
 SHA512:
-  metadata.gz: 66923883e4df73f561be67490524aa1fd82a67a2fd6724bb9dff6d25ef83cf67fd1c3dc4af55cd52c4adec661cbe23c4dfb04b2aacd38ea95755163cda432482
-  data.tar.gz: 9688661a06d7648dde507e52b4ad462c8e6ae6cd0191d96aad055bb48703c3f5ef6cf6e1a6e3f4a461f4ffd180c47dc21f84ad15cdc3ef4cd91a117ac40cc07b
+  metadata.gz: d8c40232f8fa100c7de8f49d830e20bce082126d951a69a4e53294a89134647c6cf2d0244034efe47bb88348a70352d4b3c061c5ff6c6a0d19f296e4a4de154d
+  data.tar.gz: 24543c5f5b1b72dbf554662275d47c918ef3807e723648aebe34552b217b52e82a91f9a20f35d9a7569ace4279dcdebefb00df0b136099a2f802fb66ac6c9812

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+- Fixed issue where invalid classes weren't properly removed after duplicate name declarations,
+  polluting the namespace and causing duplicate declration error messages to be lost.
+
 ## 0.1.2
 
 - Fixed issue where `::find_by_value_str` failed to return `nil` for bad values

data/README.md

@@ -1,8 +1,8 @@
 # typesafe_enum
 
-[![Build Status](https://travis-ci.org/dmolesUC3/typesafe_enum.png?branch=master)](https://travis-ci.org/dmolesUC3/typesafe_enum)
-[![Code Climate](https://codeclimate.com/github/dmolesUC3/typesafe_enum.png)](https://codeclimate.com/github/dmolesUC3/typesafe_enum)
-[![Inline docs](http://inch-ci.org/github/dmolesUC3/typesafe_enum.png)](http://inch-ci.org/github/dmolesUC3/typesafe_enum)
+[![Build Status](https://travis-ci.org/dmolesUC3/typesafe_enum.svg?branch=master)](https://travis-ci.org/dmolesUC3/typesafe_enum)
+[![Code Climate](https://codeclimate.com/github/dmolesUC3/typesafe_enum.svg)](https://codeclimate.com/github/dmolesUC3/typesafe_enum)
+[![Inline docs](http://inch-ci.org/github/dmolesUC3/typesafe_enum.svg)](http://inch-ci.org/github/dmolesUC3/typesafe_enum)
 [![Gem Version](https://img.shields.io/gem/v/typesafe_enum.svg)](https://github.com/dmolesUC3/typesafe_enum/releases)
 
 A Ruby implementation of Joshua Bloch's
@@ -24,8 +24,8 @@ class Suit < TypesafeEnum::Base
 end
 ```
 
-A constant is declared for each instance, with the key symbol as its
-value:
+A constant is declared for each instance, with an instance of the new
+class as the value of that constant:
 
 ```ruby
 Suit::CLUBS
@@ -159,7 +159,9 @@ is linear in the number of enum values, so it's best suited for smaller enumerat
 
 ## Enum classes with methods
 
-Enum classes can have methods, and other non-enum constants:
+Enum classes are just classes. They can have methods, and other non-enum constants.
+(The `:initialize` method for each class, though, is declared programmatically by
+the base class. If you need to redefine it, be sure to alias and call the original.)
 
 ```ruby
 class Suit < TypesafeEnum::Base
@@ -220,11 +222,11 @@ Operation.map { |op| op.eval(39, 23) }
 as seen in C, [C++](https://msdn.microsoft.com/en-us/library/2dzy4k6e.aspx),
 [C#](https://msdn.microsoft.com/en-us/library/sbbt4032.aspx), and
 [Objective-C](https://developer.apple.com/library/ios/releasenotes/ObjectiveC/ModernizationObjC/AdoptingModernObjective-C/AdoptingModernObjective-C.html#//apple_ref/doc/uid/TP40014150-CH1-SW6).
-In C and most C-like languages, an `enum` is simply a valued set of `int` values
+In C and most C-like languages, an `enum` is simply a named set of `int` values
 (though C++ and others require an explicit cast to assign an `enum` value to
 an `int` variable).
 
-Similarly, a `Ruby::Enum` class is simply a valued set of values of any type,
+Similarly, a `Ruby::Enum` class is simply a named set of values of any type,
 with convenience methods for iterating over the set. Usually the values are
 strings, but they can be of any type.
 
@@ -260,9 +262,9 @@ Java introduced the concept of "typesafe enums", first as a
 [design pattern]((http://www.oracle.com/technetwork/java/page1-139488.html#replaceenums))
 and later as a
 [first-class language construct](https://docs.oracle.com/javase/1.5.0/docs/guide/language/enums.html).
-In Java, an `Enum` class news a closed, valued set of _instances of that class,_ rather than
+In Java, an `Enum` class defines a closed, valued set of _instances of that class,_ rather than
 of a primitive type such as an `int`, and those instances have all the features of other objects,
-such as methods, fields, and type membership. Likewise, a `TypesafeEnum` class news a valued set
+such as methods, fields, and type membership. Likewise, a `TypesafeEnum` class defines a valued set
 of instances of that class, rather than of a set of some other type.
 
 ```ruby

data/lib/typesafe_enum/base.rb

@@ -63,10 +63,14 @@ module TypesafeEnum
       attr_accessor :by_value
       attr_accessor :as_array
 
+      def parent
+        parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
+        parent_name ? Object.const_get(parent_name) : Object
+      end
+
       def undefine_class
-        enclosing_module = Module.nesting.last
         class_value = name.split('::').last || ''
-        enclosing_module.send(:remove_const, class_value)
+        parent.send(:remove_const, class_value)
       end
 
       def register(instance)

data/lib/typesafe_enum/module_info.rb

@@ -3,7 +3,7 @@ module TypesafeEnum
   NAME = 'typesafe_enum'
 
   # The version of this gem
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   # The copyright notice for this gem
   COPYRIGHT = 'Copyright (c) 2015 The Regents of the University of California'

data/spec/.rubocop.yml

@@ -5,3 +5,6 @@ Metrics/MethodLength:
 
 Metrics/ModuleLength:
   Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false

data/spec/unit/typesafe_enum/base_spec.rb

@@ -1,27 +1,27 @@
 # coding: UTF-8
 require 'spec_helper'
 
-class Suit < TypesafeEnum::Base
+class ::Suit < TypesafeEnum::Base
   new :CLUBS
   new :DIAMONDS
   new :HEARTS
   new :SPADES
 end
 
-class Tarot < TypesafeEnum::Base
+class ::Tarot < TypesafeEnum::Base
   new :CUPS, 'Cups'
   new :COINS, 'Coins'
   new :WANDS, 'Wands'
   new :SWORDS, 'Swords'
 end
 
-class RGBColor < TypesafeEnum::Base
+class ::RGBColor < TypesafeEnum::Base
   new :RED, :red
   new :GREEN, :green
   new :BLUE, :blue
 end
 
-class Scale < TypesafeEnum::Base
+class ::Scale < TypesafeEnum::Base
   new :DECA, 10
   new :HECTO, 100
   new :KILO, 1_000
@@ -31,7 +31,7 @@ end
 module TypesafeEnum
   describe Base do
 
-    describe ':: new' do
+    describe '::new' do
       it ' news a constant enum value' do
         enum = Suit::CLUBS
         expect(enum).to be_a(Suit)
@@ -39,7 +39,7 @@ module TypesafeEnum
 
       it 'insists symbols be symbols' do
         expect do
-          class Cheat < Base
+          class ::Cheat < Base
             new 'spades', 'spades'
           end
         end.to raise_error(TypeError)
@@ -47,7 +47,7 @@ module TypesafeEnum
 
       it 'insists symbols be uppercase' do
         expect do
-          class Cheat < Base
+          class ::Cheat < Base
             new :spades, 'spades'
           end
         end.to raise_error(NameError)
@@ -55,24 +55,24 @@ module TypesafeEnum
 
       it 'disallows duplicate symbols' do
         expect do
-          class Cheat < Base
+          class ::Cheat < Base
             new :SPADES, 'spades'
             new :SPADES, 'more spades'
           end
         end.to raise_error(NameError)
 
-        expect { Cheat.class }.to raise_error(NameError)
+        expect { ::Cheat.class }.to raise_error(NameError)
       end
 
       it 'disallows duplicate values' do
         expect do
-          class Cheat < Base
+          class ::Cheat < Base
             new :SPADES, 'spades'
             new :ALSO_SPADES, 'spades'
           end
         end.to raise_error(NameError)
 
-        expect { Cheat.class }.to raise_error(NameError)
+        expect { ::Cheat.class }.to raise_error(NameError)
       end
 
       it 'defaults the value to a lower-cased version of the symbol' do
@@ -377,7 +377,7 @@ module TypesafeEnum
     end
 
     it 'supports "inner class" methods via instance_eval' do
-      class Operation < Base
+      class ::Operation < Base
         new(:PLUS, '+').instance_eval do
           def eval(x, y)
             x + y

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typesafe_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler