rapid_runty 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45302d9a8dbbf57572216e3d7decd9a79504fa51
-  data.tar.gz: 71527a5d37ac8a023a374bfb5b354738f8f61b7a
+  metadata.gz: c8e4a685ba91fc4049a3a5382aa56eb5923ebf10
+  data.tar.gz: 10d2e2bb3caf6f36d0ae842b83fc63d0a464035b
 SHA512:
-  metadata.gz: b0b02e994bb9479b459d5f15aba669b263887508d74cf71c2ba7a08dfe5f7fe707132f1110e21ea981f50515c85f4ee6103afd6904e55333ef68791ee1d713f5
-  data.tar.gz: 7d63588dc32c587faed2722be2f2bf547c6990c3d33d22b135f6b9b7d4a693ab9c7d11c1f242cc3db3f4095225c724ad62b6294a43f2486ac6fb53a5eda0eb3c
+  metadata.gz: 568008def90b41b16a42e9bec335be81811f2d5775e6337529812e820ab016fcc6377d072c2a229abeabf072034f1809fdb534865853999846ef3cf93d487b17
+  data.tar.gz: b09e7e72310f766892f19c7675eced90c7ffe7232b7407b67f96412f9c8ff34b9a0bac36379ccda6cc011faf0af96fcd5faa95464f14d3a6b2889acf286f655d

data/Gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'haml'
   gem 'poltergeist', git: 'git://github.com/teampoltergeist/poltergeist.git'
 end

data/lib/rapid_runty/application.rb

@@ -1,5 +1,5 @@
-require 'rapid_runty/routing'
-require 'rapid_runty/controller'
+require 'rapid_runty/router/base_route'
+require 'rapid_runty/controller/base_controller'
 
 module RapidRunty
   ##
@@ -18,21 +18,13 @@ module RapidRunty
     #
     # @param env [Hash] Rack environment Hash that includes CGI-like headers
     #
-    # @return [status, {headers}, [response]] array
+    # @return [status, {headers}, [response]]
     def call(env)
       request = Rack::Request.new(env)
+      response = Rack::Response.new
 
-      verb = request.request_method.downcase.to_sym
-      path = Rack::Utils.unescape(request.path_info)
-
-      return [500, {}, []] if path == '/favicon.ico'
-
-      route = routes.match(verb, path)
-      if route.nil?
-        [404, { 'Content-Type' => 'text/html' }, '404 not found']
-      else
-        [200, { 'Content-Type' => 'text/html' }, ["Hello RapidRunty"]]
-      end
+      handle(env, request, response)
+      response.finish
     end
   end
 end

data/lib/rapid_runty/controller/base_controller.rb

@@ -0,0 +1,66 @@
+module RapidRunty
+  ##
+  # Application base controller
+  class BaseController
+    attr_reader :env, :response
+
+    def initialize(env, response)
+      @env = env
+      @response = response
+    end
+
+    ##
+    # Fetch request params
+    #
+    # @return [Hash] Hash of url parameters
+    def params
+      @params ||= Rack::Utils.parse_nested_query(env['QUERY_STRING'])
+    end
+
+    ##
+    # Render the template with a default layout.
+    #
+    # @param [String] file name for the template
+    def render(view = controller_action)
+      render_template(layout) do
+        render_template(view)
+      end
+    end
+
+    ##
+    # Tilt method to render specific template
+    #
+    # @return Rack::Response compatible response [body, status, header]
+    def render_template(path, &block)
+      Tilt.new(file(path)).render(self, &block)
+    end
+
+    ##
+    # Find template file
+    #
+    # @return [Path] template path
+    def file(path)
+      Dir[File.join(ROOT_DIR, 'app', 'views', "#{path}.html.*")].first
+    end
+
+    ##
+    # Define Layout template location
+    #
+    # @return [Path] the layout template location
+    def layout
+      File.join('layouts', 'application')
+    end
+
+    ##
+    # Redirect response method
+    def redirect_to(path)
+      response.redirect path
+    end
+
+    private
+
+    def controller_action
+      File.join(env['controller'], env['action'])
+    end
+  end
+end

data/lib/rapid_runty/router/base_route.rb

@@ -0,0 +1,68 @@
+require 'rapid_runty/router/routes'
+
+module RapidRunty
+  class Application
+    attr_reader :routes
+
+    def initialize
+      @routes = RapidRunty::Router::Routes.new
+    end
+
+    # Core response method. Process the request and return the correct
+    # response or status message.
+    #
+    # @param env
+    # @param [Rack::Request] request
+    # @param [Rack::Response] response
+    def handle(env, request, response)
+      verb, path = route_args(request).values
+
+      route = routes.find_route(verb, path)
+      if route.nil?
+        not_found(response, path)
+      else
+        param = "&#{Rack::Utils.build_nested_query(route.placeholders)}"
+        env['QUERY_STRING'] << param
+        env.merge!(route.options)
+        response.write dispatch(env, route, response)
+      end
+    end
+
+    ##
+    # Dispatch the Controller and it's action to be rendered
+    def dispatch(env, route, response)
+      kontroller, action = route.options.values
+
+      controller = Object.const_get("#{kontroller.camel_case}Controller")
+      controller.new(env, response).public_send(action)
+    end
+
+    ##
+    # Default 404 error
+    #
+    # @param [Rack::Response]
+    #
+    # @return [Rack::Response]
+    def not_found(response, path)
+      response.status = 404
+      response.write "
+      <html>
+        <head>
+          <body>
+            <h1>404 Page not found for #{path}</h1>
+          </body>
+        </head>
+      </html>
+      "
+    end
+
+    private
+
+    def route_args(request)
+      {
+        verb: request.request_method.downcase.to_sym,
+        path: Rack::Utils.unescape(request.path_info)
+      }
+    end
+  end
+end

data/lib/rapid_runty/router/matcher.rb

@@ -0,0 +1,50 @@
+require 'rapid_runty/router/route_parser'
+
+module RapidRunty
+  module Router
+    ##
+    # Matches passed in path with array of application paths
+    class Matcher
+      ##
+      # Defines the route that matches the path
+      #
+      # Example:
+      #
+      #   RapidRunty::Router::Matcher.new.match("/foo", [{url: "/", to: "root#index"}, {url: "/bar", to: "bar#index"}, {url: "/foo", to: "foo#index"}]) #=> ["/foo", [], { controller: "foo", action: "index" }]
+      #   RapidRunty::Router::Matcher.new.match("/04/01/01", [{url: "/:day/:month/:year", to: "date#find"}]) #=> ["/", ["04", "01", "01"], { controller: "date", action: "find" }]
+      # @param path [String] path from ENV["PATH_INFO"]
+      # @param application routes [Array] Array of Hash application defined routes
+      #
+      # Currently only supporting ":to" options which defines the "controller#action"
+      #
+      # @return [matching_route, matched_placeholders, matched_controller_action] array
+      #
+      def match(path, routes)
+        path = route_parser.new(path)
+        url_patterns = routes.map { |route| route_parser.new(route) }
+
+        url_patterns.each do |pattern|
+          return [
+            pattern.to_s,
+            pattern.placeholders,
+            controller_action(pattern.options)
+          ] if pattern == path
+        end
+
+        [nil, {}, {}]
+      end
+
+      def controller_action(options)
+        Hash[
+          %w(controller action).zip options.split('#')
+        ]
+      end
+
+      private
+
+      def route_parser
+        RapidRunty::Router::RouteParser
+      end
+    end
+  end
+end

data/lib/rapid_runty/router/route.rb

@@ -0,0 +1,16 @@
+module RapidRunty
+  module Router
+    ##
+    # Defines a single user defined route.
+    class Route
+      attr_accessor :verb, :path, :options, :placeholders
+
+      def initialize(verb, path, options)
+        self.verb = verb
+        self.path = path
+        self.options = options
+        self.placeholders = nil
+      end
+    end
+  end
+end

data/lib/rapid_runty/router/route_parser.rb

@@ -0,0 +1,62 @@
+module RapidRunty
+  module Router
+    ##
+    # Parses the route, extracts and return the various important parts of the url.
+    #
+    # @param [String] the request url
+    class RouteParser
+      attr_accessor :path, :options
+
+      def initialize(url)
+        self.path = split_url(url[:url])
+        self.options = url[:to]
+      rescue TypeError
+        self.path = split_url(url)
+      end
+
+      def to_s
+        '/' + path.join('/')
+      end
+
+      ##
+      # Return the present placeholders for the url
+      #
+      # @return [Hash] of the placeholder key and its value.
+      def placeholders
+        return {} unless @match
+
+        placeholders = {}
+        path.each_with_index do |part, i|
+          placeholders[part.delete(':').to_s] = @match.path[i] if part[0] == ':'
+        end
+        placeholders
+      end
+
+      def ==(other)
+        is_match = size_match?(other) && path_match?(other)
+        @match = other if is_match
+        is_match
+      end
+
+      private
+
+      def size_match?(url)
+        path.size == url.path.size
+      end
+
+      def path_match?(url)
+        path.each_with_index do |part, i|
+          return false unless part[0] == ':' || url.path[i] == part
+        end
+        true
+      end
+
+      def split_url(url)
+        url = url.to_s
+        path_parts = url.split('/').reject(&:empty?)
+        path_parts = [''] if url == '/'
+        path_parts
+      end
+    end
+  end
+end

data/lib/rapid_runty/{routes/route.rb → router/routes.rb}

@@ -1,4 +1,6 @@
-require 'rapid_runty/routes/matcher'
+require 'rapid_runty/router/route_parser'
+require 'rapid_runty/router/route'
+require 'rapid_runty/router/matcher'
 
 module RapidRunty
   module Router
@@ -6,7 +8,7 @@ module RapidRunty
     # This class registers all routes defined by the draw method.
     class Routes < Array
       def add(*args)
-        self << Route.new(*args)
+        self << RapidRunty::Router::Route.new(*args)
       end
 
       ##
@@ -18,21 +20,30 @@ module RapidRunty
       # @return A RapidRunty::Router::Route Instance:
       #
       # Example:
-      #   RapidRunty::Router::Routes.match("GET", "/foo/4") = #<RapidRunty::Router::Route options={"controller"=>"foo", "action"=>"bar"}, path="/foo/:id", placeholders=[], verb=:get
-      def match(verb, path)
+      #   RapidRunty::Router::Routes.find_route("GET", "/foo/4") => #<RapidRunty::Router::Route options={"controller"=>"foo", "action"=>"bar"}, path="/foo/:id", placeholders=[], verb=:get
+      def find_route(verb, path)
         return nil if empty?
 
         verb = verb.to_s.downcase.strip.to_sym
-
         routes = select { |route| route.verb == verb }
-        paths = routes.map { |route| { url: route.path }.merge route.options }
 
-        path, places, action = RapidRunty::Router::Matcher.match(path, paths)
-        return nil if path.nil?
+        urls = select_routes_by_verb(verb, routes)
+
+        find_matching_route(path, urls, routes)
+      end
+
+      def select_routes_by_verb(_verb, routes)
+        urls = routes.map { |route| { url: route.path }.merge route.options }
+        urls
+      end
+
+      def find_matching_route(path, urls, routes)
+        url, placeholders, controller_action = RapidRunty::Router::Matcher.new.match(path, urls)
+        return nil if url.nil?
 
-        route = routes.detect { |router| router.path == path }.clone
-        route.placeholders = places
-        route.options = action
+        route = routes.detect { |router| router.path == url }.clone
+        route.placeholders = placeholders
+        route.options = controller_action
         route
       end
 
@@ -65,16 +76,5 @@ module RapidRunty
         end
       end
     end
-
-    class Route
-      attr_accessor :verb, :path, :options, :placeholders
-
-      def initialize(verb, path, options)
-        self.verb = verb
-        self.path = path
-        self.options = options
-        self.placeholders = nil
-      end
-    end
   end
 end

data/lib/rapid_runty/util.rb

@@ -14,4 +14,14 @@ class String
     downcase!
     self
   end
+
+  ##
+  # Returns the CamelCase version of a word
+  #
+  # Example:
+  #   "index_controller".camel_case = "IndexController"
+  def camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map(&:capitalize).join
+  end
 end

data/lib/rapid_runty/version.rb

@@ -1,3 +1,3 @@
 module RapidRunty
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/rapid_runty.gemspec

@@ -42,4 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack', '~> 2.0'
   spec.add_dependency 'bundler', '~> 1.12'
   spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'tilt', '~> 2.0'
+  spec.add_dependency 'sqlite3', '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapid_runty
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Herbert Kagumba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -234,6 +234,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A minimal web framework to get your web project up and running in seconds.
 email:
 - herbert.kagumba@andela.com
@@ -259,11 +287,13 @@ files:
 - gemify.sh
 - lib/rapid_runty.rb
 - lib/rapid_runty/application.rb
-- lib/rapid_runty/controller.rb
+- lib/rapid_runty/controller/base_controller.rb
 - lib/rapid_runty/dependencies.rb
-- lib/rapid_runty/routes/matcher.rb
-- lib/rapid_runty/routes/route.rb
-- lib/rapid_runty/routing.rb
+- lib/rapid_runty/router/base_route.rb
+- lib/rapid_runty/router/matcher.rb
+- lib/rapid_runty/router/route.rb
+- lib/rapid_runty/router/route_parser.rb
+- lib/rapid_runty/router/routes.rb
 - lib/rapid_runty/util.rb
 - lib/rapid_runty/version.rb
 - rapid_runty.gemspec

data/lib/rapid_runty/controller.rb

@@ -1,12 +0,0 @@
-module RapidRunty
-  # Application controller
-  #
-  # TODO: Just saves the env for now
-  class Controller
-    def initialize(env)
-      @env = env
-    end
-
-    attr_reader :env
-  end
-end

data/lib/rapid_runty/routes/matcher.rb

@@ -1,110 +0,0 @@
-require 'pathname'
-
-module RapidRunty
-  module Router
-    ##
-    # Matches passed in path with array of application paths
-    module Matcher
-      def self.match(*args)
-        Base.match(*args)
-      end
-
-      class Base
-        ##
-        # Defines the route that matches the path
-        #
-        # Example:
-        #
-        #   RapidRunty::Router::Matcher.match("/foo", [{url: "/", to: "root#index"}, {url: "/bar", to: "bar#index"}, {url: "/foo", to: "foo#index"}]) #=> ["/foo", [], { controller: "foo", action: "index" }]
-        #   RapidRunty::Router::Matcher.match("/04/01/01", [{url: "/:day/:month/:year", to: "date#find"}]) #=> ["/", ["04", "01", "01"], { controller: "date", action: "find" }]
-        # @param path [String] path from ENV["PATH_INFO"]
-        # @param application routes [Array] Array of Hash application defined routes
-        #
-        # Currently only supporting ":to" options which defines the "controller#action"
-        #
-        # @return [matching_route, matched_placeholders, matched_controller_action] array
-        #
-        def self.match(path, routes)
-          path = Path.new(path)
-          url_patterns = routes.map { |route| URLPattern.new(route) }
-
-          url_patterns.each do |pattern|
-            return [
-              pattern.to_s,
-              pattern.placeholders,
-              ControllerSetup.controller_action(pattern.options)
-            ] if pattern == path
-          end
-
-          [nil, [], {}]
-        end
-      end
-
-      class Path
-        attr_accessor :parts, :ext, :options
-
-        def initialize(path)
-          path = Pathname(path)
-          self.parts, self.ext = split_path(path)
-        rescue TypeError
-          self.parts, self.ext = split_path(path[:url])
-          self.options = path[:to]
-        end
-
-        def to_s
-          '/' + parts.join('/') + ext
-        end
-
-        private
-
-        def split_path(path)
-          path = path.to_s
-          ext = Pathname(path).extname
-          path = path.sub(/#{ext}$/, '')
-          parts = path.split('/').reject(&:empty?)
-          parts = [''] if path == '/'
-          [parts, ext]
-        end
-      end
-
-      class URLPattern < Path
-        def placeholders
-          return [] unless @match
-
-          vars = []
-          parts.each_with_index do |part, i|
-            vars << @match.parts[i] if part[0] == ':'
-          end
-          vars
-        end
-
-        def ==(other)
-          is_match = size_match?(other) && parts_match?(other)
-          @match = other if is_match
-          is_match
-        end
-
-        private
-
-        def size_match?(path)
-          parts.size == path.parts.size
-        end
-
-        def parts_match?(path)
-          parts.each_with_index do |part, i|
-            return true if part[0] == ':' || path.parts[i] == part
-          end
-          false
-        end
-      end
-
-      class ControllerSetup
-        def self.controller_action(options)
-          Hash[
-            %w(controller action).zip options.split('#')
-          ]
-        end
-      end
-    end
-  end
-end

data/lib/rapid_runty/routing.rb

@@ -1,11 +0,0 @@
-require 'rapid_runty/routes/route'
-
-module RapidRunty
-  class Application
-    attr_reader :routes
-
-    def initialize
-      @routes = RapidRunty::Router::Routes.new
-    end
-  end
-end