copyright 0.1.4 → 0.1.5

data/VERSION

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

data/copyright.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{copyright}
-  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 = ["Takaaki Kato"]

data/lib/copyright_helper.rb

@@ -3,8 +3,6 @@
 # Adds a method for copyright period
 # @author Takaaki Kato <takaaki.kato@gmail.com>
 module CopyrightHelper
-  require 'date'
-  
   # Returns copyright period in years
   # @example When the argument is the year of now
   #   copyright_years(2009) #=> "2009"
@@ -13,11 +11,11 @@ module CopyrightHelper
   # @param [#is_a?(Integer)]
   def copyright_years(since)
     raise ArgumentError, "Argument should be a number" unless since.is_a?(Integer)
-    raise ArgumentError, "since should not be a future" if since > Date.today.year
-    if since == Date.today.year
+    raise ArgumentError, "since should not be a future" if since > Time.new.year
+    if since == Time.new.year
       "#{since}"
-    else 
-      "#{since}-#{Date.today.year}"
+    else
+      "#{since}-#{Time.new.year}"
     end
   end
 end

data/test/test_copyright.rb

@@ -1,33 +1,36 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-require 'test_helper'
+# require './test_helper.rb'
+
+require File.join(File.dirname(__FILE__), ["test_helper"])
 include CopyrightHelper
 
 class CopyrightYearTest < Test::Unit::TestCase
+  context "#copyright_years()" do
+    setup do
+      @this_year = Time.stubs(:new).returns(Time.local(2010))
+      @this_year.stubs(:year).returns(2010)
+    end
   
-  def setup
-    @today = Date.stubs(:today).returns(Date.civil(2009))
-    @today.stubs(:year).returns(2009)
-  end
-  
-  should "raise when an argument is not a number" do
-    assert_raise(ArgumentError) { copyright_years() }
-    assert_raise(ArgumentError) { copyright_years("123") }
-    assert_nothing_raised { copyright_years(2004) }
-    assert_nothing_raised { copyright_years(2009) }
-  end
+    should "raise when an argument is not a number" do
+      assert_raise(ArgumentError) { copyright_years() }
+      assert_raise(ArgumentError) { copyright_years("123") }
+      assert_nothing_raised { copyright_years(2004) }
+      assert_nothing_raised { copyright_years(2009) }
+    end
   
-  should "returen the number of 'since' when the 'since' is the year of today" do
-    assert_equal("2009", copyright_years(@today.year))
-  end
+    should "returen the number of 'since' when the 'since' is the year of today" do
+      assert_equal("2010", copyright_years(2010))
+    end
   
-  should "return 2009 - 2010 when the argument is not the year of 'since'" do
-    years = copyright_years(2006)
-    assert_equal("2006-2009", years)
-  end
+    should "return 2009-2010 when the argument is not the year of 'since'" do
+      years = copyright_years(2006)
+      assert_equal("2006-2010", years)
+    end
   
-  should "raise the argument is bigger than the this year" do
-    assert_raise(ArgumentError) {copyright_years(2220)}
+    should "raise the argument is bigger than the this year" do
+      assert_raise(ArgumentError) {copyright_years(2220)}
+    end
   end
 end

data/test/test_helper.rb

@@ -5,5 +5,5 @@ require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'copyright_helper'
+require 'copyright'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: copyright
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Takaaki Kato