const_enum 1.0.1 → 1.0.2

data/Gemfile

@@ -5,10 +5,10 @@ gem 'activerecord', '>= 3.0.0'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem 'rspec', '~> 2.8.0'
-  gem 'rdoc', '~> 3.12'
-  gem 'bundler', '~> 1.0.0'
-  gem 'jeweler', '~> 1.8.3'
+  gem 'rspec',   '>= 2.8.0'
+  gem 'rdoc',    '>= 3.12'
+  gem 'bundler', '>= 1.0.0'
+  gem 'jeweler', '>= 1.8.3'
   gem 'simplecov'
   gem 'activerecord', '>= 3.0.0'
   gem 'sqlite3-ruby', :require => 'sqlite3'

data/README.rdoc

@@ -48,7 +48,7 @@ Gemfileに以下行を追加して、bundle installコマンドを実行して
   taro.status_enable?  # true
   taro.status_disable? # false
   
-  # {ATTR}_was_{CONST}? ,  #{ATTR}_{CONST}_wasメソッドが定義される
+  # was_{ATTR}_{CONST}? ,  #{ATTR}_{CONST}_wasメソッドが定義される
   taro.status = User::STATUS::DISABLE
   taro.status_enable?      # false
   taro.was_status_enable?  # true
@@ -75,8 +75,8 @@ validates :inclusionで利用することができる。
 constメソッドで定義される定数クラスはEnumerableモジュールをインクルードしているため、
 collection_selectにそのまま渡すことができる。
 値はvalue、ラベル名labelメソッドを指定する。
-  
-  form_for newhoge do |f|
+  user = User.new
+  form_for user do |f|
     f.collection_select(:status, User::STATUS, :value, :label)
   end
 
@@ -92,7 +92,7 @@ collection_selectにそのまま渡すことができる。
 
 === prefix: NamedScope、属性値テストメソッドの名前を変更する
 
-constメソッドにprefixオプションを与えることで、作成されるNamedScope、属性値検証メソッドの
+constメソッドにprefixオプションを指定することで、作成されるNamedScope、属性値検証メソッドの
 名前（プレフィクス）を変更することができる。
 定数値名がモデル内で衝突しない場合は、prefixに空文字を与えるのが使いやすい。
 
@@ -110,7 +110,7 @@ constメソッドにprefixオプションを与えることで、作成される
 
 === scope: NamedScopeを作成しない
 
-値が直接DBにない場合、scopeオプションにfalseを与え、
+値が直接DBにない場合、scopeオプションでfalseを指定すると、
 定数値を返すメソッドを定義することで各種メソッドを利用できる。
 
   class Entry < ActiveRecord::Base
@@ -159,9 +159,20 @@ constメソッドにprefixオプションを与えることで、作成される
 
 === predicate: 属性値テストメソッドを作成しない
 
-predicateにfalseを与えると、属性値テストメソッドの作成が行われない。
+predicateオプションでfalseを指定すると、属性値テストメソッドの作成が行われない。
+
+=== i18n: ラベル名にi18nを利用しない
 
+i18nオプションでfalseを指定すると、constメソッド内の定数値定義の後にラベル名を与えることでラベル名を定義することができる。
 
+  # app/models/user.rb
+  class User < ActiveRecord::Base
+    const :STATUS, :i18n => false do
+      ENABLE    1, "有効"
+      DISABLE   0, "無効"
+    end
+  end
+  
 === extensions: 定数オブジェクトに追加のメソッドを定義する
 
 ブロック内にメソッド定義を書くと、STAUTS[]やSTATUS.eachの際に取得できる定数オブジェクトに対してメソッドが定義される。
@@ -186,20 +197,37 @@ collection_selectの際に表示したいラベル名を複数パターン用意
   end
 
   # 選択肢に上で定義したcodeメソッドの値を使用する
-  form_for enable_piyo do |f|
+  user = User.new
+  form_for user do |f|
     f.collection_select(:status, User::STATUS, :value, :code)
     f.collection_select(:status, User::STATUS, :value, :label2)
   end
 
 == その他
 
+=== I18nを利用しない
+
+ConstEnum::ActiveRecord.i18nにfalseを設定すると、
+constメソッド内でラベル名を定義することができる。
+constメソッドのi18nオプションと同様
+
+  # config/initializers/const_enum.rb
+  ConstEnum::ActiveRecord.i18n = false
+  
+  # app/models/user.rb
+  class User < ActiveRecord::Base
+    const :STATUS, :prefix => '' do
+      ENABLE    1, "有効"
+      DISABLE   0, "無効"
+    end
+  end
+  
 === ラベル名を取得するメソッド名を変更する
 
-ConstEnum::ActiveRecord.label_suffixオプションを設定することで、
+ConstEnum::ActiveRecord.label_suffixを設定することで、
 ラベル名を取得すためのメソッドの名前（サフィックス）を変更することができる。
 
   # config/initializers/const_enum.rb
-  require 'const_enum'
   ConstEnum::ActiveRecord.label_suffix = '_name' # ラベル名を返すメソッドにつけるサフィックスの指定
 
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/const_enum.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "const_enum"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["yuki teraoka"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/const_enum/with_i18n.rb",
     "spec/active_record/active_record_spec.rb",
     "spec/const_enum_spec.rb",
+    "spec/labels.yml",
     "spec/spec_helper.rb",
     "spec/support/database_cleaner.rb",
     "spec/support/models.rb"
@@ -47,20 +48,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<rspec>, [">= 2.8.0"])
+      s.add_dependency(%q<rdoc>, [">= 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -68,10 +69,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<rspec>, [">= 2.8.0"])
+    s.add_dependency(%q<rdoc>, [">= 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/lib/const_enum/base.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "active_support/core_ext"
 require "active_support/core_ext/module"
 require "active_support/core_ext/array"
 

data/lib/const_enum/with_i18n.rb

@@ -11,15 +11,13 @@ module ConstEnum
       self.i18n_options = DEFAULT_OPTIONS.dup
     end
     
-    module InstanceMethods
-      def label
-        I18n.t(build_key(@attributes.second || key.to_s.downcase))
-      end
-      
-      private
-      def build_key(key)
-        "#{self.class.i18n_options[:key]}.#{key}"
-      end
+    def label
+      I18n.t(build_key(@attributes.second || key.to_s.downcase))
+    end
+    
+    private
+    def build_key(key)
+      "#{self.class.i18n_options[:key]}.#{key}"
     end
   
     module ClassMethods

data/spec/labels.yml

@@ -0,0 +1,6 @@
+en:
+  labels:
+    user:
+      status:
+        active: Active
+        resigned: Resigned

data/spec/support/models.rb

@@ -33,8 +33,7 @@ class CreateAllTables < ActiveRecord::Migration
   end
 end
 
-I18n.backend = I18n::Backend::KeyValue.new({})
-I18n.backend.store_translations :en, :labels =>{:user =>{:status => { :active => "Active", :resigned => "Resigned" }}}
+I18n.load_path << File.join(File.dirname(__FILE__), '..', 'labels.yml')
 
 ActiveRecord::Migration.verbose = false
 CreateAllTables.up

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: const_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22300760 !ruby/object:Gem::Requirement
+  requirement: &18530540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,54 +21,54 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *22300760
+  version_requirements: *18530540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22299900 !ruby/object:Gem::Requirement
+  requirement: &18526180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *22299900
+  version_requirements: *18526180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &22298640 !ruby/object:Gem::Requirement
+  requirement: &18524280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *22298640
+  version_requirements: *18524280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22297820 !ruby/object:Gem::Requirement
+  requirement: &18548740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *22297820
+  version_requirements: *18548740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22296680 !ruby/object:Gem::Requirement
+  requirement: &18545880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *22296680
+  version_requirements: *18545880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &22187480 !ruby/object:Gem::Requirement
+  requirement: &18544100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22187480
+  version_requirements: *18544100
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &22186400 !ruby/object:Gem::Requirement
+  requirement: &18542940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *22186400
+  version_requirements: *18542940
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &22185500 !ruby/object:Gem::Requirement
+  requirement: &18541260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22185500
+  version_requirements: *18541260
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &22184380 !ruby/object:Gem::Requirement
+  requirement: &18565700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22184380
+  version_requirements: *18565700
 description: define ActiveRecord constants with DSL.and more!
 email: info@techscore.com
 executables: []
@@ -133,6 +133,7 @@ files:
 - lib/const_enum/with_i18n.rb
 - spec/active_record/active_record_spec.rb
 - spec/const_enum_spec.rb
+- spec/labels.yml
 - spec/spec_helper.rb
 - spec/support/database_cleaner.rb
 - spec/support/models.rb
@@ -151,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4219554421679490713
+      hash: 2667874335032134180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: