has_enum 0.5.0 → 0.6.0

data/.gitignore

@@ -0,0 +1,8 @@
+pkg/*
+*.gem
+.bundle
+*.tmp
+.DS_Store
+spec/*.db
+*.swp
+Gemfile.lock

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm_gemset_create_on_use_flag=1
+rvm use 1.9.2@has_enum

data/Gemfile

@@ -1,14 +1,3 @@
 source "http://rubygems.org"
 
-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.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.1"
-  gem "sqlite3-ruby", "~> 1.3.2"
-  gem "rcov", ">= 0"
-end
+gemspec

data/Rakefile

@@ -1,25 +1,5 @@
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "has_enum"
-  gem.homepage = "https://github.com/openteam/has_enum"
-  gem.license = "MIT"
-  gem.summary = %Q{Gem for Rails to easily handle enumeration attributes in models}
-  gem.email = "kes.eclipse@gmail.com"
-  gem.authors = ["Andreas Korth", "Konstantin Shabanov"]
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -27,19 +7,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "has_enum #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/has_enum.gemspec

@@ -1,80 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "has_enum/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{has_enum}
-  s.version = "0.5.0"
+  s.name        = "has_enum"
+  s.version     = HasEnum::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Andreas Korth", "Konstantin Shabanov"]
+  s.email       = ["kes.eclipse@gmail.com"]
+  s.homepage    = "http://github.com/openteam/has_enum"
+  s.summary     = %q{Gem for Rails to easily handle enumeration attributes in models}
+  s.description = %q{Gem for and Rails3 to easily handle enumeration attributes in ActiveRecord's models}
+  s.licenses    = ["MIT"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andreas Korth", "Konstantin Shabanov"]
-  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",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "has_enum.gemspec",
-    "lib/has_enum.rb",
-    "lib/has_enum/active_record.rb",
-    "lib/has_enum/helpers.rb",
-    "spec/has_enum_spec.rb",
-    "spec/helpers/form_helper_spec.rb",
-    "spec/rcov.opts",
-    "spec/ru.yml",
-    "spec/spec_helper.rb",
-    "spec/test_model.rb"
-  ]
-  s.homepage = %q{https://github.com/openteam/has_enum}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Gem for Rails to easily handle enumeration attributes in models}
-  s.test_files = [
-    "spec/has_enum_spec.rb",
-    "spec/helpers/form_helper_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/test_model.rb"
-  ]
+  s.add_dependency "rails", ["~> 3.0.0"]
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "sqlite3"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    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_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<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<sqlite3-ruby>, ["~> 1.3.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  s.extra_rdoc_files = [ "LICENSE.txt", "README.md"]
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ["lib"]
 end
-

data/lib/has_enum.rb

@@ -1,4 +1,4 @@
 require 'has_enum/active_record'
 require 'has_enum/helpers'
 
-ActiveRecord::Base.send(:include, HasEnum::ActiveRecord)
+ActiveRecord::Base.send(:include, HasEnum::ActiveRecord)

data/lib/has_enum/active_record.rb

@@ -18,12 +18,11 @@ module HasEnum
         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 }
             set_value  = lambda { |value| value.is_a?(Symbol) ? Marshal.dump(value) : value }
@@ -42,26 +41,46 @@ module HasEnum
         define_method "human_#{attribute}" do
           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  = ["activerecord.attributes.#{self.class.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 human_enum
+        scope = "activerecord.attributes.#{self.klass_key}"
+        i18n = lambda { |key| I18n.t(key, :scope => scope, :raise => true) }
+        trans_hash = {}
+        
+        enum.each_pair do |attribute, values|
+          begin
+            trans_hash[attribute] = i18n.call("#{attribute}_enum")
+          rescue I18n::MissingTranslationData
+            hash = {}
+            values.each do |value|
+              hash[value.to_sym] = value.humanize
+            end
+            trans_hash[attribute] = hash
+          end
+        end
+        
+        trans_hash
+      end
+      
       def values_for_select_tag(enum)
         values = enum(enum)
         begin
-          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)
+          translation = I18n.translate("activerecord.attributes.#{self.klass_key}.#{enum}_enum", :raise => true)
 
           values.map { |value| [translation[value.to_sym], value] }
         rescue I18n::MissingTranslationData
           values.map { |value| [value.to_s.humanize, value] }
         end
       end
+
+      def klass_key
+        self.model_name.respond_to?(:i18n_key) ? self.model_name.i18n_key : self.name.underscore
+      end
     end
   end
 end

data/lib/has_enum/version.rb

@@ -0,0 +1,3 @@
+module HasEnum
+  VERSION = "0.6.0"
+end

data/spec/has_enum_spec.rb

@@ -6,11 +6,47 @@ describe HasEnum::ActiveRecord do
   before :each do
     @model = TestModel.new(:category => 'misc', :color => 'blue', :foo => 'bar', :status => :pending)
   end
-  
+
   it "should return the values for a given enum attribute" do
     TestModel.enum[:category].should eql(%w(stuff things misc))
   end
+
+  it "should return hash of values with it's translated equivalent" do
+    I18n.reload!
+    TestModel.human_enum[:size].should eql Hash[:small  => "Маленький",
+                                                :medium => "Средний",
+                                                 :large  => "Большой"]
+    TestModel.human_enum[:status].should eql Hash[:pending => "На рассмотрении",
+                                                  :failed  =>"Обработано с ошибкой",
+                                                  :done    =>"Завершено"]
+    TestModel.human_enum[:category].should eql Hash[:stuff  => 'Stuff',
+                                                    :things => 'Things',
+                                                    :misc   => 'Misc']
+  end
   
+  it "should return hash of enums with hashes of attributes and theirs translated equivalent" do
+    I18n.reload!
+    TestModel.human_enum.should eql Hash[:category => {:stuff=>"Stuff",
+                                                       :things=>"Things",
+                                                       :misc=>"Misc"},
+                                         :color    => {:red=>"Red",
+                                                       :green=>"Green",
+                                                       :blue=>"Blue"},
+                                         :size     => {:small=>"Маленький",
+                                                       :medium=>"Средний",
+                                                       :large=>"Большой"},
+                                         :status   => {:pending=>"На рассмотрении",
+                                                       :failed=>"Обработано с ошибкой",
+                                                       :done=>"Завершено"}]
+  end
+
+  it "should return translated value for attribute" do
+    I18n.reload!
+    TestModel.human_enum[:size][:large].should eql "Большой"
+    TestModel.human_enum[:color][:red].should eql "Red"
+    TestModel.human_enum[:status][:done].should eql "Завершено"
+  end
+
   describe "category enum" do
     it "should accept enum values for the attribute" do
       %w(stuff things misc).each do |value|
@@ -18,24 +54,24 @@ describe HasEnum::ActiveRecord do
         @model.should be_valid
       end
     end
-    
+
     it "should accept nil value for the attribute" do
       @model.category = nil
       @model.category.should be_nil
     end
-    
+
     it "should reject non enum values for the attribute" 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
     it "should accept any value for the attribute" do
       %w(red orange yellow).each do |value|
@@ -43,12 +79,12 @@ describe HasEnum::ActiveRecord do
         @model.should be_valid
       end
     end
-    
+
     it "should reject an empty value for the attribute" do
       @model.color = ''
       @model.errors[:color].size.should eql(1)
     end
-    
+
     it "should define a query method for each enum value" do
       @model.color     = 'green'
       @model.category  = 'stuff'
@@ -57,7 +93,7 @@ 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
@@ -76,16 +112,16 @@ describe HasEnum::ActiveRecord do
         @model.should be_valid
       end
     end
-    
+
     it "should not define query methods for enum values" do
       %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")
+      @model.category = 'stuff'
+      @model.human_category.should eql("Stuff")
     end
   end
 
@@ -94,21 +130,21 @@ describe HasEnum::ActiveRecord do
       @model.status = :pending
       @model.status.should eql(:pending)
     end
-    
+
     it "should define query methods for enum values" do
       @model.status = :pending
       @model.should be_status_pending
     end
-    
+
     it "should accept nil value for the attribute" 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
+end

data/spec/ru.yml

@@ -2,7 +2,11 @@ ru:
   activerecord:
     attributes:
       test_model:
+        size_enum:
+          small: "Маленький"
+          medium: "Средний"
+          large: "Большой"
         status_enum:
           pending: "На рассмотрении"
           failed: "Обработано с ошибкой"
-          done: "Завершено"
+          done: "Завершено"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: has_enum
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Andreas Korth
@@ -15,114 +11,45 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 +06:00
+date: 2011-02-08 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+        version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :development
+  name: sqlite3
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id007
-description: 
-email: kes.eclipse@gmail.com
+  version_requirements: *id003
+description: Gem for and Rails3 to easily handle enumeration attributes in ActiveRecord's models
+email: 
+- kes.eclipse@gmail.com
 executables: []
 
 extensions: []
@@ -131,25 +58,25 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files: 
+- .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - has_enum.gemspec
 - lib/has_enum.rb
 - lib/has_enum/active_record.rb
 - lib/has_enum/helpers.rb
+- lib/has_enum/version.rb
 - spec/has_enum_spec.rb
 - spec/helpers/form_helper_spec.rb
-- spec/rcov.opts
 - spec/ru.yml
 - spec/spec_helper.rb
 - spec/test_model.rb
 has_rdoc: true
-homepage: https://github.com/openteam/has_enum
+homepage: http://github.com/openteam/has_enum
 licenses: 
 - MIT
 post_install_message: 
@@ -162,27 +89,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -956477031175016980
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Gem for Rails to easily handle enumeration attributes in models
 test_files: 
 - spec/has_enum_spec.rb
 - spec/helpers/form_helper_spec.rb
+- spec/ru.yml
 - spec/spec_helper.rb
 - spec/test_model.rb

data/Gemfile.lock

@@ -1,92 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    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)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      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.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.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.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.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.3.0)
-    sqlite3-ruby (1.3.2)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.0)
-  jeweler (>= 1.5.1)
-  rails (~> 3.0.0)
-  rcov
-  rspec (>= 2.2.0)
-  sqlite3-ruby (~> 1.3.2)

data/VERSION

@@ -1 +0,0 @@
-0.5.0

data/spec/rcov.opts

@@ -1,3 +0,0 @@
---exclude "spec/*,gems/*" 
---rails
---sort coverage