home_run 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,49 @@
+=== 0.9.1 (2010-09-01)
+
+* Fix strptime for %Y%m%d and similar formats (jeremyevans) (#9)
+
+* Require rake-compiler when building from source (may need to clean out your ext/date_ext directory manually) (jeremyevans)
+
+* Include the ragel-generated file in the repository, so you don't need ragel to build from source (jeremyevans)
+
+* Respect Encoding.default_internal for returned strings on 1.9 (brianmario, jeremyevans)
+
+* Handle problems with zones in the -HH,DDD or -HH.DDD formats (jeremyevans)
+
+* Compile C files separately, instead of including C files in other C files (jeremyevans)
+
+* On ruby 1.9, return strings in US-ASCII encoding instead of ASCII-8BIT (jeremyevans) (#8)
+
+* Reorganize directory structure to use the standard ruby extension structure (luislavena, jeremyevans)
+
+* Support Date/DateTime#step without a block returning an Enumerator on 1.9 (jeremyevans) (#6)
+
+* Support ruby build with CALC_EXACT_MALLOC_SIZE (nocode) (#5)
+
+* Add Ragel parser for Apache Common Log Format date format (jeremyevans)
+
+* Add Ragel parser for RFC 822 date format (jeremyevans)
+
+* Fix loading date/format.rb directly where the date extension hasn't been included but the Date class has been opened (jeremyevans) (#3)
+
+* Don't override ruby's default extension optimization flags (jeremyevans)
+
+* Fix compilation on Solaris with the Sun Studio Compiler (ankopainting)
+
+* Handle YYYY/MM/DD date format in the ISO 8601 Ragel parser (jeremyevans)
+
+* Add a home_run.rb file to allow you to require 'home_run' to load the extension, useful on Heroku with ruby 1.8 (jeremyevans) (#2)
+
+* Don't think that Mac OS X/Darwin users are on Windows (jeremyevans) (#1)
+
+* Tighten up offset limits to exactly 14 hours from UTC (jeremyevans)
+
+* Make dates outside of the allowed range raise RangeErrors (jeremyevans)
+
+* Add range check for DateTime#+ and related methods (jeremyevans)
+
+* Add range check for DateTime#new! (jeremyevans)
+
 === 0.9.0 (2010-08-20)
 
 * Initial Public Release

data/README.rdoc

@@ -36,8 +36,8 @@ some comparative results for common methods:
 The standard library Date class is slow enough to be the
 bottleneck in much (if not most) of code that uses it.
 Here's a real world benchmark showing the retrieval of
-data from a database, first without home_run, and then
-with home_run.
+data from a database (using Sequel), first without home_run,
+and then with home_run.
 
   $ script/console production
   Loading production environment (Rails 2.3.5)
@@ -109,10 +109,21 @@ using home_run:
 This manipulates the RUBYLIB and RUBYOPT environment variables so
 that home_run's Date/DateTime classes will be used.
 
+You can also just require the library:
+
+  require 'home_run'
+
+This should only be used as a last resort.  Because rubygems requires
+date, you can end up with situations where the Date instances created
+before the require use the standard library version of Date, while the
+Date instances created after the require use this library's version.
+However, in some cases (such as on Heroku), this is the only way to
+easily use this library. 
+
 == Running the specs
 
-You can run the specs after installing the gem, if you have MSpec
-installed (gem install mspec):
+You can run the rubyspec based specs after installing the gem, if
+you have MSpec installed (gem install mspec):
 
   home_run --spec
 
@@ -202,6 +213,15 @@ you use the standard library.
 Any other differences will either be documented here or considered
 bugs, so please report any other differences you find.
 
+== Known incompatibilities
+
+Some other libraries are known to be incompatible with this
+extension due to the above differences:
+
+* Date::Performance - Date#<=> assumes @ajd instance variable
+  (unnecessary anyway, as home_run is faster)
+* ruby-ole - Depends on DateTime.allocate/#initialize
+
 == Reporting issues/bugs
 
 home_run uses GitHub Issues for tracking issues/bugs:
@@ -220,25 +240,19 @@ To get a copy:
 
 There are a few requirements:
 
-* Rake
-* Ragel 6.5+ for building the ragel parser.  The compiled C file is
-  included in the gem, so people installing the gem don't need
-  Ragel.  The compiled C file is not checked into git, so you need
-  Ragel if you are working with a git checkout.
+* rake
+* rake-compiler
 * MSpec (not RSpec) for running the specs.  The specs are based on
   the rubyspec specs, which is why they use MSpec.
 * RDoc 2.5.10+ if you want to build the documentation.
+* Ragel 6.5+ if you want to modify the ragel parser.
 
-The directory layout is slightly unusual in that there is no
-lib directory and there are .rb files in the ext directory. This may
-change in a future version.
-
-== Building
+== Compiling
 
-To build the library from a git checkout, after installing the
+To compile the library from a git checkout, after installing the
 requirements:
 
-  rake parser build
+  rake compile
 
 == Testing
 
@@ -246,7 +260,8 @@ The default rake task runs the specs, so just run:
 
   rake
 
-You need to build the library before running the specs.
+You need to compile the library and install MSpec before running the
+specs.
 
 == Benchmarking
 
@@ -275,18 +290,23 @@ home_run has been tested on the following:
 === Operating Systems/Platforms
 
 * Linux (x86_64, i386)
-* Mac OS X 10.6 (x86_64, i386)
+* Mac OS X 10.6 (x86_64, i386), 10.5 (i386)
 * OpenBSD (amd64, i386)
+* Solaris 10 (sparc)
 * Windows XP (i386)
+* Windows 7 (x64)
 
 === Compiler Versions
 
-* gcc (3.3.5, 4.2.1, 4.4.3, 4.5.0)
+* gcc (3.3.5, 4.0.1, 4.2.1, 4.4.3, 4.5.0)
+* Sun Studio Compiler (5.9)
 
 === Ruby Versions
 
+* jruby cext branch (as of commit 1969c504229bfd6f2de1, 2010-08-23,
+  compiles and runs specs correctly, segfaults on benchmarks)
 * rbx head (as of commit 0e265b92727cf3536053, 2010-08-16)
-* ruby 1.8.6 (p0, p398, p399)
+* ruby 1.8.6 (p0, p110, p398, p399)
 * ruby 1.8.7 (p174, p248, p299, p302)
 * ruby 1.9.1 (p243, p378, p429, p430)
 * ruby 1.9.2 (p0)
@@ -295,19 +315,11 @@ home_run has been tested on the following:
 If your platform, compiler version, or ruby version is not listed
 above, please test and send me a report including:
 
-* Your operating system and platform (e.g. i386, x86_64/amd64)
-* Your compiler
-* Your ruby version
-* The output of home_run --spec
-* The output of home_run --bench
-
-== Todo
-
-* Get it working on jruby with the cext branch
-* Add more specs for greater code coverage and to test
-  boundry conditions
-* Expand main ragel parser to handle more formats
-* Add ragel versions of the 1.9 date parsing functions
+  * Your operating system and platform (e.g. i386, x86_64/amd64)
+  * Your compiler
+  * Your ruby version
+  * The output of home_run --spec
+  * The output of home_run --bench
 
 == Author
 

data/Rakefile

@@ -2,20 +2,16 @@ require "rake"
 require "rake/clean"
 require 'rbconfig'
 
-CLEAN.include %w'ext/Makefile ext/date_ext.*o **/*.rbc *.core rdoc' 
+CLEAN.include %w'**/*.rbc *.core rdoc coverage'
 RUBY=ENV['RUBY'] || File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
-begin
-  gem 'rdoc'
-  require 'rdoc/rdoc'
-  require "rake/rdoctask"
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = "rdoc"
-    rdoc.options += ["--quiet", "--line-numbers", "--inline-source", '--title',
-      'home_run: Fast Date/DateTime classes for ruby', '--main', 'README.rdoc']
-    rdoc.rdoc_files.add %w"README.rdoc CHANGELOG LICENSE ext/**/*.rb ext/*.c"
-  end
-rescue LoadError
+desc "Build the RDoc documentation"
+task :rdoc do
+  require 'fileutils'
+  FileUtils.rm_rf('rdoc')
+  sh 'rdoc --quiet --line-numbers --inline-source --output rdoc --title ' \
+     '"home_run: Fast Date/DateTime classes for ruby" --main README.rdoc ' \
+     'README.rdoc CHANGELOG LICENSE lib/date.rb lib/date/format.rb ext/date_ext/*.c'
 end
 
 desc "Run the specs with mspec"
@@ -26,77 +22,31 @@ task :spec do
 end
 
 desc "Build the gem"
-task :gem => [:clean, :parser] do
+task :gem => [:distclean] do
   sh %{gem build home_run.gemspec}
 end
 
 desc "Try to clean up everything"
 task :distclean  do
-  CLEAN.concat(%w'pkg home_run-*.gem ext/1.* tmp rdoc ext/date_parser.c')
+  CLEAN.concat(%w'pkg home_run-*.gem lib/1.* tmp')
   Rake::Task[:clean].invoke
 end
 
-if RUBY_PLATFORM !~ /win|w32/ and File.directory?(File.join(File.expand_path(ENV['HOME']), '.rake-compiler'))
 begin
-  require "rake/extensiontask"
-  ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
-  load('home_run.gemspec')
-  desc "Internal--cross compile the windows binary gem"
-  Rake::ExtensionTask.new('date_ext', HOME_RUN_GEMSPEC) do |ext|
-    ext.name = 'date_ext'
-    ext.ext_dir = 'ext' 
-    ext.lib_dir = 'ext' 
-    ext.cross_compile = true
-    ext.cross_platform = 'i386-mswin32'
-    ext.source_pattern = '*.c'
-  end
-
-  # FIXME: Incredibly hacky, should figure out how to get
-  # rake compiler to do this correctly
-  desc "Build the cross compiled windows binary gem"
-  task :windows_gem => :clean do
-    sh %{rm -rf tmp pkg home_run-*.gem ext/1.*}
-    system %{rake cross native gem}
-    unless File.directory?('pkg')
-      sh %{cp ext/*.c tmp/i386-mswin32/date_ext/1.8.6}
-      system %{rake cross native gem}
-      sh %{cp ext/*.c tmp/i386-mswin32/date_ext/1.9.1}
-      system %{rake cross native gem}
-      sh %{rake cross native gem}
-    end
-    sh %{rm -rf home_run-*.gem tmp ext/1.*}
-    sh %{mv pkg/home_run-*.gem .}
-    sh %{rmdir pkg}
-  end
-
-  desc "Build the cross compiled windows binary gem"
-  task :windows_gem_clean do
-    sh %{rm -rf tmp ext/1.{8,9}}
-  end
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('date_ext')
 rescue LoadError
 end
-end
 
-desc "Build the ragel parser"
+desc "Regenerate the ragel parser"
 task :parser do
-  sh %{cd ext && ragel date_parser.rl}
-end
-
-desc "Build the extension"
-task :build=>[:clean] do
-  sh %{cd ext && #{RUBY} extconf.rb && make}
-end
-
-desc "Build debug version of extension"
-task :build_debug=>[:clean] do
-  ENV['DEBUG'] = '1'
-  sh %{cd ext && #{RUBY} extconf.rb && make}
+  sh %{cd ext/date_ext && ragel date_parser.rl}
 end
 
 desc "Start an IRB shell using the extension"
 task :irb do
   irb = ENV['IRB'] || File.join(RbConfig::CONFIG['bindir'], File.basename(RUBY).sub('ruby', 'irb'))
-  sh %{#{irb} -I ext -r date}
+  sh %{#{irb} -I lib -r date}
 end
 
 desc "Run comparative benchmarks"
@@ -107,34 +57,39 @@ end
 desc "Run all benchmarks"
 task :bench_all => [:bench, :mem_bench, :garbage_bench]
 
+desc "Run comparative parser benchmarks"
+task :parser_bench do
+  sh %{#{RUBY} bench/parser_bench.rb}
+end
+
 desc "Run comparative memory benchmarks"
 task :mem_bench do
-  if RUBY_PLATFORM =~ /win|w32/
+  if RUBY_PLATFORM =~ /mswin|mingw/
     puts "Memory benchmarks not supported on Windows"
     next
   end
 
   stdlib = `#{RUBY} -I #{RbConfig::CONFIG['rubylibdir']} bench/mem_bench.rb`.to_i
-  home_run = `#{RUBY} -I ext bench/mem_bench.rb`.to_i
+  home_run = `#{RUBY} -I lib bench/mem_bench.rb`.to_i
   puts "Date memory use,#{stdlib}KB,#{home_run}KB,#{sprintf('%0.1f', stdlib/home_run.to_f)}"
 
   stdlib = `#{RUBY} -I #{RbConfig::CONFIG['rubylibdir']} bench/dt_mem_bench.rb`.to_i
-  home_run = `#{RUBY} -I ext bench/dt_mem_bench.rb`.to_i
+  home_run = `#{RUBY} -I lib bench/dt_mem_bench.rb`.to_i
   puts "DateTime memory use,#{stdlib}KB,#{home_run}KB,#{sprintf('%0.1f', stdlib/home_run.to_f)}"
 end
 
 desc "Run comparative garbage creation benchmarks"
 task :garbage_bench do
-  if RUBY_PLATFORM =~ /win|w32/
+  if RUBY_PLATFORM =~ /mswin|mingw/
     puts "Garbage creation benchmarks not supported on Windows"
     next
   end
 
   stdlib = `#{RUBY} -I #{RbConfig::CONFIG['rubylibdir']} bench/garbage_bench.rb`.to_i
-  home_run = `#{RUBY} -I ext bench/garbage_bench.rb`.to_i
+  home_run = `#{RUBY} -I lib bench/garbage_bench.rb`.to_i
   puts "Date garbage created,#{stdlib}KB,#{home_run}KB,#{sprintf('%0.1f', stdlib/home_run.to_f)}"
 
   stdlib = `#{RUBY} -I #{RbConfig::CONFIG['rubylibdir']} bench/dt_garbage_bench.rb`.to_i
-  home_run = `#{RUBY} -I ext bench/dt_garbage_bench.rb`.to_i
+  home_run = `#{RUBY} -I lib bench/dt_garbage_bench.rb`.to_i
   puts "DateTime garbage created,#{stdlib}KB,#{home_run}KB,#{sprintf('%0.1f', stdlib/home_run.to_f)}"
 end

data/bench/cpu_bench.rb

@@ -1,58 +1,5 @@
-require 'rbconfig'
-$:.unshift RbConfig::CONFIG['rubylibdir']
-require 'date'
-require 'benchmark'
-
-SD = Date
-SDT = DateTime
-Object.send(:remove_const, :Date)
-Object.send(:remove_const, :DateTime)
-$:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'ext'))
-load 'ext/date.rb'
-load 'ext/date/format.rb'
-HRD = Date
-HRDT = DateTime
-NANOS_PER_SEC = 1000000000
-N = 10000
-FILTER = ARGV.empty? ? nil : Regexp.new(ARGV[0])
-
-def compare(label, datetime=false, &block)
-  return if FILTER && label !~ FILTER
-  Object.send(:remove_const, :Date)
-  Object.send(:remove_const, :DateTime)
-  Object.send(:const_set, :Date, SD)
-  Object.send(:const_set, :DateTime, SDT)
-  stdlib = 0.0
-  stdlib_times = 0
-  while stdlib < 2
-    t = Time.now
-    yield(datetime ? SDT : SD)
-    stdlib += Time.now - t
-    stdlib_times += 1
-  end
-
-  Object.send(:remove_const, :Date)
-  Object.send(:remove_const, :DateTime)
-  Object.send(:const_set, :Date, HRD)
-  Object.send(:const_set, :DateTime, HRDT)
-  home_run = 0.0
-  home_run_times = 0
-  while home_run < 2
-    t = Time.now
-    yield(datetime ? HRDT : HRD)
-    home_run += Time.now - t
-    home_run_times += 1
-  end
-  
-  puts sprintf('%s%s,%i,%i,%0.2f', datetime ? 'DateTime' : 'Date', label, (stdlib * NANOS_PER_SEC)/(N * stdlib_times),  (home_run * NANOS_PER_SEC)/(N * home_run_times), (stdlib/stdlib_times)/(home_run/home_run_times))
-end
-
-def dt_compare(label, &block)
-  compare(label, true, &block)
-end
-
+load(File.join(File.dirname(File.expand_path(__FILE__)), 'cpu_bench_util.rb'))
 n = N
-puts "label,stdlib,home_run,times faster"
 compare("._parse"){|dc| n.times{dc._parse('2010-12-13')}}
 compare("._strptime"){|dc| n.times{dc._strptime('fri jan 5 00:00:00 2007', '%c')}}
 compare(".civil"){|dc| n.times{dc.civil(2010, 1, 1)}}

data/bench/cpu_bench_util.rb

@@ -0,0 +1,55 @@
+require 'rbconfig'
+$:.unshift RbConfig::CONFIG['rubylibdir']
+require 'date'
+require 'benchmark'
+
+SD = Date
+SDT = DateTime
+Object.send(:remove_const, :Date)
+Object.send(:remove_const, :DateTime)
+$:.unshift(File.join(File.dirname(File.dirname(File.expand_path(__FILE__))), 'lib'))
+load 'lib/date.rb'
+load 'lib/date/format.rb'
+HRD = Date
+HRDT = DateTime
+NANOS_PER_SEC = 1000000000
+N = ENV['N'] ? ENV['N'].to_i : 10000
+S = ENV['S'] ? ENV['S'].to_f : 2
+FILTER = ARGV.empty? ? nil : Regexp.new(ARGV[0])
+
+def compare(label, datetime=false, &block)
+  return if FILTER && label !~ FILTER
+  Object.send(:remove_const, :Date)
+  Object.send(:remove_const, :DateTime)
+  Object.send(:const_set, :Date, SD)
+  Object.send(:const_set, :DateTime, SDT)
+  stdlib = 0.0
+  stdlib_times = 0
+  while stdlib < S
+    t = Time.now
+    yield(datetime ? SDT : SD)
+    stdlib += Time.now - t
+    stdlib_times += 1
+  end
+
+  Object.send(:remove_const, :Date)
+  Object.send(:remove_const, :DateTime)
+  Object.send(:const_set, :Date, HRD)
+  Object.send(:const_set, :DateTime, HRDT)
+  home_run = 0.0
+  home_run_times = 0
+  while home_run < S
+    t = Time.now
+    yield(datetime ? HRDT : HRD)
+    home_run += Time.now - t
+    home_run_times += 1
+  end
+  
+  puts sprintf('%s%s,%i,%i,%0.2f', datetime ? 'DateTime' : 'Date', label, (stdlib * NANOS_PER_SEC)/(N * stdlib_times),  (home_run * NANOS_PER_SEC)/(N * home_run_times), (stdlib/stdlib_times)/(home_run/home_run_times))
+end
+
+def dt_compare(label, &block)
+  compare(label, true, &block)
+end
+
+puts "label,stdlib,home_run,times faster"

data/bench/parser_bench.rb

@@ -0,0 +1,20 @@
+load(File.join(File.dirname(File.expand_path(__FILE__)), 'cpu_bench_util.rb'))
+n = N
+formats = <<END
+2010-12-13
+2010-12-13 10:20:30
+2010-12-13 10:20:30-07:00
+2009/09/23
+2009/09/23 06:38:06
+23/Aug/2010
+23/Aug/2010:14:31:32
+23/Aug/2010:14:31:32 -0700
+Mon, 23 Aug 2010
+Mon, 23 Aug 2010 11:13:31
+Mon, 23 Aug 2010 11:13:31 -0700
+Mon, 23 Aug 2010 21:43:53 GMT
+END
+formats = formats.split("\n").map{|l| l.chomp}
+formats.each do |f|
+  compare("._parse #{f.inspect}"){|dc| n.times{dc._parse(f)}}
+end

data/bin/home_run

@@ -1,46 +1,49 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'rbconfig'
 
 command = :run
-lib = File.expand_path('../../ext', __FILE__)
+lib = File.dirname(File.dirname(File.expand_path(__FILE__)))
 
 opts = OptionParser.new do |opts|
   opts.banner = "home_run: Fast Date/DateTime classes for ruby"
-  opts.define_head "Usage: home_run (--install | --uninstall | command)"
+  opts.define_head "Usage: home_run (--option | command)"
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on_tail("--install", "install home_run to site_ruby") do
+  opts.on_tail("--install", "install to site_ruby") do
     command = :install
   end
 
-  opts.on_tail("--uninstall", "uninstall home_run from site_ruby") do
+  opts.on_tail("--uninstall", "uninstall from site_ruby") do
     command = :uninstall
   end
 
-  opts.on_tail("--bench", "benchmark home_run compared to the standard library") do
+  opts.on_tail("--bench", "run comparative benchmarks") do
     command = :bench
   end
 
-  opts.on_tail("--spec", "run the home_run specs") do
+  opts.on_tail("--spec", "run the specs (requires mspec)") do
     command = :spec 
   end
 end
+if ARGV.empty?
+  $stderr.puts opts.help
+  exit(1)
+end
 opts.order!
 
 case command
 when :bench
-  Dir.chdir(File.join(lib, '..'))
-  require 'rbconfig'
+  Dir.chdir(lib)
   ENV['RUBY'] = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
   require 'rubygems'
   require 'rake'
   load './Rakefile'
   Rake::Task[:bench_all].invoke
 when :spec
-  Dir.chdir(File.join(lib, '..'))
-  require 'rbconfig'
+  Dir.chdir(lib)
   ENV['PATH'] = [RbConfig::CONFIG['bindir'], ENV['PATH']].join(File::PATH_SEPARATOR)
   ENV['RUBY'] = File.join(RbConfig::CONFIG['ruby_install_name'])
   require 'rubygems'
@@ -49,27 +52,25 @@ when :spec
   Rake::Task[:default].invoke
 when :install
   Dir.chdir(lib)
-  require 'rbconfig'
   require 'fileutils'
   FUV = FileUtils::Verbose
-  FUV.cp("date.rb", RbConfig::CONFIG['sitelibdir'])
+  FUV.cp("lib/date.rb", RbConfig::CONFIG['sitelibdir'])
   FUV.mkdir_p(File.join(RbConfig::CONFIG['sitelibdir'], 'date'))
-  FUV.cp("date/format.rb", File.join(RbConfig::CONFIG['sitelibdir'], 'date'))
-  if File.exists?("date_ext.#{RbConfig::CONFIG['DLEXT']}")
-    FUV.cp("date_ext.#{RbConfig::CONFIG['DLEXT']}", RbConfig::CONFIG['sitearchdir'])
+  FUV.cp("lib/date/format.rb", File.join(RbConfig::CONFIG['sitelibdir'], 'date'))
+  if File.exists?("lib/date_ext.#{RbConfig::CONFIG['DLEXT']}")
+    FUV.cp("lib/date_ext.#{RbConfig::CONFIG['DLEXT']}", RbConfig::CONFIG['sitearchdir'])
   else
     # Windows binary gem files
-    if File.exists?('1.8/date_ext.so')
+    if File.exists?('lib/1.8/date_ext.so')
       FUV.mkdir_p(File.join(RbConfig::CONFIG['sitearchdir'], '1.8'))
-      FUV.cp("1.8/date_ext.so", File.join(RbConfig::CONFIG['sitearchdir'], '1.8'))
+      FUV.cp("lib/1.8/date_ext.so", File.join(RbConfig::CONFIG['sitearchdir'], '1.8'))
     end
-    if File.exists?('1.9/date_ext.so')
+    if File.exists?('lib/1.9/date_ext.so')
       FUV.mkdir_p(File.join(RbConfig::CONFIG['sitearchdir'], '1.9'))
-      FUV.cp("1.9/date_ext.so", File.join(RbConfig::CONFIG['sitearchdir'], '1.9'))
+      FUV.cp("lib/1.9/date_ext.so", File.join(RbConfig::CONFIG['sitearchdir'], '1.9'))
     end
   end
 when :uninstall
-  require 'rbconfig'
   require 'fileutils'
   FUV = FileUtils::Verbose
   FUV.rm_f(File.join(RbConfig::CONFIG['sitelibdir'], 'date.rb'))
@@ -82,6 +83,6 @@ when :uninstall
   FUV.rmdir(File.join(RbConfig::CONFIG['sitearchdir'], '1.9')) rescue nil
 else
   ENV['RUBYOPT'] = "-rdate #{ENV['RUBYOPT']}"
-  ENV['RUBYLIB'] = [lib, ENV['RUBYLIB']].join(File::PATH_SEPARATOR)
+  ENV['RUBYLIB'] = [File.join(lib, 'lib'), File.join(lib, 'ext', 'date_ext'), ENV['RUBYLIB']].join(File::PATH_SEPARATOR)
   exec(*ARGV)
 end

data/default.mspec

@@ -7,6 +7,6 @@ unless ENV['HOME']
 end
 
 class MSpecScript
-  set :flags, %w'-I ext -r date'
+  set :flags, %w'-I ext/date_ext -I lib -r date'
   set :files, ['spec/date/*', 'spec/datetime/*']
 end