rack-app 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3ec73ef1741248aea0a795217bb718ad9aee4a5
-  data.tar.gz: bee58d13e8db2f14d1ed1bb7b0f06fb6c0429def
+  metadata.gz: a061f4202e995da2a1325944ec7586052d30a603
+  data.tar.gz: 193cb7950307a6161f8095b9f90073024241daff
 SHA512:
-  metadata.gz: 17bdeed0847c57119871824c6eea1defa58a51c595dada79153fa0d1d0d68db8019828a390b20d4d4c29be5d87c383dc45ff5297afad3d3a544a9ce10c39d1b4
-  data.tar.gz: 913db22c6134df5b7c6213dc7d07bafb9e71bc2d6966e401ab482f5aab76ad62f385a5937ae6f43149815b52133b867a54b6119fb5ac728a05642e269e28f06f
+  metadata.gz: 5bccaeb4dcd6599eb14003434dc54dda1cb8d31f93968c7e5fccf1420e7cbdf427d3d6728f897a9557868fa9fb8681c1ebeac8189f5e6a8261d4b202d126f38f
+  data.tar.gz: 734d959b060a38c58ecea6f7214d33bf3396c7ba71704c4cb6d90c893086a7cdbb162e41945ea626f9c6c693cad24fff8e5126c1016515056f299c3387c90ecb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-app (0.4.0)
+    rack-app (0.5.0)
       rack
 
 GEM

data/README.md

@@ -80,6 +80,35 @@ Rack::Response as response method.
 
 By default if you dont write anything to the response 'body' the endpoint block logic return will be used
 
+## Testing 
+
+use bundled in testing module for writing unit test for your rack application
+
+```ruby
+
+require_relative '../../spec_helper'
+require 'rack/app/test'
+
+describe MyRackApp do
+
+  include Rack::App::Test
+  
+  rack_app described_class
+  
+  describe '#something' do
+  
+    subject{ get('/hello', params: {'dog' => 'meat'}, headers: {'X-Cat' => 'fur'}) }
+
+    it { expect(subject.body).to eq ['world']}
+    
+    it { expect(subject.status).to eq 201 }
+    
+  end 
+  
+end 
+
+```
+
 ## Example Apps To start with
 
 * [Basic](https://github.com/adamluzsi/rack-app.rb-examples/tree/master/basic)
@@ -111,20 +140,16 @@ i feared do this for Rails that is usually slower than Grape :S
 
 ## Roadmap 
 
-### 0.3.0
-
-* add TESTING module for rspec helpers that allow easy to test controllers
-
-### 0.4.0
+### 0.6.0
 
 * serializer block/method for class shared serialization logic
 
-### 0.5.0
+### 0.7.0
 
 * content_type syntax sugar on class level 
 * response_headers syntax sugar for request processing 
 
-### 0.6.0
+### 0.8.0
 
 * custom error_handler block for api, where Exception class types can be defined to process
   * NULL Object pattern for error_handler_fetcher

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/rack/app.rb

@@ -5,21 +5,96 @@ class Rack::App
 
   require 'rack/app/version'
 
+  require 'rack/app/params'
   require 'rack/app/utils'
   require 'rack/app/router'
   require 'rack/app/endpoint'
   require 'rack/app/endpoint/not_found'
-  require 'rack/app/runner'
 
-  require 'rack/app/class_methods'
-  extend Rack::App::ClassMethods
+  class << self
 
-  require 'rack/app/request_helpers'
+    def call(request_env)
+      endpoint = router.fetch_endpoint(request_env['REQUEST_METHOD'],request_env['REQUEST_PATH'])
+      endpoint.execute(request_env)
+    end
 
-  include Rack::App::RequestHelpers
+    def description(*description_texts)
+      @last_description = description_texts.join("\n")
+    end
 
-  def self.call(request_env)
-    Rack::App::Runner.response_for(self,request_env)
+    def get(path = '/', &block)
+      add_route('GET', path, &block)
+    end
+
+    def post(path = '/', &block)
+      add_route('POST', path, &block)
+    end
+
+    def put(path = '/', &block)
+      add_route('PUT', path, &block)
+    end
+
+    def head(path = '/', &block)
+      add_route('HEAD', path, &block)
+    end
+
+    def delete(path = '/', &block)
+      add_route('DELETE', path, &block)
+    end
+
+    def options(path = '/', &block)
+      add_route('OPTIONS', path, &block)
+    end
+
+    def patch(path = '/', &block)
+      add_route('PATCH', path, &block)
+    end
+
+    def router
+      @router ||= Rack::App::Router.new
+    end
+
+    def add_route(request_method, request_path, &block)
+
+      endpoint_properties = {
+          request_method: request_method,
+          request_path: request_path,
+          description: @last_description
+      }
+
+      endpoint = Rack::App::Endpoint.new(
+          self, endpoint_properties, &block
+      )
+
+      router.add_endpoint(request_method, request_path, endpoint)
+
+      @last_description = nil
+      return endpoint
+
+    end
+
+
+    def mount(api_class)
+
+      unless api_class.is_a?(Class) and api_class <= Rack::App
+        raise(ArgumentError, 'Invalid class given for mount, must be a Rack::App')
+      end
+
+      router.merge!(api_class.router)
+
+      return nil
+    end
+
+  end
+
+  def params
+    @__params__ ||= Rack::App::Params.new(request.env).to_hash
+  end
+
+  def status(new_status=nil)
+    response.status= new_status.to_i unless new_status.nil?
+
+    response.status
   end
 
   attr_writer :request, :response

data/lib/rack/app/{request_helper/params.rb → params.rb}

@@ -1,5 +1,5 @@
 require 'cgi'
-class Rack::App::RequestHelpers::Params
+class Rack::App::Params
 
   def initialize(request_env)
     @request_env = request_env

data/lib/rack/app/test.rb

@@ -0,0 +1,63 @@
+require 'uri'
+require 'rack/app'
+module Rack::App::Test
+
+  # magic ;)
+  def self.included(klass)
+
+    klass.define_singleton_method :rack_app do |rack_app_class=nil, &constructor|
+
+      subject_app = rack_app_class.is_a?(Class) ? rack_app_class : Class.new(Rack::App)
+      subject_app.instance_eval(&constructor) unless constructor.nil?
+
+      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
+    end
+  end
+
+  def format_properties(properties)
+    raise('use hash format such as params: {"key" => "value"} or headers with the same concept') unless properties.is_a?(Hash)
+    properties[:params] ||= {}
+    properties[:headers]||= {}
+
+    properties
+  end
+
+  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) }
+
+    {
+        "REMOTE_ADDR" => "192.168.56.1",
+        "REQUEST_METHOD" => request_method.to_s.upcase,
+        "REQUEST_PATH" => url,
+        "REQUEST_URI" => url,
+        "SERVER_PROTOCOL" => "HTTP/1.1",
+        "CONTENT_LENGTH" => "0",
+        "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),
+        "HTTP_VERSION" => "HTTP/1.1",
+        "HTTP_USER_AGENT" => "spec",
+        "HTTP_HOST" => "spec.local",
+        "HTTP_ACCEPT_ENCODING" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+        "HTTP_ACCEPT" => "*/*",
+        "HTTP_CONNECTION" => "close"
+    }.merge(additional_headers)
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,15 +85,13 @@ files:
 - VERSION
 - bin/setup
 - lib/rack/app.rb
-- lib/rack/app/class_methods.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
-- lib/rack/app/request_helper/params.rb
-- lib/rack/app/request_helpers.rb
+- lib/rack/app/params.rb
 - lib/rack/app/router.rb
 - lib/rack/app/router/dynamic.rb
 - lib/rack/app/router/static.rb
-- lib/rack/app/runner.rb
+- lib/rack/app/test.rb
 - lib/rack/app/utils.rb
 - lib/rack/app/version.rb
 - rack-app.gemspec

data/lib/rack/app/class_methods.rb

@@ -1,69 +0,0 @@
-module Rack::App::ClassMethods
-
-  def description(*description_texts)
-    @last_description = description_texts.join("\n")
-  end
-
-  def get(path = '/', &block)
-    add_route('GET', path, &block)
-  end
-
-  def post(path = '/', &block)
-    add_route('POST', path, &block)
-  end
-
-  def put(path = '/', &block)
-    add_route('PUT', path, &block)
-  end
-
-  def head(path = '/', &block)
-    add_route('HEAD', path, &block)
-  end
-
-  def delete(path = '/', &block)
-    add_route('DELETE', path, &block)
-  end
-
-  def options(path = '/', &block)
-    add_route('OPTIONS', path, &block)
-  end
-
-  def patch(path = '/', &block)
-    add_route('PATCH', path, &block)
-  end
-
-  def router
-    @static_router ||= Rack::App::Router.new
-  end
-
-  def add_route(request_method, request_path, &block)
-
-    endpoint = Rack::App::Endpoint.new(
-        self,
-        {
-            request_method: request_method,
-            request_path: request_path,
-            description: @last_description
-        },
-        &block
-    )
-
-    router.add_endpoint(request_method,request_path,endpoint)
-
-    @last_description = nil
-    endpoint
-  end
-
-
-  def mount(api_class)
-
-    unless api_class.is_a?(Class) and api_class <= Rack::App
-      raise(ArgumentError, 'Invalid class given for mount, must be a Rack::App')
-    end
-
-    router.merge!(api_class.router)
-
-    nil
-  end
-
-end

data/lib/rack/app/request_helpers.rb

@@ -1,15 +0,0 @@
-module Rack::App::RequestHelpers
-
-  require 'rack/app/request_helper/params'
-
-  def params
-    @__request_params__ ||= Rack::App::RequestHelpers::Params.new(request.env).to_hash
-  end
-
-  def status(new_status=nil)
-    response.status= new_status.to_i unless new_status.nil?
-
-    response.status
-  end
-
-end

data/lib/rack/app/runner.rb

@@ -1,15 +0,0 @@
-module Rack::App::Runner
-  extend self
-
-  def response_for(api_class, request_env)
-    endpoint = fetch_endpoint(api_class,request_env['REQUEST_METHOD'],request_env['REQUEST_PATH'])
-    endpoint.execute(request_env)
-  end
-
-  protected
-
-  def fetch_endpoint(api_class, request_method, request_path)
-    api_class.router.fetch_endpoint(request_method, request_path)
-  end
-
-end