date_ext 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/date_ext.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_ext}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hasclass"]

data/lib/quarter.rb

@@ -1,4 +1,6 @@
 class Quarter
+  include Comparable
+
   attr_accessor :year, :quarter
   
   def initialize(year, quarter)
@@ -10,25 +12,40 @@ class Quarter
     Year.new(@year)
   end
 
-# def -(x)
-#   if x.is_a?(Numeric)
-#     return self.class.new(@year - x)
-#   elsif x.is_a?(Quarter) 
-#     return @year - x.year
-#   else
-#     raise TypeError, 'expected numeric or year'
-#   end
-# end
-#
-# def +(x)
-#   if x.is_a?(Numeric)
-#     return self.class.new(@year + x)
-#   elsif x.is_a?(Quarter) 
-#     return @year + x.year
-#   else
-#     raise TypeError, 'expected numeric or year'
-#   end
-# end
+  def <=>(other)
+    self.first_date <=> other.first_date
+  end
+
+  def -(x)
+    if x.is_a?(Numeric)
+      y = year - (x / 4)
+      q = quarter - (x % 4)
+      if q < 1
+        y -= 1
+        q += 4
+      end 
+      return Quarter.new(y, q)
+    else
+      raise TypeError, 'expected numeric'
+    end
+  end
+ 
+  def +(x)
+    if x.is_a?(Numeric)
+      y = year + (x / 4)
+      q = quarter + (x % 4)
+      if q > 4
+        q -= 4
+        y += 1
+      end
+      return Quarter.new(y, q)      
+    else
+      raise TypeError, 'expected numeric'
+    end
+  end
+
+  def next; self + 1; end
+  def previous; self - 1; end
 
   def months; (first_month..last_month).to_a; end
 

data/lib/year.rb

@@ -1,10 +1,16 @@
 class Year
+  include Comparable
+  
   attr_accessor :year
   
   def initialize(year)
     @year = year.to_i
   end
 
+  def <=>(other)
+    self.year <=> other.year
+  end
+
   def -(x)
     if x.is_a?(Numeric)
       return self.class.new(@year - x)

data/test/quarter_test.rb

@@ -1,6 +1,33 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class QuarterTest < Test::Unit::TestCase
+  context "#next #previous" do
+    setup {
+      @quarter = Quarter.new(2009,1)
+    }
+    
+    should "- 1" do
+      assert_equal Quarter.new(2008,4), @quarter - 1
+    end
+    should "- 2" do
+      assert_equal Quarter.new(2008,3), @quarter - 2
+    end
+    should "+ 1" do
+      assert_equal Quarter.new(2009,2), @quarter + 1
+    end
+    should "+ 4" do
+      assert_equal Quarter.new(2010,1), @quarter + 4
+    end
+    
+    should "#next" do
+      assert_equal Quarter.new(2009,2), @quarter.next
+    end
+
+    should "#previous" do
+      assert_equal Quarter.new(2008,4), @quarter.previous
+    end
+
+  end
 
   context "Quarter 2009,1" do
     setup {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: date_ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - hasclass