typelib 0.0.3 → 0.1.0

data/Rakefile

@@ -1,80 +1,104 @@
-# $Id$
-$:.push 'lib'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rdoc/task'
-require 'fileutils'
-require 'typelib'
+require 'rubygems'
+require 'rake'
 
-include FileUtils::Verbose
+version = (File.exist?('VERSION') ? File.read('VERSION') : "").chomp
 
-task :default => [ :test, :dist ]
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "typelib"
+    gem.authors = ["Erik Hollensbe"]
+    gem.email = "erik@hollensbe.org"
+    gem.summary = "An on-demand arbitrary check and conversion library that won't destroy your data."
+    gem.homepage = "http://github.com/RDBI/typelib"
+    gem.authors = ["Erik Hollensbe"]
 
-task :fixperms do
-  chmod(0755, Dir['bin/*'])  
-end
+    gem.add_development_dependency 'test-unit'
+    gem.add_development_dependency 'rdoc'
 
-#
-# Tests
-#
+    ## for now, install hanna from here: http://github.com/raggi/hanna
+    gem.add_development_dependency 'hanna'
 
-Rake::TestTask.new do |t|
-  t.libs << 'lib'
-  t.test_files = FileList['test/test*.rb']
-  t.verbose = true 
+    # 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"
 end
 
-#
-# Distribution
-#
-
-task :dist      => [:fixperms, :repackage, :gem, :rdoc]
-task :distclean => [:clobber_package, :clobber_rdoc]
-task :clean     => [:distclean]
+begin
+  gem 'test-unit'
+  require 'rake/testtask'
+  Rake::TestTask.new(:test) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :test do
+    abort "test-unit gem is not available. In order to run test-unit, you must: sudo gem install test-unit"
+  end
+end
 
-#
-# Documentation
-#
 
-RDoc::Task.new do |rd|
-  rd.rdoc_dir = "rdoc"
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc")
-  rd.rdoc_files.include("./lib/**/*.rb")
-  rd.options = %w(-a)
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
-#
-# Packaging
-# 
-
-spec = Gem::Specification.new do |s|
-  s.name = "typelib"
-  s.version = TypeLib::VERSION
-  s.author = "Erik Hollensbe"
-  s.email = "erik@hollensbe.org"
-  s.summary = "An on-demand arbitrary check and conversion library that won't destroy your data."
-  s.homepage = "http://erik.hollensbe.org/docs/typelib/"
-  s.files = Dir["Rakefile"] + Dir["README.rdoc"] + Dir["lib/**/*"] + Dir['test/**/*']
-
-  s.has_rdoc = true
-  s.add_development_dependency 'test-unit'
-  s.rdoc_options = %w(-a)
-end
+task :test => :check_dependencies
 
-Rake::GemPackageTask.new(spec) do |s|
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
 end
 
-Rake::PackageTask.new(spec.name, spec.version) do |p|
-  p.need_tar_gz = true
-  p.need_zip = true
-  p.package_files.include("./bin/**/*")
-  p.package_files.include("./Rakefile")
-  p.package_files.include("./lib/**/*.rb")
-  p.package_files.include("README")
+task :default => :test
+
+begin
+  require 'hanna'
+  require 'rdoc/task'
+  RDoc::Task.new do |rdoc|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+    rdoc.options.push '-f', 'hanna'
+    rdoc.main = 'README.rdoc'
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = "RDBI #{version} Documentation"
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
+rescue LoadError => e
+  rdoc_missing = lambda do
+    abort "What, were you born in a barn? Install rdoc and hanna at http://github.com/erikh/hanna ."
+  end
+  task :rdoc, &rdoc_missing
+  task :clobber_rdoc, &rdoc_missing
 end
 
 task :to_blog => [:clobber_rdoc, :rdoc] do
-  sh "rm -fr $git/blog/content/docs/typelib && mv rdoc $git/blog/content/docs/typelib"
+  sh "rm -fr $git/blog/content/docs/typelib && mv doc $git/blog/content/docs/typelib"
 end
+
+task :install => [:test, :build]
+
+task :docview => [:rerdoc] do
+  sh "open rdoc/index.html"
+end
+
+# vim: syntax=ruby ts=2 et sw=2 sts=2

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/lib/typelib.rb

@@ -1,5 +1,3 @@
-require 'delegate'
-
 # Typelib is a way of checking and converting data. It operates as a "filter
 # chain" system which allows it to gradually normalize disparate data into a
 # common type. Each chain is optionally a part of a list which allows it to
@@ -12,32 +10,22 @@ require 'delegate'
 #
 module TypeLib
 
-  VERSION = "0.0.3"
+  def self.execute_filterlist(filters, obj)
+    f = filters.find { |filter| filter.check(obj) }
+    f ? f.convert(obj) : obj
+  end
 
   # A FilterList is a ... list of filters. It includes all the methods that
   # Array contains, plus an additional method -- execute. See
   # TypeLib::Filter.
-  class FilterList < DelegateClass(Array)
-    # Create a new FilterList. An array of TypeLib::Filter objects is
-    # accepted for construction.
-    def initialize(ary=[])
-      @filters = ary
-      super(@filters)
-    end
-
+  class FilterList < Array
     # Execute the checks in this list against +obj+, passing in +addl+
     # if any additional arguments are provided. If the check passes, the
     # conversion is run and the chain supplied to the constructor is
     # followed. If no checks pass, the original item is returned.
-    def execute(obj, *addl)
-      ret = obj 
-      @filters.each do |filter|
-        if filter.check(obj, *addl)
-          ret = filter.convert(obj, *addl)
-          break
-        end
-      end
-      return ret
+    def execute(obj)
+      f = find { |filter| filter.check(obj) }
+      f ? f.convert(obj) : obj
     end
   end
 
@@ -59,26 +47,23 @@ module TypeLib
 
     # Check this object against the filter. If additional data is supplied,
     # it will be provided to the Filter#check_proc.
-    def check(obj, *addl)
-      check_proc.call(obj, *addl)
+    def check(obj)
+      check_proc.call(obj)
     end
 
     # Convert this object unconditionally. If additional data is supplied,
     # it will be provided to the Filter#convert_proc.
-    def convert(obj, *addl)
-      ret = convert_proc.call(obj, *addl)
-      filters.execute(ret, *addl)
+    def convert(obj)
+      ret = convert_proc.call(obj)
+      filters.execute(ret)
     end
 
     #
     # Same as TypeLib::FilterList#execute, only just for this filter.
     #
-    def execute(obj, *addl)
-      ret = obj
-      if check(obj, *addl)
-        ret = convert(obj, *addl)
-      end
-      return ret
+    def execute(obj)
+      return convert(obj) if check(obj)
+      return obj
     end
   end
 end

data/lib/typelib/canned.rb

@@ -22,7 +22,7 @@ module TypeLib
       end
 
       check = proc do |obj|
-        (DateTime.strptime(obj, format).strftime(format) == obj) rescue false 
+        (DateTime.strptime(obj, format).strftime(format) == obj) rescue false
       end
 
       convert = proc { |obj| DateTime.strptime(obj, format) }
@@ -40,6 +40,7 @@ module TypeLib
       IS_STRING  = proc { |obj| obj.kind_of?(String)  }
       IS_NUMERIC = proc { |obj| obj.kind_of?(Numeric) }
       IS_INTEGER = proc { |obj| obj.kind_of?(Integer) }
+      IS_BOOLEAN = proc { |obj| obj.kind_of?(TrueClass) || obj.kind_of?(FalseClass) }
     end
 
     # Canned Conversions.
@@ -49,6 +50,7 @@ module TypeLib
       TO_STRING          = proc { |obj| obj.to_s }
       TO_BINARY          = proc { |obj| obj.to_s(2) }
       TO_HEX             = proc { |obj| obj.to_s(16) }
+      TO_BOOLEAN         = proc { |obj| !!obj }
 
       STR_TO_BIGDECIMAL  = proc { |obj| BigDecimal.new(obj.to_s) }
     end

data/test/test_01_basic.rb

@@ -61,16 +61,6 @@ class TestBasic < Test::Unit::TestCase
     assert_raises(ArgumentError) { filters.execute("1.25") }
   end
 
-  def test_04_args
-    check   = proc { |obj, *addl| addl[0] }
-    convert = proc { |obj, *addl| addl[0] } 
-    filter  = TypeLib::Filter.new(check, convert)
-
-    assert(filter.check(true, true))
-    assert(!filter.check(true, false))
-    assert_equal("fart", filter.convert(true, "fart"))
-  end
-
   def test_05_chains
     filters = TypeLib::FilterList.new
 

data/typelib.gemspec

@@ -0,0 +1,55 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{typelib}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Erik Hollensbe"]
+  s.date = %q{2010-12-10}
+  s.email = %q{erik@hollensbe.org}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/typelib.rb",
+    "lib/typelib/canned.rb",
+    "test/test_01_basic.rb",
+    "test/test_02_canned.rb",
+    "typelib.gemspec"
+  ]
+  s.homepage = %q{http://github.com/RDBI/typelib}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{An on-demand arbitrary check and conversion library that won't destroy your data.}
+  s.test_files = [
+    "test/test_01_basic.rb",
+    "test/test_02_canned.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<hanna>, [">= 0"])
+    else
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<hanna>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<hanna>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: typelib
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -04:00
+date: 2010-12-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,34 +25,61 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hanna
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: erik@hollensbe.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
-- Rakefile
 - README.rdoc
-- lib/typelib/canned.rb
+- Rakefile
+- VERSION
 - lib/typelib.rb
+- lib/typelib/canned.rb
 - test/test_01_basic.rb
 - test/test_02_canned.rb
+- typelib.gemspec
 has_rdoc: true
-homepage: http://erik.hollensbe.org/docs/typelib/
+homepage: http://github.com/RDBI/typelib
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- -a
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -61,7 +87,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -70,7 +95,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -81,5 +105,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An on-demand arbitrary check and conversion library that won't destroy your data.
-test_files: []
-
+test_files: 
+- test/test_01_basic.rb
+- test/test_02_canned.rb