semantic_date_time_tags 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe726c652f793a8dd9fe4544b1ce97c490f8e886
-  data.tar.gz: 0e7ea49f7fb2c6099f34f300b148d6c3131d38d1
+  metadata.gz: aeed110b330e1302a7615ba2f93304b79e62a30c
+  data.tar.gz: cdca5a50d3f7f8e526eaf41e96edd931415d86f4
 SHA512:
-  metadata.gz: 710ddafcf1f2284cb34c1a8505ddca911dce078d28468e1b0c9849707ece8e879c62691d3d97a63fba1daca55043ba5fd672ea423074160cfd58614c6b3a3f6d
-  data.tar.gz: 37b06c8ec419ebef9a7742b4cd05646b00ea2cc28b0e15d582cb329fb28f1380adc56dfecd093ee321c00987e21df86ddf57a0e699df67989c6c5ea0df200981
+  metadata.gz: 79e1b964be9feb59c656b2737c6262fba6c6ae850cc4582e0ad77f6d458c0b2730ec0169ed470bbfc5d1d5611985965b03cb9fda99c869e9bc7d54ab81df8054
+  data.tar.gz: 5262805904fb6d6ce1411f4bb230b5dc7f537a777d1c20b133b04ef38003d781993d9d12e8bf79631804666cacd2202ae07c64c5db1f8ee49f0d85d03ae89a92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semantic_date_time_tags (0.0.10)
+    semantic_date_time_tags (0.1.0)
       rails (>= 3.0.0)
 
 GEM

data/lib/config/locales/semantic_date_time_tags.en.yml

@@ -7,6 +7,9 @@ en:
     formats:
       full: "%H:%M"
       test: "%H~%M"
+    in_words:
+      noon: noon
+      midnight: midnight
   date_time:
     formats:
       full: "%-d.%-m.%Y %H:%M"

data/lib/semantic_date_time_tags/tag.rb

@@ -7,13 +7,14 @@ module SemanticDateTimeTags
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::TagHelper
 
+    attr_accessor :obj
+    attr_accessor :options
     attr_accessor :output_buffer
 
     # =====================================================================
 
-    def initialize obj, tag_name, options={}
+    def initialize obj, options={}
       @obj = obj
-      @tag_name = tag_name
       @options = options.tap{ |opts| opts.delete(:scope) }
     end
 
@@ -31,34 +32,54 @@ module SemanticDateTimeTags
         type_class,
         current_date_class,
         current_year_class,
+        midnight_class,
+        noon_class,
         whole_hour_class,
         whole_minute_class,
-        @options[:class]
+        options[:class]
       ].flatten.reject(&:blank?)
     end
 
     def type_class
-      @obj.class.to_s.underscore
+      obj.class.to_s.underscore
     end
 
     def current_date_class
-      return unless [::Date,::DateTime].any?{ |c| @obj.instance_of? c }
-      'current_date' if @obj.today?
+      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 }
-      'current_year' if @obj.year == ::Date.today.year
+      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 }
-      'whole_hour' unless @obj.min > 0
+      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 }
-      'whole_minute' unless @obj.sec > 0
+      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 }
+      'noon' if obj == obj.noon
+    end
+
+    def midnight_class
+      return unless [::Time,::DateTime].any?{ |c| obj.instance_of? c }
+      'midnight' if obj == obj.midnight
+    end
+
+    # ---------------------------------------------------------------------
+
+    def dom_data
+      {
+        in_words: in_words
+      }
     end
 
     private # =============================================================
@@ -68,11 +89,37 @@ module SemanticDateTimeTags
     end
 
     def format
-      @options.fetch :format, :full
+      options.fetch :format, :full
     end
 
+    # ---------------------------------------------------------------------
+
     def localized_obj
-      I18n.l @obj, format: format
+      I18n.l obj, format: format
+    end
+
+    # ---------------------------------------------------------------------
+
+    def tag_name
+      options.fetch :tag_name, :time
+    end
+
+    # ---------------------------------------------------------------------
+
+    def in_words
+      [ 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 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 obj == obj.midnight
+      I18n.t :midnight, scope: %i(time in_words)
     end
 
   end

data/lib/semantic_date_time_tags/tag/date.rb

@@ -4,24 +4,24 @@ module SemanticDateTimeTags
   class Tag
     class Date < Tag
 
-      def initialize obj, tag_name, options={}
+      def initialize obj, options={}
         raise 'object must be Date or DateTime' unless [::Date, ::DateTime].any? { |c| obj.instance_of? c }
-        super(obj, tag_name, options)
+        super(obj, options)
       end
 
       # ---------------------------------------------------------------------
 
       def to_html
-        if @tag_name == :time
-          datetime = @obj.acts_like?(:time) ? @obj.xmlschema : @obj.iso8601
-          @options[:datetime] = datetime
+        if tag_name == :time
+          datetime = obj.acts_like?(:time) ? obj.xmlschema : obj.iso8601
+          options[:datetime] = datetime
         end
 
-        @options[:class] = dom_classes
+        options[:class] = dom_classes
 
         value = SemanticDateTimeTags::FormatParser.new(format_string, localized_obj).to_html.html_safe
 
-        content_tag(@tag_name, @options) { value }.html_safe
+        content_tag(tag_name, options) { value }.html_safe
       end
 
       private # =============================================================

data/lib/semantic_date_time_tags/tag/date_range.rb

@@ -2,6 +2,9 @@ module SemanticDateTimeTags
   class Tag
     class DateRange < Tag
 
+      attr_accessor :date_from
+      attr_accessor :date_to
+
       def initialize date_from, date_to=nil, options={}
         @date_from = date_from
         @date_to = date_to
@@ -11,25 +14,25 @@ module SemanticDateTimeTags
       # ---------------------------------------------------------------------
 
       def spans_years?
-        return false if @date_to.nil?
-        @date_from.year != @date_to.year
+        return false if date_to.nil?
+        date_from.year != date_to.year
       end
 
       def spans_months?
-        @date_from.month != @date_to.month
+        date_from.month != date_to.month
       end
 
       def within_a_week?
-        (@date_from - @date_to) <= 7
+        (date_from - date_to) <= 7
       end
 
       def one_day?
-        @date_from == @date_to
+        date_from == date_to
       end
 
       def both_in_current_year?
         return false if spans_years?
-        @date_from.year == ::Date.today.year
+        date_from.year == ::Date.today.year
       end
 
       # ---------------------------------------------------------------------
@@ -48,9 +51,9 @@ module SemanticDateTimeTags
       # ---------------------------------------------------------------------
 
       def to_html
-        from = SemanticDateTimeTags::Tag::Date.new(@date_from, :time, class: 'from').to_html
+        from = SemanticDateTimeTags::Tag::Date.new(date_from, class: 'from').to_html
         sep = content_tag(:span, separator, class: 'date_range_separator')
-        to = SemanticDateTimeTags::Tag::Date.new(@date_to, :time, class: 'to').to_html
+        to = SemanticDateTimeTags::Tag::Date.new(date_to, class: 'to').to_html
 
         content_tag(:span, class: dom_classes) { [ from, sep, to ].join.html_safe }.html_safe
       end
@@ -58,7 +61,7 @@ module SemanticDateTimeTags
       private # =============================================================
 
       def separator
-        @options.fetch(:separator, ' – ')
+        options.fetch(:separator, ' – ')
       end
 
     end

data/lib/semantic_date_time_tags/tag/date_time.rb

@@ -6,22 +6,22 @@ module SemanticDateTimeTags
 
       def initialize obj, options={}
         raise 'object must be DateTime' unless obj.instance_of?(::DateTime)
-        super(obj, :time, options)
+        super(obj, options)
       end
 
       # ---------------------------------------------------------------------
 
       def to_html
-        if @tag_name == :time
-          datetime = @obj.acts_like?(:time) ? @obj.xmlschema : @obj.iso8601
-          @options[:datetime] = datetime
+        if tag_name == :time
+          datetime = obj.acts_like?(:time) ? obj.xmlschema : obj.iso8601
+          options[:datetime] = datetime
         end
 
-        @options[:class] = dom_classes
+        options[:class] = dom_classes
 
         value = SemanticDateTimeTags::FormatParser.new(format_string, localized_obj).to_html.html_safe
 
-        time_tag(@obj, @options) { value }.html_safe
+        time_tag(obj, options) { value }.html_safe
       end
 
       private # =============================================================
@@ -31,7 +31,7 @@ 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

data/lib/semantic_date_time_tags/tag/time.rb

@@ -4,24 +4,25 @@ module SemanticDateTimeTags
   class Tag
     class Time < Tag
 
-      def initialize obj, tag_name, options={}
+      def initialize obj, options={}
         raise 'object must be Time' unless obj.instance_of?(::Time)
-        super(obj, tag_name, options)
+        super(obj, options)
       end
 
       # ---------------------------------------------------------------------
 
       def to_html
-        if @tag_name == :time
-          datetime = @obj.acts_like?(:time) ? @obj.xmlschema : @obj.iso8601
-          @options[:datetime] = datetime
+        if tag_name == :time
+          datetime = obj.acts_like?(:time) ? obj.xmlschema : obj.iso8601
+          options[:datetime] = datetime
         end
 
-        @options[:class] = dom_classes
+        options[:class] = dom_classes
+        options[:data] = dom_data
 
         value = SemanticDateTimeTags::FormatParser.new(format_string, localized_obj).to_html
 
-        content_tag(@tag_name, @options) { value }.html_safe
+        content_tag(tag_name, options) { value }.html_safe
       end
 
       private # =============================================================

data/lib/semantic_date_time_tags/version.rb

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

data/lib/semantic_date_time_tags/view_helpers.rb

@@ -23,18 +23,18 @@ module SemanticDateTimeTags
     end
 
     # accepts only datetime
-    def semantic_date_time_tag date_time, all_day=false, 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, tag_name=:time, options={}
-      SemanticDateTimeTags::Tag::Date.new(date, tag_name, options).to_html
+    def semantic_date_tag date, options={}
+      SemanticDateTimeTags::Tag::Date.new(date, options).to_html
     end
 
     # accepts datetime and time
-    def semantic_time_tag time, tag_name=:time, options={}
-      SemanticDateTimeTags::Tag::Time.new(time, tag_name, options).to_html
+    def semantic_time_tag time, options={}
+      SemanticDateTimeTags::Tag::Time.new(time, options).to_html
     end
 
   end

data/test/semantic_date_time_tags/view_helpers_test.rb

@@ -13,14 +13,18 @@ describe SemanticDateTimeTags::ViewHelpers do
 
   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_minutes) { time_object.strftime('%M') }
+    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) }
 
+
     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
@@ -29,14 +33,16 @@ 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, :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
@@ -45,8 +51,27 @@ 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
+
+    it 'adds midnight class if time is midnight' do
+      semantic_time_tag(time_object_midnight).must_match /\A<time.+?midnight.+?<\/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
+
+    it 'adds midnight as data-in-words if time is midnight' 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, :time, format: :test).must_include '~'
+      semantic_time_tag(time_object, format: :test).must_include '~'
     end
   end
 
@@ -57,24 +82,28 @@ 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, :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"
@@ -85,8 +114,9 @@ describe SemanticDateTimeTags::ViewHelpers do
       semantic_date_tag(Date.today-1.year).wont_include "current_year"
     end
 
+
     it 'allows to pass :format' do
-      semantic_date_tag(Date.today, :time, format: :test).must_include '~'
+      semantic_date_tag(Date.today, format: :test).must_include '~'
     end
   end
 
@@ -102,7 +132,7 @@ describe SemanticDateTimeTags::ViewHelpers do
     end
 
     it 'allows to pass :format' do
-      semantic_date_time_tag(date_time_object, false, format: :test).must_include '~'
+      semantic_date_time_tag(date_time_object, all_day: false, format: :test).must_include '~'
     end
   end
 

metadata

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