to_pass 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/to_pass/algorithm_reader.rb

@@ -19,8 +19,8 @@ class ToPass::AlgorithmReader
       '~/.to_pass/algorithms',
       "#{File.dirname(__FILE__)}/../algorithms"
     ].each do |dir|
-      dir = Pathname.new(dir)
-      @load_path << dir.expand_path if dir.exist?
+      dir = Pathname.new(dir).expand_path
+      @load_path << dir if dir.exist?
     end
   end
 
@@ -38,10 +38,12 @@ class ToPass::AlgorithmReader
       if file.exist?
         file
       else
-        nil
+        next
       end
     end.compact.first
 
+    raise LoadError, "algorithm #{@algorithm} could not be found in #{load_path}" if fn.nil?
+
     YAML.load_file(fn.expand_path)
   end
 end

data/test/fixtures/user_alg.yml

@@ -0,0 +1,18 @@
+desc: Test Algorithm
+name: Test
+sentence:
+  - first_chars
+  - table: chars
+  - table: symbols
+  - collapse_chars
+word:
+  - table: chars
+  - table: symbols
+tables:
+  symbols:
+    p: '%'
+    s: '/'
+  chars:
+    a: 1
+    b: 2
+    c: z

data/test/helper.rb

@@ -21,6 +21,13 @@ Test::Unit::TestCase.class_eval do
       assert_class_defined klass
     end
   end
+
+
+  def with_algorithm_in_user_dir
+    `mkdir -p ~/to_pass/algorithms; cp -f #{File.dirname(__FILE__)}/fixtures/user_alg.yml ~/.to_pass/algorithms/user_alg.yml`
+    yield
+    `rm ~/.to_pass/algorithms/user_alg.yml`
+  end
 end
 
 require 'lib/to_pass'

data/test/test_algorithm_reader.rb

@@ -33,6 +33,12 @@ class TestAlgorithmReader < Test::Unit::TestCase
     end
   end
 
+  def test_loads_from_user_dir
+    with_algorithm_in_user_dir do
+      assert_kind_of Hash, klass.load(:user_alg)
+    end
+  end
+
   protected
 
   def klass

data/test/test_integration.rb

@@ -27,4 +27,11 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal 't35t', str.to_pass
     end
   end
+
+  def test_cli_usage_with_user_algorithm
+    with_algorithm_in_user_dir do
+      assert_equal "le1/2%z", `bin/to_pass 'leasbpc' -a user_alg`.chomp
+      assert_equal "le1/2%z", `bin/to_pass 'luke eats all sausagages because peter cries' -a user_alg`.chomp
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: to_pass
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Matthias Viehweger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: to_pass
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ files:
 - lib/to_pass/converter.rb
 - lib/to_pass/integration.rb
 - lib/to_pass/string_conversions.rb
+- test/fixtures/user_alg.yml
 - test/helper.rb
 - test/test_algorithm_reader.rb
 - test/test_base.rb