tengine_support 0.3.19 → 0.3.20

data/VERSION

@@ -1 +1 @@
-0.3.19
+0.3.20

data/lib/tengine/support/config/definition.rb

@@ -22,11 +22,12 @@ module Tengine::Support::Config::Definition
   end
 
   module ClassMethods
-    def field(__name__, *args)
+    def field(__name__, *args, &block)
       attrs = args.last.is_a?(Hash) ? args.pop : {}
       attrs[:description] = args.first unless args.empty?
       attrs[:__name__] = __name__
       attrs[:__parent__] = self
+      attrs[:convertor] = block
 
       if (superclass < Tengine::Support::Config::Definition) &&
           (self.children == self.superclass.children)
@@ -61,14 +62,7 @@ module Tengine::Support::Config::Definition
         end
 
         define_method("#{field.__name__}=") do |value|
-          val =
-            case field.type
-            when :boolean then !!value
-            when :integer then value.nil? ? nil : value.to_i
-            when :string then value.nil? ? nil : value.to_s
-            else value
-            end
-          instance_variable_set("@#{field.__name__}", val)
+          instance_variable_set("@#{field.__name__}", field.convert(value))
         end
       end
     end

data/lib/tengine/support/config/definition/field.rb

@@ -1,8 +1,12 @@
+# -*- coding: utf-8 -*-
 require 'tengine/support/config/definition'
 
 class Tengine::Support::Config::Definition::Field
-  attr_accessor :__name__, :__parent__, :__block__, :__type__
-  attr_accessor :type, :default_description, :default, :description, :hidden
+  attr_accessor :__name__, :__parent__, :__type__
+  attr_accessor :__block__ # __block__ はactionの具体的な動作を保持します
+  attr_accessor :convertor # convertor はfieldの変換ロジックを保持します
+  attr_accessor :type, :default_description, :default, :description, :hidden, :enum
+
   def initialize(attrs = {})
     attrs.each{|k, v| send("#{k}=", v)}
   end
@@ -53,4 +57,18 @@ class Tengine::Support::Config::Definition::Field
     '--' << name_array.join('-').gsub(%r{_}, '-')
   end
 
+  def convert(value)
+    return convertor.call(value) if convertor
+    result = case self.type
+    when :boolean then !!value
+    when :integer then value.nil? ? nil : value.to_i
+    when :string then value.nil? ? nil : value.to_s
+    else value
+    end
+    if self.enum && !self.enum.include?(result)
+      raise ArgumentError, "must be one of #{self.enum.inspect} but was #{result.inspect}"
+    end
+    result
+  end
+
 end

data/lib/tengine/support/config/definition/has_many_children.rb

@@ -69,8 +69,8 @@ module Tengine::Support::Config::Definition::HasManyChildren
     attrs.update({
         :__name__ => name,
         :__parent__ => self,
-        :__block__ => block,
         :__type__ => attrs[:__type__] || :field,
+        :convertor => block,
       })
     if field = children.detect{|child| child.__name__ == name}
       new_field = field.dup
@@ -88,14 +88,7 @@ module Tengine::Support::Config::Definition::HasManyChildren
           (field.default.respond_to?(:to_proc) ? self.instance_eval(&field.deault) : field.default)
       end
       define_method("#{field.__name__}=") do |value|
-        val =
-          case field.type
-          when :boolean then !!value
-          when :integer then value.nil? ? nil : value.to_i
-          when :string then value.nil? ? nil : value.to_s
-          else value
-          end
-        instance_variable_set("@#{field.__name__}", val)
+        instance_variable_set("@#{field.__name__}", field.convert(value))
       end
     end
   end

data/lib/tengine/support/config/definition/optparse_visitor.rb

@@ -53,6 +53,9 @@ class Tengine::Support::Config::Definition::OptparseVisitor
           o.on(*args){|f| d.__parent__.send("#{d.__name__}=", f) }
         else
           long_opt << "=VAL"
+          if d.enum
+            desc_str << " must be one of " << (d.enum.join(',').gsub(/\A\[|\]\Z/, ''))
+          end
           if default_value = d.default_value
             desc_str << " default: #{default_value.inspect}"
           end

data/lib/tengine/support/config/logger.rb

@@ -5,12 +5,38 @@ require 'active_support/hash_with_indifferent_access'
 class Tengine::Support::Config::Logger
   include Tengine::Support::Config::Definition
 
-  field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string, :default => "STDOUT"
-  field :rotation, 'rotation file count or daily,weekly,monthly.' # , :type => :string
+  field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string, :default => "STDOUT" do |value|
+    value = value.to_s
+    case value
+    when *%w[STDOUT STDERR NULL] then value
+    else
+      dirname = File.dirname(File.expand_path(value))
+      raise ArgumentError, "directory not found #{dirname} for value" unless File.directory?(dirname)
+      value
+    end
+  end
+
+  field :rotation, 'rotation file count or daily,weekly,monthly.' do |value|
+    if value.nil?
+      nil
+    elsif value.is_a?(Integer)
+      value
+    else
+      case value.to_s
+      when *%w[daily weekly monthly] then value
+      when /\A\d+\Z/ then value.to_i
+      else raise ArgumentError, "must be nil or an Integer or one of daily,weekly,monthly"
+      end
+    end
+  end
+
   field :rotation_size, 'number of max log file size.', :type => :integer
-  field :level, 'Logging severity threshold. debug/info/warn/error/fatal.', :type => :string, :default => "info"
+
+  field :level, 'Logging severity threshold.', :type => :string,
+    :enum => %w[debug info warn error fatal], :default => "info"
 
   field :progname, 'program name to include in log messages.', :type => :string
+
   field :datetime_format, 'A string suitable for passing to strftime.', :type => :string
 
   # formatterにはprocしか設定できないので特別設定ファイルやコマンドラインオプションで指定することはできません。

data/spec/tengine/support/config/logger_spec.rb

@@ -35,7 +35,8 @@ describe 'Tengine::Support::Config::Logger' do
       it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
       its(:type){ should == :string }
       its(:__name__){ should == :level }
-      its(:description){ should == 'Logging severity threshold. debug/info/warn/error/fatal.'}
+      its(:description){ should == 'Logging severity threshold.'}
+      its(:enum){ should == %w[debug info warn error fatal]}
       its(:default){ should == "info"}
     end
 
@@ -86,6 +87,76 @@ describe 'Tengine::Support::Config::Logger' do
       its(:formatter){ should == nil}
       its(:progname){ should == nil}
     end
+
+    describe :level do
+      subject{ Tengine::Support::Config::Logger.new.instantiate_children }
+
+      %w[debug info warn error fatal].each do |name|
+        it "#{name}を設定することができる" do
+          subject.level = name
+          subject.level.should == name
+        end
+      end
+
+      %w[invalid_name DEBUG inf err].each do |name|
+        it "#{name}は設定することができない" do
+          expect{
+            subject.level = name
+          }.to raise_error(ArgumentError)
+        end
+      end
+    end
+
+    describe :rotation do
+      subject{ Tengine::Support::Config::Logger.new.instantiate_children }
+
+      ["daily", "weekly", "monthly", :daily, 2, 8].each do |value|
+        it "#{value}を設定することができる(変換なし)" do
+          subject.rotation = value
+          subject.rotation.should == value
+        end
+      end
+
+      ["1", "100"].each do |value|
+        it "#{value}を設定することができる(変換あり)" do
+          subject.rotation = value
+          subject.rotation.should == value.to_i
+        end
+      end
+
+      ['invalid_rotation', true, false].each do |value|
+        it "#{value}は設定することができない" do
+          expect{
+            subject.rotation = value
+          }.to raise_error(ArgumentError)
+        end
+      end
+    end
+
+
+    describe :output do
+      subject{ Tengine::Support::Config::Logger.new.instantiate_children }
+
+      %w[STDOUT STDERR NULL].each do |value|
+        it "#{value}を設定することができる" do
+          subject.output = value
+          subject.output.should == value
+        end
+      end
+
+      it "存在するディレクトリのファイル" do
+        path = File.expand_path("unexist.log", File.dirname(__FILE__))
+        subject.output = path
+        subject.output.should == path
+      end
+
+      it "存在しないディレクトリのファイル" do
+        expect{
+          subject.output = "/unexist/dir/foo.log"
+        }.to raise_error(ArgumentError)
+      end
+    end
+
   end
 
   describe :new_logger do

data/spec/tengine/support/config_spec/parse_spec.rb

@@ -138,14 +138,14 @@ db:
 
 log_common:
         --log-common-output=VAL      file path or "STDOUT" / "STDERR" / "NULL".  default: "STDOUT"
-        --log-common-level=VAL       Logging severity threshold. debug/info/warn/error/fatal.  default: "info"
+        --log-common-level=VAL       Logging severity threshold.  must be one of debug,info,warn,error,fatal default: "info"
         --log-common-progname=VAL    program name to include in log messages. 
         --log-common-datetime-format=VAL
                                      A string suitable for passing to strftime. 
 
 application_log:
         --application-log-output=VAL file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/application.log" else "STDOUT" default: "STDOUT"
-        --application-log-level=VAL  Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+        --application-log-level=VAL  Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
         --application-log-progname=VAL
                                      program name to include in log messages. 
         --application-log-datetime-format=VAL
@@ -155,7 +155,7 @@ process_stdout_log:
         --process-stdout-log-output=VAL
                                      file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stdout.log" else "STDOUT" default: "STDOUT"
         --process-stdout-log-level=VAL
-                                     Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+                                     Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
         --process-stdout-log-progname=VAL
                                      program name to include in log messages. 
         --process-stdout-log-datetime-format=VAL
@@ -165,7 +165,7 @@ process_stderr_log:
         --process-stderr-log-output=VAL
                                      file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stderr.log" else "STDOUT" default: "STDOUT"
         --process-stderr-log-level=VAL
-                                     Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+                                     Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
         --process-stderr-log-progname=VAL
                                      program name to include in log messages. 
         --process-stderr-log-datetime-format=VAL

data/tengine_support.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.19"
+  s.version = "0.3.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["saishu", "w-irie", "taigou", "totty", "hiroshinakao", "g-morita", "guemon", "aoetk", "hattori-at-nt", "t-yamada", "y-karashima", "akm"]
-  s.date = "2011-11-23"
+  s.date = "2011-11-25"
   s.description = "tengine_support provides utility classes/modules which is not included in active_support. It doesn't depend on other tengine gems."
   s.email = "tengine@nautilus-technologies.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
   prerelease: 
 platform: ruby
 authors:
@@ -20,11 +20,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70354660963280 !ruby/object:Gem::Requirement
+  requirement: &2155483560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70354660963280
+  version_requirements: *2155483560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354660961720 !ruby/object:Gem::Requirement
+  requirement: &2155483060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70354660961720
+  version_requirements: *2155483060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70354660960980 !ruby/object:Gem::Requirement
+  requirement: &2155482540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70354660960980
+  version_requirements: *2155482540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70354660960080 !ruby/object:Gem::Requirement
+  requirement: &2155482020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70354660960080
+  version_requirements: *2155482020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70354660949460 !ruby/object:Gem::Requirement
+  requirement: &2155481420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70354660949460
+  version_requirements: *2155481420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70354660948200 !ruby/object:Gem::Requirement
+  requirement: &2155480880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70354660948200
+  version_requirements: *2155480880
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70354660947300 !ruby/object:Gem::Requirement
+  requirement: &2155480360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354660947300
+  version_requirements: *2155480360
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70354660946260 !ruby/object:Gem::Requirement
+  requirement: &2155479800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70354660946260
+  version_requirements: *2155479800
 description: tengine_support provides utility classes/modules which is not included
   in active_support. It doesn't depend on other tengine gems.
 email: tengine@nautilus-technologies.com
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2725991210008433029
+      hash: -1551665832818632818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: