super_list 1.3.0 → 1.4.0

data/README.rdoc

@@ -12,28 +12,33 @@
 
   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.new(:gender => 'F').gender(:default)     => 'Female'
+  User.new(:gender => 'F').gender(:amos)        => 'M2'
+  User.new(:gender => 'F').gender               => 'F'
 
   User.new(:gender => 'Man').valid?             => true
-  User.new(:gender => 'Man').original_gender    => 'M'
-  User.new(:gender => 'Man').gender.to_s(:amos) => 'M1'
+  User.new(:gender => 'Man').gender             => 'M'
+  User.new(:gender => 'Man').gender(:amos)      => 'M1'
 
   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"].get_value("M").to_s, "Man"
-  SuperList["Gender"].get_key("Man"), "M"
-  SuperList["Gender1"].get_key("translation missing: en.Gender1.Female"), "F"
-  SuperList["Gender"].options                => {:use_i18n=>false, :i18n_scope=>"Gender", :allow_blank=>true}
-  SuperList["Gender"].keys                   => ["M", "F"]
+  user.gender2(:default)                     => "translation missing: en.Gender.Man"
+  user.gender2(:locale => "api")             => "translation missing: api.Gender.Man"
+
+  SuperList["Gender"].get_value("M").to_s    => "Man"
+  SuperList["Gender"].get_key("Man")         =>  "M"
+  SuperList["Gender1"].get_key("translation missing: en.Gender1.Female") => "F"
+  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.Man", "translation missing: zh.Gender1.Female"]
+                                            => ["translation missing: zh.Gender1.Man", "translation missing: zh.Gender1.Female"]
+
   assert_equal ["M","F"], SuperList["Gender"].map {|k,v| k }
   assert_equal ["Man", "Female"], SuperList["Gender"].map {|k,v| v }
 
+  assert_equal ["M","F"], SuperList["Gender"].select_options {|k,v| v }
+  assert_equal ["Man", "Female"], SuperList["Gender"].select_options {|k,v| k }
+
+
 == Please refer {test file}[https://github.com/jinzhu/super_list/blob/master/test/super_list_test.rb] for more examples.
 
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/super_list.rb

@@ -5,13 +5,16 @@ class SuperList
   @@options = { :use_i18n => false}
   @@data = ActiveSupport::OrderedHash.new
 
-  def self.default_option=(options)
-    @@options.update(options)
+  def self.options=(options)
+    Thread.current[:super_list_options] = @@options.merge(options)
+  end
+
+  def self.options
+    Thread.current[:super_list_options] || @@options
   end
 
   def initialize(name, values, options={})
-    # { :use_i18n => false, :i18n_scope => 'super_list'}
-    options = @@options.merge(:i18n_scope => name).merge(options)
+    options = { :i18n_scope => name}.merge(options)
     @@data[name] = Data.new(values, options)
   end
 
@@ -19,20 +22,6 @@ 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)
@@ -43,28 +32,36 @@ class SuperList
       @values.keys
     end
 
-    def values(type=:default, options={})
-      options, type = type, :default if type.is_a?(Hash)
-      keys.map {|x| get_value(x, options).to_s(type) }
+    def values(format=nil, opts={})
+      opts, format = format, nil if format.is_a?(Hash)
+      keys.map {|key| get_value(key, format, opts) }
     end
 
-    def map(type=:default, options={}, &blk)
-      keys.zip(values(type,options)).map &blk
-    end
+    def get_value(key, format=nil, opts={})
+      opts = options.merge(opts)
 
-    def get_value(key,options={})
-      options = @options.merge(options)
       value = @values[key]
-      value = value.is_a?(Hash) ? value : {:default => value}
-      List.new(value, options)
+      format = format || opts[:format] || :default
+      result = value.is_a?(Hash) ? value[format] : value
+
+      return I18n.t(result, :scope => opts[:i18n_scope], :default => opts[:i18n_default], :locale => opts[:locale]) if opts[:use_i18n]
+      result
     end
 
-    def get_key(value,options={})
-      keys[values(options).index(value)] rescue nil
+    def get_key(value, opts={})
+      keys[values(opts).index(value)] rescue nil
+    end
+
+    def map(format=nil, opts={}, &blk)
+      keys.zip(values(format, opts)).map &blk
+    end
+
+    def select_options(format=nil, opts={}, &blk)
+      values(format, opts).zip(keys).map &blk
     end
 
     def options
-      @options
+      SuperList.options.merge(@options)
     end
   end
 end
@@ -75,17 +72,15 @@ module SuperListActiveRecord
 
   module ClassMethods
     def super_list(column, data, options={})
-      original_column = "original_#{column}".to_sym
       data = SuperList[data]
       options = data.options.merge(options)
 
       before_validation do
         value = attributes[column.to_s]
-        keys = data.keys
+        keys  = data.keys
 
         if !keys.include?(value)
           index = data.values.find_index(value)
-
           if index
             self.send("#{column}=", keys[index])
           elsif !options[:no_validation]
@@ -93,17 +88,18 @@ module SuperListActiveRecord
             return false
           end
         end
+        return true
       end
 
-      define_method "#{column}" do |*opt|
-        opt = opt[0].is_a?(Hash) ? opt[0] : {}
-        opt = options.merge(opt)
-
-        data.get_value(attributes[column.to_s], opt)
-      end
-
-      define_method original_column do
-        attributes[column.to_s]
+      define_method "#{column}" do |*opts|
+        key = attributes[column.to_s]
+        if opts.blank? && SuperList.options[:format].blank?
+          key
+        else
+          format = opts[0].is_a?(Symbol) ? opts[0] : nil
+          opts   = opts[1].is_a?(Hash) ? opts[1] : (opts[0].is_a?(Hash) ? opts[0] : {})
+          data.get_value(key, format, options.merge(opts))
+        end
       end
     end
   end

data/test/super_list_test.rb

@@ -10,8 +10,12 @@ class SuperListTest < ActiveSupport::TestCase
 		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"
+
     assert_equal ["M","F"], SuperList["Gender"].map {|k,v| k }
     assert_equal ["Man", "Female"], SuperList["Gender"].map {|k,v| v }
+
+    assert_equal ["M","F"], SuperList["Gender"].select_options {|k,v| v }
+    assert_equal ["Man", "Female"], SuperList["Gender"].select_options {|k,v| k }
   end
 
   test "only valid when included" do
@@ -30,7 +34,7 @@ class SuperListTest < ActiveSupport::TestCase
   test "set value" do
     user = Factory.build(:user, :gender => 'Man')
     assert user.valid?
-    assert_equal user.gender.to_s(:amos), 'M1'
+    assert_equal user.gender(:amos), 'M1'
     user = Factory.build(:user, :gender => 'NoValue')
     assert user.invalid?
   end
@@ -42,20 +46,30 @@ class SuperListTest < ActiveSupport::TestCase
 
   test "SuperList gender (don't use i18n)" do
     u = Factory(:user, :gender => 'F')
-    assert_equal u.gender.to_s, 'Female'
-    assert_equal u.gender.to_s(:amos), 'M2'
+    assert_equal u.gender, 'F'
+    assert_equal u.gender(:default), 'Female'
+    assert_equal u.gender(:amos), 'M2'
   end
 
   test "SuperList gender (use i18n, no default translation)" do
     u = Factory(:user, :gender1 => 'F')
-    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"
+    assert_equal u.gender1(:default), "translation missing: en.Gender.Female"
+    assert_equal u.gender1(:default, :locale => 'new_locale'), "translation missing: new_locale.Gender.Female"
+    assert_equal u.gender1(:amos, :locale => 'new_locale'), "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.to_s, "未知"
-    assert_equal u.gender2.to_s(:nokey), "未知"
+    assert_equal u.gender2, "F"
+    assert_equal u.gender2(:nokey), "未知"
+  end
+
+  test "global options" do
+    user = Factory(:user, :gender => 'Man')
+    SuperList.options = {:format => :amos}
+    assert_equal user.gender, 'M1'
+    SuperList.options = {:format => :default}
+    assert_equal user.gender, 'Man'
+    SuperList.options = {}
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: super_list
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +08:00
+date: 2011-03-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency