algernon 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fbc850ffd9b51fb9ff4b62e9d76e994f10138ba
-  data.tar.gz: 8deabc2abc86f49371db3af3114bc0b25539d1e9
+  metadata.gz: aa688d0e655ff422bf0d0307bf7a1c35b671e08c
+  data.tar.gz: 697ab24702595edb02e1eb4ed79eeb38a310eef5
 SHA512:
-  metadata.gz: c087fdddef2a72607b181d05b69575aa62deca236693f72cb23d9323a56b09f6cba949c99338db45bf8a447fb34c33514b845fbae9265b05eb659f76c28a1e52
-  data.tar.gz: be56d536db6ef22d62fa96f515349b183bcd3a18a25e5bec0c1ef1a06312a8a32b4fc3640f01f40519ebda47bc7e49d58de54d1181889ed1ac1a090a3e57b9fd
+  metadata.gz: f693495432a2f534f3197a15c905bc0a72d6cdcf9511a7e91e164418fba20aa697a53574f4d8322c67b7acbfb9bd6b6b5f2ae2edee9f771fc1f409d3b7a8b57e
+  data.tar.gz: 0f5f27489f24e358c91cd2fd7e5f3ba862d87f0b8b1f9b181438de4f625f72d30451b811f05ca5dad1a4bd867a2c3b3fee24e2a89cc5be9ad57550bbaf5c588d

data/.gitignore

@@ -9,4 +9,5 @@
 /tmp/
 algernon-0.1.0.gem
 notes
-/database/data.sqlite
+/database/data.sqlite
+.swp

data/README.md

@@ -1,6 +1,6 @@
 #Algernon
 
-[![Coverage Status](https://coveralls.io/repos/github/andela-ydaniju/algernon/badge.svg?branch=master)](https://coveralls.io/github/andela-ydaniju/algernon?branch=master) [![Build Status](https://travis-ci.org/andela-ydaniju/algernon.svg?branch=master)](https://travis-ci.org/andela-ydaniju/algernon) [![Code Climate](https://codeclimate.com/github/andela-ydaniju/algernon/badges/gpa.svg)](https://codeclimate.com/github/andela-ydaniju/algernon)
+[![Coverage Status](https://coveralls.io/repos/github/andela-ydaniju/algernon/badge.svg?branch=master)](https://coveralls.io/github/andela-ydaniju/algernon?branch=master) [![Build Status](https://travis-ci.org/andela-ydaniju/algernon.svg?branch=master)](https://travis-ci.org/andela-ydaniju/algernon) [![Code Climate](https://codeclimate.com/github/andela-ydaniju/algernon/badges/gpa.svg)](https://codeclimate.com/github/andela-ydaniju/algernon) [![Gem Version](https://badge.fury.io/rb/algernon.svg)](https://badge.fury.io/rb/algernon)
 
 Algernon is a Ruby MVC web framework.
 
@@ -229,6 +229,7 @@ The Algernon framework has a few dependencies. These are listed below, with link
 
   * sqlite3     - https://github.com/sparklemotion/sqlite3-ruby
   * erubis      - https://rubygems.org/gems/erubis
+  * tilt        - https://github.com/rtomayko/tilt
   * bundler     - https://github.com/bundler/bundler
   * rake        - https://github.com/ruby/rake
   * rack        - https://github.com/rack/rack

data/algernon.gemspec

@@ -34,11 +34,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test", "~> 0.6"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "capybara"
-  spec.add_runtime_dependency "poltergeist"
-  spec.add_runtime_dependency "pry"
+  spec.add_development_dependency "poltergeist"
+  spec.add_development_dependency "pry"
 
   spec.add_runtime_dependency "rack", "~> 1.6.4"
-  spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "sqlite3"
-  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "erubis", "~> 2.7.0"
+  spec.add_runtime_dependency "tilt", "~> 2.0.2"
+  spec.add_runtime_dependency "sqlite3", "~> 1.3.11"
+  spec.add_runtime_dependency "activesupport", "~> 4.2.6"
 end

data/database/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+

data/lib/algernon.rb

@@ -1,11 +1,10 @@
 require "algernon/version"
 require "algernon/dependencies"
-require "utility/string_utils"
+require "algernon/utility/string_utils"
 require "algernon/routing/router"
 require "algernon/routing/route"
 require "algernon/routing/finder"
 require "algernon/application"
 require "algernon/controller/base_controller"
-require "utility/array_utils"
+require "algernon/utility/array_utils"
 require "algernon/model/model"
-require "pry"

data/lib/algernon/application.rb

@@ -1,6 +1,6 @@
 require "rack"
-require "utility/request_handler"
-require "utility/method_override"
+require "algernon/controller/dispatcher"
+require "algernon/utility/method_override"
 
 module Algernon
   class Application
@@ -25,7 +25,7 @@ module Algernon
     def respond_to_request
       route = router.get_match(request.request_method, request.path_info)
       if route
-        handler = RequestHandler.new(request, route)
+        handler = Dispatcher.new(request, route)
         handler.response
       else
         page_not_found

data/lib/algernon/controller/base_controller.rb

@@ -1,4 +1,4 @@
-require "erubis"
+require "tilt/erubis"
 require "active_support/core_ext/hash/indifferent_access"
 
 module Algernon
@@ -12,25 +12,19 @@ module Algernon
       @response
     end
 
-    def render(view_name, locals = {})
+    def render(*args)
+      response_setter(render_template(*args))
+    end
+
+    def render_template(view_name, locals = {})
       filename = File.join(APP_ROOT,
                            "app",
                            "views",
                            controller_for_views,
                            "#{view_name}.html.erb"
                           )
-      template = File.read(filename)
-      parameters = process_view_variables(locals)
-      res_body = Erubis::Eruby.new(template).result(parameters)
-      response_setter(res_body)
-    end
-
-    def process_view_variables(locals)
-      hash = {}
-      vars = instance_variables
-      vars.each { |name| hash[name] = instance_variable_get(name) }
-
-      hash.merge(locals)
+      template = Tilt::ErubisTemplate.new(filename)
+      template.render(self, locals)
     end
 
     def response_setter(body, status = 200, headers = {})

data/lib/{utility/request_handler.rb → algernon/controller/dispatcher.rb}

@@ -1,5 +1,5 @@
 module Algernon
-  class RequestHandler
+  class Dispatcher
     attr_reader :request, :route, :response
 
     def initialize(request, route)
@@ -11,7 +11,7 @@ module Algernon
     private
 
     def process_request
-      params = collage_parameters
+      params = combine_parameters
 
       request.instance_variable_set "@params", params
 
@@ -21,7 +21,7 @@ module Algernon
       @response = controller_response(controller_class, route.action.to_sym)
     end
 
-    def collage_parameters
+    def combine_parameters
       route_url_params = route.get_url_parameters(request.path_info)
       request.params.merge(route_url_params)
     end

data/lib/algernon/model/model.rb

@@ -6,11 +6,7 @@ module Algernon
   class Model
     extend Algernon::TableMaker
     extend Algernon::Orm
-
-    DB ||= SQLite3::Database.new(File.join("database", "data.sqlite"))
-
-    def initialize
-    end
+    DB = Orm::DB
 
     def save
       if id
@@ -46,7 +42,7 @@ module Algernon
     end
 
     def columns_except_id
-      self.class.columns_array.without_id.with_value(self)
+      self.class.columns.without_id.with_value(self)
     end
 
     def values_placeholders
@@ -90,8 +86,8 @@ module Algernon
         DB.execute(query)
       end
 
-      def columns_array
-        @columns_array ||= fields.keys
+      def columns
+        @model_columns ||= fields.keys
       end
     end
 

data/lib/algernon/model/orm.rb

@@ -12,7 +12,7 @@ module Algernon
     end
 
     def all
-      fields = columns_array.join(", ")
+      fields = columns.join(", ")
       data = DB.execute("SELECT id, #{fields} FROM #{table_name}")
       data.map! do |row|
         row_to_model(row)
@@ -24,7 +24,7 @@ module Algernon
     def row_to_model(row)
       model = new
 
-      columns_array.each_with_index do |field, index|
+      columns.each_with_index do |field, index|
         model.send("#{field}=", row[index + 1]) if row
       end
 
@@ -32,7 +32,7 @@ module Algernon
     end
 
     def find(id)
-      fields = columns_array.join(", ")
+      fields = columns.join(", ")
       row = DB.execute(
         "SELECT id, #{fields} FROM #{table_name} WHERE id = ?",
         id

data/lib/algernon/routing/router.rb

@@ -21,7 +21,7 @@ module Algernon
       end
 
       def has_routes?
-        true unless routes.empty?
+        routes.any?
       end
 
       def get_match(http_verb, path)

data/lib/algernon/version.rb

@@ -1,3 +1,3 @@
 module Algernon
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algernon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - andela-ydaniju
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,7 +115,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -140,44 +140,58 @@ dependencies:
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.6
 description: Algernon is a mini MVC framework built on Ruby.
 email:
 - yusuf.daniju@andela.com
@@ -190,7 +204,6 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".swp"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -200,10 +213,11 @@ files:
 - algernon.gemspec
 - bin/console
 - bin/setup
-- database/data.sqlite
+- database/.gitignore
 - lib/algernon.rb
 - lib/algernon/application.rb
 - lib/algernon/controller/base_controller.rb
+- lib/algernon/controller/dispatcher.rb
 - lib/algernon/dependencies.rb
 - lib/algernon/model/model.rb
 - lib/algernon/model/orm.rb
@@ -211,11 +225,10 @@ files:
 - lib/algernon/routing/finder.rb
 - lib/algernon/routing/route.rb
 - lib/algernon/routing/router.rb
+- lib/algernon/utility/array_utils.rb
+- lib/algernon/utility/method_override.rb
+- lib/algernon/utility/string_utils.rb
 - lib/algernon/version.rb
-- lib/utility/array_utils.rb
-- lib/utility/method_override.rb
-- lib/utility/request_handler.rb
-- lib/utility/string_utils.rb
 homepage: https://github.com/andela-ydaniju/algernon.
 licenses:
 - MIT