frequency 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/frequency.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frequency}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2010-03-11}
   s.description = %q{Interpret strings that represent frequencies (once a day, hourly, biennially, etc.)}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/djsun/frequency}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Interpret and compare frequencies (such as hourly)}
   s.test_files = [
     "spec/frequency_spec.rb",

data/lib/frequency.rb

@@ -25,6 +25,9 @@ class Frequency
     "monthly"       =>         120,
     "quarterly"     =>          40,
     "biannually"    =>          20,
+    "semiannual"    =>          20,
+    "semi-annual"   =>          20,
+    "semiannually"  =>          20,
     "annual"        =>          10,
     "annually"      =>          10,
     "yearly"        =>          10,
@@ -84,15 +87,19 @@ class Frequency
   protected
   
   def compare_safely(method, other)
-    if self.per_decade.nil?
-      raise Undefined, %(Numerical value for "#{self.plain_text}" is undefined, ) +
-        %( therefore a comparison with "#{other.plain_text}" is impossible)
-    elsif other.per_decade.nil?
-      raise Undefined, %(Numerical value for "#{other.plain_text}" is undefined, ) +
-        %( therefore a comparison with "#{self.plain_text}" is impossible)
-    else
-      self.per_decade.send(method, other.per_decade)
+    errors = find_errors([self, other])
+    raise Undefined, errors.join(",") if !errors.empty?
+    self.per_decade.send(method, other.per_decade)
+  end
+  
+  def find_errors(objects)
+    errors = []
+    objects.each do |object|
+      if object.per_decade.nil?()
+        errors << %(Numerical value for "#{object.plain_text}" is undefined)
+      end
     end
+    errors
   end
 
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: frequency
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - David James
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -05:00
+date: 2010-03-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Interpret strings that represent frequencies (once a day, hourly, biennially, etc.)
 email: djames@sunlightfoundation.com
 executables: []
@@ -55,18 +62,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Interpret and compare frequencies (such as hourly)