herbalist 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a227228f017350ecb59d583c8e521eed0cb7e2a
+  data.tar.gz: 90dd46353a292c5fe3bfaa53f80ff5c32911e74d
+SHA512:
+  metadata.gz: c4de6b5a2b8df340e4cc01b1f2ca8b7408930662a2f881e186e9a0558e376766bfd2e05c4caaf9d1ac7d963d7831c4321ccaf9e88c021ed498e3036db2f1531b
+  data.tar.gz: 6005fce915869f2e49c9c5e0dbfbedc5a6f3a4081668ff1daa651fc585a38e328e40cbc9edb4e2f180b2a10b96e294511620d959939c363f5539fb502f9eccbb

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in herbalist.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    herbalist (0.1.0)
+      alchemist (~> 0.1)
+      numerizer (~> 0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    alchemist (0.1.7)
+    numerizer (0.2.0)
+    rake (10.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  herbalist!
+  rake

data/Rakefile

@@ -1,29 +1,4 @@
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/rdoctask'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "herbalist"
-    gem.summary = %Q{Herbalist is a natural language measurements parser.}
-    gem.description = %Q{Herbalist is a natural language measurements parser. It is built on top of the Alchemist[http://github.com/toastyapps/alchemist] gem and draws heavily from the Chronic[http://github.com/evaryont/chronic].}
-    gem.email = "duff.john@gmail.com"
-    gem.homepage = "http://github.com/jduff/herbalist"
-    gem.authors = ["jduff"]
-    
-    gem.add_dependency('alchemist', '>= 0.1.2')
-    gem.add_dependency('numerizer', '>= 0.1.1')
-    
-    gem.add_development_dependency('jeremymcanally-context')
-    # 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: sudo gem install jeweler"
-end
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -32,6 +7,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
@@ -44,21 +20,3 @@ rescue LoadError
     abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
   end
 end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "herbalist #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/herbalist.gemspec

@@ -1,60 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'herbalist/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{herbalist}
-  s.version = "0.1.0"
+Gem::Specification.new do |spec|
+  spec.name          = "herbalist"
+  spec.version       = Herbalist::VERSION
+  spec.authors       = ["jduff"]
+  spec.email         = ["duff.john@gmail.com"]
+  spec.summary       = %q{Herbalist is a natural language measurements parser.}
+  spec.homepage      = "https://github.com/jduff/herbalist"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["jduff"]
-  s.date = %q{2010-01-02}
-  s.description = %q{Herbalist is a natural language measurements parser. It is built on top of the Alchemist[http://github.com/toastyapps/alchemist] gem and draws heavily from the Chronic[http://github.com/evaryont/chronic].}
-  s.email = %q{duff.john@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "herbalist.gemspec",
-     "lib/herbalist.rb",
-     "lib/herbalist/herbalist.rb",
-     "test/test_helper.rb",
-     "test/test_herbalist.rb"
-  ]
-  s.homepage = %q{http://github.com/jduff/herbalist}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Herbalist is a natural language measurements parser.}
-  s.test_files = [
-    "test/test_helper.rb",
-     "test/test_herbalist.rb"
-  ]
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<alchemist>, [">= 0.1.2"])
-      s.add_runtime_dependency(%q<numerizer>, [">= 0.1.1"])
-      s.add_development_dependency(%q<jeremymcanally-context>, [">= 0"])
-    else
-      s.add_dependency(%q<alchemist>, [">= 0.1.2"])
-      s.add_dependency(%q<numerizer>, [">= 0.1.1"])
-      s.add_dependency(%q<jeremymcanally-context>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<alchemist>, [">= 0.1.2"])
-    s.add_dependency(%q<numerizer>, [">= 0.1.1"])
-    s.add_dependency(%q<jeremymcanally-context>, [">= 0"])
-  end
+  spec.add_dependency "alchemist", "~>0.1"
+  spec.add_dependency "numerizer", "~>0.2"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
 end

data/lib/herbalist.rb

@@ -14,9 +14,10 @@ unless Alchemist.respond_to?(:si_units)
 end
 
 module Herbalist
+  Alchemist.setup
   class << self
     attr_accessor :debug
   end
   
   self.debug = false
-end
+end

data/lib/herbalist/herbalist.rb

@@ -1,6 +1,6 @@
 module Herbalist
   # collect up all the possible unit types that Alchemist can handle
-  POSSIBLE_UNITS = Alchemist.conversion_table.collect{|k,v| v.keys}.flatten.uniq
+  POSSIBLE_UNITS = Alchemist.library.categories.map{|c| Alchemist.library.unit_names c}.flatten.uniq
   MULTIWORD_UNITS = POSSIBLE_UNITS.collect{|u| u.to_s}.grep(/_/)
   
   class << self
@@ -138,9 +138,9 @@ module Herbalist
       end
       
       # try si units with prefixes (kilo, deca etc)
-      Alchemist.unit_prefixes.each do |prefix, value|
+      Alchemist.library.unit_prefixes.each do |prefix, value|
         if token.word =~ /^#{prefix.to_s}.+/i
-          Alchemist.si_units.each do |unit|
+          Alchemist.library.si_units.each do |unit|
             if unit.to_s=~/#{token.word.gsub(/^#{prefix.to_s}/i,'')}$/i
               return Tag.new(:unit, "#{prefix}#{unit}") 
             end
@@ -156,4 +156,4 @@ module Herbalist
     end
   end
 
-end
+end

data/lib/herbalist/version.rb

@@ -0,0 +1,3 @@
+module Herbalist
+  VERSION = "0.2.0"
+end

data/test/test_helper.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
 require 'test/unit'
-require 'context'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'herbalist'
 
 class Test::Unit::TestCase
+
+  def self.test(name, &block)
+    define_method("test_#{name.gsub(/\s+/,'_')}".to_sym, &block)
+  end
 end

data/test/test_herbalist.rb

@@ -3,78 +3,82 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 class HerbalistTest < Test::Unit::TestCase
   # Herbalist.debug=true
   
-  should "parse number of cups" do
-    assert_equal 1.cup, Herbalist.parse('1 cup')
-    assert_equal 2.cups, Herbalist.parse('2 cups')
-    assert_equal 2.5.cups, Herbalist.parse('2.5 cups')
+  test "parse number of cups" do
+    assert_equal :cup, Herbalist.parse('1 cup').unit_name
+    assert_equal 1.cup.value, Herbalist.parse('1 cup').value
+    assert_equal 2.cups.value, Herbalist.parse('2 cups').value
+    assert_equal 2.5.cups.value, Herbalist.parse('2.5 cups').value
   end
   
-  should "parse number of meters" do
-    assert_equal 1.meter, Herbalist.parse('1 meter')
-    assert_equal 2.meters, Herbalist.parse('2 meters')
-    assert_equal 2.5.meters, Herbalist.parse('2.5 meters')
+  test "parse number of meter" do
+    assert_equal :meter, Herbalist.parse('1 meter').unit_name
+    assert_equal 1.meter.value, Herbalist.parse('1 meter').value
+    assert_equal 2.meter.value, Herbalist.parse('2 meter').value
+    assert_equal 2.5.meter.value, Herbalist.parse('2.5 meter').value
   end
   
-  should "parse number of kilometers" do
-    assert_equal 1.kilometer, Herbalist.parse('1 kilometer')
-    assert_equal 2.kilometers, Herbalist.parse('2 kilometers')
-    assert_equal 2.5.kilometers, Herbalist.parse('2.5 kilometers')
+  test "parse number of kilometer" do
+    assert_equal :meter, Herbalist.parse('1 kilometer').unit_name
+    assert_equal 1000, Herbalist.parse('1 kilometer').exponent
+    assert_equal 1.kilometer.value, Herbalist.parse('1 kilometer').value
+    assert_equal 2.kilometer.value, Herbalist.parse('2 kilometer').value
+    assert_equal 2.5.kilometer.value, Herbalist.parse('2.5 kilometer').value
   end
   
-  should "parse mixed case units" do
-    assert_equal 1.kilometer, Herbalist.parse('1 Kilometer')
-    assert_equal 2.kilometers, Herbalist.parse('2 KiloMeters')
-    assert_equal 2.5.miles, Herbalist.parse('2.5 Miles')
+  test "parse mixed case units" do
+    assert_equal 1.kilometer.value, Herbalist.parse('1 Kilometer').value
+    assert_equal 2.kilometer.value, Herbalist.parse('2 KiloMeters').value
+    assert_equal 2.5.miles.value, Herbalist.parse('2.5 Miles').value
   end
   
-  should "parse numbers in words" do
-    assert_equal 1.kilometer, Herbalist.parse('one Kilometer')
-    assert_equal 15.kilometers, Herbalist.parse('fifteen Kilometers')
-    assert_equal 21.5.miles, Herbalist.parse('twenty-one and a half Miles')
+  test "parse numbers in words" do
+    assert_equal 1.kilometer.value, Herbalist.parse('one Kilometer').value
+    assert_equal 15.kilometer.value, Herbalist.parse('fifteen Kilometer').value
+    assert_equal 21.5.miles.value, Herbalist.parse('twenty-one and a half Miles').value
   end
   
-  should "parse fractions in words" do
-    assert_equal 0.25.cup, Herbalist.parse('a quarter cup')
-    assert_equal 0.5.teaspoon, Herbalist.parse('a half teaspoon')
-    assert_equal 1.25.liters, Herbalist.parse('one and a quarter liters')
+  test "parse fractions in words" do
+    assert_equal 0.25.cup.value, Herbalist.parse('a quarter cup').value
+    assert_equal 0.5.teaspoon.value, Herbalist.parse('a half teaspoon').value
+    assert_equal 1.25.liters.value, Herbalist.parse('one and a quarter liters').value
   end
   
-  should "parse multiword units" do
-    assert_equal 1.cubic_meter, Herbalist.parse('one Cubic Meter')
-    assert_equal 15.kilowatt_hours, Herbalist.parse('fifteen kilowatt Hours')
-    assert_equal 21.5.tropical_years, Herbalist.parse('21.5 tropical years')
+  test "parse multiword units" do
+    assert_equal 1.cubic_meter.value, Herbalist.parse('one Cubic Meter').value
+    assert_equal 15.kilowatt_hours.value, Herbalist.parse('fifteen kilowatt Hours').value
+    assert_equal 21.5.tropical_years.value, Herbalist.parse('21.5 tropical years').value
   end
   
-  should "parse units from within a string of other text" do
-    assert_equal 1.cup, Herbalist.parse("1 Cup onion chopped")
-    assert_equal 1.25.ounces, Herbalist.parse("1 Package (1.25 ounces) taco seasoning mix")
-    assert_equal 16.ounces, Herbalist.parse("1 Can (16 ounces) tomatoes, undrained")
-    assert_equal 6.cups, Herbalist.parse("and 6 Cups turkey broth")
+  test "parse units from within a string of other text" do
+    assert_equal 1.cup.value, Herbalist.parse("1 Cup onion chopped").value
+    assert_equal 1.25.ounces.value, Herbalist.parse("1 Package (1.25 ounces) taco seasoning mix").value
+    assert_equal 16.ounces.value, Herbalist.parse("1 Can (16 ounces) tomatoes, undrained").value
+    assert_equal 6.cups.value, Herbalist.parse("and 6 Cups turkey broth").value
     
-    assert_equal 2.5.football_fields, Herbalist.parse("it was two and a half football fields")
-    assert_equal 15.meters, Herbalist.parse("John ran 15 meters")
+    assert_equal 2.5.football_fields.value, Herbalist.parse("it was two and a half football fields").value
+    assert_equal 15.meter.value, Herbalist.parse("John ran 15 meter").value
   end
   
-  should "not match can to ccandela units" do
+  test "not match can to ccandela units" do
     assert_equal nil, Herbalist.parse("1 Can")
   end
   
-  should "ignore units of measure that alchemist does not understand" do
+  test "ignore units of measure that alchemist does not understand" do
     assert_equal nil, Herbalist.parse('2 awesomes')
   end
   
   # add tests for all units Alchemist can handle
-  Alchemist.conversion_table.collect{|k,v| v.keys}.flatten.uniq.each do |unit|
-    should "parse #{unit}" do
-      assert_equal 1.send(unit), Herbalist.parse("1 #{unit}")
-      assert_equal 2.5.send(unit), Herbalist.parse("2.5 #{unit}")
+  Alchemist.library.categories.map{|c| Alchemist.library.unit_names(c)}.flatten.uniq.each do |unit|
+    test "parse #{unit}" do
+      assert_equal 1.send(unit).value, Herbalist.parse("1 #{unit}").value
+      assert_equal 2.5.send(unit).value, Herbalist.parse("2.5 #{unit}").value
     end
     
     # tests for all multi word units
     if (words = unit.to_s.split('_')).length > 1
-      should "parse multiword unit '#{words.join(' ')}'" do
-        assert_equal 1.send(unit), Herbalist.parse("1 #{words.join(' ')}")
-        assert_equal 2.5.send(unit), Herbalist.parse("2.5 #{words.join(' ')}")
+      test "parse multiword unit '#{words.join(' ')}'" do
+        assert_equal 1.send(unit).value, Herbalist.parse("1 #{words.join(' ')}").value
+        assert_equal 2.5.send(unit).value, Herbalist.parse("2.5 #{words.join(' ')}").value
       end
     end
   end

metadata

@@ -1,96 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: herbalist
-version: !ruby/object:Gem::Version 
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - jduff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-01-02 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: alchemist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
   name: numerizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: jeremymcanally-context
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: Herbalist is a natural language measurements parser. It is built on top of the Alchemist[http://github.com/toastyapps/alchemist] gem and draws heavily from the Chronic[http://github.com/evaryont/chronic].
-email: duff.john@gmail.com
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
+email:
+- duff.john@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
-- .gitignore
+extra_rdoc_files: []
+files:
+- ".document"
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - herbalist.gemspec
 - lib/herbalist.rb
 - lib/herbalist/herbalist.rb
+- lib/herbalist/version.rb
 - test/test_helper.rb
 - test/test_herbalist.rb
-has_rdoc: true
-homepage: http://github.com/jduff/herbalist
-licenses: []
-
+homepage: https://github.com/jduff/herbalist
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Herbalist is a natural language measurements parser.
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/test_herbalist.rb

data/VERSION

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