abstractivator 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb01795d640d7c7f0d8a422cbe77e0e6f9ce262e
-  data.tar.gz: 953bf0c7d6d6fd18e800b7fd22780e5b22f6217a
+  metadata.gz: 348cdacd93250cedbb2e44760733ff5662432374
+  data.tar.gz: eca9b1d0b3d908d82859e4842d2f709b263010f4
 SHA512:
-  metadata.gz: 0abda16e780a4dc57ddf5873b5a36e09d379b8e14c55e14ff081ba2d00de717fd03e57afc0bd3f90bf7d56202cb43a9551a6fd095a6e9f7c430f6f28345ba224
-  data.tar.gz: 022371561b2071ffbe820b25bc3cebddf3c12c169fe391094bb1f8e9c11410fba7fe82ecf225fec010e174054e1ad27a58c4f8fadeea27a2c9c848432544db51
+  metadata.gz: 814f84087892a9570caaeeb0158b964d6ff863281ffeb5a4e3ae3fc6dbbc5db0ea1706667fcad7275bea13efec1e1bc917c5fbeac47b143b348c0cf21ba851ab
+  data.tar.gz: 31f49dfb24f94e2736227a3c65265a464e0eeac8398e5f1c189559f3a1a605f1e8df978e0337cc5941db5fd0da49c695a20883680e134290c90053ac8ddd9932

data/lib/abstractivator/enum.rb

@@ -8,6 +8,8 @@ module Enum
     # base.extend Dsl
   end
 
+  module Value; end # used to mark enum values
+
   module ClassMethods
     def values
       self.constants.map{|sym| self.const_get(sym)}.reject{|x| x.is_a?(Class) || x.is_a?(Module)}
@@ -22,7 +24,11 @@ module Enum
     end
 
     def from(x)
-      values.find{|v| v.value == x}
+      if x.is_a?(Enum::Value)
+        x
+      else
+        values.find{|v| v.value == x}
+      end
     end
 
     private
@@ -53,6 +59,7 @@ def make_enum(*fields)
       value_class =
           const_set(:Value,
                     Class.new do
+                      include Enum::Value
                       attr_reader :enum_type, :value
                       define_method(:initialize) do |enum_type, value|
                         @enum_type, @value = enum_type, value

data/lib/abstractivator/version.rb

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

data/spec/lib/abstractivator/enum_spec.rb

@@ -42,6 +42,9 @@ describe Enum do
       result = Container::Fruits.from(x)
       expect(result).to eql Container::Fruits::APPLE
     end
+    it 'works if the value is already typed' do
+      expect(Container::Fruits.from(Container::Fruits::APPLE)).to eql Container::Fruits::APPLE
+    end
   end
 end
 

metadata

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