semantic_date_time_tags 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f48716ca3eedf2271ad9edc02f534a9b47960f
-  data.tar.gz: 8a093fb2ee1a6b816d73f3ac662f576521255494
+  metadata.gz: fe726c652f793a8dd9fe4544b1ce97c490f8e886
+  data.tar.gz: 0e7ea49f7fb2c6099f34f300b148d6c3131d38d1
 SHA512:
-  metadata.gz: afb9271d74b26ad21dc007bd8e833848f8c53de617742c3f770082dc873816681df2014f8e1ab4910873bad49a28822dadb48f2eac59bd026d9b006c72b8c756
-  data.tar.gz: fad5f7f0585f5c0b3741a7e4744f3b5633dc09c2a9d4402db4e5af4710951e9815e1bbf321d9e9542b0829ac17ff0b57e88a74d5cd610866a2f19ca604ff045f
+  metadata.gz: 710ddafcf1f2284cb34c1a8505ddca911dce078d28468e1b0c9849707ece8e879c62691d3d97a63fba1daca55043ba5fd672ea423074160cfd58614c6b3a3f6d
+  data.tar.gz: 37b06c8ec419ebef9a7742b4cd05646b00ea2cc28b0e15d582cb329fb28f1380adc56dfecd093ee321c00987e21df86ddf57a0e699df67989c6c5ea0df200981

data/.gitignore

@@ -12,6 +12,7 @@ rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
 config/secrets.yml
+.DS_Store
 
 ## Environment normalisation:
 /.bundle

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semantic_date_time_tags (0.0.9)
+    semantic_date_time_tags (0.0.10)
       rails (>= 3.0.0)
 
 GEM
@@ -44,26 +44,24 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     coderay (1.1.0)
-    coveralls (0.8.1)
+    coveralls (0.8.3)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    ffi (1.9.8)
+    ffi (1.9.10)
     formatador (0.2.5)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    guard (2.12.6)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -74,13 +72,11 @@ GEM
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
+    listen (3.0.3)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     loofah (2.0.3)
@@ -89,17 +85,17 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.2)
     nenv (0.2.0)
-    netrc (0.10.3)
+    netrc (0.11.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    notiffany (0.0.6)
+    notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -131,7 +127,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
@@ -145,8 +141,8 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.3.4)
-      rack (~> 1.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -155,9 +151,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timers (4.0.1)
-      hitimes
-    tins (1.5.4)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -175,3 +169,6 @@ DEPENDENCIES
   minitest
   rake
   semantic_date_time_tags!
+
+BUNDLED WITH
+   1.10.6

data/lib/semantic_date_time_tags/tag/date_range.rb

@@ -27,12 +27,18 @@ module SemanticDateTimeTags
         @date_from == @date_to
       end
 
+      def both_in_current_year?
+        return false if spans_years?
+        @date_from.year == ::Date.today.year
+      end
+
       # ---------------------------------------------------------------------
 
       def dom_classes
         res = []
         res << 'date_range'
         res << 'same_year' unless spans_years?
+        res << 'current_year' if both_in_current_year?
         res << 'same_month' unless spans_months?
         res << 'more_than_a_week' unless within_a_week?
         res << 'same_day' if one_day?

data/lib/semantic_date_time_tags/version.rb

@@ -1,3 +1,3 @@
 module SemanticDateTimeTags
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/semantic_date_time_tags/view_helpers_test.rb

@@ -4,10 +4,10 @@ require 'semantic_date_time_tags/view_helpers'
 describe SemanticDateTimeTags::ViewHelpers do
   include SemanticDateTimeTags::ViewHelpers
 
-  let(:time_object) { Time.now }
-  let(:date_object) { Date.today }
-  let(:date_tomorrow_object) { Date.tomorrow }
-  let(:date_time_object) { DateTime.now }
+  let(:time_object) { Time.parse('31/10/2015') }
+  let(:date_object) { Date.parse('31/10/2015') }
+  let(:date_tomorrow_object) { Date.parse('31/10/2015')+1.day }
+  let(:date_time_object) { DateTime.parse('31/10/2015') }
 
   # ---------------------------------------------------------------------
 
@@ -22,27 +22,27 @@ describe SemanticDateTimeTags::ViewHelpers do
     end
 
     it 'returns hours wrapped in a span tag' do
-      semantic_time_tag(time_object).must_match Regexp.new(".*?<span class=\"hours H\">#{time_object_hours}</span>.*?")
+      semantic_time_tag(time_object).must_match Regexp.new("<span.+?hours.+?H.+?>#{time_object_hours}</span>")
     end
 
     it 'returns minutes wrapped in a span tag' do
-      semantic_time_tag(time_object).must_match Regexp.new(".*?<span class=\"minutes M\">#{time_object_minutes}</span>.*?")
+      semantic_time_tag(time_object).must_match Regexp.new("<span.+?minutes.+?M.+?>#{time_object_minutes}</span>")
     end
 
     it 'wraps the whole thing in a time tag by default' do
-      semantic_time_tag(time_object).must_match Regexp.new("\\A<time.*?>.*?</time>\\z")
+      semantic_time_tag(time_object).must_match /\A<time.+?<\/time>\z/
     end
 
     it 'wraps the whole thing in a span tag if passed as argument' do
-      semantic_time_tag(time_object, :span).must_match Regexp.new("\\A<span.*?>.*?</span>\\z")
+      semantic_time_tag(time_object, :span).must_match /\A<span.+?<\/span>\z/
     end
 
     it 'adds whole_hour class if time is whole hour' do
-      semantic_time_tag(time_object_whole_hour).must_match Regexp.new("\\A<time.*? class=\".*?whole_hour.*?\">.*?</time>\\z")
+      semantic_time_tag(time_object_whole_hour).must_match /\A<time.+?whole_hour.+?<\/time>\z/
     end
 
     it 'adds whole_minute class if time is whole minute' do
-      semantic_time_tag(time_object_whole_minute).must_match Regexp.new("\\A<time.*? class=\".*?whole_minute.*?\">.*?</time>\\z")
+      semantic_time_tag(time_object_whole_minute).must_match /\A<time.+?whole_minute.+?<\/time>\z/
     end
 
     it 'allows to pass :format' do
@@ -56,39 +56,37 @@ describe SemanticDateTimeTags::ViewHelpers do
     let(:date_object_day) { date_object.strftime('%-d') }
     let(:date_object_month) { date_object.strftime('%-m') }
     let(:date_object_year) { date_object.year }
-    let(:date_object_yesterday) { Date.yesterday }
-    let(:date_object_last_year) { Date.civil( date_object.year-1, date_object.month, date_object.day ) }
 
     it 'should only work with a date or datetime object' do
       proc { semantic_date_tag(time_object) }.must_raise RuntimeError
     end
 
     it 'wraps everything in a time tag by default' do
-      semantic_date_tag(date_object).must_match Regexp.new("\\A<time.*?>.*?</time>\\z")
+      semantic_date_tag(date_object).must_match /\A<time.+?<\/time>\z/
     end
 
     it 'wraps everything in a span tag if passed as argument' do
-      semantic_date_tag(date_object, :span).must_match Regexp.new("\\A<span.*?>.*?</span>\\z")
+      semantic_date_tag(date_object, :span).must_match /\A<span.+?<\/span>\z/
     end
 
     it 'returns year, month and day wrapped in a span tags' do
-      semantic_date_tag(date_object).must_match Regexp.new(".*?<span class=\"year .*?\">#{date_object_year}</span>.*?")
-      semantic_date_tag(date_object).must_match Regexp.new(".*?<span class=\"month .*?\">#{date_object_month}</span>.*?")
-      semantic_date_tag(date_object).must_match Regexp.new(".*?<span class=\"day .*?\">#{date_object_day}</span>.*?")
+      semantic_date_tag(date_object).must_match Regexp.new("<span.+?year.+?>#{date_object_year}</span>")
+      semantic_date_tag(date_object).must_match Regexp.new("<span.+?month.+?>#{date_object_month}</span>")
+      semantic_date_tag(date_object).must_match Regexp.new("<span.+?day.+?>#{date_object_day}</span>")
     end
 
     it 'adds current_date class if date is today' do
-      semantic_date_tag(date_object).must_include "current_date"
-      semantic_date_tag(date_object_yesterday).wont_include "current_date"
+      semantic_date_tag(Date.today).must_include "current_date"
+      semantic_date_tag(Date.today-1.day).wont_include "current_date"
     end
 
     it 'adds current class to year span if date is this year' do
-      semantic_date_tag(date_object).must_include "current_year"
-      semantic_date_tag(date_object_last_year).wont_include "current_year"
+      semantic_date_tag(Date.today).must_include "current_year"
+      semantic_date_tag(Date.today-1.year).wont_include "current_year"
     end
 
     it 'allows to pass :format' do
-      semantic_date_tag(date_object, :time, format: :test).must_include '~'
+      semantic_date_tag(Date.today, :time, format: :test).must_include '~'
     end
   end
 
@@ -100,7 +98,7 @@ describe SemanticDateTimeTags::ViewHelpers do
     end
 
     it 'wraps the whole thing in a time tag' do
-      semantic_date_time_tag(date_time_object).must_match Regexp.new("\\A<time.*?>.*?</time>\\z")
+      semantic_date_time_tag(date_time_object).must_match /\A<time.+?<\/time>\z/
     end
 
     it 'allows to pass :format' do
@@ -112,7 +110,12 @@ describe SemanticDateTimeTags::ViewHelpers do
 
   describe '#semantic_date_range_tag' do
     it 'returns the from date wrapped correctly' do
-      semantic_date_range_tag(date_object, date_tomorrow_object).must_match Regexp.new("<time class=\"semantic date current_date current_year from\".*?>.*?</time>")
+      semantic_date_range_tag(date_object, date_tomorrow_object).must_match /<time.+?semantic.+?date.+?from.+?>/
+    end
+
+    it 'adds same_year and current_year class to wrapping span' do
+      semantic_date_range_tag(date_object, date_tomorrow_object).must_match /<time.+?date_range.+?current_year.+?>/
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_date_time_tags
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails