nickel 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba3e838fa5d6806f85eb03ddf6732481d5d09947
-  data.tar.gz: f1e5af3b3a1b16c2c9f5a67eedcdf479e37265c9
+  metadata.gz: 4749a62cf4e0593e14a0add9a87e83ab42c0e22a
+  data.tar.gz: 89f4306d7c4600d52ef806ef776dc2ebfaba4880
 SHA512:
-  metadata.gz: 77c82d90eab894ed70b59e586bb8dab299e43fe2999d4d5e015f33dc133a8614bae437e4fbdf2f7aa75caccc721612123bb67fe778f07cb6dfa9fe82cbe783e7
-  data.tar.gz: e95c789fd5d6c6ec167690a0e199b19411620faf0427bf4e302a10ed95a44ab00b8dafc1d74475c3ad3b074496ae1c647780f374bc511d3a0e2af1272d6849d7
+  metadata.gz: a679225d669ab812a0c260f8bef2012047aa24a709838b869228ab32eff4db78c1f65d81903b046a23746410542e2d563d03cb88077f24ec7d3c0af3c9d9c2b0
+  data.tar.gz: b9febf74771b71217f1ce05148bd17dd4939c3eb60b7d8f51856ddd9f30d221cd0fcf18d80bf7f9323a31a1f3d9f67d8dac36b2d9180dbf2e5fd8299c4dbc0f7

data/README.md

@@ -1,13 +1,13 @@
 Nickel
 ======
 
-Nickel extracts date, time, and message information from naturally worded text.
-
 [![Gem Version](http://img.shields.io/gem/v/nickel.svg)](http://rubygems.org/gems/nickel)
 [![Build Status](http://img.shields.io/travis/iainbeeston/nickel/master.svg)](https://travis-ci.org/iainbeeston/nickel)
 [![Coverage Status](http://img.shields.io/coveralls/iainbeeston/nickel/master.svg)](https://coveralls.io/r/iainbeeston/nickel)
 [![Code Climate](http://img.shields.io/codeclimate/github/iainbeeston/nickel.svg)](https://codeclimate.com/github/iainbeeston/nickel)
 
+Nickel extracts date, time, and message information from naturally worded text.
+
 Install
 -------
 

data/lib/nickel/occurrence.rb

@@ -9,17 +9,7 @@ module Nickel
     end
 
     def inspect
-      str = %(\#<Occurrence type: #{type})
-      str << %(, start_date: "#{start_date}")  if start_date
-      str << %(, end_date: "#{end_date}")      if end_date
-      str << %(, start_time: "#{start_time}")  if start_time
-      str << %(, end_time: "#{end_time}")      if end_time
-      str << %(, interval: #{interval})             if interval
-      str << %(, day_of_week: #{day_of_week})       if day_of_week
-      str << %(, week_of_month: #{week_of_month})   if week_of_month
-      str << %(, date_of_month: #{date_of_month})   if date_of_month
-      str << ">"
-      str
+      "#<Occurrence " + members.select{|m| self[m]}.map{|m| %(#{m}: #{self[m]})}.join(", ") + ">"
     end
 
     def finalize(cur_date)

data/lib/nickel/version.rb

@@ -1,3 +1,3 @@
 module Nickel
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/nickel/zdate.rb

@@ -75,22 +75,12 @@ module Nickel
       txt.gsub!(/%d/, self.day_str)
     end
 
-    def before(d2)
-      d2.respond_to?(:year) && (year < d2.year) ||
-        d2.respond_to?(:month) && (year == d2.year && (month < d2.month ||
-          d2.respond_to?(:day) && (month == d2.month && day < d2.day)))
-    end
-
-    def after(d2)
-      d2.respond_to?(:year) && (year > d2.year) ||
-        d2.respond_to?(:month) && (year == d2.year && (month > d2.month ||
-          d2.respond_to?(:day) && (month == d2.month && day > d2.day)))
-    end
-
     def <=>(d2)
-      if before(d2)
+      return nil unless [:year, :month, :day].all?{|m| d2.respond_to?(m)}
+
+      if before?(d2)
         -1
-      elsif after(d2)
+      elsif after?(d2)
         1
       else
         0
@@ -555,6 +545,15 @@ module Nickel
     end
 
     private
+
+    def before?(d2)
+      (year < d2.year) || (year == d2.year && (month < d2.month || (month == d2.month && day < d2.day)))
+    end
+
+    def after?(d2)
+      (year > d2.year) || (year == d2.year && (month > d2.month || (month == d2.month && day > d2.day)))
+    end
+
     def validate
       raise "ZDate says: invalid date" if !valid
     end

data/lib/nickel/ztime.rb

@@ -139,23 +139,12 @@ module Nickel
       is_am? ? "am" : "pm"
     end
 
-
-    def before(t2)
-      (t2.respond_to? :hour) && (hour < t2.hour) ||
-        (t2.respond_to? :min) && (hour == t2.hour && (min < t2.min ||
-          (t2.respond_to? :sec) && (min == t2.min && sec < t2.sec)))
-    end
-
-    def after(t2)
-      (t2.respond_to? :hour) && (hour > t2.hour) ||
-        (t2.respond_to? :min) && (hour == t2.hour && (min > t2.min ||
-          (t2.respond_to? :sec) && (min == t2.min && sec > t2.sec)))
-    end
-
     def <=>(t2)
-      if before(t2)
+      return nil unless [:hour, :min, :sec].all?{|m| t2.respond_to?(m)}
+
+      if before?(t2)
         -1
-      elsif after(t2)
+      elsif after?(t2)
         1
       else
         0
@@ -352,6 +341,14 @@ module Nickel
 
     private
 
+    def before?(t2)
+      (hour < t2.hour) || (hour == t2.hour && (min < t2.min || (min == t2.min && sec < t2.sec)))
+    end
+
+    def after?(t2)
+      (hour > t2.hour) || (hour == t2.hour && (min > t2.min || (min == t2.min && sec > t2.sec)))
+    end
+
     def adjust_for(am_pm)
       # how does validation work?  Well, we already know that @time is valid, and once we modify we call time= which will
       # perform validation on the new time.  That won't catch something like this though:  ZTime.new("2215", :am)

data/spec/lib/nickel/occurrence_spec.rb

@@ -35,6 +35,14 @@ module Nickel
         expect(occ).to eq Occurrence.new(type: :daily, start_date: ZDate.new("20140128"))
       end
     end
+
+    describe "#inspect" do
+      let(:occ) { Occurrence.new(type: :daily, start_date: ZDate.new("20140128"), end_date: ZDate.new("20140209"), interval: 2) }
+
+      it "shows only members that have been set" do
+        expect(occ.inspect).to eq '#<Occurrence type: daily, start_date: 20140128, end_date: 20140209, interval: 2>'
+      end
+    end
   end
 end
 

data/spec/lib/nickel/zdate_spec.rb

@@ -89,6 +89,10 @@ module Nickel
       it "is false when the other object is a Date for any other day" do
         expect(d1).to_not eq Date.new(2010, 9, 27)
       end
+
+      it "is false when the other object is a String" do
+        expect(d1).to_not eq '20090927'
+      end
     end
   end
 end

data/spec/lib/nickel/ztime_spec.rb

@@ -254,77 +254,69 @@ module Nickel
       it "is false when the other object is a Time for any other time" do
         expect(t1).to_not eq Time.parse("17:18:19")
       end
+
+      it "is false when the other object is a String" do
+        expect(t1).to_not eq "161718"
+      end
     end
 
     describe "#hour_str" do
       it "is the hour in the day as a string" do
-        expect(ZTime.new("161718").hour_str).to eql("16")
+        expect(ZTime.new("161718").hour_str).to eq("16")
       end
     end
 
     describe "#min_str" do
       it "is the minutes past the hour as a string" do
-        expect(ZTime.new("161718").min_str).to eql("17")
+        expect(ZTime.new("161718").min_str).to eq("17")
       end
     end
 
     describe "#sec_str" do
       it "is the seconds into the minute as a string" do
-        expect(ZTime.new("161718").sec_str).to eql("18")
+        expect(ZTime.new("161718").sec_str).to eq("18")
       end
     end
 
     describe "#minute_str", :deprecated do
-      let(:t1) { ZTime.new("161718") }
-
-      it "delegates to #min_str" do
-        expect(t1).to receive(:min_str)
-        t1.minute_str
+      it "is the minutes past the hour as a string" do
+        expect(ZTime.new("161718").min_str).to eq("17")
       end
     end
 
     describe "#second_str", :deprecated do
-      let(:t1) { ZTime.new("161718") }
-
-      it "delegates to #sec_str" do
-        expect(t1).to receive(:sec_str)
-        t1.second_str
+      it "is the seconds into the minute as a string" do
+        expect(ZTime.new("161718").sec_str).to eq("18")
       end
     end
 
     describe "#hour" do
       it "is the hour in the day" do
-        expect(ZTime.new("161718").hour).to eql(16)
+        expect(ZTime.new("161718").hour).to eq(16)
       end
     end
 
     describe "#min" do
       it "is the minutes past the hour" do
-        expect(ZTime.new("161718").min).to eql(17)
+        expect(ZTime.new("161718").min).to eq(17)
       end
     end
 
     describe "#sec" do
       it "is the seconds into the minute" do
-        expect(ZTime.new("161718").sec).to eql(18)
+        expect(ZTime.new("161718").sec).to eq(18)
       end
     end
 
     describe "#minute", :deprecated do
-      let(:t1) { ZTime.new("161718") }
-
-      it "delegates to #min" do
-        expect(t1).to receive(:min)
-        t1.minute
+      it "is the minutes past the hour" do
+        expect(ZTime.new("161718").min).to eq(17)
       end
     end
 
     describe "#second", :deprecated do
-      let(:t1) { ZTime.new("161718") }
-
-      it "delegates to #sec" do
-        expect(t1).to receive(:sec)
-        t1.second
+      it "is the seconds into the minute" do
+        expect(ZTime.new("161718").sec).to eq(18)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nickel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lou Zell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler