rasti-web 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de59fca7175d5f8cbb503bf4c0e7c42f1a2d6a59
-  data.tar.gz: ac30c6d80f0b7b38f24511c5f817bade19bcca8a
+  metadata.gz: 999b0e5bcb54088a41c56b17277f32713ad9731c
+  data.tar.gz: 38afef4e73a96bc749c9b09082880c5d2c2b0098
 SHA512:
-  metadata.gz: 09ec9ae2b8e1001e66e5a6c40c8f722be2efe3f41394935d879eb25a371c4ecd564bf96b177d1d59b496bb85349fed1e6ef46ac99ecdecf50241342ad5a58a9c
-  data.tar.gz: fa6c7dffeacf5608d4b29990105873c06023b6609d36d8d2f962ed0444c14cc25507f7aa95b241ef50ccd19ea8697b00af616c2fa724bb8fa4853758b184dc54
+  metadata.gz: 9f1bbc842a4ffe459a6c1288df422fa11b7d8a61faa753ea97b5ebcbb8a2225ece830d97b72cbeb00041f6c9645ab4e8730a32028523b0e66fddbc567ff79fd2
+  data.tar.gz: 161c0a4f55c947accbd829d63640cad6bc24359bd8668c198d6f6cd1840420fbdce3df3860700ee2f88abac93cb48e49677b4587fa82af5d0fb749aa8f347c71

data/lib/rasti/web/request.rb

@@ -2,10 +2,13 @@ module Rasti
   module Web
     class Request < Rack::Request
 
-      def initialize(env)
-        super
-        params.merge! JSON.parse(body_text) if json? && body_text
-        params.merge! env[ROUTE_PARAMS] if env[ROUTE_PARAMS]
+      def params
+        @params ||= Hash::Indifferent.new.tap do |hash|
+          hash.update self.GET
+          hash.update self.POST
+          hash.update env[ROUTE_PARAMS] if env.key? ROUTE_PARAMS
+          hash.update JSON.parse(body_text) if json? && body_text
+        end
       end
 
       def body_text

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '0.0.7'
+    VERSION = '0.1.0'
   end
 end

data/lib/rasti/web.rb

@@ -5,6 +5,7 @@ require 'mime-types'
 require 'class_config'
 require 'forwardable'
 require 'logger'
+require 'hash_ext'
 
 require_relative 'web/route'
 require_relative 'web/router'

data/rasti-web.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'tilt', '~> 2.0'
   spec.add_dependency 'mime-types', '~> 2.0'
   spec.add_dependency 'class_config', '~> 0.0.2'
+  spec.add_dependency 'hash_ext', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/spec/request_spec.rb

@@ -3,13 +3,31 @@ require 'minitest_helper'
 describe Rasti::Web::Request do
   
   it 'Route params' do
-    env = Rack::MockRequest.env_for '/'
-    env[Rasti::Web::ROUTE_PARAMS] = {'x' => 1, 'y' => 2}
+    env = Rack::MockRequest.env_for '/10/20'
+    env[Rasti::Web::ROUTE_PARAMS] = {'lat' => '10', 'lon' => '20'}
 
     request = Rasti::Web::Request.new env
 
-    request['x'].must_equal 1
-    request['y'].must_equal 2
+    request.params[:lat].must_equal '10'
+    request.params['lon'].must_equal '20'
+  end
+
+  it 'Query string params' do
+    env = Rack::MockRequest.env_for '/?lat=10&lon=20'
+
+    request = Rasti::Web::Request.new env
+
+    request.params[:lat].must_equal '10'
+    request.params['lon'].must_equal '20'
+  end
+
+  it 'Form params' do
+    env = Rack::MockRequest.env_for '/', method: 'POST', params: 'lat=10&lon=20'
+
+    request = Rasti::Web::Request.new env
+
+    request.params[:lat].must_equal '10'
+    request.params['lon'].must_equal '20'
   end
 
   it 'Json body params' do
@@ -18,8 +36,8 @@ describe Rasti::Web::Request do
     request = Rasti::Web::Request.new env
 
     request.must_be :json?
-    request['lat'].must_equal 10
-    request['lon'].must_equal 20
+    request.params[:lat].must_equal 10
+    request.params['lon'].must_equal 20
   end
 
   it 'No json body params' do
@@ -28,8 +46,8 @@ describe Rasti::Web::Request do
     request = Rasti::Web::Request.new env
 
     request.wont_be :json?
-    request['lat'].must_be_nil
-    request['lon'].must_be_nil
+    request.params[:lat].must_be_nil
+    request.params['lon'].must_be_nil
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: hash_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Web blocks to build robust applications