fuzzyhash 0.0.6 → 0.0.7

data/Rakefile

@@ -9,38 +9,17 @@ begin
     s.files = FileList["[A-Z]*", "{lib,spec}/**/*"]
     s.rubyforge_project = 'fuzzyhash' # This line would be new
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
-# These are new tasks
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/fuzzyhash/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
+  
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+    rubyforge.remote_doc_path = ''
   end
+  
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-
 require 'spec'
 require 'spec/rake/spectask'
 task :spec => 'spec:all'

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 6
+:patch: 7
 :major: 0

data/lib/fuzzy_hash.rb

@@ -15,6 +15,12 @@ class FuzzyHash
     @regexes_reverse.clear
   end
   
+  def size
+    @hash.size + @regexes.size
+  end
+  alias_method :count, :size
+  
+  
   def ==(o)
     o.is_a?(FuzzyHash)
     o.instance_variable_get(:@hash) == @hash &&
@@ -83,14 +89,25 @@ class FuzzyHash
   
   private
   def regex_test
-    @regex_test ||= Regexp.new(@regexes.collect{|r| "(#{r[0]})"} * '|')
+    unless @regex_test
+      @regex_test = Object.new
+      @regex_test.instance_variable_set(:'@regexes', @regexes)
+      method = "
+        def match(str)
+          case str
+      "
+      @regexes.each_with_index do |reg, index|
+        method << "when #{reg.first.inspect}: [@regexes[#{index}][1], str]\n"
+      end
+      method << "end\nend\n"
+      @regex_test.instance_eval method
+    end
+    @regex_test
   end
   
   def regex_lookup(key)
-    if !@regexes.empty? && key.is_a?(String) && (data = regex_test.match(key))
-      (data_array = data.to_a).each_index do |i|
-        break [@regexes[i].last, data_array.at(i+1)] if data_array.at(i+1)
-      end
+    if !@regexes.empty? && key.is_a?(String) && (value = regex_test.match(key))
+      value
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fuzzyhash
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-22 00:00:00 -04:00
+date: 2009-09-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fuzzyhash
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A weird hash with special semantics for regex keys