microframe 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b26273e0e3a66da31bd5ef27ec8e035a639ef6c
-  data.tar.gz: c783982497042b856f64fccf544c71dac1de3482
+  metadata.gz: a3b1e837b9d372578d058c4a3a5089f1b6745751
+  data.tar.gz: e3c33d4c092ddcbe0b199d32665502b596d4b5c6
 SHA512:
-  metadata.gz: f9b7a5966a249c8567ed6fe9056874f216069e4662fe0a6dc4a2ad6f4911f00db1cf1768f0cabc4f7746cd46ae1f68d404dd7988388d24287195a08686a827db
-  data.tar.gz: dc024b84ebcbf29345824c63640206e76ab0cbe1bba7b41a07f620dae4dd1435f2818c4658bc411ff892e0bf0cecc07b10e9220df00911fe22837d8cac9f28e9
+  metadata.gz: 02819a23156e8797d73e3c6a170c0babb0ccc86d57dccd6db8bdf2088bc536f7913a6737c7c2d3a3616b94a0f82058a2db5198ba9cb4937b7e41ac80074e1546
+  data.tar.gz: 6b191a57a39e6fe0b19883a7c14cdc1533b05b09243de2698491f287cd5f71328dce604be33c48f0379b0e933b6192055e79d36246d74dc7e20643757ed6ca49

data/README.md

@@ -1,5 +1,7 @@
 # Microframe
 
+[![Code Climate](https://codeclimate.com/github/andela-ooranagwa/microframe/badges/gpa.svg)](https://codeclimate.com/github/andela-ooranagwa/microframe) [![Test Coverage](https://codeclimate.com/github/andela-ooranagwa/microframe/badges/coverage.svg)](https://codeclimate.com/github/andela-ooranagwa/microframe/coverage)
+
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/microframe`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
@@ -38,4 +40,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/circle.yml

@@ -0,0 +1,4 @@
+machine:
+  ruby:
+    version:
+      2.1.7

data/lib/microframe/application/application.rb

@@ -10,11 +10,8 @@ module Microframe
 
     def call(env)
       @request = Rack::Request.new(env)
-      verb = request.request_method
-      path = request.path_info
       routes.request = request
-
-      routes.handle_request(verb, path)
+      routes.handle_request
     end
   end
 end

data/lib/microframe/application/generators/generator.rb

@@ -14,21 +14,22 @@ module Microframe
     def new(name)
       @app_name = name
       directory("app_sample", "#{app_name}")
+      init_with_shell_cmds
     end
 
     desc "generate TYPE NAME OPTIONS", "Generates microframe resource of TYPE (i.e. model, controller or view) with the given NAME extra options specific to TYPE can also be provided"
     def generate(type, name, *xtras)
       @type = type.downcase
       @name = name.downcase
-      @xtras = xtras
+      @xtras ||= xtras
 
       if type == "controller"
         template("sample_controller.tt", File.join(target_root, "controllers", "#{name}_controller.rb"))
-        generate("view", name)
+        create_views
       elsif type == "model"
         template("sample_model.tt", File.join(target_root, "models", "#{name}.rb"))
       elsif type == "view"
-        directory("folder", File.join(target_root, "views", "name"))
+        create_views
       end
     end
 
@@ -43,5 +44,15 @@ module Microframe
       "app/"
     end
 
+    def create_views
+      empty_directory(File.join(target_root, "views", name))
+      xtras.each { |f| template("blank.tt", File.join(target_root, "views", name, "#{f}.html.erb")) }
+    end
+
+    def init_with_shell_cmds
+      Dir.chdir(app_name)
+      run "bundle install"
+      run "git init"
+    end
   end
 end

data/lib/microframe/application/generators/samples/app_sample/config.ru.tt

@@ -1,9 +1,11 @@
+APP_PATH = __dir__
+
 require  "bundler"
 Bundler.require
 
 <%= app_name.capitalize %>Application = Microframe::Application.new
 
-require File.join(File.dirname(__FILE__), "config", "routes")
+require File.join(APP_PATH, "config", "routes")
 
 use Rack::Reloader
 run <%= app_name.capitalize %>Application

data/lib/microframe/application/generators/samples/sample_model.tt

@@ -1,4 +1,5 @@
 class <%= name.capitalize %> < Microframe::ORM::Base
+  property :id, type: :integer, primary_key: true
   <% if !xtras.empty? %>
   <% xtras.each do |pty| %>
     <% pty = pty.split(":") %>

data/lib/microframe/controller/application_controller.rb

@@ -1,6 +1,10 @@
+require File.join(__dir__, "helpers")
+require File.join(__dir__, "view_object")
+
 module Microframe
    class ApplicationController
-     attr_reader :request, :params, :view_rendered, :errors, :child, :action
+     include Helpers
+     attr_reader :request, :params, :view_rendered, :errors, :child, :action, :view_vars
 
      def initialize(request, child, action)
        @request = request
@@ -13,22 +17,29 @@ module Microframe
        { view: action, layout: "application" }
      end
 
+     def redirect_to(location)
+       @view_rendered = true
+       [302, {"Location" => location}, []]
+     end
+
      def render(options = {})
       @view_rendered = true
       view = get_view(options[:view])
       layout = get_layout(options[:layout])
-      
+      obj = set_up_view_object
+      status = 200
+
       if(render_error?(view, layout))
-        response = Tilt.new(File.join(".", "public", "404.html.erb"))
-        response = response.render(Object.new, errors: @errors)
+        response = Tilt.new(File.join(APP_PATH, "public", "404.html.erb"))
+        status = 404
+        response = response.render(obj, errors: @errors)
       else
         template = Tilt::ERBTemplate.new(layout)
         view = Tilt::ERBTemplate.new(view)
-        vars = set_instance_variables_for_views
-        response = template.render(self, vars){ view.render(self, vars)}
+        response = template.render(obj){ view.render(obj)}
       end
 
-      [200, {}, [response]]
+      [status, {}, [response]]
      end
 
      def render_view
@@ -42,18 +53,25 @@ module Microframe
        @errors.size > 0
      end
 
-     def get_view(view)
+     def get_view(view = nil)
        view ||= default_render_option[:view]
-       file = File.join(".", "app", "views", child, "#{view}.html.erb")
+       file = File.join(APP_PATH, "app", "views", child, "#{view}.html.erb")
        unless File.file? file
-        file = File.join(".", "app", "views", "#{view}.html.erb")
+        file = File.join(APP_PATH, "app", "views", "#{view}.html.erb")
        end
        file
      end
 
-     def get_layout(layout)
+     def get_layout(layout = nil)
        layout ||= default_render_option[:layout]
-       File.join(".", "app", "views", "layouts", layout + ".html.erb")
+       File.join(APP_PATH, "app", "views", "layouts", layout + ".html.erb")
+     end
+
+     def render_partial(partial)
+       partial = partial.split("/")
+       partial[-1] = "_#{partial[-1]}"
+       partial = Tilt::ERBTemplate.new(get_view(partial.join("/")))
+       partial.render(self)
      end
 
      def set_instance_variables_for_views
@@ -65,7 +83,15 @@ module Microframe
      end
 
      def protected_instance_variables_for_views
-       [@request]
+       [:@request, :@action, :@view_rendered, :@child]
+     end
+
+     def set_up_view_object
+       obj = ViewObject.new(self)
+       obj.instance_exec(set_instance_variables_for_views) do |inst_vars|
+         inst_vars.each{|key, value| instance_variable_set("@#{key}", value) }
+       end
+       obj
      end
    end
 end

data/lib/microframe/controller/form_helper.rb

@@ -0,0 +1,54 @@
+module Microframe
+  class FormHelper
+    attr_reader :target, :target_id, :form_started,:target_name
+
+    def initialize (target, target_link)
+      @target = target
+      @target_name = target.class.to_s.downcase
+      @link = target_link
+      @form_started = false
+    end
+
+    def start_form
+      @form_started = true
+      @target_id = target.id ? target.id : nil
+      @link ||= "/#{target_name}s/#{target_id || ""}"
+      "<form action='#{@link}' method='post'>"
+    end
+
+    def label(name)
+      gatekeeper "<label>#{name}</label>"
+    end
+
+    def text_area(name)
+      gatekeeper "<textarea name = '#{target_name}[#{name}]'>#{target.send(name)}</textarea>"
+    end
+
+    def text_field(name)
+      gatekeeper "<input type = 'text' name = '#{target_name}[#{name}]' value = '#{target.send(name)}'/>"
+    end
+
+    def submit
+      output = ""
+      output += "<input type = 'hidden' name = '_method' value = 'put'/>" if target_id
+      output += "<input type = 'submit' value = 'save' />"
+      output += "</form>"
+      gatekeeper output
+    end
+
+    def check_box(name, val=nil)
+      val ||= target.send(name)
+      gatekeeper "<input type = 'checkbox' name = '#{target_name}[#{name}]' checked = '#{val}' value = 'true'/>"
+    end
+
+    def hidden(val)
+      name = val.class.to_s.downcase
+      val = val.id
+      gatekeeper "<input type = 'hidden' name = '#{name}_id' value = '#{val}'/>"
+    end
+
+    def gatekeeper(output)
+      form_started ? output : start_form + output
+    end
+  end
+end

data/lib/microframe/controller/helpers.rb

@@ -0,0 +1,33 @@
+require File.join(__dir__, "form_helper")
+
+module Microframe
+  module Helpers
+    def link_to(link, target, options = {})
+      if options[:method]
+        target = target.is_a?(String) ? target : "/#{target.class.to_s.downcase}s/#{target.id}"
+
+        "<form action='#{target}' method='post'><input type='hidden' name='_method' value='#{options[:method]}'/><input type='submit' value='#{link}' /></form>"
+      else
+        data_options = ""
+        options[:data].each { |key, val| data_options << "data-#{key}='#{val}'"} if options[:data]
+        "<a href='#{target}' #{data_options} >#{link}</a>"
+      end
+    end
+
+    def form_for(target, link=nil, &block)
+      yield(FormHelper.new(target, link))
+    end
+
+    def image_tag(image, ext = "png")
+      File.join(APP_PATH, "app", "assets", "images", "#{image}.#{ext}")
+    end
+
+    def javascript_tag(js)
+      File.join(APP_PATH, "app", "assets", "javascripts", "#{js}.js")
+    end
+
+    def stylesheet_tag(style, ext = "css")
+      File.join(APP_PATH, "app", "assets", "stylesheets", "#{style}.#{ext}")
+    end
+  end
+end

data/lib/microframe/controller/view_object.rb

@@ -0,0 +1,12 @@
+module Microframe
+  class ViewObject
+    include Helpers
+    def initialize(obj)
+      @main_obj = obj
+    end
+
+    def render_partial(option)
+      @main_obj.render_partial(option)
+    end
+  end
+end

data/lib/microframe/orm/base.rb

@@ -1,15 +1,11 @@
 require File.join(__dir__,"class_queries")
-Dir[File.join(".", "app", "models", "*.rb")].each { |file| require file}
+require File.join(__dir__,"instance_queries")
+
+Dir[File.join(APP_PATH, "app", "models", "*.rb")].each { |file| require file}
 
 module Microframe
   module ORM
     class Base
-
-      def update_queryset(key, value)
-        @queryset ||= Hash.new(Array.new)
-        @queryset[key] = @queryset[key] << value
-      end
-
       def table_name
         self.class.table_name
       end

data/lib/microframe/orm/class_queries.rb

@@ -1,42 +1,42 @@
-require File.join(__dir__,"query_utils")
-require File.join(__dir__,"instance_queries")
+require File.join(__dir__,"queryset")
 require File.join(__dir__,"relationships")
 
 module Microframe
   module ORM
     class Base
-      @@queryset = {}
+      @@create_table_query = []
       class << self
-        include QueryUtils
         include Relationships
 
         def inherited(base)
           base.include InstanceQueries
-          base.include QueryUtils
         end
 
         def property(col_name, options = {})
-          @@create_table_query ||= []
           options[:type] = options[:type].to_s.upcase
           options[:nullable] = options[:nullable] ? "NULL" : "NOT NULL"
           options[:primary_key] = options[:primary_key] ? "PRIMARY KEY AUTOINCREMENT" : ""
-          @@create_table_query << col_name.to_s + " " + options.values.join(" ")
+          @@create_table_query << (col_name.to_s + " " + options.values.join(" "))
+        end
+
+        def get_create_table_query
+          @@create_table_query
         end
 
         def create_table
           query = "CREATE TABLE IF NOT EXISTS #{table_name} (#{@@create_table_query.join(", ")})"
           if Connection.execute(query)
-            @@create_table_query = nil
+            @@create_table_query = []
             define_attributes
           end
         end
 
         def define_attributes
+          save_data = []
           Connection.retrieve_columns(table_name).each do |column|
+            save_data << column
             define_method("#{column}=") do |val|
               instance_var = "@#{column}"
-              instance_variable_set("@save_queryset", {}) unless @save_queryset
-              @save_queryset[column] = val unless column == "id"
               instance_variable_set(instance_var, val)
             end
 
@@ -45,6 +45,10 @@ module Microframe
               instance_variable_get(instance_var)
             end
           end
+
+          define_method("models_columns") do
+            save_data
+          end
         end
 
         def create(options={})
@@ -52,7 +56,7 @@ module Microframe
           values = options.values
           placeholders = Array.new(values.size, "?").join(", ")
           Connection.connect.execute("INSERT INTO #{table_name} (#{keys}) VALUES (#{placeholders})", values)
-          self
+          self.last
         end
 
         def table_name
@@ -60,51 +64,43 @@ module Microframe
         end
 
         def all
-          add_query("SELECT", "*") unless @@queryset && @@queryset["SELECT"]
-          fetch_result
+          init_queryset(:select, "*").fetch
         end
 
         def find(id)
           find_by(id: id)
         end
 
-        def find_by(options = {})
-          where(options)
+        def find_by(options)
+          init_queryset(:find_by, options).fetch.first
         end
 
-        def where(options = {})
-          sql = ""
-          options.each {|key, val| sql << "#{key.to_s} = '#{val}'"}
-          add_query("WHERE",  sql)
+        def where(options)
+          init_queryset(:where, options)
         end
 
         def select(val)
-          add_query("SELECT", val)
+          init_queryset(:select, val)
         end
 
         def count
-          result = all
-          result.size
+          all.size
         end
 
         def first
-          limit(1)
-          fetch_result
+          limit(1).fetch.first
         end
 
         def last
-          limit(1).order("id DESC")
-          fetch_result
+          limit(1).order("id DESC").fetch.first
         end
 
         def limit(val)
-          @@queryset["LIMIT"] = val
-          self
+          init_queryset(:limit, val)
         end
 
         def order(val)
-          @@queryset["ORDER BY"] = val
-          self
+          init_queryset(:order, val)
         end
 
         def destroy(id)
@@ -113,19 +109,12 @@ module Microframe
 
         def destroy_all(xtra = "; VACUUM")
           query = "DELETE FROM #{table_name} #{xtra}"
-          execute(query)
+          Connection.connect.execute(query)
           self
         end
 
-        def update_queryset(key, value)
-          @@queryset ||= {}
-          @@queryset[key] = @@queryset[key] ?  @@queryset[key] << value : [value]
-        end
-
-        def fetch_result
-          result = process_query(@@queryset)
-          @@queryset = {}
-          parse_result_to_objects(result)
+        def init_queryset(mtd, option)
+          Queryset.new(self).send(mtd, option)
         end
       end
     end

data/lib/microframe/orm/connection.rb

@@ -1,10 +1,12 @@
+require File.join(APP_PATH, "db", "config")
+
 module Microframe
   module ORM
     class Connection
       class << self
 
         def connect
-          @@db ||= SQLite3::Database.open(File.join("db", @@dbname + ".sqlite"))
+          @@db ||= SQLite3::Database.open(File.join(APP_PATH, "db", @@dbname + ".sqlite"))
           @@db.results_as_hash = true
           connection
         end
@@ -13,10 +15,6 @@ module Microframe
           @@db.execute2("SELECT * FROM #{table} WHERE id = 0")[0]
         end
 
-        def set_dbname(name)
-          @@dbname = name
-        end
-
         def connection
           @@db ||= connect
         end

data/lib/microframe/orm/instance_queries.rb

@@ -1,41 +1,27 @@
 module Microframe
   module ORM
     module InstanceQueries
+      include QueryUtils
       def save
-        @save_queryset["id"] = id
-        keys = @save_queryset.keys.join(", ")
-        values = @save_queryset.values
-        @save_queryset = nil
+        queryset = {}
+        models_columns.each { |col| queryset[col] = send(col) }
+        keys = queryset.keys.join(", ")
+        values = queryset.values
         placeholders = Array.new(values.size, "?").join(", ")
-        result = Microframe::ORM::Connection.connect.execute("REPLACE INTO #{table_name} (#{keys}) VALUES (#{placeholders})", values)
+        result = Connection.connection.execute("REPLACE INTO #{table_name} (#{keys}) VALUES (#{placeholders})", values)
         result ? self.class.last : self
       end
 
       def update(options = {})
-        @save_queryset ||= {}
-        @save_queryset.merge(options)
+        options.each{ |col, val| send("#{col}=", val) }
         save
       end
-      # def order
-      # end
-
-      # def limit
-      # end
-
-      # def offset
-      # end
-
-      # def update
-      # end
 
       def destroy
         query = "DELETE FROM #{table_name} WHERE id =#{id}"
-          execute(query)
-          self
+        execute(query)
+        self
       end
-
-      # def group
-      # end
     end
   end
 end

data/lib/microframe/orm/query_utils.rb

@@ -1,11 +1,6 @@
 module Microframe
   module ORM
     module QueryUtils
-      def add_query(key, value)
-        update_queryset(key, value)
-        self
-      end
-
       def process_query(queryset)
         return unless queryset
         query = build_query(queryset)
@@ -13,7 +8,7 @@ module Microframe
       end
 
       def execute(query)
-        Microframe::ORM::Connection.execute(query)
+        Connection.execute(query)
       end
 
       def process_select(queryhash)
@@ -22,8 +17,8 @@ module Microframe
       end
 
       def process_from(queryhash)
-        queryhash["FROM"] ||= self.to_s.downcase
-        "FROM #{queryhash["FROM"]}s"
+        queryhash["FROM"] ||= table_name
+        "FROM #{queryhash["FROM"]}"
       end
 
       def process_where(queryhash)
@@ -57,7 +52,7 @@ module Microframe
       def parse_result_to_objects(result)
         hash_objects = []
         result.each do |hash|
-          obj = self.new
+          obj = @model.new
           hash.each do |key, val|
             if key.is_a? String
               obj.instance_variable_set("@#{key}", val)
@@ -65,7 +60,7 @@ module Microframe
           end
           hash_objects << obj
         end
-        result.size == 1 ? hash_objects.first : hash_objects
+        hash_objects
       end
     end
   end

data/lib/microframe/orm/queryset.rb

@@ -0,0 +1,66 @@
+require File.join(__dir__,"query_utils")
+
+module Microframe
+  module ORM
+    class Queryset
+      include QueryUtils
+
+      attr_reader :queryset, :table_name
+
+      def initialize(model)
+        @queryset = {}
+        @table_name = model.table_name
+        @model = model
+      end
+
+      def where(options)
+        sql = []
+        options.each {|key, val| sql << "#{key.to_s} = '#{val}'"}
+        add_query("WHERE",  sql.join(" AND "))
+      end
+
+      def all(val = "*")
+        add_query("SELECT", "#{val}") unless queryset["SELECT"]
+        fetch
+      end
+
+      def find(id)
+        where(id: id)
+      end
+
+      def find_by(option)
+        where(option)
+      end
+
+      def select(val)
+        add_query("SELECT", val)
+      end
+
+      def limit(val)
+        @queryset["LIMIT"] = val
+        self
+      end
+
+      def order(val)
+        @queryset["ORDER BY"] = val
+        self
+      end
+
+      def add_query(field, condition)
+        @queryset ||= {}
+        @queryset[field] = queryset[field] ?  queryset[field] << condition : [condition]
+        self
+      end
+
+      def fetch
+        result = process_query(queryset)
+        @queryset = {}
+        parse_result_to_objects(result)
+      end
+
+      def load
+        fetch.first
+      end
+    end
+  end
+end

data/lib/microframe/orm/relationships.rb

@@ -12,11 +12,10 @@ module Microframe
       end
 
       def belongs_to(model, options = {})
-        model = model.to_s
         define_method(model) do
           options[:foreign_key] ||= "id"
-          model_id = send((model + "_id").to_sym)
-          Module.const_get(model.capitalize).where(options[:foreign_key] => model_id )
+          model_id = send("#{model}_id")
+          Module.const_get(model.to_s.capitalize).where(options[:foreign_key] => model_id ).fetch.first
         end
       end
 

data/lib/microframe/routing/mapper.rb

@@ -3,6 +3,7 @@ module Microframe
     attr_reader :routes, :placeholders
     def initialize(routes)
       @routes = routes
+      @placeholders = {};
     end
 
     def self.start(route)
@@ -11,42 +12,44 @@ module Microframe
 
     def map(verb, path)
       value = nil
-      routes[verb].each do |route, target|
-        if match_this(route, path)
-          value = target
-          break
+      if routes[verb]
+        routes[verb].each do |route, target|
+          if match_this(route, path)
+            value = target
+            break
+          end
         end
       end
       value
     end
 
-    def match_components(a, b)
+    def match_components(defined_elt, incoming_elt)
       found = false
-      if a == b
+      if defined_elt == incoming_elt
         found = true
-      elsif a[0] == ":" && a[-1] != ")" && a[-1] != "("
-        @placeholders[a[1..-1].to_sym] = b
+      elsif defined_elt[0] == ":" && defined_elt[-1] != ")" && defined_elt[-1] != "(" && !incoming_elt.nil?
+        @placeholders[defined_elt[1..-1].to_sym] = incoming_elt
         found = true
       end
       return found
     end
 
-    def match_begin_of_optional_components(a, optional)
-      if a[-1] == "("
+    def match_begin_of_optional_components(defined_elt, optional)
+      if defined_elt[-1] == "("
         optional += 1
-        a.sub!("(", "")
+        defined_elt.sub!("(", "")
         changed = true
       end
-      return a, optional, changed
+      return defined_elt, optional, changed
     end
 
-    def match_end_of_optional_components(a, optional)
-      if a[-1] == ")"
+    def match_end_of_optional_components(defined_elt, optional)
+      if defined_elt[-1] == ")"
         optional -= 1
-        a.sub!(")", "")
+        defined_elt.sub!(")", "")
         changed = true
       end
-      return a, optional, changed
+      return defined_elt, optional, changed
     end
 
     def match_optional_components(match, optional, index)
@@ -57,22 +60,22 @@ module Microframe
       return match, index, match
     end
 
-    def match_this(routes, path)
-      match = []; @placeholders = {}; index = 0;
-      route = routes.split("/")
-      paths = path.split("/")
+    def match_this(defined, incoming)
+      match = []; index = 0;
+      defined_route = defined.split("/")
+      incoming_route = incoming.split("/")
 
-      return false if route.size < paths.size
+      return false if defined_route.size < incoming_route.size
 
-      route.each do |a|
+      defined_route.each do |route_elt|
         pending_match = true; matched = false; optional = 0;
-        b = paths[index]
+        incoming_elt = incoming_route[index]
 
         while pending_match
-          matched = match_components(a, b)
+          matched = match_components(route_elt, incoming_elt)
           pending_match = false
-          a, optional, pending_match = match_begin_of_optional_components(a, optional) unless matched || pending_match
-          a, optional, pending_match = match_end_of_optional_components(a, optional) unless matched || pending_match
+          route_elt, optional, pending_match = match_begin_of_optional_components(route_elt, optional) unless matched || pending_match
+          route_elt, optional, pending_match = match_end_of_optional_components(route_elt, optional) unless matched || pending_match
           matched, index, pending_match = match_optional_components(matched, optional, index) unless matched || pending_match
         end
 

data/lib/microframe/routing/router.rb

@@ -3,19 +3,22 @@ require File.join(__dir__, "mapper")
 
 module Microframe
   class Router
-    attr_reader :route, :mapper, :object
+    attr_reader :routes, :mapper, :object
     attr_accessor :request
 
     def initialize
-      @route = Hash.new
+      @routes = Hash.new
     end
 
-    def handle_request(verb, path)
-      @mapper ||= Mapper.start(route)
+    def handle_request
+      verb = request.request_method
+      path = request.path_info
+      @mapper ||= Mapper.start(routes)
       handler = @mapper.map(verb, path) #get_handler(verb, path)
+
       return missing_path unless handler
 
-      @request.params.merge!(@mapper.placeholders)
+      request.params.merge!(@mapper.placeholders)
 
       response = setup_controller(handler)
       unless object.view_rendered
@@ -36,8 +39,7 @@ module Microframe
 
     def self.setup_verbs(*verbs)
       verbs.each do |verb|
-        verb = verb.to_s
-        define_method(verb) { |path, handler| set_route(verb.upcase, path, handler) }
+        define_method(verb) { |path, handler| set_route(verb.to_s.upcase, path, handler) }
       end
     end
 
@@ -45,7 +47,7 @@ module Microframe
 
     def draw(&block)
       instance_eval(&block)
-      @route.default = {}
+      @routes.default = {}
     end
 
     def resources(name)
@@ -56,18 +58,19 @@ module Microframe
       get("/#{name}/:id/edit", to: "#{name}#edit")
       post("/#{name}", to: "#{name}#create")
       patch("/#{name}/:id", to: "#{name}#update")
-      delete("/name/:id", to: "#{name}#destroy")
+      put("/#{name}/:id", to: "#{name}#update")
+      delete("/#{name}/:id", to: "#{name}#destroy")
     end
 
     private
 
     def get_handler(verb, path)
-      route[verb][path]
+      routes[verb][path]
     end
 
     def set_route(verb, path, handler = {})
-      @route[verb] ||= {}
-      @route[verb][path] = setup_handler(handler)
+      @routes[verb] ||= {}
+      @routes[verb][path] = setup_handler(handler)
     end
 
     def setup_handler(handler)
@@ -76,7 +79,7 @@ module Microframe
     end
 
     def get_handler_file(controller)
-      require File.join(".", "app", "controllers",  controller + "_controller")
+      require File.join(APP_PATH, "app", "controllers",  controller + "_controller")
     end
 
     def missing_path

data/lib/microframe/version.rb

@@ -1,3 +1,3 @@
 module Microframe
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/microframe.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'microframe/version'
+require "microframe/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "microframe"
@@ -13,10 +13,10 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/andela-ooranagwa/microframe"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # Prevent pushing this gem to RubyGems.org by setting "allowed_push_host", or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
@@ -26,9 +26,15 @@ Gem::Specification.new do |spec|
   spec.executables   = %w{microframe}
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "bundler", "~> 1.10"
+  spec.add_runtime_dependency "rack", "~> 1.6", ">= 1.6.4"
+  spec.add_runtime_dependency "bundler"
   spec.add_runtime_dependency "thor", "~> 0.19.1"
   spec.add_development_dependency "pry-nav", "~> 0.2.4"
-  spec.add_development_dependency "rake", '~> 10.4', '>= 10.4.2'
-  spec.add_development_dependency "minitest", '~> 5.8', '>= 5.8.3'
+  spec.add_development_dependency "rake", "~> 10.4", ">= 10.4.2"
+  spec.add_development_dependency "minitest", "~> 5.8", ">= 5.8.3"
+  spec.add_development_dependency "capybara", "~> 2.5", ">= 2.5.0"
+  spec.add_development_dependency "sqlite3", "~> 1.3", ">= 1.3.11"
+  spec.add_development_dependency "tilt", "~> 2.0", ">= 2.0.1"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4", ">= 0.4.8"
+  spec.add_development_dependency "simplecov", "~> 0.10", ">= 0.10.0"
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: microframe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Osmond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +112,106 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.8.3
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.11
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.8
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 description: 
 email:
 - osmond.oranagwa@andela.com
@@ -110,6 +230,7 @@ files:
 - bin/console
 - bin/microframe
 - bin/setup
+- circle.yml
 - lib/microframe.rb
 - lib/microframe/application/application.rb
 - lib/microframe/application/generators/generator.rb
@@ -124,14 +245,19 @@ files:
 - lib/microframe/application/generators/samples/app_sample/config/routes.rb.tt
 - lib/microframe/application/generators/samples/app_sample/db/config.rb.tt
 - lib/microframe/application/generators/samples/app_sample/public/404.html.erb.tt
+- lib/microframe/application/generators/samples/blank.tt
 - lib/microframe/application/generators/samples/sample_controller.tt
 - lib/microframe/application/generators/samples/sample_model.tt
 - lib/microframe/controller/application_controller.rb
+- lib/microframe/controller/form_helper.rb
+- lib/microframe/controller/helpers.rb
+- lib/microframe/controller/view_object.rb
 - lib/microframe/orm/base.rb
 - lib/microframe/orm/class_queries.rb
 - lib/microframe/orm/connection.rb
 - lib/microframe/orm/instance_queries.rb
 - lib/microframe/orm/query_utils.rb
+- lib/microframe/orm/queryset.rb
 - lib/microframe/orm/relationships.rb
 - lib/microframe/routing/mapper.rb
 - lib/microframe/routing/router.rb