kronos 0.1.8 → 0.1.9

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+group :development do
+  gem 'jeweler', '~> 1.5.1'
+end
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: .
+  specs:
+    kronos (0.1.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler (~> 1.5.1)
+  kronos!
+  rspec (~> 2.2)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 David James
+Copyright (c) 2009 Sunlight Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,45 +1,26 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "kronos"
-    gem.summary = %Q{Simple and flexible date parsing.}
-    gem.description = %Q{Kronos provides flexible date parsing. Currently just a thin layer on top of ParseDate.}
-    gem.email = "djames@sunlightfoundation.com"
-    gem.homepage = "http://github.com/djsun/kronos"
-    gem.authors = ["David James"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+require File.expand_path('../lib/version', __FILE__)
+Jeweler::Tasks.new do |gem|
+  gem.name = "kronos"
+  gem.version = Kronos::Version::STRING
+  gem.summary = %Q{Simple and flexible date parsing.}
+  gem.description = %Q{Kronos provides flexible date parsing. Currently just a thin layer on top of ParseDate.}
+  gem.email = "djames@sunlightfoundation.com"
+  gem.homepage = "http://github.com/djsun/kronos"
+  gem.authors = ["David James"]
+  gem.add_development_dependency "rspec", "~> 2.2"
+  gem.rubyforge_project = 'kronos'
+  # gem is a Gem::Specification
+  # see http://www.rubygems.org/read/chapter/20 for additional settings
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "kronos #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rspec/core/rake_task'
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(--color)
+  # t.rspec_opts = %w(-fs --color)
+  # t.ruby_opts  = %w(-w)
 end

data/kronos.gemspec

@@ -1,50 +1,48 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{kronos}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-12-10}
   s.description = %q{Kronos provides flexible date parsing. Currently just a thin layer on top of ParseDate.}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "kronos.gemspec",
-     "lib/kronos.rb",
-     "spec/compare_spec.rb",
-     "spec/from_hash_spec.rb",
-     "spec/parse_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/to_s_spec.rb",
-     "spec/valid_spec.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "kronos.gemspec",
+    "lib/kronos.rb",
+    "spec/compare_spec.rb",
+    "spec/from_hash_spec.rb",
+    "spec/parse_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/to_s_spec.rb",
+    "spec/valid_spec.rb"
   ]
   s.homepage = %q{http://github.com/djsun/kronos}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{kronos}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple and flexible date parsing.}
   s.test_files = [
     "spec/compare_spec.rb",
-     "spec/from_hash_spec.rb",
-     "spec/parse_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/to_s_spec.rb",
-     "spec/valid_spec.rb"
+    "spec/from_hash_spec.rb",
+    "spec/parse_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/to_s_spec.rb",
+    "spec/valid_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -52,12 +50,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.2"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.2"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.2"])
   end
 end
 

data/lib/kronos.rb

@@ -1,11 +1,12 @@
+require File.expand_path("../version", __FILE__)
 require 'parsedate'
 
 class Kronos
-  
+
   attr_accessor :year, :month, :day
-  
+
   IGNORE_PATTERN = Regexp.compile("^prior")
-  
+
   def parse(string)
     if string.nil? || string =~ IGNORE_PATTERN
       nil # do nothing
@@ -29,7 +30,7 @@ class Kronos
     end
     self
   end
-  
+
   def to_s
     s = ""
     raise "Invalid" unless valid?
@@ -38,17 +39,22 @@ class Kronos
     s << "-%02i" % day if day
     s
   end
-  
+
   def valid?
-    if day && (!month || !year)
-      false
-    elsif month && !year
-      false
-    elsif !year
-      false
-    else
-      true
+    return false if day && (!month || !year)
+    return false if month && !year
+    return false if !year
+    return false if year && !((1970 .. 2069) === year)
+    return false if month && !((1 .. 12) === month)
+    return false if day && !((1 .. 31) === day)
+    if year && month && day
+      begin
+        Date.new(year, month, day)
+      rescue ArgumentError
+        return false
+      end
     end
+    true
   end
 
   def <(other)
@@ -82,21 +88,21 @@ class Kronos
       raise "Unexpected"
     end
   end
-  
+
   def <=(other)
     (self < other) || (self == other)
   end
-  
+
   def ==(other)
     self.year == other.year &&
     self.month == other.month &&
     self.day == other.day 
   end
-  
+
   def >=(other)
     (self > other) || (self == other)
   end
-  
+
   def >(other)
     if !self.year || !other.year
       false
@@ -128,7 +134,7 @@ class Kronos
       raise "Unexpected"
     end
   end
-  
+
   def to_hash
     h = {}
     h['year']  = year  if year
@@ -136,7 +142,7 @@ class Kronos
     h['day']   = day   if day
     h
   end
-  
+
   def self.from_hash(h)
     o = self.new
     o.year  = h['year']  if h['year']
@@ -144,13 +150,13 @@ class Kronos
     o.day   = h['day']   if h['day']
     o if o.valid?
   end
-  
+
   def self.parse(string)
     self.new.parse(string)
   end
-  
+
   protected
-  
+
   def to_full_year(x)
     case x
     when (0 .. 69)  then 2000 + x
@@ -158,5 +164,5 @@ class Kronos
     else x
     end
   end
-  
-end
+
+end

data/lib/version.rb

@@ -0,0 +1,11 @@
+class Kronos
+
+  module Version
+    MAJOR = 0
+    MINOR = 1
+    PATCH = 9
+    BUILD = nil
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+  end
+
+end

data/spec/compare_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Kronos Comparisons" do
-  
+
   def new_kronos(year=nil, month=nil, day=nil)
     k = Kronos.new
     k.year  = year if year
@@ -9,7 +9,7 @@ describe "Kronos Comparisons" do
     k.day   = day if day
     k
   end
-  
+
   describe "2005 vs 2005" do
     before do
       @k1 = new_kronos(2005)
@@ -37,7 +37,7 @@ describe "Kronos Comparisons" do
     end
 
   end
-  
+
   describe "2005 vs 2006" do
     before do
       @k1 = new_kronos(2005)
@@ -199,29 +199,29 @@ describe "Kronos Comparisons" do
       (@k1 >= @k2).should == true
     end
   end
-  
+
   describe "(blank) vs 2000" do
     before do
       @k1 = new_kronos()
       @k2 = new_kronos(2000)
     end
-  
+
     it "should not be <" do
       (@k1 < @k2).should == false
     end
-  
+
     it "should not be <=" do
       (@k1 <= @k2).should == false
     end
-  
+
     it "should not be ==" do
       (@k1 == @k2).should == false
     end
-  
+
     it "should not be >" do
       (@k1 > @k2).should == false
     end
-  
+
     it "should not be >=" do
       (@k1 >= @k2).should == false
     end

data/spec/from_hash_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Kronos from_hash" do
-  
+
   it "2002" do
     k = Kronos.from_hash({
       'year' => 2002,
@@ -31,7 +31,7 @@ describe "Kronos from_hash" do
     k.month.should == 11
     k.day.should == 9
   end
-  
+
   it "Malformed: ? 9, 2002" do
     k = Kronos.from_hash({
       'year' => 2002,
@@ -39,5 +39,6 @@ describe "Kronos from_hash" do
       'day'   => 9,
     })
     k.should == nil
-  end  
-end
+  end
+
+end

data/spec/parse_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Kronos" do
-  
+
   it "15-Mar-2001" do
     c = Kronos.parse("15-Mar-2001")
     c.year.should  == 2001
@@ -13,7 +13,7 @@ describe "Kronos" do
       'day'   => 15,
     }
   end
-  
+
   it "January 1976" do
     c = Kronos.parse("January 1976")
     c.year.should  == 1976
@@ -84,7 +84,7 @@ describe "Kronos" do
       'year'  => 2019,
     }
   end
-  
+
   it "1/17/2007" do
     c = Kronos.parse("1/17/2007")
     c.year.should  == 2007
@@ -96,7 +96,7 @@ describe "Kronos" do
       'day'   => 17,
     }
   end
-  
+
   it "Aug-96" do
     c = Kronos.parse("Aug-96")
     c.year.should  == 1996
@@ -119,7 +119,7 @@ describe "Kronos" do
       'day'   => 15,
     }
   end
-  
+
   it "nil" do
     c = Kronos.parse(nil)
     c.year.should  == nil
@@ -127,7 +127,7 @@ describe "Kronos" do
     c.day.should   == nil
     c.to_hash.should == {}
   end
-  
+
   it "empty string" do
     c = Kronos.parse("")
     c.year.should  == nil
@@ -143,7 +143,7 @@ describe "Kronos" do
     c.day.should   == nil
     c.to_hash.should == {}
   end
-  
+
   it "prior to 1998" do
     c = Kronos.parse("prior to 1998")
     c.year.should  == nil
@@ -151,5 +151,5 @@ describe "Kronos" do
     c.day.should   == nil
     c.to_hash.should == {}
   end
-  
+
 end

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
-require 'kronos'
-require 'spec'
-require 'spec/autorun'
+require 'bundler/setup'
+require 'rspec'
+require File.expand_path('../../lib/kronos', __FILE__)
 
-Spec::Runner.configure do |config|
-  
-end
+Rspec.configure do |c|
+  c.mock_with :rspec
+end

data/spec/to_s_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "to_s" do
-  
+
   def new_kronos(year=nil, month=nil, day=nil)
     k = Kronos.new
     k.year  = year if year
@@ -9,7 +9,7 @@ describe "to_s" do
     k.day   = day if day
     k
   end
-  
+
   describe "2005" do
     it "should be '2005'" do
       k = new_kronos(2005)

data/spec/valid_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Kronos Comparisons" do
-  
+
   def new_kronos(year=nil, month=nil, day=nil)
     k = Kronos.new
     k.year  = year if year
@@ -9,25 +9,49 @@ describe "Kronos Comparisons" do
     k.day   = day if day
     k
   end
-  
+
   it "year only is valid" do
-    new_kronos(2005).valid?.should == true
+    new_kronos(2005).valid?.should be_true
   end
 
   it "month and year is valid" do
-    new_kronos(2005, 8).valid?.should == true
+    new_kronos(2005, 8).valid?.should be_true
+  end
+
+  it "day and year is invalid" do
+    new_kronos(2005, nil, 22).valid?.should be_false
+  end
+
+  it "nothing is invalid" do
+    new_kronos(nil, nil, nil).valid?.should be_false
   end
 
   it "month, day, and year is valid" do
-    new_kronos(2005, 8, 22).valid?.should == true
+    new_kronos(2005, 8, 22).valid?.should be_true
   end
 
-  it "day and year is invalid" do
-    new_kronos(2005, nil, 22).valid?.should == false
+  it "month, day, and year with out-of-range month is invalid" do
+    new_kronos(2005, 13, 22).valid?.should be_false
   end
-  
-  it "nothing is invalid" do
-    new_kronos(nil, nil, nil).valid?.should == false
+
+  it "month, day, and year with out-of-range day is invalid" do
+    new_kronos(2005, 4, 32).valid?.should be_false
+  end
+
+  it "June 0, 2005 is invalid" do
+    new_kronos(2005, 6, 0).valid?.should be_false
+  end
+
+  it "June 31, 2005 is invalid" do
+    new_kronos(2005, 6, 31).valid?.should be_false
+  end
+
+  it "February 29, 2008 is valid" do
+    new_kronos(2008, 2, 29).valid?.should be_true
+  end
+
+  it "February 29, 2010 is invalid" do
+    new_kronos(2010, 2, 29).valid?.should be_false
   end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kronos
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - David James
@@ -15,25 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: kronos
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
+        - 5
+        - 1
+        version: 1.5.1
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         - 2
-        - 9
-        version: 1.2.9
+        version: "2.2"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  requirement: *id004
 description: Kronos provides flexible date parsing. Currently just a thin layer on top of ParseDate.
 email: djames@sunlightfoundation.com
 executables: []
@@ -44,14 +88,16 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .bundle/config
 - .document
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - kronos.gemspec
 - lib/kronos.rb
+- lib/version.rb
 - spec/compare_spec.rb
 - spec/from_hash_spec.rb
 - spec/parse_spec.rb
@@ -64,8 +110,8 @@ homepage: http://github.com/djsun/kronos
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -88,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: kronos
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/VERSION

@@ -1 +0,0 @@
-0.1.8