semantic_date_time_tags 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd779a26b39abb5e57b3ee76930c189d9d9e4e4c
-  data.tar.gz: 4319fc74b0cd79f290f4693a67c91f99543a8019
+  metadata.gz: fb0316eee2d0502118793403d13455ac95df6d4f
+  data.tar.gz: c57428b1211df6fc793f41e128af35e41c317c45
 SHA512:
-  metadata.gz: d466220153da01be35c987bd981fa5610656b662188f92c0cc3c0d3941f8fcf23bae5e50f546432e848ba639db30ffaa1a572cee8ff194f0256eddcc4a394a88
-  data.tar.gz: 7887bb40ffb2e659257b255c8eeaec1396f5345c58ac86a4e46d8e3973f83bb518cbe69259ba5cf36db9e0bfcc8deb7072a21b9011887ebf23635655b8f0ca8b
+  metadata.gz: d8e01cc7bd515255cd49e7aba68401eb07faa69200c64269cf88834a271e60a5d6edea6a7c9d3aec4d7178a2a9c785d61c4082f92277a673647a88bed1387eae
+  data.tar.gz: b59754e7a9f8174a7903fa37d76e9248d6d8d14ba77a0413e526dc23a04dd43fb5b3c715ca263a2d332f6c5b7e63db237051a4e2badc6d142eae22e02ebd6162

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semantic_date_time_tags (0.1.4)
+    semantic_date_time_tags (0.1.5)
       rails (>= 3.0.0)
 
 GEM
@@ -76,7 +76,7 @@ GEM
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
-    listen (3.0.3)
+    listen (3.0.4)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.3)

data/lib/semantic_date_time_tags/format_parser.rb

@@ -41,7 +41,7 @@ module SemanticDateTimeTags
       when /%-?[aAdej]/ then ['day', comp[/\w/]]
       when /%-?[HKIl]/ then ['hours', comp[/\w/]]
       when /%-?[M]/ then ['minutes', comp[/\w/]]
-      when /%-?[p]/ then ['ampm', comp[/\w/]]
+      when /%-?[pP]/ then ['ampm', comp[/\w/]]
       when /\W+/ then ['sep']
       end
     end

data/lib/semantic_date_time_tags/tag/date_range.rb

@@ -40,6 +40,12 @@ module SemanticDateTimeTags
         date_from.year == ::Date.today.year
       end
 
+      def same_meridian?
+        return false unless same_day?
+        (date_from.to_time.hour < 12 && date_to.to_time.hour < 12) ||
+        (date_from.to_time.hour >= 12 && date_to.to_time.hour >= 12)
+      end
+
       # ---------------------------------------------------------------------
 
       def dom_classes
@@ -51,6 +57,7 @@ module SemanticDateTimeTags
         res << 'more_than_a_week' unless within_a_week?
         res << 'same_day' if same_day?
         res << 'same_time' if same_time?
+        res << 'same_meridian' if same_meridian?
         res
       end
 

data/lib/semantic_date_time_tags/tag.rb

@@ -29,6 +29,7 @@ module SemanticDateTimeTags
     def dom_classes
       [
         'semantic',
+        am_pm_class,
         type_class,
         current_date_class,
         current_year_class,
@@ -74,6 +75,14 @@ module SemanticDateTimeTags
       'midnight' if obj == obj.midnight
     end
 
+    def am_pm_class
+      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      case
+      when (0..11).include?(obj.hour) then 'am'
+      else 'pm'
+      end
+    end
+
     # ---------------------------------------------------------------------
 
     def dom_data

data/lib/semantic_date_time_tags/version.rb

@@ -1,3 +1,3 @@
 module SemanticDateTimeTags
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/semantic_date_time_tags/format_parser_test.rb

@@ -52,5 +52,14 @@ describe SemanticDateTimeTags::FormatParser do
         to_html.must_equal '<span class="day A">Saturday</span><span class="sep"> </span><span class="day d">12</span><span class="sep"> / </span><span class="month m">12</span><span class="sep"> / </span><span class="year Y">2014</span>'
       end
     end
+
+    describe '%-l:%M %P' do
+      let(:format) { '%-l:%M %P' }
+      let(:string) { '12:30 am' }
+
+      it 'marks up the am/pm' do
+        to_html.must_include '<span class="ampm P">'
+      end
+    end
   end
 end

data/test/semantic_date_time_tags/view_helpers_test.rb

@@ -17,6 +17,8 @@ describe SemanticDateTimeTags::ViewHelpers do
     let(:time_object_noon) { Time.new(2015, 11, 3, 12, 00) }
     let(:time_object_whole_hour) { Time.new(2014, 8, 21, 15) }
     let(:time_object_whole_minute) { Time.new(2014, 8, 21, 15, 30) }
+    let(:time_object_before_noon) { Time.new(2014, 8, 21, 11, 00) }
+    let(:time_object_after_noon) { Time.new(2014, 8, 21, 12, 01) }
 
 
     it 'does not work with a date object' do
@@ -59,6 +61,14 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_time_tag(time_object_midnight).must_match /\A<time.+?midnight.+?<\/time>\z/
     end
 
+    it 'adds am class if time is before noon' do
+      semantic_time_tag(time_object_before_noon).must_match /\A<time.+?am.+?<\/time>\z/
+    end
+
+    it 'adds pm class if time is after noon' do
+      semantic_time_tag(time_object_after_noon).must_match /\A<time.+?pm.+?<\/time>\z/
+    end
+
 
     it 'adds noon as data-in-words if time is noon' do
       semantic_time_tag(time_object_noon).must_match /\A<time.+?data-in-words=\"noon\".+?<\/time>\z/
@@ -153,6 +163,8 @@ describe SemanticDateTimeTags::ViewHelpers do
     let(:date_time_object_from) { DateTime.parse('31/10/2015') }
     let(:date_time_object_to) { DateTime.parse('11/11/2015') }
 
+    let(:date_time_object_from_morning) { DateTime.parse('7/11/2015 8:00') }
+
     it 'returns the from date wrapped correctly' do
       semantic_date_range_tag(date_object, date_tomorrow_object).must_match /<time.+?semantic.+?date.+?from.+?>.+?<time.+?semantic.+?date.+?to.+?>/
     end
@@ -169,6 +181,10 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_date_range_tag(date_time_object_from, date_time_object_from).must_match /\A<span.+?date_range.+?same_day.+?same_time.+?>/
     end
 
+    it 'adds am to wrapping span if both times in morning' do
+      semantic_date_range_tag(date_time_object_from_morning, date_time_object_from_morning+1.hour).must_match /\A<span.+?date_range.+?same_meridian.+?>/
+    end
+
     it 'accepts datetime objects' do
       semantic_date_range_tag(date_time_object_from, date_time_object_to).must_match /<time.+?from.+?<\/time>/
       semantic_date_range_tag(date_time_object_from, date_time_object_to).must_match /<time.+?to.+?<\/time>/
@@ -178,6 +194,7 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_date_time_range_tag(date_object, date_tomorrow_object).must_match /<time.+?semantic.+?date.+?from.+?>/
     end
 
+
     it 'allows to pass :format' do
       semantic_date_time_range_tag(date_object, date_tomorrow_object, format: :test).must_include '~'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semantic_date_time_tags
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tomas Celizna