has_enum 0.3.4 → 0.4.0

data/Gemfile

@@ -1,14 +1,14 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.0"
+gem "rails", "~> 3.0.3"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec",   "~> 2.2.0"
-  gem "rails",   "~> 3.0.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
+  gem "rspec",   ">= 2.2.0"
+  gem "rails",   "~> 3.0.3"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.5.1"
   gem "sqlite3-ruby", "~> 1.3.2"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -2,47 +2,46 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
+    i18n (0.5.0)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.9.1)
+    mail (2.2.12)
       activesupport (>= 2.3.6)
-      i18n (>= 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
@@ -52,31 +51,31 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
+    rspec-mocks (2.3.0)
     sqlite3-ruby (1.3.2)
-    thor (0.14.4)
+    thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -85,9 +84,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
-  rails (~> 3.0.0)
+  bundler (>= 1.0.0)
+  jeweler (>= 1.5.1)
+  rails (~> 3.0.3)
   rcov
-  rspec (~> 2.2.0)
+  rspec (>= 2.2.0)
   sqlite3-ruby (~> 1.3.2)

data/README.md

@@ -9,7 +9,7 @@ This gem has been designed for Rails 3 only.
 ### Install gem
 
 Insert
-    gem 'has_enum' :git => 'git://github.com/openteam/has_enum.git'
+    gem 'has_enum'
 in your Rails 3 Gemfile. Then do
     $ bundle install
 
@@ -22,6 +22,10 @@ Here's example model:
       has_enum :size    , %w( small medium large )   , :query_methods => false
       has_enum :status  , [:pending, :failed, :done]
     end
+Query methods are available by default. For example, query methods for color enum this methods will be available:
+      color_green?
+      color_red?
+      color_blue?
 See [sample usage in specs](https://github.com/openteam/has_enum/blob/master/spec/has_enum_spec.rb).
 
 ### Views
@@ -67,4 +71,4 @@ View specs are still failing. I'm working on it.
 ## Copyright
 
 Copyright (c) 2010 Andreas Korth, Konstantin Shabanov. See LICENSE.txt for
-further details.
+further details.

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/has_enum.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_enum}
-  s.version = "0.3.4"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Korth", "Konstantin Shabanov"]
-  s.date = %q{2010-12-10}
+  s.date = %q{2010-12-23}
   s.email = %q{kes.eclipse@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -50,28 +50,28 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.2.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.1"])
       s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-      s.add_dependency(%q<rails>, ["~> 3.0.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rspec>, [">= 2.2.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.1"])
       s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.2.0"])
-    s.add_dependency(%q<rails>, ["~> 3.0.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
+    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rspec>, [">= 2.2.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.1"])
     s.add_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/has_enum/active_record.rb

@@ -16,7 +16,7 @@ module HasEnum
 
         if options[:query_methods] != false
           values.each do |val|
-            define_method(:"#{val}?") { self.send(attribute) == val }
+            define_method(:"#{attribute}_#{val}?") { self.send(attribute) == val }
           end
         end
 
@@ -38,7 +38,7 @@ module HasEnum
         define_method "human_#{attribute}" do
           begin
             return nil unless self.send(attribute)
-            key = "activerecord.attributes.#{self.class.name.underscore}.#{attribute}_enum.#{self.send(attribute)}"
+            key = "activerecord.attributes.#{self.class.model_name.i18n_key}.#{attribute}_enum.#{self.send(attribute)}"
             translation = I18n.translate(key, :raise => true)
           rescue I18n::MissingTranslationData
             self.send(attribute).humanize
@@ -49,7 +49,7 @@ module HasEnum
       def values_for_select_tag(enum)
         values = enum(enum)
         begin
-          translation = I18n.translate("activerecord.attributes.#{self.name.underscore}.#{enum}_enum", :raise => true)
+          translation = I18n.translate("activerecord.attributes.#{self.model_name.i18n_key}.#{enum}_enum", :raise => true)
           values.map { |value| [translation[value.to_sym], value] }
         rescue I18n::MissingTranslationData
           values.map { |value| [value.humanize, value] }

data/spec/has_enum_spec.rb

@@ -44,10 +44,10 @@ describe HasEnum::ActiveRecord do
     it "should define a query method for each enum value" do
       @model.color     = 'green'
       @model.category  = 'stuff'
-      @model.should be_stuff
-      @model.should be_green
-      @model.should_not be_red
-      @model.should_not be_blue
+      @model.should be_category_stuff
+      @model.should be_color_green
+      @model.should_not be_color_red
+      @model.should_not be_color_blue
     end
   end
 
@@ -74,7 +74,7 @@ describe HasEnum::ActiveRecord do
     
     it "should define query methods for enum values" do
       @model.status = :pending
-      @model.should be_pending
+      @model.should be_status_pending
     end
     
     it "should accept nil value for the attribute" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andreas Korth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +06:00
+date: 2010-12-23 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -38,7 +38,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -68,7 +68,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -83,7 +83,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4461255227335299909
+      hash: 3267787670941739246
       segments: 
       - 0
       version: "0"