time_compact 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7154fa79a650c2616e1e12e290397e0fdb208ee
-  data.tar.gz: 6b0edc90a8bac84512dfc4f4917f497392b21e19
+  metadata.gz: a07ad5487258701576985039433534a971cd7886
+  data.tar.gz: d9dfa3fbf7af561adf42b7827c2e808a40f4c0fc
 SHA512:
-  metadata.gz: bc5126f0138f864bcd32f11d8fd18c74823b3c8c4a5508ba8c7ecb4767fa2161b17844eeeb0a86d592b3e4e09cefd1cd433c9e1d7437a00e42bfc668f3f4fecb
-  data.tar.gz: 3aa51864ac2f9f632c6953dfade2f545755ddd045fb9b9a31e1f05ad9b27f385a6a99d9797a6119f7765308a5535444b32b389265e2c5aef20c0258930afa21f
+  metadata.gz: bec71f0877f0fd18352da5daa7c164ea9bef8e75c66f154cda30e6225ca51b4e400b66bdab699527aa34cc4617ced136fc619ca1837a18372df5ae2646140dcf
+  data.tar.gz: b42c4de394bc46f6855622d4901b1d0b7e1f454355bf749946a9ceb99bf15f3475537e6299f7813a55d31a74d86759d5e0b10f3d769b07dcd8aa243de6d72845

data/README.md

@@ -5,9 +5,9 @@ Displays time compactly.
 for example:
 
     # default locale
-    2014/1/2 # when other year.
-    1/2      # when same year.
-    8:16     # when same day.
+    2014/1/2 # on other year.
+    1/2      # on same year.
+    8:16     # on same day.
 
     # 日本語ロケール
     2014年1月2日 # 違う年の時
@@ -44,11 +44,20 @@ You can customize the format.
     # config/locales/en.yml:
     en:
       time_compact:
-        same_year:  '%{month}/%{day}'
-        same_month: '%{month}/%{day}'
-        same_day:   '%{hour}:%{min}'
-        same_hour:  '%{min} min'
-        other:      '%{year}/%{month}/%{day}'
+        same_year:  '%1m/%1d'
+        same_month: '%1m/%1d'
+        same_day:   '%1H:%M'
+        same_hour:  '%1M min'
+        other:      '%Y/%1m/%1d'
+
+    # config/locales/ja.yml:
+    ja:
+      time_compact:
+        same_year:  '%1m月%1d日'
+        same_month: '%1d日'
+        same_day:   '%1H時%1M分'
+        same_hour:  '%1M分'
+        other:      '%Y年%1m月%1d日'
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
+Rake::TestTask.new do |t|
+  t.pattern = 'test/test_*.rb'
+end
+
+task default: :test

data/lib/time_compact/version.rb

@@ -1,3 +1,3 @@
 module TimeCompact
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/time_compact.rb

@@ -1,63 +1,38 @@
 require_relative 'time_compact/version'
 require_relative 'time_compact/railtie' if defined? Rails
 require 'i18n'
+require 'yaml'
 
 module TimeCompact
+  LOCALE_DIR = File.expand_path('../../locale', __FILE__)
+
   def time_compact(time, now = Time.now)
-    locale_dir = File.expand_path('../../locale', __FILE__)
-    ::I18n.load_path += Dir[locale_dir + "/*.yml"]
+    I18n.enforce_available_locales = true
+    I18n.load_path += Dir[LOCALE_DIR + '/*.yml']
 
     if time.year == now.year
       if time.month == now.month
         if time.day == now.day
           if time.hour == now.hour
-            ::I18n.t(
-              'time_compact.same_hour',
-              year:  time.year,
-              month: time.month,
-              day:   time.day,
-              hour:  time.hour,
-              min:   time.min
-            )
+            time.strftime(fetch_locale('same_hour'))
           else
-            ::I18n.t(
-              'time_compact.same_day',
-              year:  time.year,
-              month: time.month,
-              day:   time.day,
-              hour:  time.hour,
-              min:   '%02d' % time.min
-            )
+            time.strftime(fetch_locale('same_day'))
           end
         else
-          ::I18n.t(
-            'time_compact.same_month',
-            year:  time.year,
-            month: time.month,
-            day:   time.day,
-            hour:  time.hour,
-            min:   '%02d' % time.min
-          )
+          time.strftime(fetch_locale('same_month'))
         end
       else
-        ::I18n.t(
-          'time_compact.same_year',
-          year:  time.year,
-          month: time.month,
-          day:   time.day,
-          hour:  time.hour,
-          min:   '%02d' % time.min
-        )
+        time.strftime(fetch_locale('same_year'))
       end
     else
-      ::I18n.t(
-        'time_compact.other',
-        year:  time.year,
-        month: time.month,
-        day:   time.day,
-        hour:  time.hour,
-        min:   '%02d' % time.min
-      )
+      time.strftime(fetch_locale('other'))
     end
   end
+
+  private
+
+  def fetch_locale(name)
+    yml = YAML.load_file("#{LOCALE_DIR}/#{I18n.locale}.yml")
+    yml[I18n.locale.to_s]['time_compact'][name]
+  end
 end

data/locale/en.yml

@@ -1,7 +1,7 @@
 en:
   time_compact:
-    same_year:  '%{month}/%{day}'
-    same_month: '%{month}/%{day}'
-    same_day:   '%{hour}:%{min}'
-    same_hour:  '%{min} min'
-    other:      '%{year}/%{month}/%{day}'
+    same_year:  '%1m/%1d'
+    same_month: '%1m/%1d'
+    same_day:   '%1H:%M'
+    same_hour:  '%1M min'
+    other:      '%Y/%1m/%1d'

data/locale/ja.yml

@@ -1,7 +1,7 @@
 ja:
   time_compact:
-    same_year:  '%{month}月%{day}日'
-    same_month: '%{day}日'
-    same_day:   '%{hour}時%{min}分'
-    same_hour:  '%{min}分'
-    other:      '%{year}年%{month}月%{day}日'
+    same_year:  '%1m月%1d日'
+    same_month: '%1d日'
+    same_day:   '%1H時%1M分'
+    same_hour:  '%1M分'
+    other:      '%Y年%1m月%1d日'

data/test/test_time_compact.rb

@@ -1,9 +1,11 @@
-require 'minitest/unit'
 require 'minitest/autorun'
+require 'minitest/unit'
 require_relative '../lib/time_compact'
 
-class TestTimeCompact < MiniTest::Unit::TestCase
+class TestTimeCompact < MiniTest::Test
   def setup
+    I18n.enforce_available_locales = true
+    I18n.available_locales = [:en, :ja]
     @object = Object.new
     @object.extend TimeCompact
   end
@@ -13,23 +15,23 @@ class TestTimeCompact < MiniTest::Unit::TestCase
     assert_equal '2014/1/1', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2015, 1, 1, 0, 0, 0)
-    )
+    ), 'defferent year'
     assert_equal '1/1', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 2, 1, 0, 0, 0)
-    )
+    ), 'same year'
     assert_equal '1/1', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 2, 0, 0, 0)
-    )
+    ), 'same month'
     assert_equal '0:00', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 1, 1, 0, 0)
-    )
+    ), 'same day'
     assert_equal '0 min', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 1, 0, 1, 0)
-    )
+    ), 'same hour'
   end
 
   def test_time_compact_ja
@@ -37,22 +39,22 @@ class TestTimeCompact < MiniTest::Unit::TestCase
     assert_equal '2014年1月1日', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2015, 1, 1, 0, 0, 0)
-    )
+    ), 'defferent year'
     assert_equal '1月1日', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 2, 1, 0, 0, 0)
-    )
+    ), 'same year'
     assert_equal '1日', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 2, 0, 0, 0)
-    )
-    assert_equal '0時00分', @object.time_compact(
+    ), 'same month'
+    assert_equal '0時0分', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 1, 1, 0, 0)
-    )
+    ), 'same day'
     assert_equal '0分', @object.time_compact(
       Time.new(2014, 1, 1, 0, 0, 0),
       Time.new(2014, 1, 1, 0, 1, 0)
-    )
+    ), 'same hour'
   end
 end

data/time_compact.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_compact
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Masaki Komagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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'
 description: Displays time compactly.
 email:
 - komagata@gmail.com