rack-app 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dde5ac113879f10a79548e3c815ce6df2ce1c1f4
-  data.tar.gz: 737dce792b8d47068228ff468e6a25db9224e377
+  metadata.gz: 6e9e97fcff12d6ec6e33b8b73bb3a2858cfdb028
+  data.tar.gz: d40cb38798d131f0905d31f3682b1ff500ab0421
 SHA512:
-  metadata.gz: 3749bd9e51a5da2eead8467043088bfaa73d25952128366a098c09e24449691eed5771f2976e3bce79b481637d6e10dc92bb6af8aef686996c93ab722c99f5ca
-  data.tar.gz: abd365ac5e50dc6780a7171ae2e47bab25de55339fe92d7d61475d5ec8d6b4279d41b42dd996fa5ef5c08998e602f946e277a028503d9de9ba66a8556a04c7e5
+  metadata.gz: b8ed888abbdc3e27359e19bba5b00285ab44515d4958b0b7364f37bb1f9cdbcc92cbda0a4dbd4e110e6631cc126ef1921d1922112b8e75a553c75a08cad464b8
+  data.tar.gz: 3e1000a744087c86caa8eccd83d2ae333f7a471adbd7271c0f6d443e341e111afca9408560f489ad4caa4f6e17162e6c992b5005d71ef7c915f255b6dbe92a22

data/.travis.yml

@@ -0,0 +1,27 @@
+language: ruby
+script: rspec spec
+
+rvm:
+  - 1.8
+  - 1.9
+  - 2.0
+  - 2.1
+  - jruby-18mode
+  - jruby-19mode
+  - ree
+
+  - ruby-head
+  - jruby-head
+
+env:
+  global:
+    - VERBOSE=true
+    - TIMEOUT=1
+
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - adamluzsi@gmail.com

data/README.md

@@ -1,4 +1,8 @@
-# Rack::App
+# Rack::Appi [![Build Status][travis-image]][travis-link]
+
+[travis-image]: https://secure.travis-ci.org/adamluzsi/rack-app.rb.png?branch=master
+[travis-link]: http://travis-ci.org/adamluzsi/rack-app.rb
+[travis-home]: http://travis-ci.org/
 
 Your next favourite rack based micro framework that is totally addition free! 
 Have a cup of awesomeness with  your performance designed framework!

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

data/lib/rack/app.rb

@@ -14,7 +14,6 @@ class Rack::App
   require 'rack/app/request_configurator'
 
   require 'rack/app/file'
-  require 'rack/app/view'
 
   class << self
 
@@ -78,9 +77,9 @@ class Rack::App
     def add_route(request_method, request_path, &block)
 
       endpoint_properties = {
-          request_method: request_method,
-          request_path: request_path,
-          description: @last_description
+          :request_method => request_method,
+          :request_path => request_path,
+          :description => @last_description
       }
 
       endpoint = Rack::App::Endpoint.new(self, endpoint_properties, &block)

data/lib/rack/app/test.rb

@@ -4,23 +4,29 @@ module Rack::App::Test
 
   # magic ;)
   def self.included(klass)
+    class << klass
 
-    klass.define_singleton_method :rack_app do |rack_app_class=nil, &constructor|
+      define_method(:rack_app) do |*args, &constructor|
 
-      subject_app = rack_app_class.is_a?(Class) ? rack_app_class : Class.new(Rack::App)
-      subject_app.class_eval(&constructor) unless constructor.nil?
+        rack_app_class = args.shift
+        subject_app = rack_app_class.is_a?(Class) ? rack_app_class : Class.new(Rack::App)
+        subject_app.class_eval(&constructor) unless constructor.nil?
+
+        define_method(:rack_app) do
+          subject_app
+        end
 
-      klass.__send__ :define_method, :rack_app do
-        @rack_app = subject_app
       end
 
     end
-
   end
 
   [:get, :post, :put, :delete, :options].each do |request_method|
-    define_method(request_method) do |url, properties={}|
-      rack_app.call(request_env_by(request_method, url, properties)).last
+    define_method(request_method) do |properties|
+      properties ||= Hash.new
+      url = properties.delete(:url)
+      request_env = request_env_by(request_method, url, properties)
+      rack_app.call(request_env).last
     end
   end
 
@@ -35,9 +41,7 @@ module Rack::App::Test
   def request_env_by(request_method, url, raw_properties)
 
     properties = format_properties(raw_properties)
-    URI.encode_www_form(properties[:params].to_a)
-
-    additional_headers = properties[:headers].reduce({}) { |m,(k, v)| m.merge("HTTP_#{k.to_s.gsub('-', '_').upcase}" => v.to_s) }
+    additional_headers = properties[:headers].reduce({}) { |m, (k, v)| m.merge("HTTP_#{k.to_s.gsub('-', '_').upcase}" => v.to_s) }
 
     {
         "REMOTE_ADDR" => "192.168.56.1",
@@ -49,7 +53,7 @@ module Rack::App::Test
         "CONTENT_TYPE" => "application/x-www-form-urlencoded",
         "SERVER_NAME" => "hds-dev.ett.local",
         "SERVER_PORT" => "80",
-        "QUERY_STRING" => URI.encode_www_form(properties[:params].to_a),
+        "QUERY_STRING" => encode_www_form(properties[:params].to_a),
         "HTTP_VERSION" => "HTTP/1.1",
         "HTTP_USER_AGENT" => "spec",
         "HTTP_HOST" => "spec.local",
@@ -60,4 +64,51 @@ module Rack::App::Test
 
   end
 
+  def encode_www_form(enum)
+    enum.map do |k, v|
+      if v.nil?
+        encode_www_form_component(k)
+      elsif v.respond_to?(:to_ary)
+        v.to_ary.map do |w|
+          str = encode_www_form_component(k)
+          unless w.nil?
+            str << '='
+            str << encode_www_form_component(w)
+          end
+        end.join('&')
+      else
+        str = encode_www_form_component(k)
+        str << '='
+        str << encode_www_form_component(v)
+      end
+    end.join('&')
+  end
+
+  TBLENCWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    TBLENCWWWCOMP_['%%%02X' % i] = i.chr
+  end
+  TBLENCWWWCOMP_[' '] = '+'
+  TBLENCWWWCOMP_.freeze
+  TBLDECWWWCOMP = {} # :nodoc:
+  256.times do |i|
+    h, l = i>>4, i&15
+    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%x%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%X%x' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%x%x' % [h, l]
+  end
+  TBLDECWWWCOMP['+'] = ' '
+  TBLDECWWWCOMP.freeze
+
+  def encode_www_form_component(str)
+    str = str.to_s.dup
+
+    TBLENCWWWCOMP_.each do |from,to|
+      str.gsub!(from,to)
+    end
+    str
+  end
+
 end

data/lib/rack/app/version.rb

@@ -1,3 +1,2 @@
-Rack ||= Module.new
-Rack::App ||= Class.new
+require 'rack/app'
 Rack::App::VERSION = File.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'VERSION')).strip

data/rack-app.gemspec

@@ -1,12 +1,12 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rack/app/version'
+# lib = File.expand_path('../lib', __FILE__)
+# $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# require 'rack/app/version'
 
 Gem::Specification.new do |spec|
 
   spec.name          = "rack-app"
-  spec.version       = Rack::App::VERSION
+  spec.version       = File.read(File.join(File.dirname(__FILE__), 'VERSION')).strip
   spec.authors       = ["Adam Luzsi"]
   spec.email         = ["adamluzsi@gmail.com"]
 
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.license       = 'GNU General Public License v3'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 
   spec.add_dependency "rack"

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -103,7 +104,6 @@ files:
 - lib/rack/app/test.rb
 - lib/rack/app/utils.rb
 - lib/rack/app/version.rb
-- lib/rack/app/view.rb
 - rack-app.gemspec
 - spike/routing_time.rb
 homepage: https://github.com/adamluzsi/rack-app.rb

data/lib/rack/app/view.rb

@@ -1,14 +0,0 @@
-class Rack::App::View
-
-  extend Rack::App::File::Parser::Factory
-
-  def render(view_file_basename)
-    file_path = File.join(class_current_folder, view_file_basename)
-    self.class.find_file_parser_class_for(File.extname(file_path)).new(self).parse(file_path).to_a.join("\n")
-  end
-
-  def class_current_folder
-    method(:call).source_location.first.sub(/.rb$/,'')
-  end
-
-end