abstractivator 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348cdacd93250cedbb2e44760733ff5662432374
-  data.tar.gz: eca9b1d0b3d908d82859e4842d2f709b263010f4
+  metadata.gz: 34a14dfa085d8a1a7a5d462a509deed9424a9e35
+  data.tar.gz: 511e2fd85e5ab1a828c21f0ca252a3ca686bbb14
 SHA512:
-  metadata.gz: 814f84087892a9570caaeeb0158b964d6ff863281ffeb5a4e3ae3fc6dbbc5db0ea1706667fcad7275bea13efec1e1bc917c5fbeac47b143b348c0cf21ba851ab
-  data.tar.gz: 31f49dfb24f94e2736227a3c65265a464e0eeac8398e5f1c189559f3a1a605f1e8df978e0337cc5941db5fd0da49c695a20883680e134290c90053ac8ddd9932
+  metadata.gz: f503ac9376e4705618872262a237cb87cfd73fbe0063a7637451d1ad2e9cf5ce5ef556a688819ebaa7c1dc1beec22f8bdeb15ab620ce2d30a89e688196fbf942
+  data.tar.gz: 6ca46af5ec6309781d3b569a555b72325f8b2b98eabacc0f8b5864eca3cb1bff7d9eaa486832663c2c17296e1c05daab43d9252f5e19d18051f5022729c0dc43

data/lib/abstractivator/enum.rb

@@ -3,28 +3,37 @@ require 'abstractivator/enumerable_ext'
 require 'delegate'
 
 module Enum
+
+  attr_reader :value
+
+  def initialize(value)
+    @value = value
+  end
+
+  def inspect
+    "#<#{self.class.name} #{value.inspect}>"
+  end
+  alias_method :to_s, :inspect
+
   def self.included(base)
     base.extend ClassMethods
-    # 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)}
+      constants.map{|sym| const_get(sym)}.reject{|x| x == Enum::ClassMethods}
     end
 
     def name_for(value)
-      self.constants.detect{|sym| self.const_get(sym) == value}
+      constants.detect{|sym| const_get(sym) == value}
     end
 
     def from_symbol(sym)
-      safe_constantize("#{self.name}::#{sym.to_s.upcase}")
+      safe_constantize("#{name}::#{sym.to_s.upcase}")
     end
 
     def from(x)
-      if x.is_a?(Enum::Value)
+      if x.is_a?(Enum)
         x
       else
         values.find{|v| v.value == x}
@@ -54,23 +63,11 @@ end
 def make_enum(*fields)
   if fields.size == 1 && fields.first.is_a?(Hash) && fields.first.keys.all?{|f| f.is_a?(Symbol)}
     fields = fields.first
-    Module.new do
+    Class.new do
       include Enum
-      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
-                      end
-                      define_method(:inspect) do
-                        "#<#{self.class.name} #{value.inspect}>"
-                      end
-                      alias_method :to_s, :inspect
-                    end)
+      private_class_method :new
       fields.each_pair do |k, v|
-        val = value_class.new(self, v)
+        val = new(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.29'
+  VERSION = '0.0.30'
 end

data/spec/lib/abstractivator/enum_spec.rb

@@ -38,14 +38,18 @@ describe Enum do
   end
   describe '::from' do
     it 'returns the typed version of the value' do
-      x = 'apple'
-      result = Container::Fruits.from(x)
+      result = Container::Fruits.from('apple')
       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
+  describe '::new' do
+    it 'cannot be called' do
+      expect{Container::Fruits.new('durian')}.to raise_error NoMethodError
+    end
+  end
 end
 
 describe '#define_enum' do
@@ -58,10 +62,10 @@ describe '#define_enum' do
     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
-    expect(Container::Fruits::ORANGE.enum_type).to eql Container::Fruits
-    expect(Container::Vegetables::CUCUMBER.enum_type).to eql Container::Vegetables
-    expect(Container::Vegetables::EGGPLANT.enum_type).to eql Container::Vegetables
+    expect(Container::Fruits::APPLE).to be_a Container::Fruits
+    expect(Container::Fruits::ORANGE).to be_a Container::Fruits
+    expect(Container::Vegetables::CUCUMBER).to be_a Container::Vegetables
+    expect(Container::Vegetables::EGGPLANT).to be_a Container::Vegetables
   end
   it 'can define top level enumerations' do
     expect(Meats.values.map(&:value)).to eql %w(bacon more_bacon)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler