super_list 1.0.0 → 1.0.1

data/README.rdoc

@@ -15,13 +15,13 @@
   User.new(:gender => 'F').original_gender   => 'F'
 
   user = User.new(:gender => 'F', :gender2   => 'M')
-  user.gender2                               => "translation missing: en.Gender.M"
-  user.gender2(:locale => "api")             => "translation missing: api.Gender.M"
+  user.gender2                               => "translation missing: en.Gender.Man"
+  user.gender2(:locale => "api")             => "translation missing: api.Gender.Man"
 
   SuperList["Gender"].options                => {:use_i18n=>false, :i18n_scope=>"Gender", :allow_blank=>true}
   SuperList["Gender"].keys                   => ["M", "F"]
   SuperList["Gender"].values(:use_i18n => true, :locale => 'zh')
-                                             => ["translation missing: zh.Gender1.M", "translation missing: zh.Gender1.F"]
+                                             => ["translation missing: zh.Gender1.Man", "translation missing: zh.Gender1.Female"]
 
 
 == Contributing to super_list

data/VERSION

@@ -0,0 +1 @@
+1.0.1

data/lib/super_list.rb

@@ -35,11 +35,14 @@ class SuperList
 
     def get_value(key,options={})
       options = @options.merge(options)
-      if options[:use_i18n]
-        I18n.t(key, :scope => options[:i18n_scope], :default => options[:i18n_default], :locale => options[:locale])
-      else
-        @values[key]
-      end
+      key = @values[key]
+
+      return I18n.t(key, :scope => options[:i18n_scope], :default => options[:i18n_default], :locale => options[:locale]) if options[:use_i18n]
+      key
+    end
+
+    def get_key(value,options={})
+      keys[values(options).index(value)] rescue nil
     end
 
     def options

data/test/super_list_test.rb

@@ -5,7 +5,11 @@ class SuperListTest < ActiveSupport::TestCase
     assert_equal SuperList["Gender"].keys, ["M","F"]
     assert_equal SuperList["Gender"].values, ["Man", "Female"]
     assert_equal SuperList["Gender1"].values(:locale => 'zh'),
-      ["translation missing: zh.Gender1.M", "translation missing: zh.Gender1.F"]
+      ["translation missing: zh.Gender1.Man", "translation missing: zh.Gender1.Female"]
+
+		assert_equal SuperList["Gender"].get_value("M"), "Man"
+		assert_equal SuperList["Gender"].get_key("Man"), "M"
+		assert_equal SuperList["Gender1"].get_key("translation missing: en.Gender1.Female"), "F"
   end
 
   test "only valid when included" do
@@ -28,8 +32,8 @@ class SuperListTest < ActiveSupport::TestCase
 
   test "SuperList gender (use i18n, no default translation)" do
     u = Factory(:user, :gender1 => 'F')
-    assert_equal u.gender1, "translation missing: en.Gender.F"
-    assert_equal u.gender1(:locale => 'new_locale'), "translation missing: new_locale.Gender.F"
+    assert_equal u.gender1, "translation missing: en.Gender.Female"
+    assert_equal u.gender1(:locale => 'new_locale'), "translation missing: new_locale.Gender.Female"
   end
 
   test "SuperList gender (use i18n wtih default translation)" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: super_list
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +08:00
+date: 2011-02-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,8 +33,8 @@ dependencies:
   requirement: *id001
   prerelease: false
   name: bundler
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,8 +49,8 @@ dependencies:
   requirement: *id002
   prerelease: false
   name: jeweler
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,8 +63,8 @@ dependencies:
   requirement: *id003
   prerelease: false
   name: rcov
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,8 +77,8 @@ dependencies:
   requirement: *id004
   prerelease: false
   name: sqlite3-ruby
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,8 +93,8 @@ dependencies:
   requirement: *id005
   prerelease: false
   name: rails
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,8 +109,8 @@ dependencies:
   requirement: *id006
   prerelease: false
   name: capybara
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,6 +123,7 @@ dependencies:
   requirement: *id007
   prerelease: false
   name: factory_girl
+  type: :development
 description: super list
 email: wosmvp@gmail.com
 executables: []
@@ -140,6 +140,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- VERSION
 - lib/super_list.rb
 - super_list.gemspec
 - test/dummy/Rakefile
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: super list