enumattr 0.0.4 → 0.0.5

data/README.ja.md

@@ -47,9 +47,9 @@ bundler を利用しているなら、Gemfile に以下の行を加え、
 すると、クラスメソッドとインスタンスメソッドが定義されます。
 
 * クラスメソッド
-  * `User.status_keys` (`{attr_name}_keys`) は、キーワードの集合を返します
-  * `User.status_values` (`{attr_name}_values`) は、値の集合を返します
-  * `User.status_enums` (`{attr_name}_enums`) は Enum オブジェクトの集合を返します
+  * `User.status_keys` (`{attr_name}_keys`) は、キーワードの配列を返します
+  * `User.status_values` (`{attr_name}_values`) は、値の配列を返します
+  * `User.status_enums` (`{attr_name}_enums`) は Enum オブジェクトの配列を返します
   * `User.status_enum(:active)` (`{attr_name}_enum(:keyword)`) は、`:keyword` に対応する Enum オブジェクトを返します
   * `User.status_value(:active)` (`{attr_name}_value(:keyword)`) は、`:keyword` に対応する値を返します
 * インスタンスメソッド
@@ -64,13 +64,13 @@ _Enum オブジェクト_ (`Enumattr::Enums::Enum`) は、`key` と `value` と
 例:
 
     User.status_keys
-    #=> #<Set: {:active, :inactive, :deleted}>
+    #=> [:active, :inactive, :deleted]
 
     User.status_values
-    #=> #<Set: {1, 2, 3}>
+    #=> [1, 2, 3]
 
     User.status_enums
-    #=> #<Set: {#<Enumattr::Enums::Enum:0x007ff58b220618 @container=#<Enumattr::Enums:0x007ff58b2207a8>, #<Enumattr::Enums::Enum:0x007ff58b220488 @container=#<Enumattr::Enums:0x007ff58b2207a8>, @key=:inactive, @value=2, @extras=[]>, #<Enumattr::Enums::Enum:0x007ff58b220488 @container=#<Enumattr::Enums:0x007ff58b2207a8>, @key=:deleted, @value=3, @extras=[]>}>
+    #=> [#<Enumattr::Enums::Enum:0x9459d00, @key=:active, @value=1, @extras=[]>, #<Enumattr::Enums::Enum:0x9459c88, @key=:inactive, @value=2, @extras=[]>, #<Enumattr::Enums::Enum:0x9459be8, @key=:deleted, @value=3, @extras=[]>]
 
 
     enum = User.status_enum(:active)
@@ -123,7 +123,8 @@ _Enum オブジェクト_ (`Enumattr::Enums::Enum`) は、`key` と `value` と
   * enumattr に指定している名前と同じメソッドあるいは属性が存在しない場合に、参照すべきメソッドや属性を指定できます
   * `enumattr :enumattr_name, :on => :existent_attribute do ...`
 * `:enums`
-  * ハッシュで enum オブジェクトのマッピングを定義できます。ブロックによる enum オブジェクトの指定の代替記法です
+  * Hash で enum オブジェクトのマッピングを定義できます。ブロックによる enum オブジェクトの指定の代替記法です
+  * Hash で定義した場合、Ruby 1.8.7 以前では配列を返すクラスメソッドで順序が保証されません (`[[:keyword, value1], [:keyword2, value2]]` で代用は可能)
   * `enumattr :enumattr_name, :enums => {:keyword1 => value1, :keyword2 => value2}`
 * `:extend`
   * モジュールを指定して enum オブジェクトを拡張することができます

data/README.md

@@ -47,9 +47,9 @@ example:
 then defining class methods and instance methods.
 
 * class methods
-  * `User.status_keys` as `{attr_name}_keys` return keyword set
-  * `User.status_values` as `{attr_name}_values` return value set
-  * `User.status_enums` as `{attr_name}_enums` return Enum object set
+  * `User.status_keys` as `{attr_name}_keys` return keyword array
+  * `User.status_values` as `{attr_name}_values` return value array
+  * `User.status_enums` as `{attr_name}_enums` return Enum object array
   * `User.status_enum(:active)` as `{attr_name}_enum(:keyword)` return an Enum object
   * `User.status_value(:active)` as `{attr_name}_value(:keyword)` return a value
 * instance methods
@@ -64,13 +64,13 @@ _Enum object_ (`Enumattr::Enums::Enum`) has `key` and `value` attributes
 example:
 
     User.status_keys
-    #=> #<Set: {:active, :inactive, :deleted}>
+    #=> [:active, :inactive, :deleted]
 
     User.status_values
-    #=> #<Set: {1, 2, 3}>
+    #=> [1, 2, 3]
 
     User.status_enums
-    #=> #<Set: {#<Enumattr::Enums::Enum:0x007ff58b220618 @container=#<Enumattr::Enums:0x007ff58b2207a8>, #<Enumattr::Enums::Enum:0x007ff58b220488 @container=#<Enumattr::Enums:0x007ff58b2207a8>, @key=:inactive, @value=2, @extras=[]>, #<Enumattr::Enums::Enum:0x007ff58b220488 @container=#<Enumattr::Enums:0x007ff58b2207a8>, @key=:deleted, @value=3, @extras=[]>}>
+    #=> [#<Enumattr::Enums::Enum:0x9459d00, @key=:active, @value=1, @extras=[]>, #<Enumattr::Enums::Enum:0x9459c88, @key=:inactive, @value=2, @extras=[]>, #<Enumattr::Enums::Enum:0x9459be8, @key=:deleted, @value=3, @extras=[]>]
 
 
     enum = User.status_enum(:active)
@@ -125,6 +125,7 @@ example:
 * `:enums`
   * altenative enum defining leteral by hash instead of block
   * `enumattr :enumattr_name, :enums => {:keyword1 => value1, :keyword2 => value2}`
+  * `enumattr :enumattr_name, :enums => [[:keyword1, value1], [:keyword2, value2]]` (Ruby 1.8.7 and need ordered)
 * `:extend`
   * enum object extension
   * `enumattr :enumattr_name, :extend => Extension do ...`

data/lib/enumattr/enums.rb

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-require 'set'
 
 module Enumattr
   class Enums
@@ -9,32 +8,32 @@ module Enumattr
       @enumattr = enumattr
       @base     = base
       @opts     = opts.freeze
-      @set      = enum_set(&block)
-      decorate @set
+      @enums    = build_enums(&block)
+      decorate @enums
     end
 
     def enums
-      @set.clone
+      @enums.clone
     end
 
     def keys
-      Set.new @set.map(&:key)
+      @enums.map(&:key)
     end
 
     def values
-      Set.new @set.map(&:value)
+      @enums.map(&:value)
     end
 
     def enum_by_key(key)
-      @set.find{|enum| enum.key == key }
+      @enums.find{|enum| enum.key == key }
     end
 
     def enum_by_value(value)
-      @set.find{|enum| enum.value == value }
+      @enums.find{|enum| enum.value == value }
     end
 
     private
-    def enum_set(&block)
+    def build_enums(&block)
       if enums_hash = @opts[:enums]
         closure = proc{ enums_hash.each{|key, value| enum key, value } }
       else
@@ -42,25 +41,25 @@ module Enumattr
       end
 
       context = Context.new(self, &closure)
-      context.instance_variable_get(:@set)
+      context.instance_variable_get(:@enums)
     end
 
-    def decorate(set)
+    def decorate(enums)
       if @opts.has_key?(:extend)
-        set.each{|enum| enum.extend @opts[:extend] }
+        enums.each{|enum| enum.extend @opts[:extend] }
       end
     end
 
     class Context
       def initialize(container, &closure)
         @container = container
-        @set = Set.new
+        @enums = []
         instance_eval(&closure)
       end
 
       private
       def enum(key, value, *extras)
-        @set.add Enum.new(@container, key, value, *extras)
+        @enums << Enum.new(@container, key, value, *extras)
       end
     end
 

data/lib/enumattr/version.rb

@@ -1,3 +1,3 @@
 module Enumattr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/enumattr/enums_spec.rb

@@ -56,8 +56,8 @@ describe Enumattr::Enums do
       its(:base) { should == EnumsTest1 }
       its(:enums) { should have(5).enums }
       its(:opts) { should be_empty }
-      its(:keys) { should == Set.new([:test1, :test2, :test3, :test4, :test5]) }
-      its(:values) { should == Set.new([1, 2, 3, 4, 5]) }
+      its(:keys) { should == [:test1, :test2, :test3, :test4, :test5] }
+      its(:values) { should == [1, 2, 3, 4, 5] }
     end
 
     include_examples "Enumattr::Enums find methods"
@@ -80,8 +80,11 @@ describe Enumattr::Enums do
       its(:base) { should == EnumsTest2 }
       its(:enums) { should have(3).enums }
       its(:opts) { should_not be_empty }
-      its(:keys) { should == Set.new([:test1, :test2, :test3]) }
-      its(:values) { should == Set.new([1, 2, 3]) }
+      its(:keys) { should == [:test1, :test2, :test3] }
+      its(:values) { should == [1, 2, 3] }
+      # if Ruby version <= 1.8.7
+      # its(:keys) { should =~ [:test1, :test2, :test3] }
+      # its(:values) { should =~ [1, 2, 3] }
     end
 
     include_examples "Enumattr::Enums find methods"
@@ -114,8 +117,8 @@ describe Enumattr::Enums do
       its(:base) { should == EnumsTest3 }
       its(:enums) { should have(4).enums }
       its(:opts) { should_not be_empty }
-      its(:keys) { should == Set.new([:test1, :test2, :test3, :test4]) }
-      its(:values) { should == Set.new([1, 2, 3, 4]) }
+      its(:keys) { should == [:test1, :test2, :test3, :test4] }
+      its(:values) { should == [1, 2, 3, 4] }
     end
 
     include_examples "Enumattr::Enums find methods"

data/spec/enumattr/included_spec.rb

@@ -9,7 +9,7 @@ describe User, 'declare with block' do
     describe '.status_enums as #{enumattr_name}_enums' do
       subject { described_class.status_enums }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Enum instances" do
         should satisfy { |enums|
@@ -21,7 +21,7 @@ describe User, 'declare with block' do
     describe '.status_keys as #{enumattr_name}_keys' do
       subject { described_class.status_keys }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Symbol instances" do
         should satisfy { |keys|
@@ -33,7 +33,7 @@ describe User, 'declare with block' do
     describe '.status_values as #{enumattr_name}_values' do
       subject { described_class.status_values }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Numeric instances" do
         should satisfy { |values|
@@ -145,7 +145,7 @@ describe AdminUser,"with :on option" do
     describe '.authority_enums as #{enumattr_name}_enums' do
       subject { described_class.authority_enums }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Enum instances" do
         should satisfy { |enums|
@@ -157,7 +157,7 @@ describe AdminUser,"with :on option" do
     describe '.authority_keys as #{enumattr_name}_keys' do
       subject { described_class.authority_keys }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Symbol instances" do
         should satisfy { |keys|
@@ -169,7 +169,7 @@ describe AdminUser,"with :on option" do
     describe '.authority_values as #{enumattr_name}_values' do
       subject { described_class.authority_values }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(3).items }
       it "should have Numeric instances" do
         should satisfy { |values|
@@ -271,7 +271,7 @@ describe Entry,"with :enums option" do
     describe '.show_flag_enums as #{enumattr_name}_enums' do
       subject { described_class.show_flag_enums }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(2).items }
       it "should have Enum instances" do
         should satisfy { |enums|
@@ -283,7 +283,7 @@ describe Entry,"with :enums option" do
     describe '.show_flag_keys as #{enumattr_name}_keys' do
       subject { described_class.show_flag_keys }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(2).items }
       it "should have Symbol instances" do
         should satisfy { |keys|
@@ -295,7 +295,7 @@ describe Entry,"with :enums option" do
     describe '.show_flag_values as #{enumattr_name}_values' do
       subject { described_class.show_flag_values }
 
-      it { should be_a Set }
+      it { should be_a Array }
       it { should have(2).items }
       it "should have TrueClass or FalseClass instances" do
         should satisfy { |values|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enumattr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70160534844020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160534844020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: simple enum
 email:
 - aisuiiaisuii@gmail.com
@@ -67,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: manage constants by enum like object