super_list 1.0.1 → 1.1.0

data/README.rdoc

@@ -1,7 +1,8 @@
 = Super List  - https://github.com/jinzhu/super_list
 
   ## in config/initializers/super_list.rb
-  SuperList.new("Gender", {"M" => "Man", "F" => "Female"}, :allow_blank => true, :use_i18n => false)
+  SuperList.new("Gender", {"M" => {:default => "Man", :amos => "M1"}, "F" => {:default => "Female", :amos => "M2"}}, :allow_blank => true)
+  SuperList.new("Gender2", {"M" => "Man", "F" => "Female"}, :allow_blank => true, :use_i18n => false)
 
   ## in app/models/user.rb
   class User < ActiveRecord::Base
@@ -9,14 +10,15 @@
     super_list :gender2, 'Gender', :use_i18n => true
   end
 
-  User.new(:gender => 'NF').valid?           => false
-  User.new(:gender => 'M').valid?            => true
-  User.new(:gender => 'F').gender            => 'Female'
-  User.new(:gender => 'F').original_gender   => 'F'
+  User.new(:gender => 'NF').valid?            => false
+  User.new(:gender => 'M').valid?             => true
+  User.new(:gender => 'F').gender.to_s        => 'Female'
+  User.new(:gender => 'F').gender.to_s(:amos) => 'M2'
+  User.new(:gender => 'F').original_gender    => 'F'
 
-  user = User.new(:gender => 'F', :gender2   => 'M')
-  user.gender2                               => "translation missing: en.Gender.Man"
-  user.gender2(:locale => "api")             => "translation missing: api.Gender.Man"
+  user = User.new(:gender => 'F', :gender2 => 'M')
+  user.gender2.to_s                          => "translation missing: en.Gender.Man"
+  user.gender2(:locale => "api").to_s        => "translation missing: api.Gender.Man"
 
   SuperList["Gender"].options                => {:use_i18n=>false, :i18n_scope=>"Gender", :allow_blank=>true}
   SuperList["Gender"].keys                   => ["M", "F"]

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/lib/super_list.rb

@@ -19,6 +19,20 @@ class SuperList
     @@data[name]
   end
 
+  class List
+    def initialize(data, options)
+      @data, @options = data, options
+    end
+
+    def to_s(type=:default, options={})
+      options = options.merge(@options)
+      key = @data[type] || @data[:default]
+
+      return I18n.t(key, :scope => options[:i18n_scope], :default => options[:i18n_default], :locale => options[:locale]) if options[:use_i18n]
+      key
+    end
+  end
+
   ## Data Store
   class Data
     def initialize(values, options)
@@ -29,16 +43,16 @@ class SuperList
       @values.keys
     end
 
-    def values(options={})
-      keys.map {|x| get_value(x, options) }
+    def values(type=:default, options={})
+      options, type = type, :default if type.is_a?(Hash)
+      keys.map {|x| get_value(x, options).to_s(type) }
     end
 
     def get_value(key,options={})
       options = @options.merge(options)
-      key = @values[key]
-
-      return I18n.t(key, :scope => options[:i18n_scope], :default => options[:i18n_default], :locale => options[:locale]) if options[:use_i18n]
-      key
+      value = @values[key]
+      value = value.is_a?(Hash) ? value : {:default => value}
+      List.new(value, options)
     end
 
     def get_key(value,options={})

data/test/dummy/config/initializers/super_list.rb

@@ -1,2 +1,2 @@
-SuperList.new("Gender", {"M" => "Man", "F" => "Female"}, :allow_blank => true)
+SuperList.new("Gender", {"M" => {:default => "Man", :amos => "M1"}, "F" => {:default => "Female", :amos => "M2"}}, :allow_blank => true)
 SuperList.new("Gender1", {"M" => "Man", "F" => "Female"}, :use_i18n => true, :allow_blank => true)

data/test/super_list_test.rb

@@ -7,7 +7,7 @@ class SuperListTest < ActiveSupport::TestCase
     assert_equal SuperList["Gender1"].values(:locale => 'zh'),
       ["translation missing: zh.Gender1.Man", "translation missing: zh.Gender1.Female"]
 
-		assert_equal SuperList["Gender"].get_value("M"), "Man"
+		assert_equal SuperList["Gender"].get_value("M").to_s, "Man"
 		assert_equal SuperList["Gender"].get_key("Man"), "M"
 		assert_equal SuperList["Gender1"].get_key("translation missing: en.Gender1.Female"), "F"
   end
@@ -27,17 +27,20 @@ class SuperListTest < ActiveSupport::TestCase
 
   test "SuperList gender (don't use i18n)" do
     u = Factory(:user, :gender => 'F')
-    assert_equal u.gender, 'Female'
+    assert_equal u.gender.to_s, 'Female'
+    assert_equal u.gender.to_s(:amos), 'M2'
   end
 
   test "SuperList gender (use i18n, no default translation)" do
     u = Factory(:user, :gender1 => 'F')
-    assert_equal u.gender1, "translation missing: en.Gender.Female"
-    assert_equal u.gender1(:locale => 'new_locale'), "translation missing: new_locale.Gender.Female"
+    assert_equal u.gender1.to_s, "translation missing: en.Gender.Female"
+    assert_equal u.gender1(:locale => 'new_locale').to_s, "translation missing: new_locale.Gender.Female"
+    assert_equal u.gender1(:locale => 'new_locale').to_s(:amos), "translation missing: new_locale.Gender.M2"
   end
 
   test "SuperList gender (use i18n wtih default translation)" do
     u = Factory(:user, :gender2 => 'F')
-    assert_equal u.gender2, "未知"
+    assert_equal u.gender2.to_s, "未知"
+    assert_equal u.gender2.to_s(:nokey), "未知"
   end
 end

metadata

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