relativity 0.0.6 → 0.0.7

data/Changelog.rdoc

@@ -1,3 +1,7 @@
+0.0.7 2012-02-15:
+* Allow arbitrary separator and parse it automatically
+* The default_separator for DayTimeRange is removed
+
 0.0.6 2012-02-07:
 * DayTimeRange input/output now useable
 * DayTimeRange exceptions improved

data/README.rdoc

@@ -4,7 +4,7 @@ Time, Date and DateTime classes don't have a mode for working with relative
 time inside 1 day (or 1 week, 1 month, 1 quarter, etc.).
 
 A relative time object, relative to a day or a week, is useful to describe
-e.g. opening hours of a business. Time ranges are built on top, so the 
+e.g. opening hours of a business. Time ranges are built on top, so the
 ranges of opening hours can be represented.
 
 == Example
@@ -23,13 +23,12 @@ ranges of opening hours can be represented.
   dt.seconds #=> 40
   dt.nano_seconds #=> 568257238
 
-  DayTimeRange.default_separator # => " until "
-  dtr = DayTimeRange.new("8 until 12:30")
-  # => #<DayTimeRange:0x9bfa4ec @start_day_time=08:00:00, @end_day_time=12:30:00>
+  dtr = DayTimeRange.new("8 to 12:30") # => 08:00:00 to 12:30:00
   dtr.start # => 08:00:00
   dtr.end # => 12:30:00
   dtr.to_s # => "08:00:00 until 12:30:00"
 
-  night_shift = DayTimeRange.new("21:45..06:05", :separator => '..')
-  # => #<DayTimeRange:0x9b997dc @start_day_time=21:45:00, @end_day_time=06:05:00>
-  night_shift.to_s # => "21:45..06:05"
+  night_shift = DayTimeRange.new("21:45..06:05") # => 21:45:00..06:05:00
+
+  wrong_format = DayTimeRange.new("11 to 15", :separator => '..')
+  Relativity::InvalidRangeFormatError: Maybe the range separator was not set correctly? Separator used was ".."

data/TODO

@@ -1,15 +1,13 @@
 Features to be implemented:
 
-week_time = WeekTime.new
-week_day = WeekDay.new
+* Add a '...' range (up to, but not including)
 
-day_times (array of day_time entries)
+* WeekTime
+* WeekDay
 
-day_time_range (range of days_time entries)
-week_time_range
-week_day_range
+* WeekTimeRange
+* WeekDayRange
 
-ActiveRecord coupling (Aggregation ?)
 
 =====================================
 A discussion I sent on 2012-01-12 on ruby-talk:
@@ -80,5 +78,3 @@ as abstract as I want it. IIRC , ActiveSupport works on actual Date instances
 (which are not "relative" but anchored to a specific absolute time or date).
 I did not see this abstract concept of the "last day of the month" or
 "a Friday in a random week" fully implemented.
-
-

data/lib/relativity/day_time/new.rb

@@ -26,14 +26,8 @@ module DayTime::New
 private
 
   def hh_mm_ss_from_string(input)
-    separator = self.class.default_separator
-    esc_separator = Regexp.escape(separator) # e.g. separator is '.'
+    r = Regexp.new(self.class.matcher)
     input.strip!
-    match_hh = '(?<hh>\d\d?)'
-    match_mm = '(' + esc_separator + '(?<mm>\d\d?))?'
-    match_ss = '(' + esc_separator + '(?<ss>\d\d?))?'
-    matcher = '\A' + match_hh + match_mm + match_ss + '\Z'
-    r = Regexp.new(matcher)
     matchdata = r.match(input)
     raise Relativity::InvalidFormatError if matchdata.nil?
     return [matchdata[:hh].to_i, matchdata[:mm].to_i, matchdata[:ss].to_i]

data/lib/relativity/day_time.rb

@@ -12,4 +12,17 @@ class DayTime
     ':'
   end
 
+  def self.matcher
+    matcher = '\A' + internal_matcher + '\Z'
+  end
+
+  def self.internal_matcher
+    separator = default_separator
+    esc_separator = Regexp.escape(separator) # e.g. separator is '.'
+    match_hh = '(?<hh>\d\d?)'
+    match_mm = '(' + esc_separator + '(?<mm>\d\d?))?'
+    match_ss = '(' + esc_separator + '(?<ss>\d\d?))?'
+    match_hh + match_mm + match_ss
+  end
+
 end

data/lib/relativity/day_time_range.rb

@@ -24,19 +24,24 @@ class DayTimeRange
     start.to_s + @separator + self.end.to_s
   end
 
-  def self.default_separator
-    " until "
-  end
-
 private
 
   def start_end_from_string(input, options)
-    @separator = (options && options[:separator]) || self.class.default_separator
-    esc_separator = Regexp.escape(@separator)
-    matcher = '\A(?<start>.+)' + esc_separator + '(?<end>.+)\Z'
+    @separator = options && options[:separator]
+    if @separator
+      esc_separator = Regexp.escape(@separator)
+      matcher = '\A(?<start>.+)' + esc_separator + '(?<end>.+)\Z'
+    else
+      matcher = '\A' +
+                '(?<start>' + DayTime.internal_matcher + ')' +
+                '(?<separator>[^\d]+)' +
+                '(?<end>' + DayTime.internal_matcher + ')' +
+                '\Z'
+    end
     r = Regexp.new(matcher)
     matchdata = r.match(input)
     raise Relativity::InvalidRangeFormatError.new(:separator => @separator) if matchdata.nil?
+    @separator ||= matchdata[:separator]
     return [DayTime.new(matchdata[:start]), DayTime.new(matchdata[:end])]
   end
 

data/lib/relativity/version.rb

@@ -1,3 +1,3 @@
 module Relativity
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/day_time_range/marshal_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe DayTimeRange do
+
+  context "separator" do
+
+    it "until should be in the marshal" do
+      Marshal.dump(DayTimeRange.new("22 until 06:30")).should match(/until/)
+    end
+
+    it "test_sep should be in the marshal" do
+      Marshal.dump(DayTimeRange.new("22 test_sep 06:30", :separator => ' test_sep ')).should match(/ test_sep /)
+    end
+
+  end
+end

data/spec/day_time_range/parsing_spec.rb

@@ -2,9 +2,6 @@ require 'spec_helper'
 
 describe DayTimeRange do
 
-  it "default separator is ' until '" do
-    DayTimeRange.default_separator.should == ' until '
-  end
 
   it "start time is correct" do
     dtr = DayTimeRange.new("8 until 11", :separator => " until ")
@@ -21,14 +18,6 @@ describe DayTimeRange do
     dtr.start.should == DayTime.new(8)
   end
 
-  it "InvalidRangeFormatError is raised with incorrect separator format" do
-    lambda {DayTimeRange.new("8..11")}.should raise_error Relativity::InvalidRangeFormatError
-  end
-
-  it "Exception with separator message is raised with incorrect separator format" do
-    lambda {DayTimeRange.new("8..11")}.should raise_error 'Maybe the range separator was not set correctly? Separator used was " until "'
-  end
-
   it "parsing with other separator remembers the separator" do
     dtr = DayTimeRange.new("8 - 11", :separator => " - ")
     dtr.separator.should == " - "
@@ -42,7 +31,21 @@ describe DayTimeRange do
 
   it "not setting separator returns default_separator" do
     dtr = DayTimeRange.new("8 until 11")
-    dtr.separator.should == dtr.class.default_separator
+    dtr.separator.should == " until "
+  end
+
+  it "not setting separator with different separator does not reais exception" do
+    dtr = DayTimeRange.new("8..11")
+  end
+
+  it "not setting separator returns correct separator" do
+    dtr = DayTimeRange.new("8..11")
+    dtr.separator.should == '..'
+  end
+
+  it "not setting separator returns correct full result" do
+    dtr = DayTimeRange.new("8..11")
+    dtr.to_s.should == "08:00:00..11:00:00"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relativity
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &80549700 !ruby/object:Gem::Requirement
+  requirement: &80499580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *80549700
+  version_requirements: *80499580
 description: time and time_ranges relative to day, week, month, quarter etc.
 email:
 - peter@vandenabeele.com
@@ -55,6 +55,7 @@ files:
 - spec/day_time/new_spec.rb
 - spec/day_time/output_spec.rb
 - spec/day_time/overflow_spec.rb
+- spec/day_time_range/marshal_spec.rb
 - spec/day_time_range/new_spec.rb
 - spec/day_time_range/output_spec.rb
 - spec/day_time_range/parsing_spec.rb
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: time and time_ranges relative to day, week, month, quarter etc.