puffs 0.2.01 → 0.2.02

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2050723fb03f6747f185ea66bc3327571325677d
-  data.tar.gz: 8302419142f3d97e42ebcc6e0e37fe9bbae8d1fd
+  metadata.gz: a5304fd7d07adcaea292d602ca9e252271354d3e
+  data.tar.gz: 295905d933ddb84776245dda4580fc52bcd5739f
 SHA512:
-  metadata.gz: 0955ca1d1db9288ed45e7913095cb811ffda4d8a93495cdf4e3875d93a44185726c1bdc219320ae2ecdbee60a6e71fb1529094fdb0a61c1aac3ee15feb150047
-  data.tar.gz: 552718aa5c2552d4a72aeb31ba4ca3af0d865e3097d8c473c6a653152a8ff3e736707018e2686bfb81d028cfd61ce63c77f4d2be3fcc69d30d50ff00a21a3c82
+  metadata.gz: 81c92671002c89a0958fa8c8c5348f128140b316bdf3970d22e308148230b971b97e47797c0e7cc90b7ff2675c45e7bd9772386cdf440a798a16975d4c26ae35
+  data.tar.gz: c8c929fb1e2d0731590ebde369aa6954032e64858198a1b4a2f43541c3a85b2ee01136baff29fb4d9add247520ecaff61ae58a8f61c14239df26570ac43518c7

data/SamplePuffsApp/app/controllers/posts.rb

@@ -1,6 +1,6 @@
 class PostsController < Puffs::ControllerBase
   def index
-    @posts = Post.all.includes(:user).includes(:comments).order(id: :desc)
+    @posts = Post.all.includes(:user).includes(:comments).order(id: :desc).load
   end
 
   def create

data/SamplePuffsApp/app/views/posts_controller/index.html.erb

@@ -1,4 +1,4 @@
-<h1>Post Index</h1>
+<h1>PUFFFFFFFS!!!!</h1>
 
 <h2>Say Something</h2>
 <form action="/posts/create" method="post">

data/bin/puffs

@@ -53,6 +53,7 @@ end
 class Db < Thor
   desc "create", "creates the DB"
   def create
+    #Drops Puffs postgres database and recreates it.
     require_relative '../lib/db_connection'
     DBConnection.reset
     puts 'db created!'
@@ -60,6 +61,7 @@ class Db < Thor
 
   desc "migrate", "runs pending migrations"
   def migrate
+    #Creates Version table if necessary, then runs needed migrations in order.
     require_relative '../lib/db_connection'
     DBConnection.migrate
     puts "migrated!"
@@ -119,46 +121,4 @@ class CLI < Thor
   end
 end
 
-# class Snacks < Thor
-#   desc "generate", "subcommand used for generating models and controllers"
-#   subcommand 'generate', Generate
-#
-#   desc "g", "alias of generate subcommand"
-#   subcommand 'g', Generate
-#
-#   desc 'server', 'starts the Puffs server'
-#   def server
-#     require_relative '../lib/puffs'
-#     ServerConnection.start
-#   end
-#
-#   desc 'new', 'creates a new Puffs app'
-#   def new(name)
-#     Dir.mkdir "./#{name}"
-#     Dir.mkdir "./#{name}/app"
-#     Dir.mkdir "./#{name}/app/models"
-#     Dir.mkdir "./#{name}/app/views"
-#     Dir.mkdir "./#{name}/app/controllers"
-#     File.open("./#{name}/app/controllers/application_controller.rb", "w") do |f|
-#       f.write File.read(File.expand_path('../../template/app/controllers/application_controller.rb', __FILE__))
-#     end
-#     Dir.mkdir "./#{name}/config"
-#     File.open("./#{name}/config/routes.rb", "w") do |f|
-#       f.write File.read(File.expand_path('../../template/config/routes.rb', __FILE__))
-#     end
-#     Dir.mkdir "./#{name}/db"
-#     Dir.mkdir "./#{name}/db/migrate"
-#     File.open("./#{name}/db/seeds.rb", "w") do |f|
-#       f.write File.read(File.expand_path('../../template/db/seeds.rb', __FILE__))
-#     end
-#     File.open("./#{name}/Gemfile", "w") do |f|
-#       f.write File.read(File.expand_path('../../template/Gemfile', __FILE__))
-#     end
-#   end
-# end
-#
-# Snacks.start(ARGV)
-# Db.start(ARGV)
-# Generate.start(ARGV)
-
 CLI.start(ARGV)

data/lib/db_connection.rb

@@ -1,11 +1,7 @@
 require 'pg'
 
 APP_NAME = "Puffs"
-
 PRINT_QUERIES = ENV['PRINT_QUERIES'] == 'true'
-# project_root = File.dirname(File.absolute_path(__FILE__))
-# MIGRATIONS = Dir.glob(project_root + '/../db/migrate/*.sql').to_a
-
 MIGRATIONS = Dir.glob('./db/migrate/*.sql').to_a
 
 class DBConnection

data/lib/relation.rb

@@ -1,6 +1,5 @@
 require_relative './../lib/db_connection'
 require_relative 'sql_object/sql_object'
-# require_relative 'puffs'
 
 class Puffs::SQLRelation
   def self.build_association(base, included, method_name)

data/puffs.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "puffs"
-  spec.version       = "0.2.01"
+  spec.version       = "0.2.02"
   spec.authors       = ["Zachary Moroni"]
   spec.email         = ["zachary.moroni@gmail.com"]
 
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "thor", "~> 0.19"
   spec.add_runtime_dependency "pg", "~> 0.18"
-  spec.add_runtime_dependency "activesupport", "~> 4.2.5.1"
+  spec.add_runtime_dependency "activesupport", '~> 4.2', '>= 4.2.5.1'
   spec.add_runtime_dependency "pry", "~> 0.10.3"
-  spec.add_runtime_dependency "rack", "~> 1.6.4"
+  spec.add_runtime_dependency "rack", '~> 1.6', '>= 1.6.4'
   spec.add_runtime_dependency "fileutils", "~> 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffs
 version: !ruby/object:Gem::Version
-  version: 0.2.01
+  version: 0.2.02
 platform: ruby
 authors:
 - Zachary Moroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5.1
   type: :runtime
@@ -50,6 +53,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.5.1
 - !ruby/object:Gem::Dependency
@@ -71,6 +77,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :runtime
@@ -78,6 +87,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
@@ -168,26 +180,7 @@ files:
 - SamplePuffsApp/db/migrate/201600202515013026__create_post.sql
 - SamplePuffsApp/db/migrate/201600202515013032__create_comment.sql
 - SamplePuffsApp/db/seeds.rb
-- app/controllers/cats_controller.rb
-- app/controllers/house_controller.rb
-- app/controllers/humans_controller.rb
-- app/models/cat.rb
-- app/models/house.rb
-- app/models/human.rb
-- app/views/cats_controller/index.html.erb
-- app/views/cats_controller/new.html.erb
-- app/views/cats_controller/show.html.erb
-- app/views/dogs_controller/index.html.erb
-- app/views/dogs_controller/new.html.erb
-- app/views/dogs_controller/show.html.erb
-- app/views/my_controller/counting_show.html.erb
-- app/views/my_controller/show.html.erb
 - bin/puffs
-- config/routes.rb
-- db/migrate/201600202411059024_create_cats.sql
-- db/migrate/201600202411059044_create_houses.sql
-- db/migrate/201600202411059044_create_humans.sql
-- db/seeds.rb
 - lib/controller_base.rb
 - lib/db_connection.rb
 - lib/puffs.rb

data/app/controllers/cats_controller.rb

@@ -1,26 +0,0 @@
-require_relative '../../lib/controller_base'
-project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob(project_root + '/../models/*.rb') { |file| require file }
-
-class CatsController < ControllerBase
-  def index
-    @cats = Cat.all
-    render :index
-  end
-
-  def show
-    @cat = Cat.find(Integer(params['cat_id']))
-    render :show
-  end
-
-  def new
-    render :new
-  end
-
-  def create
-    @cat = Cat.new
-    @cat.name = params['cat']['name']
-    @cat.save
-    render :show
-  end
-end

data/app/controllers/house_controller.rb

@@ -1,3 +0,0 @@
-require_relative '../../lib/controller_base'
-project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob(project_root + '/../models/*.rb') { |file| require file }

data/app/controllers/humans_controller.rb

@@ -1,3 +0,0 @@
-require_relative '../../lib/controller_base'
-project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob(project_root + '/../models/*.rb') { |file| require file }

data/app/models/cat.rb

@@ -1,7 +0,0 @@
-require_relative '../../lib/sql_object/sql_object'
-
-class Cat < SQLObject
-  belongs_to :human, foreign_key: :owner_id
-  has_one_through :home, :human, :house
-end
-Cat.finalize!

data/app/models/house.rb

@@ -1,7 +0,0 @@
-require_relative '../../lib/sql_object/sql_object'
-
-class House < SQLObject
-  has_many :humans
-  has_many_through :cats, :humans, :cats
-end
-House.finalize!

data/app/models/human.rb

@@ -1,8 +0,0 @@
-require_relative '../../lib/sql_object/sql_object'
-
-class Human < SQLObject
-  self.table_name = :humans
-  belongs_to :house
-  has_many :cats, foreign_key: :owner_id
-end
-Human.finalize!

data/app/views/cats_controller/index.html.erb

@@ -1,5 +0,0 @@
-<h1>ALL THE CATS</h1>
-<% @cats.each do |cat| %>
-<h1><%= cat.name %></h1>
-<% end %>
-<a href="/cats/new">New cat!</a>

data/app/views/cats_controller/new.html.erb

@@ -1,11 +0,0 @@
-<form action="/cats/create" method="POST">
-  <label>Name
-    <input type="text" name="cat[name]" value="">
-  </label>
-
-  <label>Owner
-    <input type="text" name="cat[owner]" value="">
-  </label>
-
-  <input type="submit">
-</form>

data/app/views/cats_controller/show.html.erb

@@ -1 +0,0 @@
-<h1><%= @cat.name %></h1>

data/app/views/dogs_controller/index.html.erb

@@ -1,8 +0,0 @@
-<h1>ALL THE DOGS</h1>
-
-<% if flash[:notice] %>
-  Notice: <%= flash[:notice] %>
-<% end %>
-
-<pre>Dog Data: <%= @dogs.to_s %></pre>
-<a href="/dogs/new">New Dog!</a>

data/app/views/dogs_controller/new.html.erb

@@ -1,17 +0,0 @@
-<% if flash[:errors] %>
-  <% flash[:errors].each do |error| %>
-    <%= error %>
-  <% end %>
-<% end %>
-
-<form action="/dogs" method="POST">
-  <label>Name
-    <input type="text" name="dog[name]" value="<%= @dog.name %>">
-  </label>
-
-  <label>Owner
-    <input type="text" name="dog[owner]" value="<%= @dog.owner %>">
-  </label>
-
-  <input type="submit">
-</form>

data/app/views/dogs_controller/show.html.erb

@@ -1 +0,0 @@
-<%= link_to "all dogs", dogs_path %>

data/app/views/my_controller/counting_show.html.erb

@@ -1 +0,0 @@
-<%= session["count"] %>

data/app/views/my_controller/show.html.erb

@@ -1 +0,0 @@
-<%= (1..10).to_a.join(", ") %>

data/config/routes.rb

@@ -1,9 +0,0 @@
-require_relative '../lib/router'
-
-ROUTER = Router.new
-ROUTER.draw do
-  get Regexp.new("^/cats/new$"), CatsController, :new
-  post Regexp.new("^/cats/create$"), CatsController, :create
-  get Regexp.new("^/cats$"), CatsController, :index
-  get Regexp.new("^/cats/(?<cat_id>\\d+)$"), CatsController, :show
-end

data/db/migrate/201600202411059024_create_cats.sql

@@ -1,5 +0,0 @@
-CREATE TABLE IF NOT EXISTS cats (
-  id SERIAL PRIMARY KEY,
-  name VARCHAR(255) NOT NULL,
-  owner_id INTEGER
-);

data/db/migrate/201600202411059044_create_houses.sql

@@ -1,4 +0,0 @@
-CREATE TABLE IF NOT EXISTS houses (
-  id SERIAL PRIMARY KEY,
-  address VARCHAR(255) NOT NULL
-);

data/db/migrate/201600202411059044_create_humans.sql

@@ -1,6 +0,0 @@
-CREATE TABLE IF NOT EXISTS humans (
-  id SERIAL PRIMARY KEY,
-  fname VARCHAR(255) NOT NULL,
-  lname VARCHAR(255) NOT NULL,
-  house_id INTEGER
-);

data/db/seeds.rb

@@ -1,26 +0,0 @@
-project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob(project_root + '/../app/models/*.rb') {|file| require file}
-
-
-class Seed
-  def self.populate
-    Cat.destroy_all!
-    Human.destroy_all!
-    House.destroy_all!
-
-    h1 = House.new(address: '26th and Guerrero').save
-    h2 = House.new(address: 'Dolores and Market').save
-    h3 = House.new(address: '123 4th Street').save
-
-    devon = Human.new(fname: 'Devon', lname: 'Watts', house_id: h1.id).save
-    matt = Human.new(fname: 'Matt', lname: 'Rubens', house_id: h1.id).save
-    ned = Human.new(fname: 'Ned', lname: 'Ruggeri', house_id: h2.id).save
-    catless = Human.new(fname: 'Catless', lname: 'Human', house_id: h3.id).save
-
-    Cat.new(name: 'Breakfast', owner_id: devon.id).save
-    Cat.new(name:'Earl', owner_id: matt.id).save
-    Cat.new(name: 'Haskell', owner_id: ned.id).save
-    Cat.new(name: 'Markov', owner_id: ned.id).save
-    Cat.new(name: 'Stray Cat')
-  end
-end