has_enum 0.4.0 → 0.5.0

data/.rspec

@@ -0,0 +1,3 @@
+--colour
+--format documentation
+

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.3"
+gem "rails", "~> 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.2.0"
-  gem "rails",   "~> 3.0.3"
+  gem "rails",   "~> 3.0.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.5.1"
   gem "sqlite3-ruby", "~> 1.3.2"

data/Gemfile.lock

@@ -86,7 +86,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   jeweler (>= 1.5.1)
-  rails (~> 3.0.3)
+  rails (~> 3.0.0)
   rcov
   rspec (>= 2.2.0)
   sqlite3-ruby (~> 1.3.2)

data/README.md

@@ -18,7 +18,7 @@ in your Rails 3 Gemfile. Then do
 Here's example model:
     class TestModel < ActiveRecord::Base
       has_enum :category, %w( stuff things misc )
-      has_enum :color   , %w( red green blue )
+      has_enum :color   , %w( red green blue )       , :scopes        => true
       has_enum :size    , %w( small medium large )   , :query_methods => false
       has_enum :status  , [:pending, :failed, :done]
     end
@@ -26,6 +26,10 @@ Query methods are available by default. For example, query methods for color enu
       color_green?
       color_red?
       color_blue?
+If you set *:scopes => true* these scopes 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

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/has_enum.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_enum}
-  s.version = "0.4.0"
+  s.version = "0.5.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-23}
+  s.date = %q{2011-01-19}
   s.email = %q{kes.eclipse@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -29,7 +30,7 @@ Gem::Specification.new do |s|
     "spec/has_enum_spec.rb",
     "spec/helpers/form_helper_spec.rb",
     "spec/rcov.opts",
-    "spec/spec.opts",
+    "spec/ru.yml",
     "spec/spec_helper.rb",
     "spec/test_model.rb"
   ]
@@ -50,26 +51,26 @@ 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.3"])
+      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.3"])
+      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_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 2.2.0"])
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      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<sqlite3-ruby>, ["~> 1.3.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 2.2.0"])
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    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<sqlite3-ruby>, ["~> 1.3.2"])

data/lib/has_enum/active_record.rb

@@ -12,13 +12,17 @@ module HasEnum
       end
 
       def has_enum(attribute, values, options = {})
+        options.assert_valid_keys(:query_methods, :scopes)
         enum[attribute] = values.freeze
 
-        if options[:query_methods] != false
-          values.each do |val|
-            define_method(:"#{attribute}_#{val}?") { self.send(attribute) == val }
-          end
-        end
+        values.each do |val|
+          scope :"#{attribute}_#{val}", where(:"#{attribute}" => "#{val}")
+        end if options[:scopes]
+        
+        values.each do |val|
+          define_method(:"#{attribute}_#{val}?") { self.send(attribute) == val }
+        end if options[:query_methods] != false
+
 
         define_method(:"#{attribute}=") do |value|
           if value.nil? or values.find{ |val| val == value }
@@ -36,25 +40,28 @@ module HasEnum
         end
 
         define_method "human_#{attribute}" do
-          begin
-            return nil unless 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
-          end
+          return nil unless self.send(attribute)
+
+          klass     = self.class
+          klass_key = klass.model_name.respond_to?(:i18n_key) ? klass.model_name.i18n_key : klass.name.underscore
+          defaults  = ["activerecord.attributes.#{klass_key}.#{attribute}_enum.#{self.send(attribute)}"]
+
+          defaults << self.send(attribute).to_s.humanize
+          I18n.translate(defaults.shift, :default => defaults, :raise => true)
         end
       end
 
       def values_for_select_tag(enum)
         values = enum(enum)
         begin
-          translation = I18n.translate("activerecord.attributes.#{self.model_name.i18n_key}.#{enum}_enum", :raise => true)
+          klass_key  = self.model_name.respond_to?(:i18n_key) ? self.model_name.i18n_key : self.name.underscore
+          translation = I18n.translate("activerecord.attributes.#{klass_key}.#{enum}_enum", :raise => true)
+
           values.map { |value| [translation[value.to_sym], value] }
         rescue I18n::MissingTranslationData
-          values.map { |value| [value.humanize, value] }
+          values.map { |value| [value.to_s.humanize, value] }
         end
       end
     end
   end
-end
+end

data/spec/has_enum_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe HasEnum::ActiveRecord do
@@ -26,6 +28,12 @@ describe HasEnum::ActiveRecord do
       @model.category = 'objects'
       @model.errors[:category].size.should eql(1)
     end
+    
+    it "should define query methods for enum values" do
+      %w( stuff things misc ).each do |value|
+        @model.should respond_to(:"category_#{value}?")
+      end
+    end
   end
     
   describe "color enum" do
@@ -49,6 +57,16 @@ describe HasEnum::ActiveRecord do
       @model.should_not be_color_red
       @model.should_not be_color_blue
     end
+    
+    it "should define a scope for each enum value" do
+      @model.color = 'red'
+      @model.save
+      @model2 = TestModel.new(:color => 'red')
+      @model2.save
+
+      TestModel.color_red.all.should eql TestModel.where(:color => 'red').all
+      TestModel.color_green.all.should be_empty
+    end
   end
 
   describe "size enum" do
@@ -60,10 +78,15 @@ describe HasEnum::ActiveRecord do
     end
     
     it "should not define query methods for enum values" do
-      %w( small? medium? large? ).each do |method|
-        @model.should_not respond_to(method)
+      %w(small medium large).each do |value|
+        @model.should_not respond_to(:"size_#{value}?")
       end
     end
+    
+    it "should return humanized translation if not localized" do
+      @model.size = 'medium'
+      @model.human_size.should eql("Medium")
+    end
   end
 
   describe "status enum" do
@@ -81,5 +104,11 @@ describe HasEnum::ActiveRecord do
       @model.status = nil
       @model.status.should be_nil
     end
+    
+    it "should translate values for the enum" do
+      I18n.reload!
+      @model.status = :pending
+      @model.human_status.should eql("На рассмотрении")
+    end
   end
 end

data/spec/helpers/form_helper_spec.rb

@@ -71,5 +71,4 @@ describe ActionView::Helpers::FormHelper do
       html.should include(%(<label for="model_status_done">Erledigt</label>))
     end
   end
-end
-
+end

data/spec/ru.yml

@@ -0,0 +1,8 @@
+ru:
+  activerecord:
+    attributes:
+      test_model:
+        status_enum:
+          pending: "На рассмотрении"
+          failed: "Обработано с ошибкой"
+          done: "Завершено"

data/spec/spec_helper.rb

@@ -23,4 +23,7 @@ ActiveRecord::Schema.define(:version => 0) do
   end
 end
 
-require File.dirname(__FILE__) + "/test_model" unless defined?(Model)
+I18n.load_path << 'spec/ru.yml'
+I18n.default_locale = :ru
+
+require File.dirname(__FILE__) + "/test_model" unless defined?(Model)

data/spec/test_model.rb

@@ -1,6 +1,6 @@
 class TestModel < ActiveRecord::Base
   has_enum :category, %w( stuff things misc )
-  has_enum :color   , %w( red green blue )
+  has_enum :color   , %w( red green blue )       , :scopes        => true
   has_enum :size    , %w( small medium large )   , :query_methods => false
   has_enum :status  , [:pending, :failed, :done]
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andreas Korth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-23 00:00:00 +06:00
+date: 2011-01-19 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -131,6 +131,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -144,7 +145,7 @@ files:
 - spec/has_enum_spec.rb
 - spec/helpers/form_helper_spec.rb
 - spec/rcov.opts
-- spec/spec.opts
+- spec/ru.yml
 - spec/spec_helper.rb
 - spec/test_model.rb
 has_rdoc: true
@@ -161,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3267787670941739246
+      hash: -956477031175016980
       segments: 
       - 0
       version: "0"

data/spec/spec.opts

@@ -1,5 +0,0 @@
---colour
---format progress
---format failing_examples:tmp/failed_examples.txt
---loadby mtime
---reverse