clockpunch 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Clockpunch Changelog
 
+## Version 0.1.7 (August 1, 2013)
+
+  * Specify format via data-format attribute
+  * Long (e.g. "1 hour 30 minutes") output format
+
 ## Version 0.1.6 (July 12, 2013)
 
   * New h?m format

data/README.md

@@ -87,6 +87,9 @@ This library comprises the following pieces:
   * h?m
     * If more than an hour it's the same as 'hm'
     * Does not zero-pad minutes if less than an hour
+  * long: "H hour(s), M minute(s)"
+    * Should only be used in spans (since it is not currently parsable)
+    * H will not be shown if zero
 
 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.6
+Clockpunch 0.1.7
 https://github.com/tablexi/clockpunch
 */
 
@@ -17,7 +17,9 @@ https://github.com/tablexi/clockpunch
           options = {};
         }
         return this.each(function(input_field) {
-          return new TimeParsingInput(this, options['format']);
+          var format;
+          format = options['format'] || $(this).data('format');
+          return new TimeParsingInput(this, format);
         });
       }
     });
@@ -259,7 +261,8 @@ https://github.com/tablexi/clockpunch
           var total_minutes;
           total_minutes = hours * 60 + minutes;
           return total_minutes.toString();
-        }
+        },
+        long: this.long_format
       };
       if (format == null) {
         return formats[TimeParser.default_format || 'default'];
@@ -273,6 +276,26 @@ https://github.com/tablexi/clockpunch
       return format_string.replace('{HOURS}', hours).replace('{MINUTES}', TimeParser.pad(minutes.toString()));
     };
 
+    TimeParser.prototype.long_format = function(hours, minutes) {
+      var output;
+      output = [];
+      if (hours > 0) {
+        output.push("" + hours + " " + (this.pluralize(hours, 'hour')));
+      }
+      if (minutes > 0 || (minutes === 0 && hours === 0)) {
+        output.push("" + minutes + " " + (this.pluralize(minutes, 'minute')));
+      }
+      return output.join(" ");
+    };
+
+    TimeParser.prototype.pluralize = function(count, string) {
+      if (count === 1) {
+        return string;
+      } else {
+        return "" + string + "s";
+      }
+    };
+
     return TimeParser;
 
   })();

data/lib/clockpunch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clockpunch
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass