keigo 0.0.3 → 0.0.5

data/Gemfile

@@ -6,9 +6,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
+  gem "rspec", ">= 2.3.0"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.6.4"
   gem "rcov", ">= 0"
   gem 'autotest'
 end

data/Gemfile.lock

@@ -26,7 +26,7 @@ PLATFORMS
 
 DEPENDENCIES
   autotest
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
+  bundler (>= 1.0.0)
+  jeweler (>= 1.6.4)
   rcov
-  rspec (~> 2.3.0)
+  rspec (>= 2.3.0)

data/README.rdoc

@@ -1,9 +1,5 @@
 = keigo
 
-keigo translates Japanese to polite expressions.
-
-== DESCRIPTION
-
 keigo translates Japanese into polite expressions.
 
 == INSTALL
@@ -14,14 +10,14 @@ keigo translates Japanese into polite expressions.
 
   require 'keigo'
 
-  Keigo.new.sama 'Alice'
+  'Alice'.sama
   # => 'Alice様'
 
-  Keigo.new.k '今日こいつが来る。'
-  # => '本日こちらさまがおいでになる。'
+  '今日こいつが来る'.keigo
+  # => '本日こちらさまがおいでになる'
 
-  k 'あいつが今日から本を読む。'
-  # => 'あちらさまが本日から本をお読みになる。'
+  'あいつが今日から本を読む'.keigo
+  # => 'あちらさまが本日から本をお読みになる'
 
 == Contributing to keigo
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/keigo.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{keigo}
-  s.version = "0.0.3"
+  s.name = "keigo"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{kano4}]
-  s.date = %q{2011-08-11}
-  s.description = %q{This is a polite expression gem.}
-  s.email = %q{shinji@kano4.com}
+  s.authors = ["kano4"]
+  s.date = "2011-10-28"
+  s.description = "This is a polite expression gem."
+  s.email = "shinji@kano4.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,32 +32,32 @@ Gem::Specification.new do |s|
     "spec/keigo_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kano4/keigo}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{polite expression}
+  s.homepage = "http://github.com/kano4/keigo"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "polite expression"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rspec>, [">= 2.3.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
   end

data/keigo.yml

@@ -12,25 +12,47 @@
 今日      : 本日
 
 # 動詞
-言う      : おっしゃる
 思う      : 思われる
 書く      : お書きになる
 考える    : お考えになる
-見る      : ご覧になる
-聞く      : お聞きになる
-会う      : お会いになる
-行く      : 行かれる
-来る      : おいでになる
-尋ねる    : お尋ねになる
 与える    : お与えになる
 もらう    : お受けになる
 知る      : お知りになる
-食べる    : お食べになる
-着る      : 着られる
 読む      : お読みになる
 送る      : お送りになる
 贈る      : お贈りになる
 買う      : お買いになる
 飲む      : 飲まれる
+会う      : お会いになる
+与える    : くださる
+やる      : くださる
+集まる    : お集まりになる
+言う      : おっしゃる
+行く      : お出かけになる
+来る      : お見えになる
+いる      : いらっしゃる
+売る      : お譲りになる
+教える    : お教えくださる
+買う      : お求めになる
+借りる    : お借りになる
+帰る      : お帰りになる
+がんばる  : お励みになる
+聞く      : お聞きになる
+決める    : お決めになる
+着る      : お召しになる
+叱る      : お叱りになる
+死ぬ      : お亡くなりになる
+する      : なさる
+助ける    : お力添え
+尋ねる    : お尋ねになる
+食べる    : 召し上がる
+連れていく: お連れになる
+眠る      : お休みになる
+寝る      : お休みになる
+見せる    : お見せになる
+見る      : ご覧になる
+ゆるす    : お許しになる
+わかる    : おわかりになる
+
 いる      : いらっしゃる
 する      : される

data/lib/keigo.rb

@@ -2,25 +2,14 @@
 require 'yaml'
 $keigo_henkan = YAML.load_file(File.dirname(__FILE__) + '/../keigo.yml')
 
-def sama name
-  Keigo.new.sama name
-end
-
-def k text
-  Keigo.new.k text
-end
-
-class Keigo
-  def initialize
-    @keigo_henkan = $keigo_henkan
-  end
-
-  def sama name
-    "#{name}様"
+class String
+  def sama
+    "#{self}様"
   end
 
-  def k text
-    @keigo_henkan.each_key {|key| text = text.sub(key, @keigo_henkan[key])}
+  def keigo
+    text = self
+    $keigo_henkan.each_key {|key| text = text.sub(key, $keigo_henkan[key])}
     text
   end
 end

data/spec/keigo_spec.rb

@@ -3,33 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'yaml'
 $keigo_henkan = YAML.load_file(File.dirname(__FILE__) + '/../keigo.yml')
 
-describe 'Keigo' do
-  before(:each) do
-    @keigo = Keigo.new
-  end
-  it 'は、keigo.samaを使うと最後に"様"が付加される' do
-    name = @keigo.sama('Keigo')
-    name.should == 'Keigo様'
-  end
-
-  it 'は、sama関数を使うと最後に"様"が付加される' do
-    sama('Keigo').should be_eql 'Keigo様'
-  end
+describe String do
+  it { "Alice".sama.should be_eql 'Alice様' }
 
   context 'は、変換後に登録されていない場合' do
-    it { k('こんにちわ').should be_eql 'こんにちわ' }
-    it { k('わたくし').should be_eql 'わたくし' }
+    it { 'こんにちわ'.keigo.should be_eql 'こんにちわ' }
+    it { 'わたくし'.keigo.should be_eql 'わたくし' }
   end
 
   context 'は、変換語に登録されている場合' do
-    @keigo_henkan = $keigo_henkan
-
-    @keigo_henkan.each do |key, keigo|
-      it { k(key).should be_eql keigo }
+    $keigo_henkan.each do |key, keigo|
+      it { key.keigo.should be_eql keigo }
     end
 
-    it { k('あいつが今日来る。').should be_eql 'あちらさまが本日おいでになる。' }
-
-    it { @keigo.k('わたし').should be_eql 'わたくし' }
+    it { 'あいつが今日来る。'.keigo.should be_eql 'あちらさまが本日おいでになる。' }
   end
 end

metadata

@@ -1,82 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: keigo
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - kano4
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &26873780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26873780
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &26873240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26873240
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &26872620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26872620
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &26872040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *26872040
+- !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &26871560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *26871560
 description: This is a polite expression gem.
 email: shinji@kano4.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .autotest
 - .document
 - .rspec
@@ -92,34 +89,31 @@ files:
 - spec/keigo_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kano4/keigo
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3658054192511642163
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 656101100285914300
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: polite expression
 test_files: []
-