clockpunch 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Clockpunch Changelog
 
+## Version 0.1.6 (July 12, 2013)
+
+  * New h?m format
+  * Ability to set default format across the board
+
 ## Version 0.1.5 (July 12, 2013)
 
   * Don't apply timeinput multiple times

data/README.md

@@ -76,7 +76,7 @@ This library comprises the following pieces:
 
 ### Formats
 
-There are three built-in formats:
+#### Built-in formats:
 
   * default: "H:MM"
     * Zero-padded minutes
@@ -84,6 +84,9 @@ There are three built-in formats:
     * Zero-padded minutes
   * minutes: MMm
     * Not zero-padded. Always show total minutes. E.g. 90 minutes stays "90m"
+  * h?m
+    * If more than an hour it's the same as 'hm'
+    * Does not zero-pad minutes if less than an hour
 
 To use one of the other formats, just pass it in the constructor, e.g. `new TimeParser('hm')`
 

data/app/assets/javascripts/clockpunch.js

@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 1.4.0
 
 /*
-Clockpunch 0.1.5
+Clockpunch 0.1.6
 https://github.com/tablexi/clockpunch
 */
 
@@ -127,6 +127,10 @@ https://github.com/tablexi/clockpunch
     */
 
 
+    TimeParser.set_default_format = function(string) {
+      return this.default_format = string;
+    };
+
     TimeParser.to_minutes = function(string) {
       var parser;
       parser = new TimeParser();
@@ -244,6 +248,13 @@ https://github.com/tablexi/clockpunch
         hm: function(hours, minutes) {
           return this.default_string_format('{HOURS}h{MINUTES}m', hours, minutes);
         },
+        "h?m": function(hours, minutes) {
+          if (hours > 0) {
+            return formats['hm'].call(this, hours, minutes);
+          } else {
+            return "" + minutes + "m";
+          }
+        },
         minutes: function(hours, minutes) {
           var total_minutes;
           total_minutes = hours * 60 + minutes;
@@ -251,7 +262,7 @@ https://github.com/tablexi/clockpunch
         }
       };
       if (format == null) {
-        return formats['default'];
+        return formats[TimeParser.default_format || 'default'];
       }
       return formats[format] || function(hours, minutes) {
         return this.default_string_format(format, hours, minutes);

data/lib/clockpunch/version.rb

@@ -1,3 +1,3 @@
 module Clockpunch
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockpunch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: