japanese_calendar 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d4ce4f513c811d200136af280c962486e32bd5
-  data.tar.gz: 95395e12fd637cf92b479d1ee14cde9f090aa969
+  metadata.gz: 911eaaf3d1894319e9d2f7349c303fa236f7c7eb
+  data.tar.gz: 3a240bb75f650ab1559123df1272e66deff033a9
 SHA512:
-  metadata.gz: a8665096c0364ab4a25ff043ba4e3a2ed23f60c8c7a7f5b641315621ff2a9a417375afead38a702727d1f5c8fc8a2da198ade9f4770a1b935a0f3828e2bba088
-  data.tar.gz: f2fadd2f711e4524bcb880e77bdd0d5bc4eb6ffe05e455a1bd19b84ea3d0ab3a9d5f996c87f1dfbff8db1992e8cb307785c5bec6765a410d68cb9ab00289b7d1
+  metadata.gz: 1135f2ec0097a8c9763bc4ef9e048241d24449f9e195de64ade0e54e045c479065588d2ebdeb8ad82dc5803a0df2cf0b1ab6c93abc1e401b3515864295f0dbb7
+  data.tar.gz: 7ed0a7ec12be84cb46a8a0f58dff1b444272b5c0c9466a18c01d073215a5476c229cd0dee185db0bfc0db3b95371e5effb999d158ec1662c8944c3ff2c8893e0

data/.travis.yml

@@ -1,7 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-- 2.3.3
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.13.6
 addons:
   code_climate:

data/japanese_calendar.gemspec

@@ -21,9 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.1"
+
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 end

data/lib/japanese_calendar/era.rb

@@ -61,20 +61,19 @@ module JapaneseCalendar
     #   Time.new(1872, 12, 31).strftime("%K%-J年") # => RuntimeError
     def strftime(format)
       string = format.dup
+      string.gsub!(/%K/,   era_name)
+      string.gsub!(/%O/,   era_name(:romaji))
+      string.gsub!(/%\^O/, era_name(:romaji).upcase)
+      string.gsub!(/%o/,   era_name(:romaji)[0])
       string.gsub!(/%J/,   "%02d" % era_year)
       string.gsub!(/%-J/,  "%d"   % era_year)
       string.gsub!(/%_J/,  "%2d"  % era_year)
-      string.gsub!(/%K/,   era_name.to_s)
-      string.gsub!(/%O/,   era_name(:romaji).to_s)
-      string.gsub!(/%\^O/, era_name(:romaji).upcase.to_s)
-      string.gsub!(/%o/,   era_name(:romaji)[0].to_s)
       super(string)
     end
 
     private
-      Period = Struct.new(:beginning_of_period, :kanji_name, :romaji_name)
 
-      MEIJI_6 = Time.new(1873, 1, 1)
+      Period = Struct.new(:beginning_of_period, :kanji_name, :romaji_name)
 
       PERIODS = [
         Period.new(Time.new(1989,  1,  8), "平成", "Heisei").freeze,
@@ -83,6 +82,8 @@ module JapaneseCalendar
         Period.new(Time.new(1868,  1, 25), "明治", "Meiji" ).freeze
       ].freeze
 
+      MEIJI_6 = Time.new(1873, 1, 1)
+
       def current_era
         error_proc = proc { raise "#{self.class.name.downcase} out of range" }
         error_proc.call if self < MEIJI_6

data/lib/japanese_calendar/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module JapaneseCalendar
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japanese_calendar
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ryo Yamamoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -127,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Japanese calendar utility for Ruby