date_range_formatter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e002e59aee2911d9192d69da6ed4ab83f1091538
-  data.tar.gz: fb8a825c58f5ea82b846fab2fabb4ef334bf4120
+  metadata.gz: 519b570cbd7197b36603406f38ba039b399a7442
+  data.tar.gz: f60d00bd1dd302db894fe7b06e863245fee4d68a
 SHA512:
-  metadata.gz: 46c3ed5474248d53be8ea36c90b90a71e21632e4361420d89f64e6bbdb8b54a2bf2a2266af107787cfaa4a2ef5b457261a6e78152533e54fea393b7dbf2a7851
-  data.tar.gz: a98d262d8a491a608e4eee483bff1ca7ba746618e2b0bc8e8dae05cc41b01ed90901080842cbd387f20d058d889d30a8aa1ef678c4cc121b2a1a05fdfc5cb4c5
+  metadata.gz: ba44e05668dd36eb52626b0730b7af0335f7d2161f88b681ed1b05c97939ed33cce7b018c40afae7a79d16df07a1f604f497dc8f4c9d9ca896ae69b24c1308b5
+  data.tar.gz: 6ebef3db359d7f83c276367d169dda15b89e02f9583d23ace0b346b287470f46979d35fd333e5fb5c0e5ca55a9380d18ca27dbf644d03fa2a8b7368a70474e1f

data/.travis.yml

@@ -1,3 +1,5 @@
 language: ruby
 rvm:
   - 2.1.0
+env:
+  - CODECLIMATE_REPO_TOKEN=95b13d8f15b2fe39396c52ffb4fac3e97213505251ad2caff7fcfc7135521fcd

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'codeclimate-test-reporter', require: false
 # Specify your gem's dependencies in date_range_formatter.gemspec
 gemspec

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/darkleaf/date_range_formatter.svg?branch=master)](https://travis-ci.org/darkleaf/date_range_formatter)
 [![Gem Version](https://badge.fury.io/rb/date_range_formatter.svg)](http://badge.fury.io/rb/date_range_formatter)
+[![Code Climate](https://codeclimate.com/github/darkleaf/date_range_formatter.png)](https://codeclimate.com/github/darkleaf/date_range_formatter)
 [![Build Status](https://drone.io/github.com/darkleaf/date_range_formatter/status.png)](https://drone.io/github.com/darkleaf/date_range_formatter/latest)
 
 This gem makes working with dates more pretty. It works well with Ruby application and most frameworks like  [Ruby on Rails](https://github.com/rails/rails "Ruby on Rails").
@@ -19,25 +20,16 @@ Imagine the situation when you need to show dates of some stuff at your website.
     2 January 2015
     15 July 2016 - 13 February 2017
 
-To show this dates in this format you need to describe the format of displaying dates like 'default' in your locale file:
-
-```yaml
-en:
-  date_range:
-    default: # it's the 'format'
-      separator: " - " # added ' - ' symbol to the date ranges
-      month: "%B"
-      year: "%Y"
-      same_months: "%{from_day}-%{until_day} %{month} %{year}"
-      same_years: "%{from_day} %{from_month} - %{until_day} %{until_month} %{year}"
-```
-
 After that you should call the module DateRangeFormatter with arguments wchich describes the range of dates and format to display. For example, we have date_beginning, date_ending and format by default:
 
 ```ruby
 DateRangeFormatter.format('2013-01-14', '2013-02-15')
 #=> '14 January - 15 February 2013'
+```
 
+Also you can use `format_range` method and enumerable object:
+
+```ruby
 DateRangeFormatter.format_range(['2013-02-20', '2013-01-14', '2013-01-15'])
 #=> '14 January - 20 February 2013'
 ```
@@ -50,7 +42,15 @@ date_ending = Date.new(2014, 02, 15)
 date_range_str = DateRangeFormatter.format(date_beginning, date_ending, 'short')
 ```
 
-That's all. Enjoy yout profit!
+If you want to show hours, you can call it:
+```ruby
+DateRangeFormatter.format('10:00 2013-01-14', '20:00 2013-01-14', :with_time)
+#=> '14 January 2013, 10am - 08pm'
+```
+
+See [predefined formats](https://github.com/darkleaf/date_range_formatter/blob/master/lib/locale/en.yml). Also you can override this formats or add your own.
+
+That's all. Enjoy your profit!
 
 ## Other
 

data/lib/date_range_formatter.rb

@@ -12,7 +12,7 @@ module DateRangeFormatter
 
     def format_range(enumerable_range, format = :default)
       return if enumerable_range.none?
-      sorted_range = enumerable_range.map(&:to_date).sort
+      sorted_range = enumerable_range.map(&:to_datetime).sort
       date_beginning = sorted_range.first
       date_ending = sorted_range.last
 
@@ -31,14 +31,15 @@ module DateRangeFormatter
     end
 
     def to_s
+      return I18n.t 'same_hours', same_hours_data.merge(scope: ['date_range', format]) if same_hours?
       return I18n.t 'same_days', same_days_data.merge(scope: ['date_range', format]) if same_days?
       return I18n.t 'same_months', same_months_data.merge(scope: ['date_range', format]) if same_months?
       return I18n.t 'same_years', same_years_data.merge(scope: ['date_range', format]) if same_years?
+      I18n.t 'different_components', different_components_data.merge(scope: ['date_range', format])
+    end
 
-      from_str = I18n.l from_date, format:  format
-      until_str = I18n.l until_date, format: format
-      separator = I18n.t "separator", scope: ["date_range", format]
-      [from_str, separator, until_str].join
+    def same_hours?
+      same_days? && from_date.hour == until_date.hour
     end
 
     def same_days?
@@ -54,8 +55,19 @@ module DateRangeFormatter
     end
 
     private
+    def same_hours_data
+      {
+          hour: formatted_hour(from_date),
+          day: from_date.day,
+          month: formatted_month(from_date),
+          year: formatted_year(from_date),
+      }
+    end
+
     def same_days_data
       {
+          from_hour: formatted_hour(from_date),
+          until_hour: formatted_hour(until_date),
           day: from_date.day,
           month: formatted_month(from_date),
           year: formatted_year(from_date),
@@ -81,6 +93,22 @@ module DateRangeFormatter
       }
     end
 
+    def different_components_data
+      {
+        from_day: from_date.day,
+        until_day: until_date.day,
+        from_month: formatted_month(from_date),
+        until_month: formatted_month(until_date),
+        from_year: formatted_year(from_date),
+        until_year: formatted_year(until_date),
+      }
+    end
+
+    def formatted_hour(date)
+      format_str = I18n.t "hour", scope: ["date_range", format]
+      I18n.l date, format: format_str
+    end
+
     def formatted_month(date)
       format_str = I18n.t "month", scope: ["date_range", format]
       I18n.l date, format: format_str

data/lib/date_range_formatter/version.rb

@@ -1,3 +1,3 @@
 module DateRangeFormatter
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/locale/en.yml

@@ -1,9 +1,20 @@
 en:
   date_range:
     default:
-      separator: " - "
       month: "%B"
       year: "%Y"
+      same_hours: "%{day} %{month} %{year}"
       same_days: "%{day} %{month} %{year}"
       same_months: "%{from_day}-%{until_day} %{month} %{year}"
       same_years: "%{from_day} %{from_month} - %{until_day} %{until_month} %{year}"
+      different_components: "%{from_day} %{from_month} %{from_year} - %{until_day} %{until_month} %{until_year}"
+
+    with_time:
+      hour: "%I%P"
+      month: "%B"
+      year: "%Y"
+      same_hours: "%{day} %{month} %{year}, %{hour}"
+      same_days: "%{day} %{month} %{year}, %{from_hour} - %{until_hour}"
+      same_months: "%{from_day}-%{until_day} %{month} %{year}"
+      same_years: "%{from_day} %{from_month} - %{until_day} %{until_month} %{year}"
+      different_components: "%{from_day} %{from_month} %{from_year} - %{until_day} %{until_month} %{until_year}"

data/test/lib/date_range_formatter_test.rb

@@ -31,7 +31,19 @@ class DateRangeFormatterTest < TestHelper
     date_ending = Date.new(2014, 02, 15)
     date_range_str = DateRangeFormatter.format(date_beginning, date_ending)
 
-    assert_equal '2013-01-14 - 2014-02-15', date_range_str
+    assert_equal '14 January 2013 - 15 February 2014', date_range_str
+  end
+
+  def test_same_hours_with_time_format
+    date_range_str = DateRangeFormatter.format('10:00 2013-01-14', '10:00 2013-01-14', :with_time)
+
+    assert_equal '14 January 2013, 10am', date_range_str
+  end
+
+  def test_same_days_with_time_format
+    date_range_str = DateRangeFormatter.format('10:00 2013-01-14', '20:00 2013-01-14', :with_time)
+
+    assert_equal '14 January 2013, 10am - 08pm', date_range_str
   end
 end
 

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'bundler/setup'
 require 'minitest/unit'
 require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_range_formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mikhail Kuzmin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport