gazebo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e1c03436e96b489059927089d42de8a98f07ff
-  data.tar.gz: f01dc87cbb489db33f283a2467a5f884992ad235
+  metadata.gz: 2343322e65130a3a649ce4a71bbd9fe4471f15f0
+  data.tar.gz: 23efbd0419d865922d69e21be572141089975769
 SHA512:
-  metadata.gz: 2ac34da08d89d7f35e323af6eda2800c72187d66d8a0207bafe65d73591b771b57549031dd5f6720c2f831cede9fc990ae8442b824d8031082cb6c6f8c373d8c
-  data.tar.gz: 61aff4beade614102cef92417327088d6f7abe458c30caca8e363f539b72851c344e6d9f7beb5de5d84f06cc7210dee1ab053cb2809696183efa6768a6002cae
+  metadata.gz: 6d5e94fcbda1de26d97edaf888995f56f5ed0bb1087166aaf5a0469d3b2ab517fe3fe7b5cdede22b3a3ac5ace3e60f7e05c67ac17f711b8dcebcf8bd7b1b8eb7
+  data.tar.gz: 8d98941122b0b4134ae0d7a5b60953ea50362eef60f6b24a17193c2df5d6c57171c81f64c0813d7125e929a117214178005563546ee07623ee4aed0f4c0ef917

data/lib/actioncondor/controller_base.rb

@@ -6,7 +6,6 @@ class ControllerBase
     @@protect_from_forgery = true
   end
 
-  # Setup the controller
   def initialize(req, res, route_params = {})
     @req = req
     @res = res
@@ -18,12 +17,10 @@ class ControllerBase
     @flash ||= Flash.new(req)
   end
 
-  # Helper method to alias @already_built_response
   def already_built_response?
     @already_built_response || false
   end
 
-  # Set the response status code and header
   def redirect_to(url)
     check_for_repeat_action!
     res.status = 302
@@ -34,9 +31,6 @@ class ControllerBase
     @already_built_response = true
   end
 
-  # Populate the response with content.
-  # Set the response's content type to the given type.
-  # Raise an error if the developer tries to double render.
   def render_content(content, content_type)
     check_for_repeat_action!
     res['Content-Type'] = content_type
@@ -47,13 +41,11 @@ class ControllerBase
     @already_built_response = true
   end
 
-  #raise error if already_built_response
+  #change to custom doubleRender error
   def check_for_repeat_action!
     raise "Cannot call render/redirect twice in one action" if already_built_response?
   end
 
-  # use ERB and binding to evaluate templates
-  # pass the rendered html to render_content
   def render(template_name)
     controller_name = self.class.to_s.underscore[0..-("_controller".length + 1)]
     file_path = "app/views/#{controller_name}/#{template_name}.html.erb"
@@ -66,12 +58,10 @@ class ControllerBase
     render_content(content, 'text/html')
   end
 
-  # method exposing a `Session` object
   def session
     @session ||= Session.new(req)
   end
 
-  # use this with the router to call action_name (:index, :show, :create...)
   def invoke_action(name)
     if protect_from_forgery? && req.request_method != 'GET'
       check_authenticity_token

data/lib/actioncondor/flash.rb

@@ -19,8 +19,6 @@ class Flash
     @flash[key.to_s] = val
   end
 
-  # serialize the hash into json and save in a cookie
-  # add to the responses cookies
   def store_flash(res)
     res.set_cookie(
       '_gazebo_app_flash',

data/lib/actioncondor/session.rb

@@ -1,6 +1,4 @@
 class Session
-  # find the cookie for this app
-  # deserialize the cookie into a hash
   attr_reader :cookie
 
   def initialize(req)
@@ -17,8 +15,6 @@ class Session
     @cookie[key.to_s] = val
   end
 
-  # serialize the hash into json and save in a cookie
-  # add to the responses cookies
   def store_session(res)
     res.set_cookie(
       '_gazebo_app',

data/lib/activeleopard/db_connection.rb

@@ -2,11 +2,55 @@ require 'pg'
 PRINT_QUERIES = true
 
 class DBConnection
+  def self.instance
+    open if @db.nil?
+
+    @db
+  end
+
+  def self.execute(*args)
+    print_query(*args)
+    instance.exec(*args)
+  end
+
+  def self.async_exec(*args)
+    print_query(*args)
+    instance.send_query(*args)
+  end
+
+  def self.get_first_row(*args)
+    print_query(*args)
+    instance.exec(*args).first
+  end
+
+  def self.run_migrations
+    ensure_migrations_table!
+    migrations = Dir.entries("db/migrations").reject { |fname| fname.start_with?('.') }
+    migrations.sort_by! { |fname| Integer(fname[0..1]) }
+
+    migrations.each do |file_name|
+      migration_name = file_name.match(/\w+/).to_s
+
+      next if migration_name.empty? || already_run?(migration_name)
+
+      file = File.join(Gazebo::ROOT, "db/migrations", file_name)
+      migration_sql = File.read(file)
+      execute(migration_sql)
+
+      record_migration!(migration_name)
+    end
+  end
+
+  private
+  def self.database_name
+    Gazebo::ROOT.split('/').last.gsub("-", "_") + '_development'
+  end
+
   def self.open
     if ENV['DATABASE_URL']
-      self.open_production
+      open_production
     else
-      self.open_development
+      open_development
     end
     run_migrations
   end
@@ -48,25 +92,6 @@ class DBConnection
     end
   end
 
-  def self.run_migrations
-    ensure_migrations_table!
-    migrations = Dir.entries("db/migrations").reject { |fname| fname.start_with?('.') }
-    migrations.sort_by! { |fname| Integer(fname[0..1]) }
-
-    migrations.each do |file_name|
-      migration_name = file_name.match(/\w+/).to_s
-
-      next if migration_name.empty? || already_run?(migration_name)
-
-      file = File.join(Gazebo::ROOT, "db/migrations", file_name)
-      migration_sql = File.read(file)
-
-      execute(migration_sql)
-
-      record_migration!(migration_name)
-    end
-  end
-
   def self.record_migration!(migration_name)
     time = Time.new.strftime("%Y%m%dT%H%M")
     here_doc = <<-SQL
@@ -81,9 +106,9 @@ class DBConnection
 
   def self.already_run?(migration_name)
     !!execute(<<-SQL, [migration_name]).first
-      SELECT *
-      FROM migrations
-      WHERE name = $1
+    SELECT *
+    FROM migrations
+    WHERE name = $1
     SQL
   end
 
@@ -92,33 +117,6 @@ class DBConnection
     master_conn.exec("CREATE DATABASE #{database_name}")
   end
 
-  def self.database_name
-    Gazebo::ROOT.split('/').last.gsub("-", "_") + '_development'
-  end
-
-  def self.instance
-    open if @db.nil?
-
-    @db
-  end
-
-  def self.execute(*args)
-    print_query(*args)
-    instance.exec(*args)
-  end
-
-  def self.async_exec(*args)
-    print_query(*args)
-    instance.send_query(*args)
-  end
-
-  def self.get_first_row(*args)
-    print_query(*args)
-    instance.exec(*args).first
-  end
-
-  private
-
   def self.random_color
     [:blue, :light_blue, :red, :green, :yellow].sample
   end

data/lib/cli.rb

@@ -12,5 +12,4 @@ module Gazebo
       Gazebo.seed
     end
   end
-
 end

data/lib/gazebo.rb

@@ -12,7 +12,7 @@ require_relative 'cli'
 
 module Gazebo
   Router = Router.new
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 
   def self.app
     fetch_routes

data/lib/router.rb

@@ -8,18 +8,14 @@ class Route
     @action_name = action_name
   end
 
-  # checks if pattern matches path and method matches request method
   def matches?(req)
     return false if (pattern =~ req.path).nil?
 
-    # check if form is providing non-get/post method
     req_method = req.params["_method"] || req.request_method
 
     req_method.upcase == http_method.to_s.upcase
   end
 
-  # use pattern to pull out route params (save for later?)
-  # instantiate controller and call controller action
   def run(req, res)
     matched_params = pattern.match(req.path)
 
@@ -39,32 +35,16 @@ class Router
     @routes = []
   end
 
-  # simply adds a new route to the list of routes
-  def add_route(pattern, method, controller_class, action_name)
-    route = Route.new(pattern, method, controller_class, action_name)
-    @routes << route
-  end
-
-  # evaluate the proc in the context of the instance
-  # for syntactic sugar :)
   def draw(&proc)
     self.instance_eval(&proc)
   end
 
-  # make each of these methods that
-  # when called add route
   [:get, :post, :put, :delete].each do |http_method|
     define_method(http_method) do |pattern, controller_class, action_name|
       add_route(pattern, http_method, controller_class, action_name)
     end
   end
 
-  # should return the route that matches this request
-  def match(req)
-    routes.find { |route| route.matches?(req) }
-  end
-
-  # either throw 404 or call run on a matched route
   def run(req, res)
     matched_route = match(req)
 
@@ -75,4 +55,14 @@ class Router
       res.status = 404
     end
   end
+
+  private
+  def match(req)
+    routes.find { |route| route.matches?(req) }
+  end
+
+  def add_route(pattern, method, controller_class, action_name)
+    route = Route.new(pattern, method, controller_class, action_name)
+    @routes << route
+  end
 end

data/lib/static_asset_server.rb

@@ -19,6 +19,7 @@ class StaticAssetServer
     res.finish
   end
 
+  private
   def servable?(path)
     path.match("#{root}")
   end
@@ -51,7 +52,7 @@ class FileServer
   def requested_file_name(env)
     req = Rack::Request.new(env)
     path = req.path
-    dir = File.dirname(__FILE__)
-    File.join(dir, '..', path)
+    dir = Gazebo::ROOT
+    File.join(dir, path)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gazebo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tassos Bareiss