abstractivator 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e4b42be94b67b4941fa92b59dde30b82f7f5621
-  data.tar.gz: 60fbb6aef6b5e1d5b238e5b25b93e555f19d0de7
+  metadata.gz: e2e72efdd6bc89faf5f8b2cfa863d7fed8dc643e
+  data.tar.gz: 4ff37a3fb3cb13a2ef309a954c3220406f219585
 SHA512:
-  metadata.gz: 52b1865dd2933ca08c785188be8efa59d284bff6e2e965138b25fcefd42309ce3d6cc16913a059dcc4c4470077631e5be9d01514b1251f96d27c9bdbadef1ee9
-  data.tar.gz: 4e98f6f9f0e31efb1b1445b0aa6f7a299780b99581679a8019a2a295098b9c5a99792c62c3fecf1d2b9d7865fc3351496f987912f2918855501816f80ff97ca5
+  metadata.gz: 5fe33acb32046988112b02e974747349d6fb124e333416cbdacc3bb7797e22cc3ed38559b0470d5d91afca3f91ac60dfbca2980ad92503df0bb82b2b70d0ccee
+  data.tar.gz: 89ba9f0d00caf957ca7c3b588d9f8c48abfca63913df185a449eeed55c21bf11c1bec08c59f83a687ccf76c9eb4cd4fb798b39d7c9456cd504744fa201b6c0b6

data/lib/abstractivator/enum.rb

@@ -1,13 +1,16 @@
 require 'active_support/inflector'
+require 'abstractivator/enumerable_ext'
+require 'delegate'
 
 module Enum
   def self.included(base)
     base.extend ClassMethods
+    # base.extend Dsl
   end
 
   module ClassMethods
     def values
-      self.constants.map{|sym| self.const_get(sym)}
+      self.constants.map{|sym| self.const_get(sym)}.reject{|x| x == Enum::ClassMethods}
     end
 
     def name_for(value)
@@ -18,6 +21,8 @@ module Enum
       safe_constantize("#{self.name}::#{sym.to_s.upcase}")
     end
 
+    private
+
     def safe_constantize(str)
       begin
         str.constantize
@@ -27,3 +32,43 @@ module Enum
     end
   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)
+  const_set(name, make_enum(*fields))
+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
+      include Enum
+      fields.each_pair do |k, v|
+        val = v.frozen? ? WrappedEnumValue.new(v) : v
+        val.enum_type = self
+        fld = k.to_s.upcase.to_sym
+        const_set(fld, val)
+      end
+    end
+  elsif fields.all?{|f| f.is_a?(Symbol)}
+    make_enum(fields.hash_map(&:to_s))
+  else
+    raise 'Arguments must be one or more symbols or a single symbol-keyed hash'
+  end
+end

data/lib/abstractivator/enumerable_ext.rb

@@ -47,7 +47,7 @@ module Enumerable
     x.respond_to?(:call)
   end
 
-  def hash_map(get_key, &get_value)
+  def hash_map(get_key=->x{x}, &get_value)
     Hash[self.map{|x| [get_key.(x), get_value ? get_value.(x) : x]}]
   end
 
@@ -91,4 +91,14 @@ module Enumerable
     block ||= proc { value }
     self + ([n-self.size, 0].max).times.map(&block)
   end
+
+  def stable_sort(&compare)
+    compare = compare || ->(a, b){a <=> b}
+    xis = self.each_with_index.map{|x, i| [x, i]}
+    sorted = xis.sort do |(a, ai), (b, bi)|
+      primary = compare.call(a, b)
+      primary != 0 ? primary : (ai <=> bi)
+    end
+    sorted.map(&:first)
+  end
 end

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

data/lib/enumerable_ext.rb

@@ -1,11 +1,2 @@
-module Enumerable
-  def stable_sort(&compare)
-    compare = compare || ->(a, b){a <=> b}
-    xis = self.each_with_index.map{|x, i| [x, i]}
-    sorted = xis.sort do |(a, ai), (b, bi)|
-      primary = compare.call(a, b)
-      primary != 0 ? primary : (ai <=> bi)
-    end
-    sorted.map(&:first)
-  end
-end
+# deprecate this file
+require 'abstractivator/enumerable_ext'

data/spec/lib/abstractivator/enum_spec.rb

@@ -0,0 +1,58 @@
+require 'rspec'
+require 'abstractivator/enum'
+
+class Container
+  module Traditional
+    include Enum
+    FOO = 'foo'
+    BAR = 'bar'
+  end
+
+  define_enum(:Fruits, :apple, :orange)
+  define_enum(:Vegetables, cucumber: 'Cucumis sativus', eggplant: 8)
+end
+
+describe Enum do
+  describe '::values' do
+    it 'enumerates the values' do
+      expect(Container::Traditional.values).to eql %w(foo bar)
+    end
+  end
+  describe '::name_for' do
+    it 'returns the symbol name of an enum value' do
+      expect(Container::Traditional.name_for('foo')).to eql :FOO
+    end
+    it 'return nil if the value does not belong to the enumeration' do
+      expect(Container::Traditional.name_for('baz')).to be_nil
+    end
+  end
+  describe '::from_symbol' do
+    it 'coerces a symbol to an enum value' do
+      expect(Container::Traditional.from_symbol(:bar)).to eql 'bar'
+    end
+    it 'raises an error if no such value exists in the enumeration' do
+      expect{Container::Traditional.from_symbol(:baz)}.to raise_error
+    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'
+  end
+  it 'defines an enum given a hash' do
+    expect(Container::Vegetables::CUCUMBER).to eql 'Cucumis sativus'
+    expect(Container::Vegetables::EGGPLANT).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
+  end
+  it 'raises an error when called with bad arguments' do
+    expect{define_enum(:Stuff, 5)}.to raise_error /Arguments must be/
+    expect{define_enum(:Stuff, '!@$' => '')}.to raise_error /Arguments must be/
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - spec/lib/abstractivator/array_ext_spec.rb
 - spec/lib/abstractivator/collections_spec.rb
 - spec/lib/abstractivator/cons_spec.rb
+- spec/lib/abstractivator/enum_spec.rb
 - spec/lib/abstractivator/enumerable_ext_spec.rb
 - spec/lib/abstractivator/proc_ext_spec.rb
 - spec/lib/abstractivator/tree_visitor_spec.rb
@@ -126,6 +127,7 @@ test_files:
 - spec/lib/abstractivator/array_ext_spec.rb
 - spec/lib/abstractivator/collections_spec.rb
 - spec/lib/abstractivator/cons_spec.rb
+- spec/lib/abstractivator/enum_spec.rb
 - spec/lib/abstractivator/enumerable_ext_spec.rb
 - spec/lib/abstractivator/proc_ext_spec.rb
 - spec/lib/abstractivator/tree_visitor_spec.rb