rapid_runty 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e4a685ba91fc4049a3a5382aa56eb5923ebf10
-  data.tar.gz: 10d2e2bb3caf6f36d0ae842b83fc63d0a464035b
+  metadata.gz: 552435a1122425b729618b289eac9ccfc527f738
+  data.tar.gz: 72cbc9234769d801db768c50bfeda93e335b48c8
 SHA512:
-  metadata.gz: 568008def90b41b16a42e9bec335be81811f2d5775e6337529812e820ab016fcc6377d072c2a229abeabf072034f1809fdb534865853999846ef3cf93d487b17
-  data.tar.gz: b09e7e72310f766892f19c7675eced90c7ffe7232b7407b67f96412f9c8ff34b9a0bac36379ccda6cc011faf0af96fcd5faa95464f14d3a6b2889acf286f655d
+  metadata.gz: d93783f423451db1c32708f7e7b63c16ee86a048367f9c5b376ea7ee355f46accb1244f88507aed0ef589f5911ab70a86bb7efb87555ed42688bd49dc5c7a97b
+  data.tar.gz: cbc6120fcc46feff483a022c66622ef920a4c76801ae1770e82808f245684e7364e87c7ffc038ea6c7cd5bde54769555eaaa280ac72259e6a2645d4dbf298186

data/lib/rapid_runty/application.rb

@@ -1,5 +1,6 @@
 require 'rapid_runty/router/base_route'
 require 'rapid_runty/controller/base_controller'
+require 'rapid_runty/model/base'
 
 module RapidRunty
   ##
@@ -21,10 +22,7 @@ module RapidRunty
     # @return [status, {headers}, [response]]
     def call(env)
       request = Rack::Request.new(env)
-      response = Rack::Response.new
-
-      handle(env, request, response)
-      response.finish
+      handle(env, request)
     end
   end
 end

data/lib/rapid_runty/controller/base_controller.rb

@@ -2,11 +2,17 @@ module RapidRunty
   ##
   # Application base controller
   class BaseController
-    attr_reader :env, :response
+    attr_reader :env, :request
 
-    def initialize(env, response)
+    def initialize(env, request)
       @env = env
-      @response = response
+      @request = request
+    end
+
+    def call_action(action)
+      send(action)
+      render unless @response
+      @response
     end
 
     ##
@@ -14,7 +20,9 @@ module RapidRunty
     #
     # @return [Hash] Hash of url parameters
     def params
-      @params ||= Rack::Utils.parse_nested_query(env['QUERY_STRING'])
+      @params ||= request.params.merge(
+        Rack::Utils.parse_nested_query(env['QUERY_STRING'])
+      )
     end
 
     ##
@@ -22,9 +30,11 @@ module RapidRunty
     #
     # @param [String] file name for the template
     def render(view = controller_action)
-      render_template(layout) do
+      body = render_template(layout) do
         render_template(view)
       end
+
+      response(body, 200, {})
     end
 
     ##
@@ -53,8 +63,8 @@ module RapidRunty
 
     ##
     # Redirect response method
-    def redirect_to(path)
-      response.redirect path
+    def redirect_to(location)
+      response([], 302, "Location" => location)
     end
 
     private
@@ -62,5 +72,9 @@ module RapidRunty
     def controller_action
       File.join(env['controller'], env['action'])
     end
+
+    def response(body, status = 200, header = {})
+      @response = Rack::Response.new(body, status, header)
+    end
   end
 end

data/lib/rapid_runty/model/base.rb

@@ -0,0 +1,52 @@
+require 'rapid_runty/model/db'
+require 'rapid_runty/model/base_queries'
+
+module RapidRunty
+  module Model
+    class Base
+      include RapidRunty::Model::BaseQueries
+
+      def self.to_table(name)
+        @table = name.to_s
+      end
+
+      def self.property(field, attr)
+        @property ||= {}
+        @property[field] = attr
+      end
+
+      def self.create_table
+        DB.execute_query(
+          "CREATE TABLE IF NOT EXISTS #{@table}" \
+          "(#{column_names.join(', ')})"
+        )
+        @property.keys.each(&method(:attr_accessor))
+      end
+
+      def self.primary_key(primary)
+        'PRIMARY KEY AUTOINCREMENT' if primary
+      end
+
+      def self.nullable(is_null)
+        'NOT NULL' unless is_null
+      end
+
+      def self.type(value)
+        value.to_s
+      end
+
+      def self.column_names
+        columns = []
+        @property.each do |column_name, constraints|
+          properties_and_constraints = []
+          properties_and_constraints << column_name.to_s
+          constraints.each do |attribute, value|
+            properties_and_constraints << send(attribute.downcase.to_s, value)
+          end
+          columns << properties_and_constraints.join(' ')
+        end
+        columns
+      end
+    end
+  end
+end

data/lib/rapid_runty/model/base_queries.rb

@@ -0,0 +1,118 @@
+module RapidRunty
+  module Model
+    module BaseQueries
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def find(id)
+          row = DB.execute_query(
+            "SELECT * FROM #{@table} WHERE id = ?",
+            id.to_i
+          ).first
+          model_object(row)
+        end
+
+        def find_by(search_params)
+          param, value = search_params.first
+          row = DB.execute_query(
+            "SELECT * FROM #{@table} WHERE #{param} = ?",
+            value
+          ).first
+          model_object(row)
+        end
+
+        def first
+          row = DB.execute_query(
+            "SELECT * FROM #{@table} ORDER BY id LIMIT 1 "
+          ).first
+          model_object(row)
+        end
+
+        def last
+          row = DB.execute_query(
+            "SELECT * FROM #{@table} ORDER BY id DESC LIMIT 1"
+          ).first
+          model_object(row)
+        end
+
+        def all
+          DB.execute_query(
+            "SELECT * FROM #{@table} ORDER BY id"
+          ).map(&method(:model_object))
+        end
+
+        def count
+          all.size
+        end
+
+        def destroy_all
+          DB.execute_query("DELETE from #{@table}")
+        end
+
+        def model_object(row)
+          return nil unless row
+          model ||= new
+          @property.keys.each_with_index do |key, index|
+            model.send("#{key}=", row[index])
+          end
+          model
+        end
+      end
+
+      def save
+        if id
+          DB.execute_query(
+            "UPDATE #{get_table_name} SET #{update_placeholders} WHERE id = ?",
+            entity_values << id
+          )
+        else
+          DB.execute_query(
+            "INSERT INTO #{get_table_name} (#{get_table_columns}) VALUES (#{new_placeholders})",
+            entity_values
+          )
+        end
+        true
+      end
+
+      alias save! save
+
+      def destroy
+        DB.execute_query("DELETE FROM #{get_table_name} WHERE id = ?", id)
+      end
+
+      private
+
+      def get_properties
+        self.class.instance_variable_get(:@property)
+      end
+
+      def get_table_name
+        self.class.instance_variable_get(:@table)
+      end
+
+      def entity_values
+        get_columns.map(&method(:send))
+      end
+
+      def update_placeholders
+        get_columns.map { |column| "#{column} = ?" }.join(',')
+      end
+
+      def new_placeholders
+        (['?'] * (get_properties.keys.size - 1)).join(', ')
+      end
+
+      def get_columns
+        columns ||= get_properties.keys
+        columns.delete(:id)
+        columns
+      end
+
+      def get_table_columns
+        get_columns.map(&:to_s).join(', ')
+      end
+    end
+  end
+end

data/lib/rapid_runty/model/db.rb

@@ -0,0 +1,16 @@
+require 'sqlite3'
+
+module RapidRunty
+  module Model
+    class DB
+      def self.create_db
+        SQLite3::Database.new(File.join(ROOT_DIR, 'db', 'rapid.db'))
+      end
+
+      def self.execute_query(*query)
+        @db ||= create_db
+        @db.execute(*query)
+      end
+    end
+  end
+end

data/lib/rapid_runty/router/base_route.rb

@@ -14,27 +14,27 @@ module RapidRunty
     # @param env
     # @param [Rack::Request] request
     # @param [Rack::Response] response
-    def handle(env, request, response)
+    def handle(env, request)
       verb, path = route_args(request).values
 
       route = routes.find_route(verb, path)
       if route.nil?
-        not_found(response, path)
+        not_found(path)
       else
         param = "&#{Rack::Utils.build_nested_query(route.placeholders)}"
         env['QUERY_STRING'] << param
         env.merge!(route.options)
-        response.write dispatch(env, route, response)
+        dispatch(env, route, request)
       end
     end
 
     ##
     # Dispatch the Controller and it's action to be rendered
-    def dispatch(env, route, response)
+    def dispatch(env, route, request)
       kontroller, action = route.options.values
 
       controller = Object.const_get("#{kontroller.camel_case}Controller")
-      controller.new(env, response).public_send(action)
+      controller.new(env, request).call_action(action)
     end
 
     ##
@@ -43,17 +43,23 @@ module RapidRunty
     # @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>
-      "
+    def not_found(path)
+      [
+        404,
+        {},
+        [
+          "
+          <html>
+            <head>
+              <body>
+                <h1>404 Page not found for #{path}</h1>
+              </body>
+            </head>
+          </html>
+          "
+        ]
+      ]
+
     end
 
     private

data/lib/rapid_runty/router/route.rb

@@ -9,7 +9,7 @@ module RapidRunty
         self.verb = verb
         self.path = path
         self.options = options
-        self.placeholders = nil
+        self.placeholders = {}
       end
     end
   end

data/lib/rapid_runty/router/routes.rb

@@ -32,7 +32,7 @@ module RapidRunty
         find_matching_route(path, urls, routes)
       end
 
-      def select_routes_by_verb(_verb, routes)
+      def select_routes_by_verb(verb, routes)
         urls = routes.map { |route| { url: route.path }.merge route.options }
         urls
       end

data/lib/rapid_runty/version.rb

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

data/rapid_runty.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'capybara', '~> 2.7'
   spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'factory_girl', '~> 4.7'
+  spec.add_development_dependency 'faker', '~> 1.6'
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'guard', '~> 2.14'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapid_runty
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Herbert Kagumba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +317,9 @@ files:
 - lib/rapid_runty/application.rb
 - lib/rapid_runty/controller/base_controller.rb
 - lib/rapid_runty/dependencies.rb
+- lib/rapid_runty/model/base.rb
+- lib/rapid_runty/model/base_queries.rb
+- lib/rapid_runty/model/db.rb
 - lib/rapid_runty/router/base_route.rb
 - lib/rapid_runty/router/matcher.rb
 - lib/rapid_runty/router/route.rb