jenna_time 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ce6c79bb1913ebe6ef6638ebdd4fe86443f3e30
-  data.tar.gz: 5fc2545e368a7d5ec5e00a94ce0b841a975a0c6e
+  metadata.gz: 659af458f317d4c930a307090309231ef1d1ed4c
+  data.tar.gz: d61f9094081342559e5033d9ac1472f57395df00
 SHA512:
-  metadata.gz: 8308a8daa320c0c130f6a7d3e84108b7c43274533debd6b876362ad7da1c3a58b6dc2fbc17bb434d96d7be87d955ba56dacf406d536a6bc9dc044cb700e9ca1d
-  data.tar.gz: 40ffa0599fddfabf9fd1565761191e4e0c05957ba671a82a57ac6938df9f1a413fc00a7d5f2d31f5e1e8739e6a85817c4f3fea114c0a24567227c498ed6fd213
+  metadata.gz: d6889b3f7c349914f458766e8fbfd59dac39d6b2cf17fc6095c3dcfe8b27d5470a233de31a294832fb31209b4635580a915ea1fad6e926b8233730e7d7bac37b
+  data.tar.gz: 05751d073445eb9a3339857b10a2a9278a6e25688bc24d5a55869956a1aa0edddf2a4be138e1562b1b485b3494dbf7e757163cc4b7076b1c088559d88ebb3df6

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-
 gemspec
 

data/README.md

@@ -36,11 +36,9 @@ It follows the following rules:
 * 1 yr, 9 months <-> 2 yr minus 1 sec                                       # => __~2y__
 * 2 yrs <-> max time or date                                                # => __[years]y__
 
-It abbreviates the time so 'less than a minute' becomes '<1m' and 'about 1 year' becomes '~1y'.
-
 If there are less than 60 seconds left then it will display in the format of '36s'.
 
-If starttime is greater than endtime then it will express the time distance in the same way, except there will be a negative sign at the start, e.g. '-30s', '-~1yr'.
+If starttime is greater than endtime then it will express the time distance in the same way, except there will be a negative sign at the start, e.g. '-30s', '~-1yr'.
 
 ## License
 

data/lib/jenna_time.rb

@@ -4,7 +4,23 @@ include ActionView::Helpers::DateHelper
 require 'date'
 
 module JennaTime
+
+  def self.verify_argument(time)
+      unless time.is_a?(DateTime) or time.is_a?(Time)
+        begin
+          DateTime.parse(time)
+        rescue 
+          raise InvalidDateTimeArgument.new("Invalid argument: #{time.to_s}")
+        end
+      else
+        time
+      end
+  end
+
   def self.duration(starttime, endtime=Time.now())
+    starttime = verify_argument(starttime)
+    endtime = verify_argument(endtime)
+
     remaining_seconds = Integer(endtime.to_time - starttime.to_time)
     if remaining_seconds == 0
       return ""
@@ -35,4 +51,7 @@ module JennaTime
       "#{approximation}#{sign}#{number}#{unit}"
     end
   end
+
+  class InvalidDateTimeArgument < StandardError
+  end
 end

data/spec/jenna_time.rb

@@ -102,4 +102,13 @@ describe "Time duration testing" do
     starttime = Time.now
     expect(JennaTime::duration(starttime)).to eq('')
   end
+  it "If we supply an invalid starttime then the appropriate error should be raised" do
+    starttime = 'error'
+    expect{JennaTime::duration(starttime)}.to raise_error(JennaTime::InvalidDateTimeArgument)
+  end
+  it "If we supply an string starttime and endtime then it should parse it appropriately" do
+    starttime = '2016-06-17 12:24:15 +0100'
+    endtime = '2016-06-17 12:24:38 +0100'
+    expect{JennaTime::duration(starttime,endtime)}.to_not raise_error
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenna_time
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview