match_map 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmVlYjdjYTQwNTczZjA2ODcyYjIxN2E2MjNhNjc3Y2UyNWI1MTRkNQ==
+  data.tar.gz: !binary |-
+    YWM5OGNlMmU4OWRmNTg0N2FhNWY3OTQ4Mzg1OWU1ZDY1ZWY2NzIyYg==
+SHA512:
+  metadata.gz: !binary |-
+    MmM3NTM1N2MyYzE5YTdkMjQ0ZDViNTE3OTcwYzM0YjAyMDRiZmJjYTdlYjM4
+    MTQ2NTE2ODU3ZTMwMzI1Y2UxZWQzNTQzNThmN2U4NGI5NjYwMmMxNGQ2NjA4
+    Y2M1ODgyNTAzNTk3Y2Y1NDMyODc5MmRhNWMwZDk3YzkzNjE2NGY=
+  data.tar.gz: !binary |-
+    MTRkNDM2MGYyMzY5ZTc1MzM4M2ZjYmFlMTY0MmJlOTQ4NDRlMGY4OGZiYTY4
+    ZDI4NjAwZWIxYTIyMGE5Nzk4YTM5MDlmZTIyZGQ0MDgyOWY0YTMwYTM2ODNm
+    YmYyOTgxZmQ2MmEwODQzZWJjMDlhZDg2NmQyNzgzMjZkMjNlODQ=

data/.gitignore

@@ -0,0 +1,50 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+Gemfile.lock

data/.travis.yml

@@ -1,10 +1,7 @@
 language: ruby
 bundler_args: --without documentation
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
-  - jruby-18mode
-  - rbx-18mode
+

data/Gemfile

@@ -1,29 +1,3 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+gemspec
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-
-if RUBY_VERSION =~ /^1.8/
-  gem 'hashery'
-end
-
-
-group :documentation do
-  gem "yard", "~> 0.6.0"
-end  
-
-group :development do
-  gem "minitest", ">= 0"
-  gem "bundler", "~> 1"
-  gem "jeweler", "~> 1.6.4"
-end
-
-# Don't require 'turn' to format tests, but use it if you have it
-# begin
-#   require 'turn'
-#   gem 'turn', '>=0.9.3'
-# rescue LoadError
-# end

data/README.md

@@ -11,9 +11,9 @@ mm[/a/] = 'apat'
 mm[/b/] = ['bpat1', 'bpat2']
 mm[/.+b$/] = 'bpat3'
 
-mm['a'] #=> ['a_string', 'apat'] # order is the same as the key order
-mm['aa']  #=> ['apat']
-mm['b']   #=> ['bpat1', 'bpat2']
+mm['a']    #=> ['a_string', 'apat'] # order is the same as the key order
+mm['aa']   #=> ['apat']
+mm['b']    #=> ['bpat1', 'bpat2']
 mm['cob']  #=> ['bpat1', 'bpat2', 'bpat3'] # flattened one level!!!
 mm['cab']  #=> ['apat', 'bpat1', 'bpat2', 'bpat3']
 mm['c']    #=> [] # no match

data/Rakefile

@@ -1,44 +1,40 @@
 # encoding: utf-8
+begin
+  require 'bundler'
+rescue LoadError => e
+  warn e.message
+  warn "Run `gem install bundler` to install Bundler."
+  exit -1
+end
 
-require 'rubygems'
-require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn "Run `bundle install` to install missing gems."
   exit e.status_code
 end
+
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "match_map"
-  gem.homepage = "http://github.com/billdueber/match_map"
-  gem.license = "MIT"
-  gem.summary = "A multimap that allows keys to match regex patterns"
-  gem.description = %Q{MatchMap is a map representing key=>value pairs but where 
-    (a) a query argument can match more than one key, and (b) the argument is compraed to the key
-    such that you can use regex patterns as keys}
-  gem.email = "bill@dueber.com"
-  gem.authors = ["Bill Dueber"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require "bundler/gem_tasks"
+
+require 'yard'
+YARD::Rake::YardocTask.new  
+task :doc => :yard
 
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+Rake::TestTask.new do |test|
+  test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
+task :default => [:test]
+
 desc "Run a quick benchmark"
 task :bench do
   $: << 'lib'
   load 'bench/bench.rb'
 end
 
-task :default => :test
-

data/bench/bench.rb

@@ -1,5 +1,7 @@
 require 'benchmark'
 require 'match_map'
+require 'pry'
+require 'pry-nav'
 
 h5 = {
   'a' => 'A',
@@ -20,6 +22,8 @@ end
 # @mm2[/a/] = 'AAA'
 
 iters = 100_000
+binding.pry
+
 puts "Testing #{iters} accesses"
 
 method = (defined? JRUBY_VERSION) ? :bmbm : :bm

data/lib/match_map/version.rb

@@ -0,0 +1,3 @@
+class MatchMap
+  VERSION = '2.0.1'
+end

data/lib/match_map.rb

@@ -6,26 +6,25 @@ class MatchMap
 
   attr_accessor :default
   attr_reader   :echo
-
-  if RUBY_VERSION =~ /^1\.9/
-    require 'match_map/match_map_19'
-    include MatchMapIncludes::OnePointNine
-  else 
-    require 'match_map/match_map_18'    
-    include MatchMapIncludes::OnePointEight
-  end
   
-  def initialize h = {}
+  def initialize(h = {}, &blk)
     @default = nil # default miss value is nil
     @attrs = {}
+    
     # Set up the appripriate @map and define which inner_get to use
-    self.setup h
+    # initially, the non-optimized version
+    @map = {}
+    define_singleton_method :inner_get, method(:normal_inner_get)
     
     # Initialize with the given hash
     h.each_pair do |k, v| 
       self[k] = v
     end  
     
+    if block_given?
+      blk.call(self)
+    end
+    
   end
 
   def delete key

data/match_map.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'match_map/version'
+
+
+Gem::Specification.new do |gem|
+  gem.name = "match_map"
+  gem.version = MatchMap::VERSION
+  gem.summary = "A multimap that allows keys to match regex patterns"
+  gem.description = "MatchMap is a map representing key=>value pairs but where \n    (a) a query argument can match more than one key, and (b) the argument is compraed to the key\n    such that you can use regex patterns as keys"
+  gem.license       = "MIT"
+  gem.authors       = ["Bill Dueber"]
+  gem.email         = "bill@dueber.com"
+  gem.homepage = "http://github.com/billdueber/match_map"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ['lib']
+
+  
+  gem.add_development_dependency 'bundler', '~> 1.0'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'yard'
+
+
+end
+

data/test/helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
@@ -7,16 +6,9 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+require 'minitest'
 require 'minitest/spec'
 require 'minitest/benchmark'
-# if RUBY_VERSION =~ /^1.9/
-#   begin
-#     require 'turn/autorun'
-#     # f = ENV['format'] ||  'progress'
-#     # Turn.config.format = f.to_sym if f
-#   rescue LoadError
-#   end
-# end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -25,4 +17,4 @@ require 'match_map'
 class MiniTest::Unit::TestCase
 end
 
-MiniTest::Unit.autorun
+MiniTest.autorun

metadata

@@ -1,60 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: match_map
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2168628360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168628360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2168624380 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168624380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2168621520 !ruby/object:Gem::Requirement
-    none: false
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168621520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "MatchMap is a map representing key=>value pairs but where \n    (a)
   a query argument can match more than one key, and (b) the argument is compraed to
   the key\n    such that you can use regex patterns as keys"
 email: bill@dueber.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .travis.yml
 - CHANGES
 - Gemfile
@@ -64,36 +85,35 @@ files:
 - VERSION
 - bench/bench.rb
 - lib/match_map.rb
-- lib/match_map/match_map_18.rb
-- lib/match_map/match_map_19.rb
+- lib/match_map/version.rb
+- match_map.gemspec
 - test/helper.rb
 - test/test_match_map.rb
 homepage: http://github.com/billdueber/match_map
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2828716471477841812
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A multimap that allows keys to match regex patterns
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_match_map.rb
+has_rdoc: 

data/lib/match_map/match_map_18.rb

@@ -1,15 +0,0 @@
-# In ruby 1.8x, the Hashes are not ordered, so we fall back on 
-# the hashery ordered_hash
-
-require 'hashery/ordered_hash'
-
-module MatchMapIncludes
-  module OnePointEight
-    # 1.8 setup
-    def setup h
-      singleton_class = class << self; self; end
-      singleton_class.send(:define_method, :inner_get, method(:normal_inner_get))
-      @map = OrderedHash.new
-    end
-  end
-end

data/lib/match_map/match_map_19.rb

@@ -1,12 +0,0 @@
-# The 1.9 hash is already ordered; just use it
-
-module MatchMapIncludes
-  module OnePointNine
-    
-    # 1.9 setup
-    def setup h
-      @map = {}
-      define_singleton_method :inner_get, method(:normal_inner_get)
-    end
-  end
-end