request 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e5609a4d356f4253c73bbfd2b6bdcf67e736a20b
+  data.tar.gz: 97315e65a35520a162dc480632522570d5239c7d
+SHA512:
+  metadata.gz: 5321734f4c8547c2664cf3332537734ba77f12f10659b2a7b003c335b43a1d77c0432737f9dc6c8e1ae7cd817e52e619d640519660c3dca44a1009e05d7e8974
+  data.tar.gz: f3b0c427a5866920d8aa72a2c2b2d92bd28f026e4025a0c485fb75311c2258761d75ff964afdaadfa207b47425b014f539b4a69a9613730f28631448c192f98e

data/.circle.yml

@@ -0,0 +1,4 @@
+---
+test:
+  override: 
+    - bundle exec rake ci

data/.travis.yml

@@ -1,17 +1,13 @@
 language: ruby
 script: 'bundle exec rake spec'
 rvm:
-  - ree
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-18mode
   - rbx-19mode
-notifications:
-  email:
-    - mbj@seonic.net
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.0.4 2013-05-21
+
+- Fix equalizing of Request::Rack
+
 # v0.0.3 2013-05-21
 
 - Regression in Request::Rack#rack_env

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
+gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.0.4'
+  gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.13.0'
   gem 'yard',  '~> 0.8.6.1'
 end
@@ -11,12 +11,12 @@ group :yard do
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.0'
+  gem 'guard',         '~> 1.8.1'
   gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 2.5.4'
+  gem 'guard-rspec',   '~> 3.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 1.0.2'
+  gem 'listen',     '~> 1.2.2'
   gem 'rb-fchange', '~> 0.0.6', :require => false
   gem 'rb-fsevent', '~> 0.9.3', :require => false
   gem 'rb-inotify', '~> 0.9.0', :require => false
@@ -28,20 +28,20 @@ group :guard do
 end
 
 group :metrics do
-  gem 'backports',       '~> 3.3', '>= 3.3.0'
-  gem 'coveralls',       '~> 0.6.6'
-  gem 'flay',            '~> 2.2.0'
-  gem 'flog',            '~> 4.0.0'
-  gem 'reek',            '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
-  gem 'simplecov',       '~> 0.7.1'
-  gem 'yardstick',       '~> 0.9.6'
+  gem 'backports', '~> 3.3', '>= 3.3.2'
+  gem 'coveralls', '~> 0.6.7'
+  gem 'flay',      '~> 2.3.0'
+  gem 'flog',      '~> 4.1.0'
+  gem 'reek',      '~> 1.3.1', :git => 'https://github.com/troessner/reek.git'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'yardstick', '~> 0.9.6'
 
   platforms :ruby_19 do
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :mri_19, :rbx do
-    gem 'mutant', '~> 0.2.20'
+  platforms :ruby_19, :ruby_20 do
+    gem 'mutant', '~> 0.3.0.beta4'
   end
 
   platforms :rbx do

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 12
-total_score: 77
+total_score: 74

data/config/reek.yml

@@ -22,7 +22,8 @@ UncommunicativeMethodName:
   - !ruby/regexp /[A-Z]/
 LongParameterList:
   max_params: 2 
-  exclude: []
+  exclude:
+  - Request::Rack#self.accessor # 3 params
   enabled: true
   overrides: {}
 FeatureEnvy:

data/lib/request.rb

@@ -10,7 +10,7 @@ require 'securerandom'
 class Request
 
   KEYS = %W(
-    path_info protocol port request_method 
+    path_info protocol port request_method
     host if_modified_since query_params query_params_hash
     query_string content_length content_type body
   ).map(&:to_sym).freeze
@@ -133,18 +133,6 @@ class Request
     "#{root_uri}#{path}"
   end
 
-  # Return routed request
-  #
-  # @param [Hash] params
-  #
-  # @return [Request::Routed]
-  #
-  # @api private
-  #
-  def route(params)
-    Routed.new(self, params)
-  end
-
   # Return root uri
   #
   # @return [String]
@@ -178,6 +166,5 @@ end
 
 require 'request/key'
 require 'request/rack'
-require 'request/routed'
 require 'request/method'
 require 'request/protocol'

data/lib/request/rack.rb

@@ -1,7 +1,6 @@
 class Request
   # Rack request
   class Rack < self
-    include Concord::Public.new(:rack_env)
 
     SERVER_PORT       = Key.new('SERVER_PORT')
     REQUEST_METHOD    = Key.new('REQUEST_METHOD')
@@ -9,6 +8,29 @@ class Request
     IF_MODIFIED_SINCE = Key.new('HTTP_IF_MODIFIED_SINCE')
     CONTENT_LENGTH    = Key.new('CONTENT_LENGTH')
 
+    # Error raised when an invalid rack env key is accessed
+    InvalidKeyError = Class.new(RuntimeError)
+
+    # Initialize object
+    #
+    # @param [Hash] rack_env
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def initialize(rack_env)
+      @rack_env = rack_env
+    end
+
+    # Return rack env
+    #
+    # @return [Hash]
+    #
+    # @api private
+    #
+    attr_reader :rack_env
+
     # Declare accessor
     #
     # @param [Symbol] name
@@ -18,11 +40,12 @@ class Request
     #
     # @api private
     #
-    def self.accessor(name, key)
+    def self.accessor(name, key, *args)
       define_method(name) do
-        access(key)
+        access(key, *args)
       end
     end
+    private_class_method :accessor
 
     # Return http port
     #
@@ -57,6 +80,8 @@ class Request
     end
     memoize :request_method
 
+    CONTENT_LENGTH_REGEXP = /\A[0-9]+\z/.freeze
+
     # Return content length
     #
     # @return [Fixnum]
@@ -64,8 +89,17 @@ class Request
     # @api private
     #
     def content_length
-      access(CONTENT_LENGTH).to_i(10)
+      value = @rack_env.fetch(CONTENT_LENGTH) do
+        return 0
+      end
+
+      unless value =~ CONTENT_LENGTH_REGEXP
+        raise InvalidKeyError, 'invalid content length'
+      end
+
+      value.to_i
     end
+    memoize :content_length
 
     # Return query params
     #
@@ -98,11 +132,11 @@ class Request
     end
     memoize :if_modified_since
 
-    accessor(:path_info,    Key.new('PATH_INFO')   )
-    accessor(:host,         Key.new('SERVER_NAME') )
-    accessor(:query_string, Key.new('QUERY_STRING'))
-    accessor(:content_type, Key.new('CONTENT_TYPE'))
-    accessor(:body,         Key.new('rack.input'))
+    accessor(:path_info,    Key.new('PATH_INFO')        )
+    accessor(:host,         Key.new('SERVER_NAME')      )
+    accessor(:query_string, Key.new('QUERY_STRING')     )
+    accessor(:content_type, Key.new('CONTENT_TYPE'), nil)
+    accessor(:body,         Key.new('rack.input')       )
 
   private
 
@@ -114,8 +148,9 @@ class Request
     #
     # @api private
     #
-    def access(key)
-      @rack_env.fetch(key)
+    def access(key, *args)
+      @rack_env.fetch(key, *args)
     end
-  end
-end
+
+  end # Rack
+end # Request

data/request.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |gem|
   gem.name        = 'request'
-  gem.version     = '0.0.3'
+  gem.version     = '0.0.4'
   gem.authors     = [ 'Markus Schirp' ]
-  gem.email       = [ 'mbj@seonic.net' ]
+  gem.email       = [ 'mbj@schirp-dso.com' ]
   gem.description = 'HTTP request porofication'
   gem.summary     = gem.description
   gem.homepage    = 'https://github.com/mbj/response'
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('backports',     [ '~> 3.0', '>= 3.0.3' ])
   gem.add_dependency('concord',       '~> 0.1.0')
-  gem.add_dependency('ice_nine',      '~> 0.7.0')
-  gem.add_dependency('adamantium',    '~> 0.0.7')
+  gem.add_dependency('ice_nine',      '~> 0.8.0')
+  gem.add_dependency('adamantium',    '~> 0.0.8')
   gem.add_dependency('equalizer',     '~> 0.0.5')
   gem.add_dependency('abstract_type', '~> 0.0.5')
 end

data/spec/shared/rack_env_accessor_behavior.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'a rack env accessor' do
+shared = proc do
   let(:rack_key_value) { :Value }
 
   let(:default_env) do
@@ -11,9 +11,13 @@ shared_examples_for 'a rack env accessor' do
     }
   end
 
-  let(:expected_value) { rack_key_value }
+  let(:expected_value) { rack_key_value                                }
+  let(:env)            { default_env.merge(rack_key => rack_key_value) }
+  let(:object)         { described_class.new(env)                      }
+end
 
-  let(:env) { default_env.merge(rack_key => rack_key_value) }
+shared_examples_for 'a rack env accessor' do
+  instance_eval(&shared)
 
   it { should eql(expected_value) }
 
@@ -22,3 +26,11 @@ shared_examples_for 'a rack env accessor' do
     env.frozen?.should be(false)
   end
 end
+
+shared_examples_for 'an invalid rack env accessor' do
+  instance_eval(&shared)
+
+  it 'should raise error' do
+    expect { subject }.to raise_error(Request::Rack::InvalidKeyError, expected_message)
+  end
+end

data/spec/unit/request/protocol/class_methods/get_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Request::Protocol, '.get' do
+  let(:object) { described_class }
+
+  subject { object.get(input) }
+
+  context 'with "http"' do
+    let(:input) { 'http' }
+    it { should eql(Request::Protocol::HTTP) }
+  end
+
+  context 'with "https"' do
+    let(:input) { 'https' }
+    it { should eql(Request::Protocol::HTTPS) }
+  end
+
+  context 'with "ftp"' do
+    let(:input) { 'ftp' }
+    it 'should raise error' do
+      expect { subject }.to raise_error(KeyError, 'key not found: "ftp"')
+    end
+  end
+end

data/spec/unit/request/rack/content_length_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Request::Rack, '#content_length' do
+  subject { object.content_length }
+
+  let(:rack_key) { 'CONTENT_LENGTH'}
+
+  context 'with decimal positive integer' do
+    it_should_behave_like 'a rack env accessor' do
+
+      let(:rack_key_value)   { '10' }
+      let(:expected_value)   {  10  }
+
+    end
+  end
+
+  context 'with decimal negative integer' do
+
+    it_should_behave_like 'an invalid rack env accessor' do
+
+      let(:rack_key_value)   { '-10' }
+      let(:expected_message) { 'invalid content length' }
+
+    end
+  end
+
+  context 'other garbadge' do
+
+    it_should_behave_like 'an invalid rack env accessor' do
+
+      let(:rack_key_value)   { '0asd2431' }
+      let(:expected_message) { 'invalid content length' }
+
+    end
+  end
+
+  context 'when CONTENT_LENGTH key is not present' do
+
+    let(:rack_key) { 'SOMETHING_OTHER' }
+
+    it_should_behave_like 'a rack env accessor' do
+
+      let(:expected_value) { 0                }
+
+    end
+  end
+end

data/spec/unit/request/rack/protocol_spec.rb

@@ -11,8 +11,6 @@ describe Request::Rack, '#protocol' do
       let(:rack_key_value)   { protocol.name            }
       let(:expected_value)   { protocol                 }
 
-      #let(:expected_method)
-
     end
   end
 end

data/spec/unit/request/rack/query_string_spec.rb

@@ -6,7 +6,7 @@ describe Request::Rack, '#query_string' do
   it_should_behave_like 'a rack env accessor' do
 
     let(:object)   { described_class.new(env) }
-    let(:rack_key) { 'QUERY_STRING'            }
+    let(:rack_key) { 'QUERY_STRING'           }
 
   end
 end

data/spec/unit/request/rack/rack_env_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Request::Rack, '#rack_env' do
-  let(:object) { described_class.new(rack_env) }
-
   subject { object.rack_env }
 
+  let(:object) { described_class.new(rack_env) }
+
   let(:rack_env) { mock('Rack Env') }
 
   it { should be(rack_env) }
 
-  it_should_behave_like 'a command method'
+  it_should_behave_like 'an idempotent method'
 end

data/spec/unit/request/rack/request_method_spec.rb

@@ -11,8 +11,6 @@ describe Request::Rack, '#request_method' do
       let(:rack_key_value)   { method.verb              }
       let(:expected_value)   { method                   }
 
-      #let(:expected_method)
-
     end
   end
 end

metadata

@@ -1,42 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: request
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,39 +47,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +82,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +89,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,14 +96,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
 description: HTTP request porofication
 email:
-- mbj@seonic.net
+- mbj@schirp-dso.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -123,6 +110,7 @@ extra_rdoc_files:
 - README.md
 - TODO
 files:
+- .circle.yml
 - .gitignore
 - .rspec
 - .travis.yml
@@ -146,11 +134,12 @@ files:
 - lib/request/method.rb
 - lib/request/protocol.rb
 - lib/request/rack.rb
-- lib/request/routed.rb
 - request.gemspec
 - spec/shared/rack_env_accessor_behavior.rb
 - spec/spec_helper.rb
 - spec/unit/request/key/hash_spec.rb
+- spec/unit/request/protocol/class_methods/get_spec.rb
+- spec/unit/request/rack/content_length_spec.rb
 - spec/unit/request/rack/host_spec.rb
 - spec/unit/request/rack/if_modified_since_spec.rb
 - spec/unit/request/rack/path_info_spec.rb
@@ -161,27 +150,26 @@ files:
 - spec/unit/request/rack/request_method_spec.rb
 homepage: https://github.com/mbj/response
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HTTP request porofication
 test_files: []
 has_rdoc: 

data/lib/request/routed.rb

@@ -1,20 +0,0 @@
-class Request
-  # A routed request with routing params
-  #
-  # FIXME: I do not like this, need to come up with something much better!
-  #
-  # Violates LSP. 
-  #
-  # Remove this once "Dispatch" class in Joy is ready.
-  #
-  class Routed < self
-    include Concord::Public.new(:request, :routing_params)
-
-    METHODS.each do |name|
-      define_method(name) do
-        @request.public_send(name)
-      end
-    end
-  end
-end
-