selectable_attr_rails 0.3.11 → 0.3.12

data/Rakefile

@@ -1,42 +1,5 @@
 require 'rubygems'
-gem 'rspec', '>= 1.1.4'
 require 'rake'
-require 'rake/rdoctask'
-require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
- 
-desc 'Default: run unit tests.'
-task :default => :spec
- 
-task :pre_commit => [:spec, 'coverage:verify']
- 
-desc 'Run all specs under spec/**/*_spec.rb'
-Spec::Rake::SpecTask.new(:spec => 'coverage:clean') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["-c", "--diff"]
-  t.rcov = true
-  t.rcov_opts = ["--include-file", "lib\/*\.rb", "--exclude", "spec\/"]
-end
- 
-desc 'Generate documentation for the selectable_attr_rails plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SelectableAttrRails'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
- 
-namespace :coverage do
-  desc "Delete aggregate coverage data."
-  task(:clean) { rm_f "coverage" }
- 
-  desc "verify coverage threshold via RCov"
-  RCov::VerifyTask.new(:verify => :spec) do |t|
-    t.threshold = 100.0 # Make sure you have rcov 0.7 or higher!
-    t.index_html = 'coverage/index.html'
-  end
-end
 
 begin
   require 'jeweler'
@@ -51,7 +14,62 @@ begin
     s.add_dependency("activerecord", ">= 2.0.2")
     s.add_dependency("actionpack", ">= 2.0.2")
     s.add_dependency("selectable_attr", ">= 0.3.11")
+    s.add_development_dependency "rspec", ">= 1.3.1"
+    s.add_development_dependency "sqlite3-ruby"
+    s.add_development_dependency "rcov"
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+begin
+  require 'reek/adapters/rake_task'
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
+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 = "range_dsl #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 11
-:build: 
 :major: 0
 :minor: 3
+:patch: 12
+:build: 

data/lib/selectable_attr_i18n.rb

@@ -9,7 +9,7 @@ if defined?(I18n)
         enums.each do |instance|
           unless instance.i18n_scope
             SelectableAttrRails.logger.debug("no i18n_scope of #{instance.inspect}")
-            next 
+            next
           end
           paths = instance.i18n_scope.dup
           current = result
@@ -27,7 +27,7 @@ if defined?(I18n)
         @i18n_scope = path unless path.empty?
         @i18n_scope
       end
-    
+
       class Entry
         def name
           I18n.locale.nil? ? @name :

data/lib/selectable_attr_rails/db_loadable.rb

@@ -7,7 +7,7 @@ module SelectableAttrRails
       @update_timing = options[:when]
       self.extend(InstanceMethods) unless respond_to?(:update_entries)
     end
-    
+
     module Entry
 
       if defined?(I18n)
@@ -20,18 +20,18 @@ module SelectableAttrRails
           @names_from_db ||= {}
           @names_from_db[I18n.locale.to_s] = value
         end
-        
+
         def name_with_from_db
           name_from_db || name_without_from_db
         end
 
       else
-        
+
         attr_accessor :name_from_db
         def name_with_from_db
           @name_from_db || name_without_from_db
         end
-      
+
       end
 
       def self.extended(obj)
@@ -42,18 +42,18 @@ module SelectableAttrRails
       end
 
     end
-    
+
     module InstanceMethods
       def entries
         update_entries if must_be_updated?
         @entries
       end
-      
+
       def must_be_updated?
         return false if @update_timing == :never
         return true if @update_timing == :everytime
       end
-      
+
       def update_entries
         unless @original_entries
           @original_entries = @entries.dup
@@ -68,7 +68,7 @@ module SelectableAttrRails
           sql = @sql_to_update.gsub(/\:locale/, I18n.locale.to_s.inspect)
           records = ActiveRecord::Base.connection.select_rows(sql)
         end
-        
+
         new_entries = []
         records.each do |r|
           if entry = @original_entries.detect{|entry| entry.id == r.first}
@@ -90,6 +90,6 @@ module SelectableAttrRails
         @entries = new_entries
       end
     end
-    
+
   end
 end

data/lib/selectable_attr_rails/helpers/abstract_selection_helper.rb

@@ -1,7 +1,7 @@
 module SelectableAttrRails::Helpers
   class AbstractSelectionBuilder
     attr_reader :entry_hash
-    
+
     def initialize(object, object_name, method, options, template)
       @object, @object_name, @method = object, object_name, method
       @base_name = @object.class.enum_base_name(method.to_s)
@@ -15,7 +15,7 @@ module SelectableAttrRails::Helpers
       base_name = @object.class.enum_base_name(@method.to_s)
       @object.send("#{base_name}_hash_array")
     end
-    
+
     def enum_hash_array_from_class
       base_name = @object.class.enum_base_name(@method.to_s)
       @object.class.send("#{base_name}_hash_array")
@@ -26,19 +26,19 @@ module SelectableAttrRails::Helpers
       tag.scan(/ id\=\"(.*?)\"/){|s|result = s}
       return result
     end
-    
+
     def add_class_name(options, class_name)
       (options ||= {}).stringify_keys!
       (options['class'] ||= '') << ' ' << class_name
       options
     end
-    
+
     def camelize_keys(hash, first_letter = :lower)
       result = {}
       hash.each{|key, value|result[key.to_s.camelize(first_letter)] = value}
       result
     end
-    
+
     def update_options(dest, *options_array)
       result = dest || {}
       options_array.each do |options|
@@ -50,6 +50,6 @@ module SelectableAttrRails::Helpers
       end
       result
     end
-  
+
   end
 end

data/lib/selectable_attr_rails/helpers/check_box_group_helper.rb

@@ -2,22 +2,23 @@ require 'selectable_attr_rails/helpers/abstract_selection_helper'
 module SelectableAttrRails::Helpers
   module CheckBoxGroupHelper
     class Builder < SelectableAttrRails::Helpers::AbstractSelectionBuilder
-      
+
       def initialize(object, object_name, method, options, template)
         super(object, object_name, method, options, template)
         @entry_hash_array ||= enum_hash_array_from_object
         @param_name = "#{@base_name}_ids"
         @check_box_options = @options.delete(:check_box) || {}
       end
-      
+
       def each(&block)
-        @entry_hash_array.each do |@entry_hash|
+        @entry_hash_array.each do |entry_hash|
+          @entry_hash= entry_hash
           @tag_value = @entry_hash[:id].to_s.gsub(/\s/, "_").gsub(/\W/, "")
           @check_box_id = "#{@object_name}_#{@param_name}_#{@tag_value}"
           yield(self)
         end
       end
-      
+
       def check_box(options = nil)
         options = update_options({
             :id => @check_box_id, :type => 'checkbox', :value => @tag_value,
@@ -26,7 +27,7 @@ module SelectableAttrRails::Helpers
         options[:checked] = 'checked' if @entry_hash[:select]
         @template.content_tag("input", nil, options)
       end
-      
+
       def label(text = nil, options = nil)
         @template.content_tag("label", text || @entry_hash[:name],
           update_options({:for => @check_box_id}, options))
@@ -52,10 +53,10 @@ module SelectableAttrRails::Helpers
         end
       end
     end
-    
+
     module FormBuilder
       def check_box_group(method, options = nil, &block)
-        @template.check_box_group(@object_name, method, 
+        @template.check_box_group(@object_name, method,
           (options || {}).merge(:object => @object), &block)
       end
     end

data/lib/selectable_attr_rails/helpers/radio_button_group_helper.rb

@@ -1,10 +1,10 @@
 module SelectableAttrRails::Helpers
   module RadioButtonGroupHelper
     class Builder < SelectableAttrRails::Helpers::AbstractSelectionBuilder
-      
-      attr_reader :entry_hash_array 
-      attr_reader :entry_hash 
-      attr_accessor :radio_button_id 
+
+      attr_reader :entry_hash_array
+      attr_reader :entry_hash
+      attr_accessor :radio_button_id
 
       def initialize(object, object_name, method, options, template)
         super(object, object_name, method, options, template)
@@ -19,12 +19,12 @@ module SelectableAttrRails::Helpers
           yield(self)
         end
       end
-      
+
       def radio_button(options = nil)
-        @template.radio_button(@object_name, @method, @entry_hash[:id], 
+        @template.radio_button(@object_name, @method, @entry_hash[:id],
           update_options({:id => @radio_button_id}, options))
       end
-      
+
       def label(text = nil, options = nil)
         @template.content_tag("label", text || @entry_hash[:name],
           update_options({:for => @radio_button_id}, options))
@@ -48,10 +48,10 @@ module SelectableAttrRails::Helpers
         end
       end
     end
-    
+
     module FormBuilder
       def radio_button_group(method, options = nil, &block)
-        @template.radio_button_group(@object_name, method, 
+        @template.radio_button_group(@object_name, method,
           (options || {}).merge(:object => @object), &block)
       end
     end

data/lib/selectable_attr_rails/helpers/select_helper.rb

@@ -6,7 +6,7 @@ module SelectableAttrRails::Helpers
           alias_method_chain :select, :attr_enumeable
         end
       end
-      
+
       # def select_with_attr_enumeable(object, method, choices, options = {}, html_options = {})
       def select_with_attr_enumeable(object_name, method, *args, &block)
         if args.length > 3
@@ -23,7 +23,7 @@ module SelectableAttrRails::Helpers
         return single_enum_select(object_name, method, options, html_options, &block) if object.class.respond_to?("#{base_name}_hash_array")
         raise ArgumentError, "invaliad argument"
       end
-      
+
       def single_enum_select(object_name, method, options = {}, html_options = {}, &block)
         options = update_enum_select_options(options, object_name, method)
         object = options[:object] # options.delete(:object)
@@ -32,7 +32,7 @@ module SelectableAttrRails::Helpers
         container = entry_hash_array.map{|hash| [hash[:name].to_s, hash[:id]]}
         select_without_attr_enumeable(object_name, method, container, options, html_options || {}, &block)
       end
-      
+
       def multi_enum_select(object_name, method, options = {}, html_options = {}, &block)
         html_options = {:size => 5, :multiple => 'multiple'}.update(html_options || {})
         options = update_enum_select_options(options, object_name, method)
@@ -43,7 +43,7 @@ module SelectableAttrRails::Helpers
         attr = "#{base_name}_ids"
         select_without_attr_enumeable(object_name, attr, container, options, html_options, &block)
       end
-      
+
       def update_enum_select_options(options, object_name, method)
         options ||= {}
         object = (options[:object] ||= instance_variable_get("@#{object_name}"))
@@ -51,7 +51,7 @@ module SelectableAttrRails::Helpers
         options
       end
     end
-    
+
     module FormBuilder
       def self.included(base)
         base.module_eval do

data/lib/selectable_attr_rails.rb

@@ -13,19 +13,19 @@ module SelectableAttrRails
     def logger=(value)
       @logger = value
     end
-    
+
     def add_features_to_active_record
-      ActiveRecord::Base.module_eval do 
+      ActiveRecord::Base.module_eval do
         include ::SelectableAttr::Base
         include ::SelectableAttrRails::Validatable::Base
       end
-      SelectableAttr::Enum.module_eval do 
+      SelectableAttr::Enum.module_eval do
         include ::SelectableAttrRails::DbLoadable
         include ::SelectableAttrRails::Validatable::Enum
       end
       logger.debug("#{self.name}.add_features_to_active_record")
     end
-    
+
     def add_features_to_action_view
       ActionView::Base.module_eval do
         include ::SelectableAttrRails::Helpers::SelectHelper::Base

data/selectable_attr_rails.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{selectable_attr_rails}
-  s.version = "0.3.7"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takeshi Akima"]
-  s.date = %q{2009-08-17}
+  s.date = %q{2010-11-01}
   s.description = %q{selectable_attr_rails makes possible to use selectable_attr in rails application}
   s.email = %q{akima@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +31,9 @@ Gem::Specification.new do |s|
      "lib/selectable_attr_rails/helpers/check_box_group_helper.rb",
      "lib/selectable_attr_rails/helpers/radio_button_group_helper.rb",
      "lib/selectable_attr_rails/helpers/select_helper.rb",
+     "lib/selectable_attr_rails/validatable.rb",
+     "lib/selectable_attr_rails/validatable/base.rb",
+     "lib/selectable_attr_rails/validatable/enum.rb",
      "lib/selectable_attr_rails/version.rb",
      "selectable_attr_rails.gemspec",
      "spec/database.yml",
@@ -41,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/akm/selectable_attr_rails/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{selectable_attr_rails makes possible to use selectable_attr in rails application}
   s.test_files = [
     "spec/introduction_spec.rb",
@@ -54,21 +60,31 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<actionpack>, [">= 2.0.2"])
-      s.add_runtime_dependency(%q<akm-selectable_attr>, [">= 0.3.5"])
+      s.add_runtime_dependency(%q<selectable_attr>, [">= 0.3.11"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3.1"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_dependency(%q<activerecord>, [">= 2.0.2"])
       s.add_dependency(%q<actionpack>, [">= 2.0.2"])
-      s.add_dependency(%q<akm-selectable_attr>, [">= 0.3.5"])
+      s.add_dependency(%q<selectable_attr>, [">= 0.3.11"])
+      s.add_dependency(%q<rspec>, [">= 1.3.1"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     s.add_dependency(%q<activerecord>, [">= 2.0.2"])
     s.add_dependency(%q<actionpack>, [">= 2.0.2"])
-    s.add_dependency(%q<akm-selectable_attr>, [">= 0.3.5"])
+    s.add_dependency(%q<selectable_attr>, [">= 0.3.11"])
+    s.add_dependency(%q<rspec>, [">= 1.3.1"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
   end
 end
+

data/spec/introduction_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe SelectableAttr do
 
@@ -13,81 +13,81 @@ describe SelectableAttr do
     p3 = klass.new(:name => '未来派野郎', :product_type_cd => '03', :price => 3000)
     p3.discount_price.should == 1500
   end
-  
+
   # 定数をガンガン定義した場合
   # 大文字が多くて読みにくいし、関連するデータ(ここではDISCOUNT)が増える毎に定数も増えていきます。
   class LegacyProduct1 < ActiveRecord::Base
     set_table_name 'products'
-    
+
     PRODUCT_TYPE_BOOK = '01'
     PRODUCT_TYPE_DVD = '02'
     PRODUCT_TYPE_CD = '03'
     PRODUCT_TYPE_OTHER = '09'
-    
+
     PRODUCT_TYPE_OPTIONS = [
       ['書籍', PRODUCT_TYPE_BOOK],
       ['DVD', PRODUCT_TYPE_DVD],
       ['CD', PRODUCT_TYPE_CD],
       ['その他', PRODUCT_TYPE_OTHER]
     ]
-    
-    DISCOUNT = { 
+
+    DISCOUNT = {
       PRODUCT_TYPE_BOOK => 0.8,
       PRODUCT_TYPE_DVD => 0.2,
       PRODUCT_TYPE_CD => 0.5,
       PRODUCT_TYPE_OTHER => 1
     }
-    
+
     def discount_price
       (DISCOUNT[product_type_cd] * price).to_i
     end
   end
-  
+
   it "test_legacy_product" do
     assert_product_discount(LegacyProduct1)
-    
+
     # 選択肢を表示するためのデータは以下のように取得できる
     LegacyProduct1::PRODUCT_TYPE_OPTIONS.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
   end
-  
-  
-  
-  
+
+
+
+
   # できるだけ定数定義をまとめた場合
   # 結構すっきりするけど、同じことをいろんなモデルで書くかと思うと気が重い。
   class LegacyProduct2 < ActiveRecord::Base
     set_table_name 'products'
-    
+
     PRODUCT_TYPE_DEFS = [
       {:id => '01', :name => '書籍', :discount => 0.8},
       {:id => '02', :name => 'DVD', :discount => 0.2},
       {:id => '03', :name => 'CD', :discount => 0.5},
       {:id => '09', :name => 'その他', :discount => 1}
     ]
-    
+
     PRODUCT_TYPE_OPTIONS = PRODUCT_TYPE_DEFS.map{|t| [t[:name], t[:id]]}
-    DISCOUNT = PRODUCT_TYPE_DEFS.inject({}){|dest, t| 
+    DISCOUNT = PRODUCT_TYPE_DEFS.inject({}){|dest, t|
       dest[t[:id]] = t[:discount]; dest}
-      
+
     def discount_price
       (DISCOUNT[product_type_cd] * price).to_i
     end
   end
-  
+
   it "test_legacy_product" do
     assert_product_discount(LegacyProduct2)
-    
+
     # 選択肢を表示するためのデータは以下のように取得できる
-    LegacyProduct2::PRODUCT_TYPE_OPTIONS.should == 
+    LegacyProduct2::PRODUCT_TYPE_OPTIONS.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
   end
-  
+
   # selectable_attrを使った場合
   # 定義は一カ所にまとめられて、任意の属性(ここでは:discount)も一緒に書くことができてすっきり〜
   class Product1 < ActiveRecord::Base
     set_table_name 'products'
-    
+
     selectable_attr :product_type_cd do
       entry '01', :book, '書籍', :discount => 0.8
       entry '02', :dvd, 'DVD', :discount => 0.2
@@ -100,15 +100,15 @@ describe SelectableAttr do
       (product_type_entry[:discount] * price).to_i
     end
   end
-  
+
   it "test_product1" do
     assert_product_discount(Product1)
     # 選択肢を表示するためのデータは以下のように取得できる
     Product1.product_type_options.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
   end
-  
-  
+
+
   # selectable_attrが定義するインスタンスメソッドの詳細
   it "test_product_type_instance_methods" do
     p1 = Product1.new
@@ -117,19 +117,19 @@ describe SelectableAttr do
     p1.product_type_name.should be_nil
     # idを変更すると得られるキーも名称も変わります
     p1.product_type_cd = '02'
-    p1.product_type_cd.should ==   '02' 
-    p1.product_type_key.should ==  :dvd 
+    p1.product_type_cd.should ==   '02'
+    p1.product_type_key.should ==  :dvd
     p1.product_type_name.should == 'DVD'
     # キーを変更すると得られるidも名称も変わります
     p1.product_type_key = :book
     p1.product_type_cd.should ==   '01'
-    p1.product_type_key.should ==  :book 
+    p1.product_type_key.should ==  :book
     p1.product_type_name.should == '書籍'
     # id、キー、名称以外の任意の属性は、entryの[]メソッドで取得します。
     p1.product_type_key = :cd
     p1.product_type_entry[:discount].should == 0.5
   end
-  
+
   # selectable_attrが定義するクラスメソッドの詳細
   it "test_product_type_class_methods" do
     # キーからid、名称を取得できます
@@ -138,8 +138,8 @@ describe SelectableAttr do
     Product1.product_type_id_by_key(:cd).should == '03'
     Product1.product_type_id_by_key(:other).should == '09'
     Product1.product_type_name_by_key(:book).should == '書籍'
-    Product1.product_type_name_by_key(:dvd).should == 'DVD'   
-    Product1.product_type_name_by_key(:cd).should == 'CD'    
+    Product1.product_type_name_by_key(:dvd).should == 'DVD'
+    Product1.product_type_name_by_key(:cd).should == 'CD'
     Product1.product_type_name_by_key(:other).should == 'その他'
     # 存在しないキーの場合はnilを返します
     Product1.product_type_id_by_key(nil).should be_nil
@@ -161,7 +161,7 @@ describe SelectableAttr do
     Product1.product_type_name_by_id(nil).should be_nil
     Product1.product_type_key_by_id('99').should be_nil
     Product1.product_type_name_by_id('99').should be_nil
-    
+
     # id、キー、名称の配列を取得できます
     Product1.product_type_ids.should == ['01', '02', '03', '09']
     Product1.product_type_keys.should == [:book, :dvd, :cd, :other]
@@ -169,11 +169,11 @@ describe SelectableAttr do
     # 一部のものだけ取得することも可能です。
     Product1.product_type_ids(:cd, :dvd).should == ['03', '02' ]
     Product1.product_type_keys('02', '03').should == [:dvd, :cd  ]
-    Product1.product_type_names('02', '03').should == ['DVD', 'CD'] 
+    Product1.product_type_names('02', '03').should == ['DVD', 'CD']
     Product1.product_type_names(:cd, :dvd).should == ['CD', 'DVD']
-    
+
     # select_tagなどのoption_tagsを作るための配列なんか一発っす
-    Product1.product_type_options.should == 
+    Product1.product_type_options.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
   end
 
@@ -183,12 +183,12 @@ describe SelectableAttr do
     p1.valid?.should == true
     p1.errors.empty?.should == true
 
-    p1.product_type_key = :book 
+    p1.product_type_key = :book
     p1.product_type_cd.should == '01'
     p1.valid?.should == true
     p1.errors.empty?.should == true
 
-    p1.product_type_cd = 'XX' 
+    p1.product_type_cd = 'XX'
     p1.product_type_cd.should == 'XX'
     p1.valid?.should == false
     p1.errors.on(:product_type_cd).should == "は次のいずれかでなければなりません。 書籍, DVD, CD, その他"
@@ -197,15 +197,15 @@ describe SelectableAttr do
   # selectable_attrのエントリ名をDB上に保持するためのモデル
   class ItemMaster < ActiveRecord::Base
   end
-  
+
   # selectable_attrを使った場合その２
   # アクセス時に毎回アクセス時にDBから項目名を取得します。
   class ProductWithDB1 < ActiveRecord::Base
     set_table_name 'products'
-    
+
     selectable_attr :product_type_cd do
       update_by(
-        "select item_cd, name from item_masters where category_name = 'product_type_cd' order by item_no", 
+        "select item_cd, name from item_masters where category_name = 'product_type_cd' order by item_no",
         :when => :everytime)
       entry '01', :book, '書籍', :discount => 0.8
       entry '02', :dvd, 'DVD', :discount => 0.2
@@ -217,7 +217,7 @@ describe SelectableAttr do
       (product_type_entry[:discount] * price).to_i
     end
   end
-  
+
   it "test_update_entry_name" do
     # DBに全くデータがなくてもコードで記述してあるエントリは存在します。
     ItemMaster.delete_all("category_name = 'product_type_cd'")
@@ -228,17 +228,17 @@ describe SelectableAttr do
     ProductWithDB1.product_type_name_by_key(:other).should == 'その他'
 
     assert_product_discount(ProductWithDB1)
-    
+
     # DBからエントリの名称を動的に変更できます
     item_book = ItemMaster.create(:category_name => 'product_type_cd', :item_no => 1, :item_cd => '01', :name => '本')
     ProductWithDB1.product_type_entries.length.should == 4
-    ProductWithDB1.product_type_name_by_key(:book).should == '本'    
-    ProductWithDB1.product_type_name_by_key(:dvd).should == 'DVD'   
-    ProductWithDB1.product_type_name_by_key(:cd).should == 'CD'    
-    ProductWithDB1.product_type_name_by_key(:other).should == 'その他' 
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_name_by_key(:book).should == '本'
+    ProductWithDB1.product_type_name_by_key(:dvd).should == 'DVD'
+    ProductWithDB1.product_type_name_by_key(:cd).should == 'CD'
+    ProductWithDB1.product_type_name_by_key(:other).should == 'その他'
+    ProductWithDB1.product_type_options.should ==
       [['本', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
-    
+
     # DBからエントリの並び順を動的に変更できます
     item_book.item_no = 4;
     item_book.save!
@@ -247,40 +247,40 @@ describe SelectableAttr do
     item_cd = ItemMaster.create(:category_name => 'product_type_cd', :item_no => 3, :item_cd => '03') # nameは指定しなかったらデフォルトが使われます。
     ProductWithDB1.product_type_options.should ==
       [['その他', '09'], ['DVD', '02'], ['CD', '03'], ['本', '01']]
-    
+
     # DBからエントリを動的に追加することも可能です。
     item_toys = ItemMaster.create(:category_name => 'product_type_cd', :item_no => 5, :item_cd => '04', :name => 'おもちゃ')
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_options.should ==
       [['その他', '09'], ['DVD', '02'], ['CD', '03'], ['本', '01'], ['おもちゃ', '04']]
     ProductWithDB1.product_type_key_by_id('04').should == :entry_04
-    
+
     # DBからレコードを削除してもコードで定義したentryは削除されません。
     # 順番はDBからの取得順で並び替えられたものの後になります
     item_dvd.destroy
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_options.should ==
       [['その他', '09'], ['CD', '03'], ['本', '01'], ['おもちゃ', '04'], ['DVD', '02']]
-    
+
     # DB上で追加したレコードを削除すると、エントリも削除されます
     item_toys.destroy
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_options.should ==
       [['その他', '09'], ['CD', '03'], ['本', '01'], ['DVD', '02']]
-    
+
     # 名称を指定していたDBのレコードを削除したら元に戻ります。
     item_book.destroy
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_options.should ==
       [['その他', '09'], ['CD', '03'], ['書籍', '01'], ['DVD', '02']]
-    
+
     # エントリに該当するレコードを全部削除したら、元に戻ります。
     ItemMaster.delete_all("category_name = 'product_type_cd'")
-    ProductWithDB1.product_type_options.should == 
+    ProductWithDB1.product_type_options.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
-    
+
     assert_product_discount(ProductWithDB1)
   end
-  
-  
 
-  
+
+
+
   # Q: product_type_cd の'_cd'はどこにいっちゃったの？
   # A: デフォルトでは、/(_cd$|_code$|_cds$|_codes$)/ を削除したものをbase_nameとして
   #    扱い、それに_keyなどを付加してメソッド名を定義します。もしこのルールを変更したい場合、
@@ -288,7 +288,7 @@ describe SelectableAttr do
   class Product2 < ActiveRecord::Base
     set_table_name 'products'
     self.selectable_attr_name_pattern = /^product_|_cd$/
-    
+
     selectable_attr :product_type_cd do
       entry '01', :book, '書籍', :discount => 0.8
       entry '02', :dvd, 'DVD', :discount => 0.2
@@ -300,7 +300,7 @@ describe SelectableAttr do
       (type_entry[:discount] * price).to_i
     end
   end
-  
+
   it "test_product2" do
     assert_product_discount(Product2)
     # 選択肢を表示するためのデータは以下のように取得できる
@@ -319,12 +319,12 @@ describe SelectableAttr do
     # キーを変更すると得られるidも名称も変わります
     p2.type_key = :book
     p2.product_type_cd.should == '01'
-    p2.type_key.should == :book 
+    p2.type_key.should == :book
     p2.type_name.should == '書籍'
     # id、キー、名称以外の任意の属性は、entryの[]メソッドで取得します。
     p2.type_key = :cd
     p2.type_entry[:discount].should == 0.5
-    
+
     Product2.type_id_by_key(:book).should == '01'
     Product2.type_id_by_key(:dvd).should == '02'
     Product2.type_name_by_key(:cd).should == 'CD'
@@ -336,15 +336,15 @@ describe SelectableAttr do
     Product2.type_keys('02', '03').should == [:dvd, :cd]
     Product2.type_names(:cd, :dvd).should == ['CD', 'DVD']
   end
-  
-  
-  
-  
+
+
+
+
   # Q: selectable_attrの呼び出し毎にbase_bname(って言うの？)を指定したいんだけど。
   # A: base_nameオプションを指定してください。
   class Product3 < ActiveRecord::Base
     set_table_name 'products'
-    
+
     selectable_attr :product_type_cd, :base_name => 'type' do
       entry '01', :book, '書籍', :discount => 0.8
       entry '02', :dvd, 'DVD', :discount => 0.2
@@ -356,13 +356,13 @@ describe SelectableAttr do
       (type_entry[:discount] * price).to_i
     end
   end
-  
-  it "test_product3" do 
+
+  it "test_product3" do
     assert_product_discount(Product3)
     # 選択肢を表示するためのデータは以下のように取得できる
     Product3.type_options.should ==
       [['書籍', '01'], ['DVD', '02'], ['CD', '03'], ['その他', '09']]
-      
+
     p3 = Product3.new
     p3.product_type_cd.should be_nil
     p3.type_key.should be_nil
@@ -380,18 +380,18 @@ describe SelectableAttr do
     # id、キー、名称以外の任意の属性は、entryの[]メソッドで取得します。
     p3.type_key = :cd
     p3.type_entry[:discount].should == 0.5
-    
+
     Product3.type_id_by_key(:book).should ==    '01'
-    Product3.type_id_by_key(:dvd).should ==     '02'    
-    Product3.type_name_by_key(:cd).should ==    'CD'    
+    Product3.type_id_by_key(:dvd).should ==     '02'
+    Product3.type_name_by_key(:cd).should ==    'CD'
     Product3.type_name_by_key(:other).should == 'その他'
-    Product3.type_key_by_id('09').should ==     :other  
-    Product3.type_name_by_id('01').should ==    '書籍'  
+    Product3.type_key_by_id('09').should ==     :other
+    Product3.type_name_by_id('01').should ==    '書籍'
     Product3.type_keys.should == [:book, :dvd, :cd, :other]
     Product3.type_names.should == ['書籍', 'DVD', 'CD', 'その他']
     Product3.type_keys('02', '03').should == [:dvd, :cd]
     Product3.type_names(:cd, :dvd).should == ['CD', 'DVD']
   end
-  
+
 end
 

data/spec/schema.rb

@@ -7,7 +7,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  
+
   create_table "item_masters", :force => true do |t|
     t.string   "category_name", :limit => 20
     t.integer  "item_no"
@@ -16,7 +16,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  
+
   create_table "i18n_item_masters", :force => true do |t|
     t.string   "locale", :limit => 5
     t.string   "category_name", :limit => 20
@@ -26,5 +26,5 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  
+
 end

data/spec/selectable_attr_i18n_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 if defined?(I18n)
-  require File.join(File.dirname(__FILE__), 'spec_helper')
+  require File.expand_path('spec_helper', File.dirname(__FILE__))
 
   describe SelectableAttr::Enum do
 
@@ -27,9 +27,9 @@ if defined?(I18n)
 
     it 'test_enum1_i18n' do
       I18n.locale = nil
-      I18n.locale.should == :en 
+      I18n.locale.should == :en
       Enum1.name_by_key(:entry1).should == "entry one"
-      Enum1.name_by_key(:entry2).should == "entry two" 
+      Enum1.name_by_key(:entry2).should == "entry two"
       Enum1.name_by_key(:entry3).should == "entry three"
       Enum1.names.should == ["entry one", "entry two", "entry three"]
 
@@ -62,12 +62,16 @@ if defined?(I18n)
     it 'test_attr1_i18n' do
       I18n.default_locale = 'ja'
       I18n.locale = nil
-      I18n.locale.should == 'ja' 
-      SelectableAttrMock1.attr1_name_by_key(:entry1).should == "エントリ壱" 
-      SelectableAttrMock1.attr1_name_by_key(:entry2).should == "エントリ弐" 
-      SelectableAttrMock1.attr1_name_by_key(:entry3).should == "エントリ参" 
+      if ActiveRecord::VERSION::STRING <= "2.2.3"
+        I18n.locale.should == 'ja'
+      else
+        I18n.locale.should == :ja
+      end
+      SelectableAttrMock1.attr1_name_by_key(:entry1).should == "エントリ壱"
+      SelectableAttrMock1.attr1_name_by_key(:entry2).should == "エントリ弐"
+      SelectableAttrMock1.attr1_name_by_key(:entry3).should == "エントリ参"
       SelectableAttrMock1.attr1_options.should == [["エントリ壱",1], ["エントリ弐",2], ["エントリ参",3]]
-      
+
       I18n.locale = 'ja'
       SelectableAttrMock1.attr1_name_by_key(:entry1).should == "エントリ壱"
       SelectableAttrMock1.attr1_name_by_key(:entry2).should == "エントリ弐"
@@ -75,8 +79,8 @@ if defined?(I18n)
       SelectableAttrMock1.attr1_options.should == [["エントリ壱",1], ["エントリ弐",2], ["エントリ参",3]]
 
       I18n.locale = 'en'
-      SelectableAttrMock1.attr1_name_by_key(:entry1).should == "entry one" 
-      SelectableAttrMock1.attr1_name_by_key(:entry2).should == "entry two" 
+      SelectableAttrMock1.attr1_name_by_key(:entry1).should == "entry one"
+      SelectableAttrMock1.attr1_name_by_key(:entry2).should == "entry two"
       SelectableAttrMock1.attr1_name_by_key(:entry3).should == "entry three"
       SelectableAttrMock1.attr1_options.should == [["entry one",1], ["entry two",2], ["entry three",3]]
     end
@@ -93,7 +97,11 @@ if defined?(I18n)
     it 'test_enum1_i18n' do
       I18n.default_locale = 'ja'
       I18n.locale = nil
-      I18n.locale.should == 'ja'
+      if ActiveRecord::VERSION::STRING <= "2.2.3"
+        I18n.locale.should == 'ja'
+      else
+        I18n.locale.should == :ja
+      end
       SelectableAttrMock2.enum1_name_by_key(:entry1).should == "エントリ壱"
       SelectableAttrMock2.enum1_name_by_key(:entry2).should == "エントリ弐"
       SelectableAttrMock2.enum1_name_by_key(:entry3).should == "エントリ参"
@@ -106,8 +114,8 @@ if defined?(I18n)
       SelectableAttrMock2.enum1_options.should == [["エントリ壱",1], ["エントリ弐",2], ["エントリ参",3]]
 
       I18n.locale = 'en'
-      SelectableAttrMock2.enum1_name_by_key(:entry1).should == "entry one"  
-      SelectableAttrMock2.enum1_name_by_key(:entry2).should == "entry two"  
+      SelectableAttrMock2.enum1_name_by_key(:entry1).should == "entry one"
+      SelectableAttrMock2.enum1_name_by_key(:entry2).should == "entry two"
       SelectableAttrMock2.enum1_name_by_key(:entry3).should == "entry three"
       SelectableAttrMock2.enum1_options.should == [["entry one",1], ["entry two",2], ["entry three",3]]
     end
@@ -125,7 +133,7 @@ if defined?(I18n)
         # update_byメソッドには、エントリのidと名称を返すSELECT文を指定する代わりに、
         # エントリのidと名称の配列の配列を返すブロックを指定することも可能です。
         update_by(:when => :everytime) do
-          records = I18nItemMaster.find(:all, 
+          records = I18nItemMaster.find(:all,
             :conditions => [
               "category_name = 'product_type_cd' and locale = ? ", I18n.locale.to_s],
             :order => "item_no")
@@ -148,7 +156,7 @@ if defined?(I18n)
       ProductWithI18nDB1.product_type_name_by_key(:dvd).should   == 'DVD'
       ProductWithI18nDB1.product_type_name_by_key(:cd).should    == 'CD'
       ProductWithI18nDB1.product_type_name_by_key(:other).should == 'その他'
-      
+
       ProductWithI18nDB1.product_type_hash_array.should == [
         {:id => '01', :key => :book, :name => '書籍', :discount => 0.8},
         {:id => '02', :key => :dvd, :name => 'DVD', :discount => 0.2},
@@ -158,7 +166,7 @@ if defined?(I18n)
 
       # DBからエントリの名称を動的に変更できます
       item_book = I18nItemMaster.create(:locale => 'ja', :category_name => 'product_type_cd', :item_no => 1, :item_cd => '01', :name => '本')
-      ProductWithI18nDB1.product_type_entries.length.should == 4 
+      ProductWithI18nDB1.product_type_entries.length.should == 4
       ProductWithI18nDB1.product_type_name_by_key(:book).should == '本'
       ProductWithI18nDB1.product_type_name_by_key(:dvd).should == 'DVD'
       ProductWithI18nDB1.product_type_name_by_key(:cd).should == 'CD'
@@ -200,7 +208,7 @@ if defined?(I18n)
       item_dvd = I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 2, :item_cd => '02', :name => 'DVD')
       item_cd = I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 3, :item_cd => '03', :name => 'CD')
       item_toys = I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 5, :item_cd => '04', :name => 'Toy')
-      
+
       # 英語名が登録されていてもI18n.localeが変わらなければ、日本語のまま
       ProductWithI18nDB1.product_type_options.should == [['その他', '09'], ['DVD', '02'], ['CD', '03'], ['本', '01'], ['おもちゃ', '04']]
       ProductWithI18nDB1.product_type_key_by_id('04').should == :entry_04
@@ -212,7 +220,7 @@ if defined?(I18n)
         {:id => '01', :key => :book, :name => '本', :discount => 0.8},
         {:id => '04', :key => :entry_04, :name => 'おもちゃ'}
       ]
-      
+
       # I18n.localeを変更すると取得できるエントリの名称も変わります
       I18n.locale = 'en'
       ProductWithI18nDB1.product_type_options.should == [['Others', '09'], ['DVD', '02'], ['CD', '03'], ['Book', '01'], ['Toy', '04']]
@@ -229,7 +237,7 @@ if defined?(I18n)
       I18n.locale = 'ja'
       ProductWithI18nDB1.product_type_options.should == [['その他', '09'], ['DVD', '02'], ['CD', '03'], ['本', '01'], ['おもちゃ', '04']]
       ProductWithI18nDB1.product_type_key_by_id('04').should == :entry_04
-      
+
       I18n.locale = 'en'
       ProductWithI18nDB1.product_type_options.should == [['Others', '09'], ['DVD', '02'], ['CD', '03'], ['Book', '01'], ['Toy', '04']]
       ProductWithI18nDB1.product_type_key_by_id('04').should == :entry_04
@@ -276,7 +284,7 @@ if defined?(I18n)
       I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 3, :item_cd => '03', :name => 'CD')
       I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 4, :item_cd => '01', :name => 'Book')
       I18nItemMaster.create(:locale => 'en', :category_name => 'product_type_cd', :item_no => 5, :item_cd => '04', :name => 'Toy')
-      
+
       I18n.locale = 'en'
       actual = SelectableAttr::Enum.i18n_export
       actual.keys.should == ['selectable_attrs']

data/spec/spec_helper.rb

@@ -28,3 +28,17 @@ def assert_hash(expected, actual)
     assert_equal expected[key], actual[key], "unmatch value for #{key.inspect}"
   end
 end
+
+# http://d.hatena.ne.jp/nedate/20101004/1286183882
+if defined?(Rcov)
+  class Rcov::CodeCoverageAnalyzer
+    def update_script_lines__
+      if '1.9'.respond_to?(:force_encoding)
+        SCRIPT_LINES__.each do |k,v|
+          v.each { |src| src.force_encoding('utf-8') }
+        end
+      end
+      @script_lines__ = @script_lines__.merge(SCRIPT_LINES__)
+    end
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: selectable_attr_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Takeshi Akima
@@ -9,49 +14,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +09:00
+date: 2010-11-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: selectable_attr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 11
         version: 0.3.11
-    version: 
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: selectable_attr_rails makes possible to use selectable_attr in rails application
 email: akima@gmail.com
 executables: []
@@ -98,21 +164,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: selectable_attr_rails makes possible to use selectable_attr in rails application