reloj 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42da7fc580502d942eb23f8aa85102338741a544
-  data.tar.gz: 23060fa9e00ad5ced9d20dc86421283e398ab73d
+  metadata.gz: 0900113d767f58cdb927a7a5fd0df386020402a1
+  data.tar.gz: f3f871588d9070b720f1d32b7c00fa39ede22eb0
 SHA512:
-  metadata.gz: 0d4eaaa5e8874830e9105d1bd68c492dfb4ee7aa65c0a0530ca1ca7c871cd569a38cf9f841252593b29202c77da8234dea73a20c756051ac3029d8d879fb30d2
-  data.tar.gz: 9fce521ca07a2c63c5dd6bd25ab6b2c322093597551ba4b5b163ca678cc904dbdbe2a6d0b54c1d13efcdc21569234818161b242fa21e06024de2a73913f6140d
+  metadata.gz: aaea01ab0d4ae2201e0b64c17b8c93238c465262aa510f0421008620453085ae6c0a73b7eb860ed5fe949ebbb90c44d93cc5b822fe25c23f9462f4185da49c0a
+  data.tar.gz: a6e70a038678d2f48d4f0a819a137213fd7f3d55b54ca4f7e532a9433aef469f33b07c62930f38c9b07442810ac12adb863765ef726365734794debea7bd033e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    reloj (0.1.4)
+    reloj (0.1.7)
       activesupport (~> 4.2)
       pg (~> 0.18)
       require_all (~> 1.3)

data/README.md

@@ -141,4 +141,10 @@ Reloj is built to make deploying to heroku as easy as possible, here's how:
 
 		heroku open
 		
-Enjoy your now-deployed app!
+Enjoy your now-deployed app!
+
+## TODO
+* WEBrick doesn't support PATCH/DELETE (I think). Maybe I can monkey-patch that in using servlets
+* Right now it doesn't serve assets. I think I can get it that work using servlets, also.
+* REFERENCE: [http://ruby-doc.org/stdlib-1.9.3/libdoc/webrick/rdoc/WEBrick.html#module-WEBrick-label-Servlets](http://ruby-doc.org/stdlib-1.9.3/libdoc/webrick/rdoc/WEBrick.html#module-WEBrick-label-Servlets)
+

data/lib/reloj/orm/model_base.rb

@@ -1,16 +1,18 @@
 require_relative 'pg_db'
 require 'active_support/inflector'
+require 'byebug'
 
 class ModelBase
 
 #  rough idea on how to replace self.finalize!
 #  need to run at end of class definiton, not beginning
+  #  could work if isntead of calling tablename i call self.to_s.tableize
 #  def self.inherited(subclass)
 #    attr_writer(*subclass.columns)
 #  end
 
   def self.columns
-    result = Database.execute(<<-SQL)
+    @columns ||= Database.execute(<<-SQL).fields.map(&:to_sym)
       SELECT
         *
       FROM
@@ -18,8 +20,6 @@ class ModelBase
       LIMIT
         0;
     SQL
-
-    result.fields.map(&:to_sym)
   end
 
   def self.finalize!
@@ -62,16 +62,16 @@ class ModelBase
   end
 
   def self.find(id)
-    x = Database.execute(<<-SQL, id)
+    res = Database.execute(<<-SQL, [id])
     SELECT
       *
     FROM
       #{table_name}
     WHERE
-      id = ?;
+      id = $1;
     SQL
 
-    x.empty? ? nil : self.new(x.first)
+    res.num_tuples.zero? ? nil : self.new(res.first)
   end
 
   def initialize(params = {})
@@ -93,35 +93,48 @@ class ModelBase
     end
   end
 
+  def not_id_attribute_values
+    self.class.columns.drop(1).map { |column| self.send(column) }
+  end
+
   def insert
-    my_columns = self.class.columns
+    my_columns = self.class.columns.drop(1)
     col_names = my_columns.join(", ")
     n = my_columns.length
-    question_marks = (["?"] * n).join(", ")
+    placeholders = [*1..n].map { |num| "$" + num.to_s }.join(', ')
 
-    response = Database.execute(<<-SQL, self.attribute_values)
+    response = Database.execute(<<-SQL, self.not_id_attribute_values)
       INSERT INTO
         #{self.class.table_name} (#{col_names})
       VALUES
-        (#{question_marks})
+        (#{placeholders})
       RETURNING
         id;
     SQL
     self.id = response[0]['id'].to_i
   end
 
+  def destroy
+    Database.execute(<<-SQL)
+    DELETE FROM
+      #{self.class.table_name}
+    WHERE
+      id = #{self.id};
+    SQL
+  end
+
   def update
-    columns_line = self.class.columns.map do |col_name|
-      "#{col_name} = ?"
+    columns_line = self.class.columns.map.with_index do |col_name, i|
+      "#{col_name} = $#{i + 1}"
     end.join(", ")
 
-    Database.execute(<<-SQL, self.attribute_values, self.id)
+    Database.execute(<<-SQL, self.attribute_values)
       UPDATE
         #{self.class.table_name}
       SET
         #{columns_line}
       WHERE
-        id = ?;
+        id = #{self.id};
     SQL
   end
 

data/lib/reloj/orm/pg_db.rb

@@ -52,7 +52,15 @@ class Database
   end
 
   def self.execute(*args)
+    pretty_print_sql(*args)
     instance.exec(*args)
   end
 
+  def self.pretty_print_sql(*sql_args)
+    pretty = sql_args.map do |a|
+      a.is_a?(String) ? a.gsub(/\s+/, " ").gsub(/;\s/, ";\n") : a.join(", ")
+    end.join("\n")
+    print "\n#{pretty}\n"
+  end
+
 end

data/lib/reloj/skeletons/{sample_app → old_example}/app/controllers/cats_controller.rb

@@ -13,7 +13,6 @@ class CatsController < Reloj::ControllerBase
     session['count'] ||= 0
     session['count'] += 1
     @cats = Cat.all
-    p @cats
     render :index
   end
 

data/lib/reloj/skeletons/old_example/config/routes.rb

@@ -0,0 +1,10 @@
+module App
+  ROUTES = Proc.new do
+#   put the routes for your app here, e.g.
+#   get '/cats/:cat_id/statuses', StatusesController, :index
+
+    get '/cats', CatsController, :index
+    get '/cats/new', CatsController, :new
+    post '/cats', CatsController, :create
+  end
+end

data/lib/reloj/skeletons/old_example/db/setup.sql

@@ -0,0 +1,46 @@
+DROP TABLE IF EXISTS cats;
+CREATE TABLE cats (
+  id SERIAL PRIMARY KEY,
+  name VARCHAR(255) NOT NULL,
+  owner_id INTEGER
+
+  -- FOREIGN KEY(owner_id) REFERENCES humans(id)
+);
+
+DROP TABLE IF EXISTS humans;
+CREATE TABLE humans (
+  id INTEGER PRIMARY KEY,
+  fname VARCHAR(255) NOT NULL,
+  lname VARCHAR(255) NOT NULL,
+  house_id INTEGER
+
+  -- FOREIGN KEY(house_id) REFERENCES houses(id)
+);
+
+DROP TABLE IF EXISTS houses;
+CREATE TABLE houses (
+  id INTEGER PRIMARY KEY,
+  address VARCHAR(255) NOT NULL
+);
+
+INSERT INTO
+  houses (id, address)
+VALUES
+  (1, '26th and Guerrero'), (2, 'Dolores and Market');
+
+INSERT INTO
+  humans (id, fname, lname, house_id)
+VALUES
+  (1, 'Devon', 'Watts', 1),
+  (2, 'Matt', 'Rubens', 1),
+  (3, 'Ned', 'Ruggeri', 2),
+  (4, 'Catless', 'Human', NULL);
+
+INSERT INTO
+  cats (name, owner_id)
+VALUES
+  ('Breakfast', 1),
+  ('Earl', 2),
+  ('Haskell', 3),
+  ('Markov', 3),
+  ('Stray Cat', NULL);

data/lib/reloj/skeletons/sample_app/app/controllers/todos_controller.rb

@@ -0,0 +1,27 @@
+class TodosController < Reloj::ControllerBase
+
+  def index
+    @todos = Todo.all
+    render :index
+  end
+
+  def new
+    @todo = Todo.new
+    render :new
+  end
+
+  def create
+    @todo = Todo.new(params[:todo])
+    if @todo.title == "" || @todo.save
+      redirect_to "/"
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    @todo = Todo.find(params[:id])
+    @todo.destroy
+    render_content("{}", "application/json")
+  end
+end

data/lib/reloj/skeletons/sample_app/app/models/todo.rb

@@ -0,0 +1,4 @@
+class Todo < ModelBase
+
+  finalize!
+end

data/lib/reloj/skeletons/sample_app/app/views/todos_controller/index.html.erb

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+</head>
+<body>
+
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<!-- Brand and toggle get grouped for better mobile display -->
+			<div class="navbar-header">
+				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+					<span class="sr-only">Toggle navigation</span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+				</button>
+				<a class="navbar-brand" href="/">Todo app Build with Reloj</a>
+			</div>
+
+			<!-- Collect the nav links, forms, and other content for toggling -->
+			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+				<ul class="nav navbar-nav navbar-right">
+					<li><a href="http://github.com/ougarcia/reloj">GitHub</a></li>
+				</ul>
+			</div><!-- /.navbar-collapse -->
+		</div><!-- /.container-fluid -->
+	</nav>
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-xs-8 col-xs-offset-2 col-sm-6 col-sm-offset-3">
+        <h1>Todos</h1>
+
+        <div class="panel panel-default">
+          <ul class="list-group">
+            <% @todos.each do |todo| %>
+              <li class="list-group-item">
+                <%= todo.title %>
+                <button data-id="<%= todo.id %>" class="btn btn-danger btn-xs pull-right" type="submit">
+                  Done
+                </button>
+              </li>
+            <% end %>
+          </ul>
+
+          <div class="panel-footer">
+            <a href="/todos/new" class="btn btn-primary btn-lg btn-block">
+              New Todo
+            </a>
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </div>
+  <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+  <!-- until I build an asset pipeline, I'll have to make do with CDNs & inline js -->
+  <script>
+    $('button.btn-danger').on('click', function(e) {
+      e.preventDefault();
+      var $currentTarget = $(e.currentTarget);
+      var id = $currentTarget.data('id');
+      $currentTarget.parent().remove();
+      $.ajax({
+        url: "/todos/" + id + '/delete',
+        method: "POST"
+      });
+    });
+  </script>
+</body>
+</html>

data/lib/reloj/skeletons/sample_app/app/views/todos_controller/new.html.erb

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+</head>
+<body>
+
+	<nav class="navbar navbar-default">
+		<div class="container-fluid">
+			<!-- Brand and toggle get grouped for better mobile display -->
+			<div class="navbar-header">
+				<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+					<span class="sr-only">Toggle navigation</span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+				</button>
+				<a class="navbar-brand" href="/">Todo app Build with Reloj</a>
+			</div>
+
+			<!-- Collect the nav links, forms, and other content for toggling -->
+			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+				<ul class="nav navbar-nav navbar-right">
+					<li><a href="http://github.com/ougarcia/reloj">GitHub</a></li>
+				</ul>
+			</div><!-- /.navbar-collapse -->
+		</div><!-- /.container-fluid -->
+	</nav>
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-xs-8 col-xs-offset-2 col-sm-6 col-sm-offset-3">
+
+        <h1>New Todo</h1>
+        <form action="/todos" method="POST">
+          <div class="form-group">
+            <label for="todo-title">Title</label>
+            <input type="text" class="form-control" name="todo[title]">
+          </div>
+          <input
+            type="submit"
+            class="btn btn-primary btn-lg btn-block"
+            value="submit"
+            disabled="disabled"
+          >
+        </form>
+
+      </div>
+    </div>
+  </div>
+</body>
+<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+<script>
+  $('input:text').keyup(function () {
+    var disable = false;
+    if ( $('input:text').val() === "" ) {
+      disable = true
+    }
+    $('input:submit').prop('disabled', disable);
+  });
+</script>
+</html>

data/lib/reloj/skeletons/sample_app/config/db.yml

@@ -0,0 +1,2 @@
+---
+:dbname: reloj_sample

data/lib/reloj/skeletons/sample_app/config/routes.rb

@@ -1,10 +1,11 @@
 module App
   ROUTES = Proc.new do
-#   put the routes for your app here, e.g.
-#   get '/cats/:cat_id/statuses', StatusesController, :index
 
-    get '/cats', CatsController, :index
-    get '/cats/new', CatsController, :new
-    post '/cats', CatsController, :create
+    get '/', TodosController, :index
+    get '/todos', TodosController, :index
+    get '/todos/new', TodosController, :new
+    post '/todos/:id/delete', TodosController, :destroy
+    post '/todos', TodosController, :create
+
   end
 end

data/lib/reloj/skeletons/sample_app/db/setup.sql

@@ -1,46 +1,15 @@
-DROP TABLE IF EXISTS cats;
-CREATE TABLE cats (
-  id INTEGER PRIMARY KEY,
-  name VARCHAR(255) NOT NULL,
-  owner_id INTEGER
-
-  -- FOREIGN KEY(owner_id) REFERENCES humans(id)
-);
-
-DROP TABLE IF EXISTS humans;
-CREATE TABLE humans (
-  id INTEGER PRIMARY KEY,
-  fname VARCHAR(255) NOT NULL,
-  lname VARCHAR(255) NOT NULL,
-  house_id INTEGER
-
-  -- FOREIGN KEY(house_id) REFERENCES houses(id)
-);
-
-DROP TABLE IF EXISTS houses;
-CREATE TABLE houses (
-  id INTEGER PRIMARY KEY,
-  address VARCHAR(255) NOT NULL
+DROP TABLE IF EXISTS todos;
+CREATE TABLE todos (
+  id SERIAL PRIMARY KEY,
+  title VARCHAR(255) NOT NULL
 );
 
 INSERT INTO
-  houses (id, address)
-VALUES
-  (1, '26th and Guerrero'), (2, 'Dolores and Market');
-
-INSERT INTO
-  humans (id, fname, lname, house_id)
-VALUES
-  (1, 'Devon', 'Watts', 1),
-  (2, 'Matt', 'Rubens', 1),
-  (3, 'Ned', 'Ruggeri', 2),
-  (4, 'Catless', 'Human', NULL);
-
-INSERT INTO
-  cats (id, name, owner_id)
+  todos (title)
 VALUES
-  (1, 'Breakfast', 1),
-  (2, 'Earl', 2),
-  (3, 'Haskell', 3),
-  (4, 'Markov', 3),
-  (5, 'Stray Cat', NULL);
+  ('Laundry'),
+  ('Buy Groceries'),
+  ('Water Plants'),
+  ('Run Dishwasher'),
+  ('Walk the Dog'),
+  ('Clean Room');

data/lib/reloj/version.rb

@@ -1,3 +1,3 @@
 module Reloj
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reloj
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - ougarcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,11 +171,22 @@ files:
 - lib/reloj/skeletons/new_app/app/views/.keep
 - lib/reloj/skeletons/new_app/config/routes.rb
 - lib/reloj/skeletons/new_app/db/.keep
-- lib/reloj/skeletons/sample_app/app/controllers/cats_controller.rb
-- lib/reloj/skeletons/sample_app/app/models/cat.rb
-- lib/reloj/skeletons/sample_app/app/views/cats_controller/index.html.erb
-- lib/reloj/skeletons/sample_app/app/views/cats_controller/new.html.erb
+- lib/reloj/skeletons/old_example/app/controllers/cats_controller.rb
+- lib/reloj/skeletons/old_example/app/models/cat.rb
+- lib/reloj/skeletons/old_example/app/views/cats_controller/index.html.erb
+- lib/reloj/skeletons/old_example/app/views/cats_controller/new.html.erb
+- lib/reloj/skeletons/old_example/config/routes.rb
+- lib/reloj/skeletons/old_example/db/setup.sql
+- lib/reloj/skeletons/sample_app/app/controllers/.keep
+- lib/reloj/skeletons/sample_app/app/controllers/todos_controller.rb
+- lib/reloj/skeletons/sample_app/app/models/.keep
+- lib/reloj/skeletons/sample_app/app/models/todo.rb
+- lib/reloj/skeletons/sample_app/app/views/.keep
+- lib/reloj/skeletons/sample_app/app/views/todos_controller/index.html.erb
+- lib/reloj/skeletons/sample_app/app/views/todos_controller/new.html.erb
+- lib/reloj/skeletons/sample_app/config/db.yml
 - lib/reloj/skeletons/sample_app/config/routes.rb
+- lib/reloj/skeletons/sample_app/db/.keep
 - lib/reloj/skeletons/sample_app/db/setup.sql
 - lib/reloj/version.rb
 - reloj.gemspec