duct_tape 0.2.0 → 0.3.0

data/README.md

@@ -180,19 +180,19 @@ of partial matches can explode if abused in the worst case.
 
     aa = Containers::AutoassociativeArray.new
     aa << [1,2,3] << [2,3,4] << [3,4,5]       #=> [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
-    aa[1]                                     #=> [1, 2, 3]
+    aa[1]                                     #=> [[1, 2, 3]]
     aa[2]                                     #=> [[1, 2, 3], [2, 3, 4]]
     aa[3]                                     #=> [[1, 2, 3], [2, 3, 4], [3, 4, 5]]
     aa[4]                                     #=> [[2, 3, 4], [3, 4, 5]]
-    aa[5]                                     #=> [3, 4, 5]
+    aa[5]                                     #=> [[3, 4, 5]]
     aa[2,3]                                   #=> [[1, 2, 3], [2, 3, 4]]
-    aa[2,3,4]                                 #=> [2, 3, 4]
+    aa[2,3,4]                                 #=> [[2, 3, 4]]
     aa[2,5]                                   #=> []
     aa.partial_match(1,4)                     #=> [[2, 3, 4], [3, 4, 5]]
     aa.partial_match(1,5)                     #=> [[1, 2, 3], [3, 4, 5]]
     aa.partial_match(1,3,5)                   #=> [[1, 2, 3], [3, 4, 5]]
-    aa.partial_match(1,4,5)                   #=> [3, 4, 5]
-    aa.partial_match(2,4)                     #=> [2, 3, 4]
+    aa.partial_match(1,4,5)                   #=> [[3, 4, 5]]
+    aa.partial_match(2,4)                     #=> [[2, 3, 4]]
     aa.partial_match(2,5)                     #=> [[1, 2, 3], [2, 3, 4]]
 
 Partial matches return the set of arrays with the most matched elements from the

data/Rakefile

@@ -15,6 +15,7 @@ Jeweler::Tasks.new do |gem|
   gem.required_ruby_version = '>= 1.8.7'
   gem.license = 'Simplified BSD'
   gem.version = VERSION_STRING
+  gem.files.exclude 'Gemfile.lock'
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/duct_tape.gemspec

@@ -2,15 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: duct_tape 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "duct_tape"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Rodriguez"]
-  s.date = "2014-06-21"
+  s.date = "2014-06-23"
   s.description = "A general-purpose utility library for Ruby"
   s.email = ["tw.rodriguez@gmail.com"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -21,7 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitattributes",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.md",
     "REQUIRED_FILES",
@@ -34,7 +32,7 @@ Gem::Specification.new do |s|
     "lib/algorithms/containers/priority_queue.rb",
     "lib/duct_tape.rb",
     "lib/duct_tape/autoassociative_array.rb",
-    "lib/duct_tape/autoassociative_hash.rb",
+    "lib/duct_tape/fuzzy_hash.rb",
     "lib/ext/array.rb",
     "lib/ext/boolean.rb",
     "lib/ext/datetime.rb",
@@ -54,7 +52,7 @@ Gem::Specification.new do |s|
     "spec/algorithms/containers/heap_spec.rb",
     "spec/algorithms/containers/priority_queue_spec.rb",
     "spec/duct_tape/autoassociative_array_spec.rb",
-    "spec/duct_tape/autoassociative_hash_spec.rb",
+    "spec/duct_tape/fuzzy_hash.rb",
     "spec/ext/array_spec.rb",
     "spec/ext/boolean_spec.rb",
     "spec/ext/datetime_spec.rb",
@@ -77,11 +75,11 @@ Gem::Specification.new do |s|
   s.licenses = ["Simplified BSD"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "1.8.23.2"
   s.summary = "A bunch of useful patches for core Ruby classes"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facets>, [">= 2.9.3"])

data/lib/duct_tape/autoassociative_array.rb

@@ -31,12 +31,11 @@ module Containers
           break
         end
       end
-      (ret && ret.one? ? ret[0] : ret)
+      ret
     end
 
     def [](*args)
-      ret = match_impl(*args)
-      (ret && ret.one? ? ret[0] : ret)
+      match_impl(*args)
     end
 
     def by_column(col, key)

data/lib/duct_tape/{autoassociative_hash.rb → fuzzy_hash.rb}

@@ -1,7 +1,7 @@
 module Containers
-  class AutoassociativeHash
+  class FuzzyHash
     def initialize(&block)
-      @mapping_block = block_given? ? block : nil
+      @mapping_proc = block_given? ? block : lambda { |key| [*key] }
       @auto_array = Containers::AutoassociativeArray.new
       @hash = {}
       @values = {}
@@ -9,13 +9,15 @@ module Containers
     end
 
     def [](key)
-      mapped_key = @mapping_block ? @mapping_block[key] : key
+      mapped_key = @mapping_proc[key]
+      type_assert(mapped_key, Array)
       match = @auto_array.partial_match(*mapped_key)
-      @values[match]
+      @values[match[0]]
     end
 
     def []=(key, val)
-      mapped_key = @mapping_block[key]
+      mapped_key = @mapping_proc[key]
+      type_assert(mapped_key, Array)
       @hash[key] = val
       @auto_array.insert(*mapped_key)
       @values[mapped_key] = val
@@ -46,7 +48,7 @@ module Containers
     end
 
     def dup
-      ret = self.class.new(&@mapping_block)
+      ret = self.class.new(&@mapping_proc)
       @hash.each { |key,val| ret[key] = val }
       ret
     end

data/spec/duct_tape/autoassociative_array_spec.rb

@@ -40,7 +40,7 @@ describe Containers::AutoassociativeArray, "#partial_match" do
   it "returns the matches with the most query matches" do
     aa = Containers::AutoassociativeArray.new
     aa << [1,2,3] << [2,3,4] << [3,4,5]
-    expect(aa.partial_match(1,4,5)).to eq([3,4,5])
+    expect(aa.partial_match(1,4,5)).to eq([[3,4,5]])
   end
 
   it "returns all of the matches with the most query matches" do
@@ -48,7 +48,7 @@ describe Containers::AutoassociativeArray, "#partial_match" do
     aa << [1,2,3] << [2,3,4] << [3,4,5]
     expect(aa.partial_match(1,5)).to eq([[1,2,3], [3,4,5]])
     expect(aa.partial_match(1,3,5)).to eq([[1,2,3], [3,4,5]])
-    expect(aa.partial_match(2,4)).to eq([2,3,4])
+    expect(aa.partial_match(2,4)).to eq([[2,3,4]])
   end
 
   it "returns the matches with the most query matches with the most matches" do

data/spec/duct_tape/fuzzy_hash.rb

@@ -0,0 +1,107 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+
+#
+# Containers::FuzzyHash#initialize
+#
+describe Containers::FuzzyHash, "#initialize" do
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#[]
+#
+describe Containers::FuzzyHash, "#[]" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:[])).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#[]=
+#
+describe Containers::FuzzyHash, "#[]=" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:[]=)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#empty?
+#
+describe Containers::FuzzyHash, "#empty?" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:empty?)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#length
+#
+describe Containers::FuzzyHash, "#length" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:length)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#size
+#
+describe Containers::FuzzyHash, "#size" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:size)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#clear
+#
+describe Containers::FuzzyHash, "#clear" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:clear)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#inspect
+#
+describe Containers::FuzzyHash, "#inspect" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:inspect)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#to_s
+#
+describe Containers::FuzzyHash, "#to_s" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:to_s)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Containers::FuzzyHash#dup
+#
+describe Containers::FuzzyHash, "#dup" do
+  it "should have the method defined" do
+    expect(Containers::FuzzyHash.method_defined?(:dup)).to be(true)
+  end
+
+  pending "More tests"
+end

metadata

@@ -1,125 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: duct_tape
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Tim Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.9.3
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A general-purpose utility library for Ruby
@@ -134,7 +151,6 @@ extra_rdoc_files:
 files:
 - .gitattributes
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - REQUIRED_FILES
@@ -147,7 +163,7 @@ files:
 - lib/algorithms/containers/priority_queue.rb
 - lib/duct_tape.rb
 - lib/duct_tape/autoassociative_array.rb
-- lib/duct_tape/autoassociative_hash.rb
+- lib/duct_tape/fuzzy_hash.rb
 - lib/ext/array.rb
 - lib/ext/boolean.rb
 - lib/ext/datetime.rb
@@ -167,7 +183,7 @@ files:
 - spec/algorithms/containers/heap_spec.rb
 - spec/algorithms/containers/priority_queue_spec.rb
 - spec/duct_tape/autoassociative_array_spec.rb
-- spec/duct_tape/autoassociative_hash_spec.rb
+- spec/duct_tape/fuzzy_hash.rb
 - spec/ext/array_spec.rb
 - spec/ext/boolean_spec.rb
 - spec/ext/datetime_spec.rb
@@ -188,25 +204,26 @@ files:
 homepage: http://github.com/twrodriguez/duct_tape
 licenses:
 - Simplified BSD
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A bunch of useful patches for core Ruby classes
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 41675ecda34ca568f08df0a857ae56674e18ee95
-  data.tar.gz: 02ffc1adfb8a907b5e7d53ac2e0c0ae19ba35e2d
-SHA512:
-  metadata.gz: 45090f67f4f8e3cd03f6d6d45ad369a49232c6fb86643d1f13d9e2a61a5553d0d650b9ff5f8059a500627cdd6bc2365d2ed97cece2802164f21b8e20bcd37347
-  data.tar.gz: e11c2a3a6680c5f965f260de31326cba18ce0eb2a9c8aac4c595018ea2651fcc6496addb6053c85418ea91d4fa47396a25b234a8bb0aeeca0f507ad69ff53a3e

data/Gemfile.lock

@@ -1,85 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    algorithms (0.6.1)
-    backports (3.6.0)
-    builder (3.2.2)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    facets (2.9.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.0.0)
-    highline (1.6.21)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    thread_safe (0.3.4)
-    yard (0.8.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  algorithms
-  backports
-  bundler
-  facets (>= 2.9.3)
-  jeweler
-  rake
-  rspec
-  simplecov
-  yard

data/spec/duct_tape/autoassociative_hash_spec.rb

@@ -1,107 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
-
-#
-# Containers::AutoassociativeHash#initialize
-#
-describe Containers::AutoassociativeHash, "#initialize" do
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#[]
-#
-describe Containers::AutoassociativeHash, "#[]" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:[])).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#[]=
-#
-describe Containers::AutoassociativeHash, "#[]=" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:[]=)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#empty?
-#
-describe Containers::AutoassociativeHash, "#empty?" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:empty?)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#length
-#
-describe Containers::AutoassociativeHash, "#length" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:length)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#size
-#
-describe Containers::AutoassociativeHash, "#size" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:size)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#clear
-#
-describe Containers::AutoassociativeHash, "#clear" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:clear)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#inspect
-#
-describe Containers::AutoassociativeHash, "#inspect" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:inspect)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#to_s
-#
-describe Containers::AutoassociativeHash, "#to_s" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:to_s)).to be(true)
-  end
-
-  pending "More tests"
-end
-
-#
-# Containers::AutoassociativeHash#dup
-#
-describe Containers::AutoassociativeHash, "#dup" do
-  it "should have the method defined" do
-    expect(Containers::AutoassociativeHash.method_defined?(:dup)).to be(true)
-  end
-
-  pending "More tests"
-end