semantic_date_time_tags 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d8c43c5c3d623cffd10a337fdd6d698e2c276a9
-  data.tar.gz: 5aea0fa3d4bcc94e434c680ec77fdaa07999861d
+  metadata.gz: 770b668d9784919dbff28f3cebadf264fdd83ef9
+  data.tar.gz: d2c46bb284fbf9977312c5724e366249d7939f62
 SHA512:
-  metadata.gz: 9f22369991e84e0035da428d6cbfa6bd703c1f03a8874472e13f125578f30f36f6b0f13515eb6958f35c5a008f824b312422413316b68bcf2cf1bb86a11cb85a
-  data.tar.gz: b9307018d8de01c8e1a41866fa6acf21e72e2cecf37e6fa5c07b3c4c852a536517ed9d602bd753184828ba4ce2ec2fdd00358d423ed31099ce2eba41c50e8fb5
+  metadata.gz: 6287afc303c9d24a4b84e1c1525ce503025c1f88482fe3ae50ab7b798e61537b15a6580737d926e079ca3be9873906c0bfdb0765806cc13dc2de5c68e429017f
+  data.tar.gz: 3c3bf57fe98ac100da20c24c5e5dfe297932658f9d7e4c101293f87adfa06c21ed239e37d32dd3a77d7b2a257c86d42b3418e83b170452badc45e841abfc8344

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 cache: bundler
 script: 'bundle exec rake'
+sudo: false
 rvm:
   - 2.1.2
 
@@ -9,4 +10,4 @@ notifications:
     recipients:
       - tomas.celizna@gmail.com
     on_failure: change
-    on_success: never
+    on_success: never

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    semantic_date_time_tags (0.1.7)
+    semantic_date_time_tags (0.1.8)
       rails (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -45,6 +45,7 @@ GEM
     arel (6.0.3)
     builder (3.2.2)
     coderay (1.1.0)
+    concurrent-ruby (1.0.1)
     coveralls (0.8.3)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -86,12 +87,12 @@ GEM
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.8.2)
     nenv (0.2.0)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -102,16 +103,16 @@ GEM
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -119,11 +120,11 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -141,12 +142,13 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.4.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -171,4 +173,4 @@ DEPENDENCIES
   semantic_date_time_tags!
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/README.md

@@ -59,8 +59,16 @@ $ gem install semantic_date_time_tags
 ```
 
 If you want to use the default css you can include it like this:
+```css
+/*
+ *= require 'semantic_date_time_tags/default'
+ */
 ```
-*= require 'semantic_date_time_tags'
+
+Or if you like to use some of the mixins, import them like this:
+
+```scss
+@import "semantic_date_time_tags/partials/mixins";
 ```
 
 ## Usage

data/lib/assets/stylesheets/semantic_date_time_tags/default.scss

@@ -0,0 +1,7 @@
+@import 'partials/mixins';
+
+span.date_range {
+  @include date-range-same-year;
+  @include date-range-same-year-same-month;
+  @include date-range-same-day;
+}

data/lib/assets/stylesheets/semantic_date_time_tags/partials/_mixins.scss

@@ -0,0 +1 @@
+@import 'mixins/*';

data/lib/assets/stylesheets/semantic_date_time_tags/partials/mixins/_date_range.scss

@@ -0,0 +1,49 @@
+/* hides first year of date range if same year */
+@mixin date-range-same-year {
+  &.same_year {
+    time.date.from {
+      span.year {
+        display: none;
+      }
+    }
+  }
+}
+
+
+/* hides first month of date range if same month */
+@mixin date-range-same-year-same-month {
+  &.same_year.same_month {
+    time.date.from {
+      span.month {
+        display: none;
+      }
+      span.month + span.sep {
+        display: none;
+      }
+    }
+  }
+}
+
+
+/* hides time from and date range seperator if same day */
+@mixin date-range-same-day {
+  &.same_day {
+    time.date.from,
+    span.date_range_separator {
+      display: none;
+    }
+  }
+}
+
+
+/* hides first am/pm if same meridian */
+@mixin date-range-same-meridian {
+  &.same_meridian {
+    time.from {
+      span.minutes + span.sep,
+      span.minutes + span.sep + span.ampm {
+        display: none;
+      }
+    }
+  }
+}

data/lib/assets/stylesheets/semantic_date_time_tags/partials/mixins/_date_time.scss

@@ -0,0 +1,20 @@
+/* hides minutes if whole hour */
+@mixin date-time-whole-hour {
+  &.whole_hour {
+    span.minutes,
+    span.minutes + span.sep {
+      display: none;
+    }
+  }
+}
+
+
+/* hides seconds if whole minutes */
+@mixin date-time-whole-minute {
+  &.whole_minute {
+    span.seconds,
+    span.seconds + span.sep {
+      display: none;
+    }
+  }
+}

data/lib/assets/stylesheets/semantic_date_time_tags.css

@@ -0,0 +1,4 @@
+/*
+ *= require_tree .
+ *= require_self
+*/

data/lib/semantic_date_time_tags/format_parser.rb

@@ -2,7 +2,6 @@ require 'action_view'
 
 module SemanticDateTimeTags
   class FormatParser < Struct.new :format, :str
-
     include ActionView::Helpers::TagHelper
 
     def to_html
@@ -23,18 +22,18 @@ module SemanticDateTimeTags
       format.scan /(%-?\w|.+?(?=%))/
     end
 
-    def get_tag_for_match match, comp
+    def get_tag_for_match(match, comp)
       content_tag :span, match, class: get_classes_for_component(comp)
     end
 
-    def get_regexp_for_component comp
+    def get_regexp_for_component(comp)
       case
-      when comp =~ /%-?\w/ then "(\\w+)"
+      when comp =~ /%-?\w/ then '(\\w+)'
       else "(#{comp})"
       end
     end
 
-    def get_classes_for_component comp
+    def get_classes_for_component(comp)
       case comp
       when /%-?[YCy]/ then ['year', comp[/\w/]]
       when /%-?[mBbh]/ then ['month', comp[/\w/]]
@@ -45,6 +44,5 @@ module SemanticDateTimeTags
       when /\W+/ then ['sep']
       end
     end
-
   end
 end

data/lib/semantic_date_time_tags/tag/date.rb

@@ -3,8 +3,7 @@ require_relative '../format_parser'
 module SemanticDateTimeTags
   class Tag
     class Date < Tag
-
-      def initialize obj, options={}
+      def initialize(obj, options = {})
         raise 'object must be Date or DateTime' unless [::Date, ::DateTime].any? { |c| obj.instance_of? c }
         super(obj, options)
       end
@@ -29,7 +28,6 @@ module SemanticDateTimeTags
       def scope
         'date.formats'
       end
-
     end
   end
 end

data/lib/semantic_date_time_tags/tag/date_range.rb

@@ -1,12 +1,11 @@
 module SemanticDateTimeTags
   class Tag
     class DateRange < Tag
-
       attr_accessor :date_from
       attr_accessor :date_to
       attr_accessor :options
 
-      def initialize date_from, date_to=nil, options={}
+      def initialize(date_from, date_to = nil, options = {})
         @date_from = date_from
         @date_to = date_to
         @options = options
@@ -43,7 +42,7 @@ module SemanticDateTimeTags
       def same_meridian?
         return false unless same_day?
         (date_from.to_datetime.hour < 12 && date_to.to_datetime.hour < 12) ||
-        (date_from.to_datetime.hour >= 12 && date_to.to_datetime.hour >= 12)
+          (date_from.to_datetime.hour >= 12 && date_to.to_datetime.hour >= 12)
       end
 
       # ---------------------------------------------------------------------
@@ -65,18 +64,18 @@ module SemanticDateTimeTags
 
       def to_html
         from = case date_from
-        when ::DateTime then SemanticDateTimeTags::Tag::DateTime.new(date_from, options.merge(class: 'from')).to_html
-        when ::Date then SemanticDateTimeTags::Tag::Date.new(date_from.to_date, options.merge(class: 'from')).to_html
+               when ::DateTime then SemanticDateTimeTags::Tag::DateTime.new(date_from, options.merge(class: 'from')).to_html
+               when ::Date then SemanticDateTimeTags::Tag::Date.new(date_from.to_date, options.merge(class: 'from')).to_html
         end
 
         sep = content_tag(:span, separator, class: 'date_range_separator')
 
         to = case date_to
-        when ::DateTime then SemanticDateTimeTags::Tag::DateTime.new(date_to, options.merge(class: 'to')).to_html
-        when ::Date then SemanticDateTimeTags::Tag::Date.new(date_to.to_date, options.merge(class: 'to')).to_html
+             when ::DateTime then SemanticDateTimeTags::Tag::DateTime.new(date_to, options.merge(class: 'to')).to_html
+             when ::Date then SemanticDateTimeTags::Tag::Date.new(date_to.to_date, options.merge(class: 'to')).to_html
         end
 
-        content_tag(:span, class: dom_classes) { [ from, sep, to ].join.html_safe }.html_safe
+        content_tag(:span, class: dom_classes) { [from, sep, to].join.html_safe }.html_safe
       end
 
       private # =============================================================
@@ -84,7 +83,6 @@ module SemanticDateTimeTags
       def separator
         options.fetch(:separator, ' – ')
       end
-
     end
   end
 end

data/lib/semantic_date_time_tags/tag/date_time.rb

@@ -3,8 +3,7 @@ require_relative '../format_parser'
 module SemanticDateTimeTags
   class Tag
     class DateTime < Tag
-
-      def initialize obj, options={}
+      def initialize(obj, options = {})
         raise 'object must be DateTime' unless obj.instance_of?(::DateTime)
         super(obj, options)
       end
@@ -32,9 +31,8 @@ module SemanticDateTimeTags
       end
 
       def localized_obj
-        obj.strftime I18n.t( format, scope: scope, locale: I18n.locale )
+        obj.strftime I18n.t(format, scope: scope, locale: I18n.locale)
       end
-
     end
   end
 end

data/lib/semantic_date_time_tags/tag/time.rb

@@ -3,8 +3,7 @@ require_relative '../format_parser'
 module SemanticDateTimeTags
   class Tag
     class Time < Tag
-
-      def initialize obj, options={}
+      def initialize(obj, options = {})
         raise 'object must be Time' unless obj.instance_of?(::Time)
         super(obj, options)
       end
@@ -30,7 +29,6 @@ module SemanticDateTimeTags
       def scope
         'time.formats'
       end
-
     end
   end
 end

data/lib/semantic_date_time_tags/tag.rb

@@ -3,7 +3,6 @@ require 'i18n'
 
 module SemanticDateTimeTags
   class Tag
-
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::TagHelper
 
@@ -13,9 +12,9 @@ module SemanticDateTimeTags
 
     # =====================================================================
 
-    def initialize obj, options={}
+    def initialize(obj, options = {})
       @obj = obj
-      @options = options.tap{ |opts| opts.delete(:scope) }
+      @options = options.tap { |opts| opts.delete(:scope) }
     end
 
     # ---------------------------------------------------------------------
@@ -46,39 +45,39 @@ module SemanticDateTimeTags
     end
 
     def current_date_class
-      return unless [::Date,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Date, ::DateTime].any? { |c| obj.instance_of? c }
       'current_date' if obj.today?
     end
 
     def current_year_class
-      return unless [::Date,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Date, ::DateTime].any? { |c| obj.instance_of? c }
       'current_year' if obj.year == ::Date.today.year
     end
 
     def whole_hour_class
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       'whole_hour' unless obj.min > 0
     end
 
     def whole_minute_class
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       'whole_minute' unless obj.sec > 0
     end
 
     def noon_class
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       'noon' if obj == obj.noon
     end
 
     def midnight_class
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       'midnight' if obj == obj.midnight
     end
 
     def am_pm_class
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       case
-      when (0..11).include?(obj.hour) then 'am'
+      when (0..11).cover?(obj.hour) then 'am'
       else 'pm'
       end
     end
@@ -114,20 +113,19 @@ module SemanticDateTimeTags
     # ---------------------------------------------------------------------
 
     def in_words
-      [ noon_in_words, midnight_in_words ].reject(&:blank?).join(' ')
+      [noon_in_words, midnight_in_words].reject(&:blank?).join(' ')
     end
 
     def noon_in_words
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       return unless obj == obj.noon
       I18n.t :noon, scope: %i(time in_words)
     end
 
     def midnight_in_words
-      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      return unless [::Time, ::DateTime].any? { |c| obj.instance_of? c }
       return unless obj == obj.midnight
       I18n.t :midnight, scope: %i(time in_words)
     end
-
   end
 end

data/lib/semantic_date_time_tags/version.rb

@@ -1,3 +1,3 @@
 module SemanticDateTimeTags
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/semantic_date_time_tags/view_helpers.rb

@@ -8,8 +8,7 @@ require_relative 'tag/time'
 
 module SemanticDateTimeTags
   module ViewHelpers
-
-    def self.included klass
+    def self.included(klass)
       klass.class_eval do
         include ActionView::Context
       end
@@ -18,25 +17,24 @@ module SemanticDateTimeTags
     # =====================================================================
 
     # accepts datetime and date
-    def semantic_date_range_tag date_from, date_to, options={}
+    def semantic_date_range_tag(date_from, date_to, options = {})
       SemanticDateTimeTags::Tag::DateRange.new(date_from, date_to, options).to_html
     end
-    alias_method :semantic_date_time_range_tag, :semantic_date_range_tag
+    alias semantic_date_time_range_tag semantic_date_range_tag
 
     # accepts only datetime
-    def semantic_date_time_tag date_time, options={}
+    def semantic_date_time_tag(date_time, options = {})
       SemanticDateTimeTags::Tag::DateTime.new(date_time, options).to_html
     end
 
     # accepts datetime and date
-    def semantic_date_tag date, options={}
+    def semantic_date_tag(date, options = {})
       SemanticDateTimeTags::Tag::Date.new(date, options).to_html
     end
 
     # accepts datetime and time
-    def semantic_time_tag time, options={}
+    def semantic_time_tag(time, options = {})
       SemanticDateTimeTags::Tag::Time.new(time, options).to_html
     end
-
   end
 end

data/lib/semantic_date_time_tags.rb

@@ -3,4 +3,4 @@ require "semantic_date_time_tags/railtie" if defined?(Rails)
 require "semantic_date_time_tags/engine"
 require "semantic_date_time_tags/version"
 
-I18n.load_path += Dir.glob(File.join( File.dirname(__FILE__), 'config', 'locales', '*.yml' ))
+I18n.load_path += Dir.glob(File.join( File.dirname(__FILE__), 'config', 'locales', '*.yml' ))

data/test/semantic_date_time_tags/view_helpers_test.rb

@@ -4,28 +4,26 @@ require 'semantic_date_time_tags/view_helpers'
 describe SemanticDateTimeTags::ViewHelpers do
   include SemanticDateTimeTags::ViewHelpers
 
-  let(:date_object) { Date.parse('31/10/2015') }
-  let(:date_tomorrow_object) { Date.parse('31/10/2015')+1.day }
-  let(:time_object) { Time.parse('31/10/2015') }
+  let(:date_object) { Date.parse("31/10/#{Date.today.year}") }
+  let(:date_tomorrow_object) { Date.parse("31/10/#{Date.today.year}") + 1.day }
+  let(:time_object) { Time.parse("31/10/#{Date.today.year}") }
 
   # ---------------------------------------------------------------------
 
   describe '#semantic_time_tag' do
     let(:time_object_hours) { time_object.strftime('%H') }
-    let(:time_object_midnight) { Time.new(2015, 11, 3, 24, 00) }
+    let(:time_object_midnight) { Time.new(Date.today.year, 11, 3, 24, 00) }
     let(:time_object_minutes) { time_object.strftime('%M') }
-    let(:time_object_noon) { Time.new(2015, 11, 3, 12, 00) }
+    let(:time_object_noon) { Time.new(Date.today.year, 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
       proc { semantic_time_tag(date_object) }.must_raise RuntimeError
     end
 
-
     it 'returns hours wrapped in a span tag' do
       semantic_time_tag(time_object).must_match Regexp.new("<span.+?hours.+?H.+?>#{time_object_hours}</span>")
     end
@@ -34,16 +32,14 @@ describe SemanticDateTimeTags::ViewHelpers do
       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 /\A<time.+?<\/time>\z/
     end
 
     it 'wraps the whole thing in a span tag if passed as argument' do
-      semantic_time_tag(time_object, { tag_name: :span }).must_match /\A<span.+?<\/span>\z/
+      semantic_time_tag(time_object, tag_name: :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 /\A<time.+?whole_hour.+?<\/time>\z/
     end
@@ -52,7 +48,6 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_time_tag(time_object_whole_minute).must_match /\A<time.+?whole_minute.+?<\/time>\z/
     end
 
-
     it 'adds noon class if time is noon' do
       semantic_time_tag(time_object_noon).must_match /\A<time.+?noon.+?<\/time>\z/
     end
@@ -69,7 +64,6 @@ describe SemanticDateTimeTags::ViewHelpers 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/
     end
@@ -78,7 +72,6 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_time_tag(time_object_midnight).must_match /\A<time.+?data-in-words=\"midnight\".+?<\/time>\z/
     end
 
-
     it 'allows to pass :format' do
       semantic_time_tag(time_object, format: :test).must_include '~'
     end
@@ -91,39 +84,34 @@ describe SemanticDateTimeTags::ViewHelpers do
     let(:date_object_month) { date_object.strftime('%-m') }
     let(:date_object_year) { date_object.year }
 
-
     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 /\A<time.+?<\/time>\z/
     end
 
     it 'wraps everything in a span tag if passed as argument' do
-      semantic_date_tag(date_object, { tag_name: :span }).must_match /\A<span.+?<\/span>\z/
+      semantic_date_tag(date_object, tag_name: :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.+?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.today).must_include "current_date"
-      semantic_date_tag(Date.today-1.day).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.today).must_include "current_year"
-      semantic_date_tag(Date.today-1.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.today, format: :test).must_include '~'
     end
@@ -132,9 +120,9 @@ describe SemanticDateTimeTags::ViewHelpers do
   # ---------------------------------------------------------------------
 
   describe '#semantic_date_time_tag' do
-    let(:date_time_object) { DateTime.parse('31/10/2015') }
-    let(:date_time_object_noon) { DateTime.parse('31/10/2015').noon }
-    let(:date_time_object_midnight) { DateTime.parse('31/10/2015').midnight }
+    let(:date_time_object) { DateTime.parse("31/10/#{Date.today.year}") }
+    let(:date_time_object_noon) { DateTime.parse("31/10/#{Date.today.year}").noon }
+    let(:date_time_object_midnight) { DateTime.parse("31/10/#{Date.today.year}").midnight }
 
     it 'only works with a time or date_time object' do
       proc { semantic_date_time_tag(time_object) }.must_raise RuntimeError
@@ -160,11 +148,11 @@ describe SemanticDateTimeTags::ViewHelpers do
   # ---------------------------------------------------------------------
 
   describe '#semantic_date_range_tag' 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) { DateTime.parse("31/10/#{Date.today.year}") }
+    let(:date_time_object_to) { DateTime.parse("11/11/#{Date.today.year}") }
 
-    let(:date_time_object_from_morning) { DateTime.parse('14/11/2015 11:00') }
-    let(:date_time_object_to_afternoon) { DateTime.parse('14/11/2015 15:00') }
+    let(:date_time_object_from_morning) { DateTime.parse("14/11/#{Date.today.year} 11:00") }
+    let(:date_time_object_to_afternoon) { DateTime.parse("14/11/#{Date.today.year} 15: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.+?>/
@@ -183,9 +171,9 @@ describe SemanticDateTimeTags::ViewHelpers do
     end
 
     it 'adds am to wrapping span if both times in morning' do
-      semantic_date_range_tag(date_time_object_from_morning-1.hour, date_time_object_from_morning).must_match /\A<span.+?date_range.+?same_meridian.+?>/
+      semantic_date_range_tag(date_time_object_from_morning - 1.hour, date_time_object_from_morning).must_match /\A<span.+?date_range.+?same_meridian.+?>/
       semantic_date_range_tag(date_time_object_from_morning, date_time_object_to_afternoon).wont_match /\A<span.+?date_range.+?same_meridian.+?>/
-      semantic_date_range_tag(date_time_object_to_afternoon, date_time_object_to_afternoon+1.hour).must_match /\A<span.+?date_range.+?same_meridian.+?>/
+      semantic_date_range_tag(date_time_object_to_afternoon, date_time_object_to_afternoon + 1.hour).must_match /\A<span.+?date_range.+?same_meridian.+?>/
     end
 
     it 'accepts datetime objects' do
@@ -197,10 +185,8 @@ 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
   end
-
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'rubygems'
 
 I18n.backend.send(:init_translations)
 
-if ENV["CI"]
-  require "coveralls"
+if ENV['CI']
+  require 'coveralls'
   Coveralls.wear!
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_date_time_tags
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,7 +124,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/assets/stylesheets/semantic_date_time_tags.css.scss
+- lib/assets/stylesheets/semantic_date_time_tags.css
+- lib/assets/stylesheets/semantic_date_time_tags/default.scss
+- lib/assets/stylesheets/semantic_date_time_tags/partials/_mixins.scss
+- lib/assets/stylesheets/semantic_date_time_tags/partials/mixins/_date_range.scss
+- lib/assets/stylesheets/semantic_date_time_tags/partials/mixins/_date_time.scss
 - lib/config/locales/semantic_date_time_tags.en.yml
 - lib/semantic_date_time_tags.rb
 - lib/semantic_date_time_tags/engine.rb

data/lib/assets/stylesheets/semantic_date_time_tags.css.scss

@@ -1,27 +0,0 @@
-span.date_range {
-  &.same_year {
-    time.date.from {
-      span.year {
-        display: none;
-      }
-    }
-  }
-
-  &.same_year.same_month {
-    time.date.from {
-      span.month {
-        display: none;
-      }
-      span.month + span.sep {
-        display: none;
-      }
-    }
-  }
-
-  &.same_day {
-    time.date.from,
-    span.date_range_separator {
-      display: none;
-    }
-  }
-}