abstractivator 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8b4b8142e88b9765c903640aebb186dc0c2071c
-  data.tar.gz: a167c975cb24aef9ef28eec2e33da0b2630921a7
+  metadata.gz: eb01795d640d7c7f0d8a422cbe77e0e6f9ce262e
+  data.tar.gz: 953bf0c7d6d6fd18e800b7fd22780e5b22f6217a
 SHA512:
-  metadata.gz: 24bddba24e33849ba4058c32e20308679dad0999e7d425e6e2c00e8ca0f326c36aef73f979eeff9d698a09fbc8971208d8725f518fd8d34ac2d5e178a40000ca
-  data.tar.gz: 6cb633bd0551aab119b11c641abf5e9fcd07124306cc41895d66d993ee37d71a1f413fe27a379e2f372a0367646435aa818e904ef4c1b80567c1a34eeff1df4c
+  metadata.gz: 0abda16e780a4dc57ddf5873b5a36e09d379b8e14c55e14ff081ba2d00de717fd03e57afc0bd3f90bf7d56202cb43a9551a6fd095a6e9f7c430f6f28345ba224
+  data.tar.gz: 022371561b2071ffbe820b25bc3cebddf3c12c169fe391094bb1f8e9c11410fba7fe82ecf225fec010e174054e1ad27a58c4f8fadeea27a2c9c848432544db51

data/lib/abstractivator/enum.rb

@@ -10,7 +10,7 @@ module Enum
 
   module ClassMethods
     def values
-      self.constants.map{|sym| self.const_get(sym)}.reject{|x| x == Enum::ClassMethods}
+      self.constants.map{|sym| self.const_get(sym)}.reject{|x| x.is_a?(Class) || x.is_a?(Module)}
     end
 
     def name_for(value)
@@ -22,7 +22,7 @@ module Enum
     end
 
     def from(x)
-      values.find{|v| v == x}
+      values.find{|v| v.value == x}
     end
 
     private
@@ -37,23 +37,6 @@ module Enum
   end
 end
 
-module EnumMember
-  attr_accessor :enum_type
-end
-
-class Object
-  include EnumMember
-end
-
-class WrappedEnumValue < SimpleDelegator
-  include EnumMember
-  attr_reader :class # pure evil
-  def initialize(value)
-    __setobj__(value)
-    @class = value.class
-  end
-end
-
 def define_enum(name, *fields)
   if respond_to?(:const_set)
     const_set(name, make_enum(*fields))
@@ -67,9 +50,20 @@ def make_enum(*fields)
     fields = fields.first
     Module.new do
       include Enum
+      value_class =
+          const_set(:Value,
+                    Class.new do
+                      attr_reader :enum_type, :value
+                      define_method(:initialize) do |enum_type, value|
+                        @enum_type, @value = enum_type, value
+                      end
+                      define_method(:inspect) do
+                        "#<#{self.class.name} #{value.inspect}>"
+                      end
+                      alias_method :to_s, :inspect
+                    end)
       fields.each_pair do |k, v|
-        val = v.frozen? ? WrappedEnumValue.new(v) : v
-        val.enum_type = self
+        val = value_class.new(self, v)
         fld = k.to_s.upcase.to_sym
         const_set(fld, val)
       end

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

data/spec/lib/abstractivator/enum_spec.rb

@@ -39,21 +39,20 @@ describe Enum do
   describe '::from' do
     it 'returns the typed version of the value' do
       x = 'apple'
-      expect(x.enum_type).to be_nil
       result = Container::Fruits.from(x)
-      expect(result.enum_type).to eql Container::Fruits
+      expect(result).to eql Container::Fruits::APPLE
     end
   end
 end
 
 describe '#define_enum' do
   it 'defines an enum given an array of symbols' do
-    expect(Container::Fruits::APPLE).to eql 'apple'
-    expect(Container::Fruits::ORANGE).to eql 'orange'
+    expect(Container::Fruits::APPLE.value).to eql 'apple'
+    expect(Container::Fruits::ORANGE.value).to eql 'orange'
   end
   it 'defines an enum given a hash' do
-    expect(Container::Vegetables::CUCUMBER).to eql 'Cucumis sativus'
-    expect(Container::Vegetables::EGGPLANT).to eql 8
+    expect(Container::Vegetables::CUCUMBER.value).to eql 'Cucumis sativus'
+    expect(Container::Vegetables::EGGPLANT.value).to eql 8
   end
   it 'values know their parent' do
     expect(Container::Fruits::APPLE.enum_type).to eql Container::Fruits
@@ -62,7 +61,7 @@ describe '#define_enum' do
     expect(Container::Vegetables::EGGPLANT.enum_type).to eql Container::Vegetables
   end
   it 'can define top level enumerations' do
-    expect(Meats.values).to eql %w(bacon more_bacon)
+    expect(Meats.values.map(&:value)).to eql %w(bacon more_bacon)
   end
   it 'raises an error when called with bad arguments' do
     expect{define_enum(:Stuff, 5)}.to raise_error /Arguments must be/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Peter Winton