selectable_attr_rails 0.3.10 → 0.3.11

data/README

@@ -11,13 +11,19 @@ http://github.com/akm/selectable_attr/tree/master
 
 
 == Install
-=== 1. Railsプロジェクトで使う場合
-==== a. plugin install
+=== a. plugin install
  ruby script/plugin install git://github.com/akm/selectable_attr.git
  ruby script/plugin install git://github.com/akm/selectable_attr_rails.git
 
-==== b. gem install
- [sudo] gem install akimatter-selectable_attr akimatter-selectable_attr_rails -s http://gems.github .com
+=== b. gem install
+ [sudo] gem install selectable_attr_rails
+
+config/initializers/selectable_attr.rb
+ require 'selectable_attr'
+ require 'selectable_attr_i18n'
+ require 'selectable_attr_rails'
+ SelectableAttrRails.setup
+
 
 == チュートリアル
 

data/Rakefile

@@ -50,7 +50,7 @@ begin
     s.add_dependency("activesupport", ">= 2.0.2")
     s.add_dependency("activerecord", ">= 2.0.2")
     s.add_dependency("actionpack", ">= 2.0.2")
-    s.add_dependency("selectable_attr", ">= 0.3.5")
+    s.add_dependency("selectable_attr", ">= 0.3.11")
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/init.rb

@@ -1,5 +1,4 @@
 require 'selectable_attr'
 require 'selectable_attr_i18n'
 require 'selectable_attr_rails'
-
-SelectableAttrRails.add_features_to_rails
+SelectableAttrRails.setup

data/lib/selectable_attr_i18n.rb

@@ -1,11 +1,14 @@
 if defined?(I18n)
+  require 'selectable_attr'
+
   module SelectableAttr
     class Enum
-      def self.i18n_export
+      def self.i18n_export(enums = nil)
+        enums ||= instances
         result = {}
-        instances.each do |instance|
+        enums.each do |instance|
           unless instance.i18n_scope
-            # puts "no i18n_scope of #{instance.inspect}"
+            SelectableAttrRails.logger.debug("no i18n_scope of #{instance.inspect}")
             next 
           end
           paths = instance.i18n_scope.dup

data/lib/selectable_attr_rails.rb

@@ -7,9 +7,14 @@ module SelectableAttrRails
   autoload :Validatable, 'selectable_attr_rails/validatable'
 
   class << self
+    def logger
+      @logger ||= Logger.new(STDERR)
+    end
+    def logger=(value)
+      @logger = value
+    end
     
     def add_features_to_active_record
-      puts "SelectableAttrRails.add_features_to_active_record"
       ActiveRecord::Base.module_eval do 
         include ::SelectableAttr::Base
         include ::SelectableAttrRails::Validatable::Base
@@ -18,6 +23,7 @@ module SelectableAttrRails
         include ::SelectableAttrRails::DbLoadable
         include ::SelectableAttrRails::Validatable::Enum
       end
+      logger.debug("#{self.name}.add_features_to_active_record")
     end
     
     def add_features_to_action_view
@@ -31,13 +37,20 @@ module SelectableAttrRails
         include ::SelectableAttrRails::Helpers::CheckBoxGroupHelper::FormBuilder
         include ::SelectableAttrRails::Helpers::RadioButtonGroupHelper::FormBuilder
       end
+      logger.debug("#{self.name}.add_features_to_action_view")
     end
 
     def add_features_to_rails
-      puts "SelectableAttrRails.add_features_to_rails"
       add_features_to_active_record
       add_features_to_action_view
     end
+
+    def setup
+      logger = defined?(Rails) ? Rails.logger : ActiveRecord::Base.logger
+      self.logger = logger
+      SelectableAttr.logger = logger if SelectableAttr.respond_to?(:logger=) # since 0.3.11
+      add_features_to_rails
+    end
   end
 
 end

data/spec/database.yml

@@ -1,6 +1,6 @@
 sqlite:
   :adapter: sqlite
-  :dbfile: selectable_attr_test.sqlite.db
+  :database: selectable_attr_test.sqlite.db
 sqlite3:
   :adapter: sqlite3
-  :dbfile: selectable_attr_test.sqlite3.db
+  :database: selectable_attr_test.sqlite3.db

data/spec/selectable_attr_i18n_spec.rb

@@ -253,6 +253,9 @@ if defined?(I18n)
     end
 
     it 'test_i18n_export' do
+      io = StringIO.new
+      SelectableAttrRails.logger = Logger.new(io)
+
       I18nItemMaster.delete_all("category_name = 'product_type_cd'")
 
       I18n.locale = 'ja'
@@ -282,11 +285,26 @@ if defined?(I18n)
         {'entry1'=>"entry one",
          'entry2'=>"entry two",
          'entry3'=>"entry three"}
-      actual['selectable_attrs'].keys.include?('ProductWithI18nDB1').should == true
+      actual['selectable_attrs'].keys.should include('ProductWithI18nDB1')
       actual['selectable_attrs']['ProductWithI18nDB1'].should ==
         {'product_type_cd'=>
           {'book'=>"Book", 'dvd'=>"DVD", 'cd'=>"CD", 'other'=>"Others", 'entry_04'=>"Toy"}}
     end
+
+    Enum2 = SelectableAttr::Enum.new do
+      entry 1, :entry1, "縁鳥1"
+      entry 2, :entry2, "縁鳥2"
+      entry 3, :entry3, "縁鳥3"
+    end
+
+    it "i18n_scope missing" do
+      io = StringIO.new
+      SelectableAttrRails.logger = Logger.new(io)
+      actual = SelectableAttr::Enum.i18n_export([Enum2])
+      actual.inspect.should_not =~ /縁鳥/
+      io.rewind
+      io.readline.should =~ /^no\ i18n_scope\ of\ /
+    end
   end
 else
   $stderr.puts "WARNING! i18n test skipeed because I18n not found"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selectable_attr_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors: 
 - Takeshi Akima
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +09:00
+date: 2010-01-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.5
+        version: 0.3.11
     version: 
 description: selectable_attr_rails makes possible to use selectable_attr in rails application
 email: akima@gmail.com