in-the-zone 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f0bc1e993ba1a6a150126b62ac0332fc80c233
-  data.tar.gz: 9d773b67e41839149792df270584d3075a29af9e
+  metadata.gz: 45a46caa46971175205becd39c8a61a922d11e70
+  data.tar.gz: 9c3b65ab914fc6ef6aa3af625d2a3b55c36870e3
 SHA512:
-  metadata.gz: b76bc52908d42e65e98de2c0646850b503f6f367e05785c1aa49c11834afcd54e9123588d9b9550070df71dfb8a0905851a40ddd06ad77b7155b97691c426458
-  data.tar.gz: 472d35dbe0dcc7bdfb00eaf41b267a3bf7c1f0c1ee6f4b45fd7367c869b562c36c4469649795722a6d2dd143bab314001aa0bb0b0b5dbf916dd3e4874d081a73
+  metadata.gz: 20e778fc2af793598a2843ba843d3f8d87e01ad9ef90941fac9b2cb48b3e9ee0edd65f6b8675f053744bcd8f83a518f76c5ae6811e3eb080232c6e3bab20f59e
+  data.tar.gz: a0807b3c124a13527d1022a7795789c4a09d1e03e317f13f23499534339c15eed4f43c3851b236694fff519f102cf7c242d045ecb94a74f9e7979078f948ff07

data.tar.gz.sig

@@ -1 +1 @@
-�K�����")]���pݱVލ�+�g��3�MU��LI�w�Q�6}b�?]p`j}0;گF��[\^����]�S4��0��u��3�a��Eqf���]!k��SEfU��(�;P�O��l���q����h��3�̟���{�n� �0DA�"�q����n�/�>+&/j���0Q�#��}D�q䊂ĉ��(�-�wӛ����i(c���no&ܸFO�2���D(Ehe����$�N̎���!R
+4���i3�Ŏ�0����QF?c��|���2*�>����T�q��z�X}(Ao?���D�.'�_`���G	H��JF�I����]�<'[�t��J;�	$��[ū���a���z�Z���Y�N��D1�SSX���ڨ�	���7X7��H$52�A;�
�/y�d��c���ҁAI���Q$˦_��6E�$�=?U�DI�3�7���e۸a)@�C�i�1hT��.�����&��e�ϙ�ѠrB��r�$w3�;1�

data/lib/in_the_zone.rb

@@ -55,6 +55,9 @@ module InTheZone
     if opts[ :from_now ]
       data[ :options ][ :from_now ] = true
     end
+    if opts[ :format_method ]
+      data[ :options ][ :format_method ] = opts[ :format_method ].to_s
+    end
     if opts[ :live_update ]
       data[ :options ][ :live_update ] = true
     end

data/lib/in_the_zone/version.rb

@@ -1,3 +1,3 @@
 module InTheZone
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/static_assets/javascripts/in_the_zone.js

@@ -2,12 +2,17 @@ define('inthezone',
 	['ko', 'moment'],
 	function(ko, moment) {
 
+		var options = {
+			format_methods: {}
+		};
+
 		var InTheZone = function(element, opts) {
 			this.element = element;
 			this.format = ko.observable(opts.format);
 			this.current_time = ko.observable(moment.unix(opts.timestamp));
 			this.from_now = ko.observable(opts.from_now);
 			this.live_update = ko.observable(opts.live_update);
+			this.format_method = ko.observable(opts.format_method);
 			if(this.from_now() && this.live_update()) {
 				this.start_interval();
 			};
@@ -33,25 +38,14 @@ define('inthezone',
 			return(60*60*24*interval_base);
 		};
 
-		// A Cozy-style time_from_now function...
-		// InTheZone.prototype.time_from_now = function(time) {
-		// 	if(time.diff(moment(),'days')==0) {
-		// 		return(time.format('LT'));
-		// 	} else if(time.diff(moment(),'days')==-1){
-		// 		return('Yesterday');
-		// 	} else {
-		// 		return(time.format('l'));
-		// 	};
-		// };
-
-		InTheZone.prototype.time_from_now = function(time) {
-			return(time.fromNow());
-		};
-
 		InTheZone.prototype.update_time = function(new_time) {
 			if(new_time) this.current_time(moment(new_time));
-			if(this.from_now()) {
-				this.element.innerHTML = this.time_from_now(this.current_time());
+			var meth;
+			if(this.format_method() && (meth = options.format_methods[ this.format_method() ])) {
+				this.element.innerHTML = meth(this.current_time());
+			}
+			else if(this.from_now()) {
+				this.element.innerHTML = this.current_time().fromNow();
 			} else {
 				this.element.innerHTML = this.current_time().format(this.format());
 			};
@@ -72,4 +66,6 @@ define('inthezone',
 				element.timeHandler.update_time();
 			}
 		}
+
+		return(options)
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in-the-zone
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Bragg
@@ -30,7 +30,7 @@ cert_chain:
   TlaAvFdgPdUIydKBhAeUZA4ACyA9QT6EKa2WlkZoV/nVD6N3UfTzj/2Em2EP1lfm
   dSlv1HCMhSbE8y64mkOubGxyu9V3eM99rqEGwSNo7zMu/cb1
   -----END CERTIFICATE-----
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler