tengine_support 0.3.26 → 0.3.27

data/.travis.yml

@@ -8,3 +8,4 @@ rvm:
 gemfile:
   - gemfiles/Gemfile.activesupport-3.0.10
   - gemfiles/Gemfile.activesupport-3.1.1
+  - gemfiles/Gemfile.activesupport-3.2.3

data/Gemfile

@@ -6,6 +6,8 @@ source "http://rubygems.org"
 gem "activesupport", ">= 3.0.0"
 group :test do
   gem "eventmachine", "~> 0.12.0"
+  gem "bson_ext", "~> 1.3"
+  gem "mongoid", "~> 2.3.3"
 end
 
 # Add dependencies to develop your gem here.
@@ -13,7 +15,7 @@ end
 group :development do
   gem "rspec", "~> 2.6.0"
   gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.0.18"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.6.4"
   # gem "rcov", ">= 0"
   gem "simplecov", "~> 0.5.3"

data/README.md

@@ -18,4 +18,4 @@ tengine_support is distributed under the LGPL and MPL
 
 ## Copyright
 
-Copyright (c) 2011 nautilus-technologies.com
+Copyright (c) 2012 Groovenauts, Inc.

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MPL/LGPL"
   gem.summary = "tengine_support provides utility classes/modules which isn't included in active_support."
   gem.description = "tengine_support provides utility classes/modules which is not included in active_support. It doesn't depend on other tengine gems."
-  gem.email = "tengine@nautilus-technologies.com"
-  gem.authors = %w[shyouhei akm]
+  gem.email = "tengine-info@groovenauts.jp"
+  gem.authors = %w[shyouhei akm taigou]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.26
+0.3.27

data/gemfiles/Gemfile.activesupport-3.0.10

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 gem "activesupport", "= 3.0.10"
 group :test do
   gem "eventmachine", "~> 0.12.0"
+  gem "mongoid", "~> 2.2.6"
 end
 
 # Add dependencies to develop your gem here.
@@ -13,7 +14,7 @@ end
 group :development do
   gem "rspec", "~> 2.6.0"
   gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.0.18"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.6.4"
   # gem "rcov", ">= 0"
   gem "simplecov", "~> 0.5.3"

data/gemfiles/Gemfile.activesupport-3.1.1

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 gem "activesupport", "= 3.1.1"
 group :test do
   gem "eventmachine", "~> 0.12.0"
+  gem "mongoid", "~> 2.3.3"
 end
 
 # Add dependencies to develop your gem here.
@@ -13,7 +14,7 @@ end
 group :development do
   gem "rspec", "~> 2.6.0"
   gem "yard", "~> 0.7.2"
-  gem "bundler", "~> 1.0.18"
+  gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.6.4"
   # gem "rcov", ">= 0"
   gem "simplecov", "~> 0.5.3"

data/gemfiles/Gemfile.activesupport-3.2.3

@@ -0,0 +1,24 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+gem "activesupport", "= 3.2.3"
+group :test do
+  gem "eventmachine", "~> 0.12.0"
+  gem "mongoid", "~> 2.4.9"
+end
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.6.0"
+  gem "yard", "~> 0.7.2"
+  gem "bundler", "~> 1.1.3"
+  gem "jeweler", "~> 1.6.4"
+  # gem "rcov", ">= 0"
+  gem "simplecov", "~> 0.5.3"
+  gem "autotest"
+
+  gem 'rdiscount'
+end

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

@@ -56,10 +56,11 @@ class Tengine::Support::Config::Logger
     end
     rotation = options[:rotation]
     shift_age = (rotation =~ /\A\d+\Z/) ? rotation.to_i : rotation
-    result = ::Logger.new(dev, shift_age, options[:rotation_size])
-    result.level = ::Logger.const_get(options[:level].to_s.upcase)
     dtf = options[:datetime_format]
+    result = ::Logger.new(dev, shift_age, options[:rotation_size])
+    result.formatter = (options[:formatter] || dtf) ? Logger::Formatter.new : nil
     result.datetime_format = dtf if dtf
+    result.level = ::Logger.const_get(options[:level].to_s.upcase)
     progname = options[:progname]
     result.progname = progname if progname
     result

data/lib/tengine/support/core_ext/array.rb

@@ -2,7 +2,7 @@
 
 # このファイルはクラスやモジュールを定義せず、tengine/support/core_ext/*.rbをrequireするだけです
 Dir.chdir(File.expand_path("../../../", File.dirname(__FILE__))) do
-  Dir['tengine/support/core_ext/array'].each do |f|
-    require File.basename(f)
+  Dir['tengine/support/core_ext/array/*.rb'].each do |f|
+    require f
   end
 end

data/lib/tengine/support/core_ext/hash.rb

@@ -2,7 +2,7 @@
 
 # このファイルはクラスやモジュールを定義せず、tengine/support/core_ext/*.rbをrequireするだけです
 Dir.chdir(File.expand_path("../../../", File.dirname(__FILE__))) do
-  Dir['tengine/support/core_ext/hash'].each do |f|
-    require File.basename(f)
+  Dir['tengine/support/core_ext/hash/*.rb'].each do |f|
+    require f
   end
 end

data/lib/tengine/support/core_ext.rb

@@ -2,7 +2,7 @@
 
 # このファイルはクラスやモジュールを定義せず、tengine/support/core_ext/*.rbをrequireするだけです
 Dir.chdir(File.expand_path("../../", File.dirname(__FILE__))) do
-  Dir['tengine/support/core_ext'].each do |f|
-    require File.basename(f)
+  Dir['tengine/support/core_ext/*.rb'].each do |f|
+    require f
   end
 end

data/lib/tengine/support/mongoid.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+require 'mongoid'
+
+module Mongoid::Document::ClassMethods
+
+  def human_name(options = nil)
+    @@human_name_exception_handler ||= lambda{|*args| self.name }
+    options = {
+      :scope => [i18n_scope, :models],
+      :exception_handler => @@human_name_exception_handler
+    }.update(options || {})
+    I18n.translate(self.name.underscore, options)
+  end
+end

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

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 require 'logger'
 require 'tempfile'
+require 'active_support/core_ext/logger'
 
 describe 'Tengine::Support::Config::Logger' do
 
@@ -168,7 +169,14 @@ describe 'Tengine::Support::Config::Logger' do
     context "デフォルトの場合" do
       subject{ Tengine::Support::Config::Logger.new.instantiate_children.new_logger }
       its(:datetime_format){ should == nil}
-      its(:formatter){ should == nil}
+
+      require 'active_support/version'
+      if ActiveSupport::VERSION::STRING =~ /^3\.0\./
+        its(:formatter){ should be_a(Logger::SimpleFormatter)}
+      else
+        its(:formatter){ should == nil}
+      end
+
       its(:level){ should == 1}
       its(:progname){ should == nil}
     end
@@ -199,7 +207,7 @@ describe 'Tengine::Support::Config::Logger' do
         }.instantiate_children.new_logger
       end
       its(:datetime_format){ should == "%Y/%m/%d %H:%M:%S"}
-      its(:formatter){ should == nil}
+      its(:formatter){ should be_a(Logger::Formatter)}
       its(:level){ should == 1}
       its(:progname){ should == "foobar"}
       it "実際に出力してみる" do

data/spec/tengine/support/mongoid_spec.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require 'mongoid'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'tengine/support/mongoid'
+
+class TestModel1
+  include Mongoid::Document
+end
+
+describe Mongoid::Document do
+  describe :human_name do
+    before do
+      I18n.backend = I18n::Backend::Simple.new
+      I18n.backend.store_translations :ja, :mongoid => {:models => {
+          :test_model1 => "テストモデル1"
+        } }
+    end
+
+    context "リソースが登録されていない場合" do
+      before{ I18n.locale = :en }
+      subject{ TestModel1 }
+      it{ TestModel1.human_name.should == 'TestModel1' }
+      its(:i18n_scope){ should == :mongoid }
+    end
+
+    context "リソースが登録されている場合" do
+      before{ I18n.locale = :ja }
+      subject{ TestModel1 }
+      it{ TestModel1.human_name.should == 'テストモデル1' }
+      it{ TestModel1.name.should == "TestModel1" }
+      it{ TestModel1.name.underscore.should == "test_model1" }
+      it{ I18n.t(:test_model1, :scope => [:mongoid, :models]).should == "テストモデル1" }
+    end
+
+  end
+end

data/tengine_support.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.26"
+  s.version = "0.3.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["shyouhei", "akm", "taigou"]
-  s.date = "2012-02-16"
+  s.date = "2012-05-02"
   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.email = "tengine-info@groovenauts.jp"
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "gemfiles/Gemfile.activesupport-3.0.10",
     "gemfiles/Gemfile.activesupport-3.1.1",
+    "gemfiles/Gemfile.activesupport-3.2.3",
     "lib/tengine/support.rb",
     "lib/tengine/support/config.rb",
     "lib/tengine/support/config/amqp.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
     "lib/tengine/support/core_ext/hash/keys.rb",
     "lib/tengine/support/core_ext/module.rb",
     "lib/tengine/support/core_ext/module/private_constant.rb",
+    "lib/tengine/support/mongoid.rb",
     "lib/tengine/support/null_logger.rb",
     "lib/tengine/support/yaml_with_erb.rb",
     "lib/tengine_support.rb",
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     "spec/tengine/support/core_ext/hash/compact_spec.rb",
     "spec/tengine/support/core_ext/hash/deep_dup_spec.rb",
     "spec/tengine/support/core_ext/hash/keys_spec.rb",
+    "spec/tengine/support/mongoid_spec.rb",
     "spec/tengine/support/null_logger_spec.rb",
     "spec/tengine/support/yaml_with_erb_spec.rb",
     "spec/tengine/support/yaml_with_erb_spec/test1.yml.erb",
@@ -83,7 +86,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/tengine/tengine_support"
   s.licenses = ["MPL/LGPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.16"
+  s.rubygems_version = "1.8.12"
   s.summary = "tengine_support provides utility classes/modules which isn't included in active_support."
 
   if s.respond_to? :specification_version then
@@ -93,7 +96,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
@@ -102,7 +105,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<yard>, ["~> 0.7.2"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 0"])
@@ -112,7 +115,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<yard>, ["~> 0.7.2"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.18"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<simplecov>, ["~> 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.27
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70123005106240 !ruby/object:Gem::Requirement
+  requirement: &2160555620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70123005106240
+  version_requirements: *2160555620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70123005105760 !ruby/object:Gem::Requirement
+  requirement: &2160553820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70123005105760
+  version_requirements: *2160553820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70123005105280 !ruby/object:Gem::Requirement
+  requirement: &2160552160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,21 +45,21 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70123005105280
+  version_requirements: *2160552160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70123005104800 !ruby/object:Gem::Requirement
+  requirement: &2160550840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.18
+        version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70123005104800
+  version_requirements: *2160550840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70123005104320 !ruby/object:Gem::Requirement
+  requirement: &2160549300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70123005104320
+  version_requirements: *2160549300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70123005103840 !ruby/object:Gem::Requirement
+  requirement: &2160547040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70123005103840
+  version_requirements: *2160547040
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70123005103360 !ruby/object:Gem::Requirement
+  requirement: &2160545500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123005103360
+  version_requirements: *2160545500
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70123005102880 !ruby/object:Gem::Requirement
+  requirement: &2160543180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70123005102880
+  version_requirements: *2160543180
 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
+email: tengine-info@groovenauts.jp
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -119,6 +119,7 @@ files:
 - VERSION
 - gemfiles/Gemfile.activesupport-3.0.10
 - gemfiles/Gemfile.activesupport-3.1.1
+- gemfiles/Gemfile.activesupport-3.2.3
 - lib/tengine/support.rb
 - lib/tengine/support/config.rb
 - lib/tengine/support/config/amqp.rb
@@ -142,6 +143,7 @@ files:
 - lib/tengine/support/core_ext/hash/keys.rb
 - lib/tengine/support/core_ext/module.rb
 - lib/tengine/support/core_ext/module/private_constant.rb
+- lib/tengine/support/mongoid.rb
 - lib/tengine/support/null_logger.rb
 - lib/tengine/support/yaml_with_erb.rb
 - lib/tengine_support.rb
@@ -165,6 +167,7 @@ files:
 - spec/tengine/support/core_ext/hash/compact_spec.rb
 - spec/tengine/support/core_ext/hash/deep_dup_spec.rb
 - spec/tengine/support/core_ext/hash/keys_spec.rb
+- spec/tengine/support/mongoid_spec.rb
 - spec/tengine/support/null_logger_spec.rb
 - spec/tengine/support/yaml_with_erb_spec.rb
 - spec/tengine/support/yaml_with_erb_spec/test1.yml.erb
@@ -185,6 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2647105739452243185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,10 +199,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: tengine_support provides utility classes/modules which isn't included in
   active_support.
 test_files: []
-has_rdoc: