kronic 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kronic (0.4.1)
+    kronic (1.0.0)
 
 GEM
   remote: http://rubygems.org/

data/HISTORY

@@ -1,3 +1,6 @@
+1.1.0 - 28 October 2010
+  * Remove dependency on strftime.js
+
 1.0.0 - 27 October 2010
   * Added javascript implementation
   * Committed to backwards compatibility for current API until v2

data/README.rdoc

@@ -18,12 +18,10 @@ Supported formats: Today, yesterday, tomorrow, last thursday, this thursday, 14
 
 Install by grabbing the latest versions direct from github:
 
-  curl http://github.com/xaviershay/kronic/raw/master/lib/js/strftime.js > public/javascripts/strftime.js
   curl http://github.com/xaviershay/kronic/raw/master/lib/js/kronic.js   > public/javascripts/kronic.js
 
 Use with the following script:
 
-  <script src="/javascripts/strftime.js" type="text/javascript"></script> 
   <script src="/javascripts/kronic.js"   type="text/javascript"></script>
   <script>
     Kronic.parse("Today");
@@ -51,7 +49,7 @@ Kronic is tested on 1.8.7, 1.9.2, Rubinius 1.1, and JRuby 1.5.1.
   rake
   open spec/kronic_spec.rb
 
-There are comments to help you along but it is pretty basic code, so everything should make sense pretty quickly. The javascript code is a direct translation of the ruby code, and as such it is undocumented - just refer back to the ruby code. strftime.js is an external library bundled here for convenience. Do not change it.
+There are comments to help you along but it is pretty basic code, so everything should make sense pretty quickly. The javascript code is a direct translation of the ruby code, and as such it is undocumented - just refer back to the ruby code.
 
 The exact same set of specs are run again the ruby and javascript libraries, so they should be 100% compatible.
 

data/lib/js/kronic.js

@@ -0,0 +1,154 @@
+/* This code is a direct port of the ruby code.
+ * See kronic.rb for explanatory remarks.
+ */
+var Kronic = (function() { 
+  var DELIMITER           = /[,\s]+/;
+  var NUMBER              = /^[0-9]+$/;
+  var NUMBER_WITH_ORDINAL = /^([0-9]+)(st|nd|rd|th)?$/;
+  var ISO_8601_DATE       = /^([0-9]{4})-?(1[0-2]|0?[1-9])-?(3[0-1]|[1-2][0-9]|0?[1-9])$/;
+
+  var MONTH_NAMES = ["january", "jan", "february", "feb", "march", "mar", "april", "apr", "may", "may", "june", "jun", "july", "jul", "august", "aug", "september", "sep", "october", "oct", "november", "nov", "december", "dec"];
+  var DAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+
+  function trim(string) {
+    return string.replace(/^\s+|\s+$/g, '');
+  }
+
+  function map(array, func) {
+    var result = [];
+    for (x in array) {
+      result.push(func(array[x]));
+    }
+    return result;
+  }
+  
+  function inject(array, initialValue, func) {
+    var accumulator = initialValue;
+    for (x in array) {
+      accumulator = func(accumulator, array[x]);
+    }
+    return accumulator;
+  }
+
+  function addDays(date, numberOfDays) {
+    return new Date(date * 1 + numberOfDays * 60 * 60 * 24 * 1000);
+  }
+
+  function titleize(str) {
+    return str.replace(/^\w/, function($0) { return $0.toUpperCase(); });
+  }
+
+  function parseNearbyDays(string, today) {
+    if (string == 'today')     return today;
+    if (string == 'yesterday') return addDays(today, -1);
+    if (string == 'tomorrow')  return addDays(today, +1);
+  }
+
+  function parseLastOrThisDay(string, today) {
+    var tokens = string.split(DELIMITER);
+
+    if (['last', 'this'].indexOf(tokens[0]) >= 0) {
+      var days = map([1,2,3,4,5,6,7], function(x) {
+        return addDays(today, tokens[0] == 'last' ? -x : x);
+      });
+
+      days = inject(days, {}, function(a, x) {
+        a[DAY_NAMES[x.getDay()].toLowerCase()] = x;
+        return a;
+      });
+
+      return days[tokens[1]];
+    }
+  }
+
+  function parseExactDay(string, today) {
+    var tokens = string.split(DELIMITER);
+    if (tokens.length >= 2) {
+      var matches = tokens[0].match(NUMBER_WITH_ORDINAL);
+      if (matches) {
+        return parseExactDateParts(matches[1], tokens[1], tokens[2], today);
+      } else {
+        matches = tokens[1].match(NUMBER_WITH_ORDINAL);
+        if (matches) {
+          return parseExactDateParts(matches[1], tokens[0], tokens[2], today);
+        } else {
+          return null;
+        }
+      }
+    }
+  }
+
+  function parseExactDateParts(rawDay, rawMonth, rawYear, today) {
+    var day = rawDay * 1;
+    var month = monthFromName(rawMonth);
+    var year;
+
+    if (rawYear)
+      year = rawYear.match(NUMBER) ? rawYear * 1 : null;
+    else
+      year = today.getYear() + 1900;
+
+    if (!(day && month && year))
+      return null;
+
+    var result = new Date(year, month, day);
+    if (result > today && !rawYear)
+      result = new Date(year - 1, month, day);
+    return result;
+  }
+
+  function parseIso8601Date(string) {
+    if (string.match(ISO_8601_DATE)) {
+      var tokens = map(string.split('-'), function(x) { return x * 1; });
+      return (new Date(tokens[0], tokens[1] - 1, tokens[2]));
+    }
+  }
+
+  function monthFromName(month) {
+    monthIndex = MONTH_NAMES.indexOf(month);
+    return monthIndex >= 0 ? Math.floor(monthIndex / 2) : null;
+  }
+
+  return {
+    parse: function(string) {
+      var now = Kronic.today();
+
+      string = trim(string + '').toLowerCase();
+      return parseNearbyDays(   string, now) ||
+             parseLastOrThisDay(string, now) ||
+             parseExactDay(     string, now) ||
+             parseIso8601Date(  string);
+    },
+    format: function(date, opts) {
+      if (!opts)
+        opts = {today: Kronic.today()};
+
+      var diff = Math.floor((date * 1 - opts.today * 1) / 60 / 60 / 24 / 1000);
+
+      switch (diff) {
+        case -7:
+        case -6:
+        case -5:
+        case -4:
+        case -3:
+        case -2: return "Last " + DAY_NAMES[date.getDay()];
+        case -1: return "Yesterday";
+        case 0:  return "Today";
+        case 1:  return "Tomorrow";
+        case 2:
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+        case 7:  return "This " + DAY_NAMES[date.getDay()];
+        default: 
+          return date.getDate() + " " +
+                 titleize(MONTH_NAMES[date.getMonth() * 2]) + " " + 
+                 (date.getYear() + 1900); 
+      }
+    },
+    today: function() {
+      return new Date();
+    }
+  };
+})();

data/spec/kronic_spec.rb

@@ -10,9 +10,7 @@ describe Kronic do
 
       @js = V8::Context.new
       @js['alert'] = proc {|s| puts s.inspect } # For debugging, not used normally
-      %w(strftime kronic).each do |file|
-        @js.eval(File.open(File.dirname(__FILE__) + "/../lib/js/#{file}.js").read)
-      end
+      @js.eval(File.open(File.dirname(__FILE__) + "/../lib/js/kronic.js").read)
       @js.eval("Kronic")['today'] = proc { date(:today).to_time }
     end
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Xavier Shay
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +11:00
+date: 2010-10-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - spec/kronic_spec.rb
 - spec/spec_helper.rb
 - lib/kronic.rb
+- lib/js/kronic.js
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -122,6 +123,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A dirt simple library for parsing human readable dates
+summary: A dirt simple library for parsing and formatting human readable dates
 test_files: []