frequency 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/frequency.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frequency}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]

data/lib/frequency.rb

@@ -73,12 +73,16 @@ class Frequency
   
   def per_decade
     value = FREQUENCIES[plain_text]
-    value ? value[0] : nil
+    return nil unless value
+    return nil unless value[0]
+    value[0]
   end
   
   def per_year
     value = FREQUENCIES[plain_text]
-    value ? (value[0] / 10.0) : nil
+    return nil unless value
+    return nil unless value[0]
+    value[0] / 10.0
   end
 
   def valid?

data/spec/frequency_spec.rb

@@ -124,6 +124,58 @@ describe "Frequency" do
     end
   end
   
+  describe "other" do
+    before do
+      @freq = Frequency.new("other")
+    end
+
+    it "should be valid" do
+      @freq.plain_text.should == "other"
+    end
+  
+    it "should be valid" do
+      @freq.valid?.should be_true
+    end
+
+    it "#per_year should be correct" do
+      @freq.per_year.should == nil
+    end
+
+    it "#per_decade should be correct" do
+      @freq.per_decade.should == nil
+    end
+    
+    it "< should be undefined" do
+      lambda {
+        @freq.should < Frequency.new('monthly')
+      }.should raise_error(Frequency::Undefined)
+    end
+
+    it "<= should be undefined" do
+      lambda {
+        @freq.should <= Frequency.new('monthly')
+      }.should raise_error(Frequency::Undefined)
+    end
+    
+    it "== should be undefined" do
+      lambda {
+        @freq.should == Frequency.new('monthly')
+      }.should raise_error(Frequency::Undefined)
+    end
+
+    it ">= should be undefined" do
+      lambda {
+        @freq.should >= Frequency.new('monthly')
+      }.should raise_error(Frequency::Undefined)
+    end
+    
+    it "> should be undefined" do
+      lambda {
+        @freq.should > Frequency.new('monthly')
+      }.should raise_error(Frequency::Undefined)
+    end
+  end
+  
   # ---
   
   describe "list" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - David James