jiff 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951d699915d4ea5e0d75788428898e3a89a19c36
-  data.tar.gz: 24a37e3f47cff1c38493ca5642925916bfec0570
+  metadata.gz: d586cd0f39f9d3f7d0ea94263e0414bfd3c0c114
+  data.tar.gz: db6a94b200613fad4dee1118a4920c49921a7207
 SHA512:
-  metadata.gz: 987ca0406640756887c757990b1e761c07dc0a89622200c10b92bc093c63487c631a8794ef9b59d67013789e20be395022613d056815850450c9c14b0b061972
-  data.tar.gz: 77db212d00f873e8d6f471dd51ee4cd5657365505ade0669bc7cab9baa0256b9f752e69ad785322baafa98f925fa875debdaf2367b8918cc9b39a1da9336cca9
+  metadata.gz: 0b30baba9c2fe8e47b037b14e8be67a006444e6dd9c50763fa1669b832d11ab3aeb1adb9f6eee2e3c9eaccd330001a8c6851ac51be8f69b033babcd2eece43dd
+  data.tar.gz: 6966466c95a8d743e02202c5a4c0baf05e06ca36166c833a8c5b79d6b2640524e5c9806fb6cd03d5749bc421f5e776d3a0870024740053d950f4bed2f44b7e75

data/README.md

@@ -1,6 +1,6 @@
 # Jiff
 
-[![Build Status](https://travis-ci.org/revett/jiff.svg?branch=master)](https://travis-ci.org/revett/jiff)
+[![Gem Version](https://badge.fury.io/rb/jiff.svg)](http://badge.fury.io/rb/jiff) [![Build Status](https://travis-ci.org/revett/jiff.svg?branch=master)](https://travis-ci.org/revett/jiff) ![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)
 
 Parse, validate, manipulate, and display dates in Ruby.
 
@@ -176,16 +176,16 @@ This is exactly the same as **.add**, only instead of adding time, it subtracts
 
 #### Keys
 
-|**Key**|**Description**|
+|**Shorthand**|**Key**|
 |-------|---------------|
-|y      |Year           |
-|M      |Month          |
-|w      |Week           |
-|d      |Day            |
-|h      |Hour           |
-|m      |Minute         |
-|s      |Second         |
-|ms     |Millisecond    |
+|y      |year           |
+|M      |month          |
+|w      |week           |
+|d      |day            |
+|h      |hour           |
+|m      |minute         |
+|s      |second         |
+|ms     |millisecond    |
 
 ### Timezone
 

data/jiff.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "jiff"
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ["Charlie Revett"]
   spec.email         = ["charlierevett@gmail.com"]
   spec.summary       = %q{Parse, validate, manipulate, and display dates in Ruby.}

data/lib/jiff/manipulate.rb

@@ -1,25 +1,35 @@
 module Manipulate
   def add(amount, type)
-    manipulate(amount, type.to_sym, '+')
+    manipulate(amount, convert_type(type), '+')
   end
 
   def subtract(amount, type)
-    manipulate(amount, type.to_sym, '-')
+    manipulate(amount, convert_type(type), '-')
   end
 
   private
 
   SECONDS = {
-    y:  31556926,
-    M:  2629743.83,
-    w:  604800,
-    d:  86400,
-    h:  3600,
-    m:  60,
-    s:  1,
-    ms: 0.001
+    'y'  => 31556926,
+    'M'  => 2629743.83,
+    'w'  => 604800,
+    'd'  => 86400,
+    'h'  => 3600,
+    'm'  => 60,
+    's'  => 1,
+    'ms' => 0.001
   }
 
+  def convert_type(type)
+    return type if type.length <= 2
+    %w(month millisecond).include?(type) ? handle_special_type(type)
+                                         : type.downcase[0]
+  end
+
+  def handle_special_type(type)
+    type == 'month' ? 'M' : 'ms'
+  end
+
   def manipulate(amount, type, operator)
     raise ArgumentError, 'Invalid Type' unless type_exist? type
     @date = @date.send(operator, (amount * SECONDS[type]))

data/spec/manipulate_spec.rb

@@ -13,34 +13,42 @@ describe Jiff do
     context 'using a valid type' do
       context 'adding 1 year' do
         specify { expect(subject.add(1, 'y').year).to eq 1993 }
+        specify { expect(subject.add(1, 'year').year).to eq 1993 }
       end
 
       context 'adding 1 month' do
         specify { expect(subject.add(1, 'M').month).to eq 7 }
+        specify { expect(subject.add(1, 'month').month).to eq 7 }
       end
 
       context 'adding 1 week' do
         specify { expect(subject.add(1, 'w').day).to eq 15 }
+        specify { expect(subject.add(1, 'week').day).to eq 15 }
       end
 
       context 'adding 1 day' do
         specify { expect(subject.add(1, 'd').day).to eq 9 }
+        specify { expect(subject.add(1, 'day').day).to eq 9 }
       end
 
       context 'adding 1 hour' do
         specify { expect(subject.add(1, 'h').hour).to eq 11 }
+        specify { expect(subject.add(1, 'hour').hour).to eq 11 }
       end
 
       context 'adding 1 minute' do
         specify { expect(subject.add(1, 'm').minute).to eq 31 }
+        specify { expect(subject.add(1, 'minute').minute).to eq 31 }
       end
 
       context 'adding 1 second' do
         specify { expect(subject.add(1, 's').second).to eq 16 }
+        specify { expect(subject.add(1, 'second').second).to eq 16 }
       end
 
       context 'adding 1 millisecond' do
         specify { expect(subject.add(1, 'ms').millisecond).to eq 1 }
+        specify { expect(subject.add(1, 'millisecond').millisecond).to eq 1 }
       end
     end
 
@@ -55,34 +63,42 @@ describe Jiff do
     context 'using a valid type' do
       context 'subtracting 1 year' do
         specify { expect(subject.subtract(1, 'y').year).to eq 1991 }
+        specify { expect(subject.subtract(1, 'year').year).to eq 1991 }
       end
 
       context 'subtracting 1 month' do
         specify { expect(subject.subtract(1, 'M').month).to eq 5 }
+        specify { expect(subject.subtract(1, 'month').month).to eq 5 }
       end
 
       context 'subtracting 1 week' do
         specify { expect(subject.subtract(1, 'w').day).to eq 1 }
+        specify { expect(subject.subtract(1, 'week').day).to eq 1 }
       end
 
       context 'subtracting 1 day' do
         specify { expect(subject.subtract(1, 'd').day).to eq 7 }
+        specify { expect(subject.subtract(1, 'day').day).to eq 7 }
       end
 
       context 'subtracting 1 hour' do
         specify { expect(subject.subtract(1, 'h').hour).to eq 9 }
+        specify { expect(subject.subtract(1, 'hour').hour).to eq 9 }
       end
 
       context 'subtracting 1 minute' do
         specify { expect(subject.subtract(1, 'm').minute).to eq 29 }
+        specify { expect(subject.subtract(1, 'minute').minute).to eq 29 }
       end
 
       context 'subtracting 1 second' do
         specify { expect(subject.subtract(1, 's').second).to eq 14 }
+        specify { expect(subject.subtract(1, 'second').second).to eq 14 }
       end
 
       context 'subtracting 1 millisecond' do
         specify { expect(subject.subtract(1, 'ms').millisecond).to eq 998 }
+        specify { expect(subject.subtract(1, 'millisecond').millisecond).to eq 998 }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jiff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charlie Revett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler