rack-indifferent 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc197e706d48727ac52eefbba3f0ce795e123ca
-  data.tar.gz: b485a599d9fef549149db6aa1bd845d4d26d58a0
+  metadata.gz: 6eeac559ad3836d054b7c541846f37b298de8300
+  data.tar.gz: 34845a381540a1a33357e3c1d7519214139e1234
 SHA512:
-  metadata.gz: 85e5b41de703623d69b7a3d10aafda2443f37278e99547e82cbb6f5e71fa6602b47491c7b418f5ae52ac9abca57f901b3a1ef1f74f4cb9060fbdab0819d5892d
-  data.tar.gz: 8c2da5241b89361057cb043d682004c59fe1431e89da79e676cebc146fed86184db2a7f52eec8dbec4450e9a76cddb648181df162bd2e6414dea089f00df55f5
+  metadata.gz: 69602aadf87abb0056624104297d87b37bc5af159043445d27e30065c02da8de73f22a387961996e35ed0873c2c32500b5659b7104b5079770a3f447150dcfda
+  data.tar.gz: dee47d84bd98c6fdffb0ea349b51f58319bcc60c310c321a1ee75fb901eb9027bd476c18f4183ea7c84a40c3deead264f284c0693d58572a99a4913ab3924847

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 1.2.0 (2016-09-20)
+
+* Work correctly with rack 2 when empty GET parameters are used (jeremyevans)
+
 = 1.1.0 (2015-03-08)
 
 * Reduce the number of procs created (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Jeremy Evans
+Copyright (c) 2015-2016 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,9 +1,9 @@
 = rack-indifferent
 
-rack-indifferent monkey patches Rack::Utils::KeySpaceConstrainedParams
-to make the hash it stores params in support indifferent access.  So web
-frameworks that use rack-indifferent don't have to make a deep copy
-of the params to allow indifferent access to the params.
+rack-indifferent modifiesrack to make the hash it stores query params in
+support indifferent access.  This allows web frameworks/applications that
+use rack-indifferent don't have to make a deep copy of the params to allow
+indifferent access to the params.
 
 == Installation
 
@@ -15,12 +15,17 @@ Source code is available on GitHub at https://github.com/jeremyevans/rack-indiff
 
 == Basic Usage
 
-Since this just monkey patches part of Rack::Utils, you just need to require
-the library:
+You just need to require the library:
 
   require 'rack/indifferent'
 
-This will change the params hashes that rack uses to use indifferent access.
+On rack 1, this will monkey patch a rack class to change the query params hashes
+that rack uses to use indifferent access.
+
+On rack 2, this will set a new default query parser that uses hashes with
+indifferent access.  Note that web frameworks and applications that use
+custom query parsers in their request class will not be affected by
+rack-indifferent.
 
 == License
 

data/Rakefile

@@ -8,34 +8,8 @@ task :package=>[:clean] do |p|
   sh %{#{FileUtils::RUBY} -S gem build rack-indifferent.gemspec}
 end
 
-### Specs
-
-begin
-  begin
-    # RSpec 1
-    require "spec/rake/spectask"
-    spec_class = Spec::Rake::SpecTask
-    spec_files_meth = :spec_files=
-  rescue LoadError
-    # RSpec 2
-    require "rspec/core/rake_task"
-    spec_class = RSpec::Core::RakeTask
-    spec_files_meth = :pattern=
-  end
-
-  spec = lambda do |name, files, d|
-    lib_dir = File.join(File.dirname(File.expand_path(__FILE__)), 'lib')
-    ENV['RUBYLIB'] ? (ENV['RUBYLIB'] += ":#{lib_dir}") : (ENV['RUBYLIB'] = lib_dir)
-    desc d
-    spec_class.new(name) do |t|
-      t.send(spec_files_meth, files)
-    end
-  end
-
-  task :default => [:spec]
-  spec.call("spec", Dir["spec/*_spec.rb"], "Run specs")
-rescue LoadError
-  task :default do
-    puts "Must install rspec to run the default task (which runs specs)"
-  end
+desc "Build rack-indifferent gem"
+task :spec do |p|
+  sh %{#{FileUtils::RUBY} -rubygems -I lib spec/indifferent_spec.rb}
 end
+task :default => :spec

data/lib/rack/indifferent.rb

@@ -1,12 +1,36 @@
+require 'rack'
 require 'rack/utils'
 
-class Rack::Utils::KeySpaceConstrainedParams
-  INDIFFERENT_PROC = lambda{|h,k| h[k.to_s] if k.is_a?(Symbol)}
+if Rack.release > '2'
+  module Rack::Indifferent
+    class QueryParser < Rack::QueryParser
+      # Work around for invalid optimization in rack
+      def parse_nested_query(qs, d=nil)
+        return make_params.to_params_hash if qs.nil? || qs.empty?
+        super
+      end
+      
+      class Params < Rack::QueryParser::Params
+        INDIFFERENT_PROC = lambda{|h,k| h[k.to_s] if k.is_a?(Symbol)}
 
-  def initialize(limit = Rack::Utils.key_space_limit)
-    @limit  = limit
-    @size   = 0
-    @params = Hash.new(&INDIFFERENT_PROC)
+        def initialize(limit = Rack::Utils.key_space_limit)
+          @limit  = limit
+          @size   = 0
+          @params = Hash.new(&INDIFFERENT_PROC)
+        end
+      end
+
+      Rack::Utils.default_query_parser = new(Params, 65536, 100)
+    end
   end
-end
+else
+  class Rack::Utils::KeySpaceConstrainedParams
+    INDIFFERENT_PROC = lambda{|h,k| h[k.to_s] if k.is_a?(Symbol)}
 
+    def initialize(limit = Rack::Utils.key_space_limit)
+      @limit  = limit
+      @size   = 0
+      @params = Hash.new(&INDIFFERENT_PROC)
+    end
+  end
+end

data/spec/indifferent_spec.rb

@@ -1,25 +1,23 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), '../lib/rack/indifferent')
 require 'rack/mock'
-
-if defined?(RSpec)
-  require 'rspec/version'
-  if RSpec::Version::STRING >= '2.11.0'
-    RSpec.configure do |config|
-      config.expect_with :rspec do |c|
-        c.syntax = :should
-      end
-    end
-  end
-end
+require 'minitest/autorun'
 
 describe 'rack-indifferent' do
   it "should make requests use indifferent param hashes" do
     params = Rack::Request.new(Rack::MockRequest.env_for('/?a=b&c[d]=e&f[][g]=h', :input=>'i=j&k[l]=m&n[][o]=p', :method=>'POST')).params
-    params[:a].should == 'b'
-    params[:c][:d].should == 'e'
-    params[:f][0][:g].should == 'h'
-    params[:i].should == 'j'
-    params[:k][:l].should == 'm'
-    params[:n][0][:o].should == 'p'
+    params[:a].must_equal 'b'
+    params[:c][:d].must_equal 'e'
+    params[:f][0][:g].must_equal 'h'
+    params[:i].must_equal 'j'
+    params[:k][:l].must_equal 'm'
+    params[:n][0][:o].must_equal 'p'
+  end
+
+  it "should make requests handle empty params" do
+    params = Rack::Request.new(Rack::MockRequest.env_for('/', :input=>'i=j&k[l]=m&n[][o]=p', :method=>'POST')).params
+    params[:a].must_equal nil
+    params[:i].must_equal 'j'
+    params[:k][:l].must_equal 'm'
+    params[:n][0][:o].must_equal 'p'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-indifferent
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fast indifferent access to request params