puffs 0.2.0 → 0.2.01

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 789f86d9c4c28f12db7037140383b27bca20eb3d
-  data.tar.gz: 8bcf4de32aa7e435a0fa172c1eb8f1c0ea939635
+  metadata.gz: 2050723fb03f6747f185ea66bc3327571325677d
+  data.tar.gz: 8302419142f3d97e42ebcc6e0e37fe9bbae8d1fd
 SHA512:
-  metadata.gz: 59b3f8ff0c882f5e694988946fb8809ddb59ddb40da8a66920377141cd278ad0df20260669555c8fc80d08af85e7c9577a575cefb47a2e1b12aa379e9f64283b
-  data.tar.gz: 2e09edf43562578e6216bf8ca8768a0410007e2410caf5d5b23e966a4a13a3bc5ee4debfb7c7991ec96c36d24dd6ba013032344d0481c1a84f52f530ae7aeac9
+  metadata.gz: 0955ca1d1db9288ed45e7913095cb811ffda4d8a93495cdf4e3875d93a44185726c1bdc219320ae2ecdbee60a6e71fb1529094fdb0a61c1aac3ee15feb150047
+  data.tar.gz: 552718aa5c2552d4a72aeb31ba4ca3af0d865e3097d8c473c6a653152a8ff3e736707018e2686bfb81d028cfd61ce63c77f4d2be3fcc69d30d50ff00a21a3c82

data/SamplePuffsApp/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "puffs"

data/SamplePuffsApp/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    coderay (1.1.1)
+    fileutils (0.7)
+      rmagick (>= 2.13.1)
+    i18n (0.7.0)
+    json (1.8.3)
+    method_source (0.8.2)
+    minitest (5.8.4)
+    pg (0.18.4)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    puffs (0.2.01)
+      activesupport (~> 4.2.5.1)
+      fileutils (~> 0.7)
+      pg (~> 0.18)
+      pry (~> 0.10.3)
+      rack (~> 1.6.4)
+      thor (~> 0.19)
+    rack (1.6.4)
+    rmagick (2.15.4)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  puffs
+
+BUNDLED WITH
+   1.11.2

data/SamplePuffsApp/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < Puffs::ControllerBase
+  #Prevent CSRF attacks by raising an exception.
+end

data/SamplePuffsApp/app/controllers/comments.rb

@@ -0,0 +1,3 @@
+class CommentsController < Puffs::ControllerBase
+
+end

data/SamplePuffsApp/app/controllers/posts.rb

@@ -0,0 +1,16 @@
+class PostsController < Puffs::ControllerBase
+  def index
+    @posts = Post.all.includes(:user).includes(:comments).order(id: :desc)
+  end
+
+  def create
+    @post = Post.new(body: params['post']['body'], author_id: 6).save
+    redirect_to ('/posts')
+  end
+
+  def destroy
+    @post = Post.find(params['post_id'])
+    @post.destroy!
+    redirect_to ('/posts')
+  end
+end

data/SamplePuffsApp/app/controllers/users.rb

@@ -0,0 +1,6 @@
+class UsersController < Puffs::ControllerBase
+  def show
+    @user = User.find(params['user_id'])
+    render :show
+  end
+end

data/SamplePuffsApp/app/models/comment.rb

@@ -0,0 +1,5 @@
+class Comment < Puffs::SQLObject
+  belongs_to :user, foreign_key: :commenter_id
+  belongs_to :post
+end
+Comment.finalize!

data/SamplePuffsApp/app/models/post.rb

@@ -0,0 +1,5 @@
+class Post < Puffs::SQLObject
+  belongs_to :user, foreign_key: :author_id
+  has_many :comments
+end
+Post.finalize!

data/SamplePuffsApp/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < Puffs::SQLObject
+  has_many :posts, foreign_key: :author_id
+  has_many :authored_comments, foreign_key: :commenter_id
+  has_many_through :comments, :posts, :comments
+end
+User.finalize!

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

@@ -0,0 +1,31 @@
+<h1>Post Index</h1>
+
+<h2>Say Something</h2>
+<form action="/posts/create" method="post">
+  <label>Type you post in here.
+    <input type="text" name="post[body]" value="">
+  </label>
+  <button>Submit</button>
+</form>
+
+<ul>
+  <% @posts.each do |post| %>
+    <li>
+      <h2><a href="/users/<%=post.author_id%>"><%= post.user.name %></a> Posted:</h2>
+      <h3><%= post.body %></h3>
+      <% if post.author_id == "6" %>
+        <form action="/posts/destroy" method="post">
+          <input type="hidden" name="_method" value="delete">
+          <input type="hidden" name="post_id" value="<%= post.id %>">
+          <button>Delete Post</button>
+        </form>
+      <% end %>
+      <h3>Comments:</h3>
+      <ul>
+        <% post.comments.each do |comment| %>
+        <li><%= comment.body %></li>
+        <% end %>
+      </ul>
+    </li>
+  <% end %>
+</ul>

data/SamplePuffsApp/app/views/users_controller/show.html.erb

@@ -0,0 +1,18 @@
+<h1><%= @user.name %></h1>
+
+<ul>
+  <% @user.posts.each do |post| %>
+    <li>
+      <h3><%= post.body %></h3>
+      <h3>Comments:</h3>
+      <ul>
+        <% post.comments.each do |comment| %>
+        <li><%= comment.body %> - <%= comment.user.name %></li>
+        <% end %>
+      </ul>
+    </li>
+  <% end %>
+</ul>
+<br />
+<br />
+<a href="/posts">Back to all the posts!</a>

data/SamplePuffsApp/config/routes.rb

@@ -0,0 +1,17 @@
+ROUTER = Router.new
+ROUTER.draw do
+  #Some sample routes:
+
+  get Regexp.new("^/posts$"), PostsController, :index
+  post Regexp.new("^/posts/create$"), PostsController, :create
+  post Regexp.new("^/posts/destroy$"), PostsController, :destroy
+
+  get Regexp.new("^/users$"), UsersController, :index
+
+  get Regexp.new("^/users/(?<user_id>\\d+)$"), UsersController, :show
+
+  # 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/SamplePuffsApp/db/migrate/201600202515013018__create_user.sql

@@ -0,0 +1,3 @@
+CREATE TABLE IF NOT EXISTS users (
+	id SERIAL PRIMARY KEY,
+	name VARCHAR(255) NOT NULL);

data/SamplePuffsApp/db/migrate/201600202515013026__create_post.sql

@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS posts (
+	id SERIAL PRIMARY KEY,
+	body VARCHAR(255) NOT NULL,
+	author_id INTEGER NOT NULL);

data/SamplePuffsApp/db/migrate/201600202515013032__create_comment.sql

@@ -0,0 +1,5 @@
+CREATE TABLE IF NOT EXISTS comments (
+	id SERIAL PRIMARY KEY,
+	body VARCHAR(255) NOT NULL,
+	commenter_id INTEGER,
+	post_id INTEGER);

data/SamplePuffsApp/db/seeds.rb

@@ -0,0 +1,56 @@
+class Seed
+  def self.populate
+    User.destroy_all!
+    Post.destroy_all!
+    Comment.destroy_all!
+
+    zach = User.new(name: "Zach").save
+    tina = User.new(name: "Tina").save
+    breakfast = User.new(name: "Breakfast").save
+
+    z1 = Post.new(body: "Pufffffffffffssss!!!", author_id: zach.id).save
+    z2 = Post.new(body: "Puffs ain't crispy.", author_id: zach.id).save
+    z3 = Post.new(body: "Cheesy Puffs!", author_id: zach.id).save
+
+    t1 = Post.new(body: "I heart Puffs!", author_id: tina.id).save
+    t2 = Post.new(body: "Puffs is tasty!", author_id: tina.id).save
+    t3 = Post.new(body: "Puffs, wow!", author_id: tina.id).save
+
+    b1 = Post.new(body: "I'm Breakfast!", author_id: breakfast.id).save
+    b2 = Post.new(body: "I'm a cat!", author_id: breakfast.id).save
+    b3 = Post.new(body: "Puffs?", author_id: breakfast.id).save
+
+    Comment.new(body: "I'm a cat!", commenter_id: breakfast.id, post_id: t1.id).save
+    Comment.new(body: "I'm a cat!", commenter_id: breakfast.id, post_id: t2.id).save
+    Comment.new(body: "I'm a cat!", commenter_id: breakfast.id, post_id: t3.id).save
+
+    Comment.new(body: "I'm hungry!", commenter_id: zach.id, post_id: b1.id).save
+    Comment.new(body: "PUFFS IS AWESOME", commenter_id: zach.id, post_id: b2.id).save
+    Comment.new(body: "Such puffs!", commenter_id: zach.id, post_id: b3.id).save
+
+    Comment.new(body: "Amaze!", commenter_id: tina.id, post_id: z1.id).save
+    Comment.new(body: "Love puffs!", commenter_id: tina.id, post_id: z2.id).save
+    Comment.new(body: "Puffs is easy!", commenter_id: tina.id, post_id: z3.id).save
+
+    #Create seeds in this method. Here's an example:
+
+    # 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

data/bin/puffs

@@ -10,8 +10,7 @@ class Generate < Thor
 
     #writes model file
     File.open("./app/models/#{m_name.downcase}.rb", "w") do |f|
-      f.write("require_relative '../../lib/sql_object/sql_object'\n\n")
-      f.write("class #{m_name} < SQLObject\n\n")
+      f.write("class #{m_name} < Puffs::SQLObject\n\n")
       f.write("end\n")
       f.write("#{m_name}.finalize!")
     end
@@ -25,16 +24,12 @@ class Generate < Thor
 
     #Writes controller file
     File.open("./app/controllers/#{c_name.downcase}.rb", "w") do |f|
-      f.write("require_relative '../../lib/controller_base'\n")
-      f.write("project_root = File.dirname(File.absolute_path(__FILE__))\n")
-      f.write("Dir.glob(project_root + '/../models/*.rb') { |file| require file }\n\n")
-
-      f.write("class #{c_name}Controller < ControllerBase\n\n")
+      f.write("class #{c_name}Controller < Puffs::ControllerBase\n\n")
       f.write("end")
     end
 
     #creates empty views directory
-    Dir.mkdir "./app/views/#{c_name.downcase}"
+    Dir.mkdir "./app/views/#{c_name.downcase}_controller"
     puts "#{c_name} controller created"
   end
 
@@ -49,6 +44,7 @@ class Generate < Thor
     File.open("./db/migrate/#{filename}.sql", "w") do |f|
       f.write ("CREATE TABLE IF NOT EXISTS #{name} (\n")
       f.write ("\tid SERIAL PRIMARY KEY,\n")
+      f.write ("\tname VARCHAR(255) NOT NULL")
       f.write (");")
     end
   end
@@ -71,7 +67,7 @@ class Db < Thor
 
   desc "seed", "seeds the DB"
   def seed
-    require './db/seeds'
+    require_relative '../lib/puffs'
     Seed.populate
     puts 'db seeded!'
   end
@@ -85,16 +81,16 @@ class Db < Thor
   end
 end
 
-class Puffs < Thor
-  desc "generate", "subcommand used for generating models and controllers"
-  subcommand 'generate', Generate
+class CLI < Thor
+  register(Generate, 'generate', 'generate <command>', 'Generates a model or controller.')
+  register(Db, 'db', 'db <command>', 'Accesses commands for the DB.')
 
   desc "g", "alias of generate subcommand"
   subcommand 'g', Generate
 
   desc 'server', 'starts the Puffs server'
   def server
-    require_relative '../lib/server_connection'
+    require_relative '../lib/puffs'
     ServerConnection.start
   end
 
@@ -123,6 +119,46 @@ class Puffs < Thor
   end
 end
 
-Puffs.start
-Db.start
-Generate.start
+# 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/controller_base.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext'
 require 'erb'
 require_relative 'session'
 require 'active_support/inflector'
-require 'puffs'
+# require_relative 'puffs'
 
 class Puffs::ControllerBase
   attr_reader :req, :res, :params

data/lib/puffs.rb

@@ -1,15 +1,16 @@
-require_relative 'version'
+module Puffs
+  #enjoy puffs
+end
 
-#might not need these.
-require_relative 'sql_object/sql_object'
-require_relative 'controller_base'
+require_relative "sql_object/sql_object"
+require_relative "controller_base"
 
-# project_root = File.dirname(File.absolute_path(__FILE__))
-# Dir.glob(project_root + '/../app/models/*.rb') { |file| require file }
+Dir.glob('./app/models/*.rb') {|file| require file}
+Dir.glob('./app/controllers/*.rb') {|file| require file}
 
-# Dir.glob('./app/models/*.rb') { |file| require file }
-# Dir.glob('./app/controllers/*.rb') { |file| require file }
+require './db/seeds'
 
-module Puffs
-
-end
+require_relative 'db_connection'
+require_relative 'router'
+require_relative 'server_connection'
+require_relative 'session'

data/lib/relation.rb

@@ -1,5 +1,6 @@
 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)
@@ -26,7 +27,7 @@ class Puffs::SQLRelation
       #After we find our values iteratively, we overwrite the method again
       #to the result values to reduce future lookup time to O(1).
       new_match = proc { associated }
-      SQLObject.define_singleton_method_by_proc(
+      Puffs::SQLObject.define_singleton_method_by_proc(
         self, method_name, new_match)
 
       associated
@@ -35,7 +36,7 @@ class Puffs::SQLRelation
     #we overwrite the association method for each SQLObject in the
     #collection so that it points to our cached relation and doesn't fire a query.
     base.collection.each do |b_sql_obj|
-      SQLObject.define_singleton_method_by_proc(
+      Puffs::SQLObject.define_singleton_method_by_proc(
         b_sql_obj, method_name, match)
     end
   end
@@ -136,7 +137,7 @@ class Puffs::SQLRelation
             (#{in_ids});
         SQL
         included = assoc.model_class.parse_all(results)
-        SQLRelation.build_association(relation, included, param)
+        Puffs::SQLRelation.build_association(relation, included, param)
       end
     end
 

data/lib/router.rb

@@ -1,6 +1,3 @@
-project_root = File.dirname(File.absolute_path(__FILE__))
-Dir.glob(project_root + '/../app/controllers/*.rb') { |file| require file }
-
 class Route
   attr_reader :pattern, :http_method, :controller_class, :action_name
 

data/lib/server_connection.rb

@@ -1,5 +1,5 @@
 require 'rack'
-require_relative '../config/routes'
+require './config/routes'
 
 class ServerConnection
   def self.start

data/lib/sql_object/associatable.rb

@@ -28,6 +28,8 @@ class HasManyOptions < AssocOptions
   def initialize(name, self_class_name, options = {})
     @primary_key = options[:primary_key] || :id
     @foreign_key = options[:foreign_key] || "#{self_class_name.to_s.underscore}_id".to_sym
+
+    #I think there is a bug here, investigate.
     @class_name = options[:class_name] || name.to_s.singularize.camelcase
   end
 end
@@ -85,7 +87,7 @@ module Associatable
       through_class = through_options.model_class
       key_val = self.send(through_options.primary_key)
 
-      #2 queries, we could reduce to 1 by writing SQLRelation::join.
+      #2 queries, we could reduce to 1 by writing Puffs::SQLRelation.join.
       through_class.where(through_fk => key_val)
                    .includes(source_name)
                    .load

data/lib/sql_object/sql_object.rb

@@ -2,7 +2,7 @@ require_relative '../../lib/db_connection'
 require_relative 'associatable'
 require_relative '../relation'
 require 'active_support/inflector'
-require 'puffs'
+# require_relative '../puffs'
 
 class Puffs::SQLObject
   extend Associatable
@@ -13,7 +13,7 @@ class Puffs::SQLObject
 
   RELATION_METHODS.each do |method|
     define_singleton_method(method) do |arg|
-      SQLRelation.new(klass: self).send(method, arg)
+      Puffs::SQLRelation.new(klass: self).send(method, arg)
     end
   end
 
@@ -69,7 +69,7 @@ class Puffs::SQLObject
   end
 
   def self.parse_all(results)
-    relation = SQLRelation.new(klass: self, loaded: true)
+    relation = Puffs::SQLRelation.new(klass: self, loaded: true)
     results.each do |result|
       relation << self.new(result)
     end

data/puffs.gemspec

@@ -2,11 +2,10 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
 
 Gem::Specification.new do |spec|
   spec.name          = "puffs"
-  spec.version       = Puffs::VERSION
+  spec.version       = "0.2.01"
   spec.authors       = ["Zachary Moroni"]
   spec.email         = ["zachary.moroni@gmail.com"]
 
@@ -28,7 +27,7 @@ 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.0.13"
+  spec.add_runtime_dependency "activesupport", "~> 4.2.5.1"
   spec.add_runtime_dependency "pry", "~> 0.10.3"
   spec.add_runtime_dependency "rack", "~> 1.6.4"
   spec.add_runtime_dependency "fileutils", "~> 0.7"

data/template/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < ControllerBase
+class ApplicationController < Puffs::ControllerBase
   #Prevent CSRF attacks by raising an exception.
 end

data/template/db/seeds.rb

@@ -1,5 +1,3 @@
-Dir.glob('./app/models/*.rb') {|file| require file}
-
 class Seed
   def self.populate
     #Create seeds in this method. Here's an example:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.01
 platform: ruby
 authors:
 - Zachary Moroni
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.2.5.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,22 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- SamplePuffsApp/Gemfile
+- SamplePuffsApp/Gemfile.lock
+- SamplePuffsApp/app/controllers/application_controller.rb
+- SamplePuffsApp/app/controllers/comments.rb
+- SamplePuffsApp/app/controllers/posts.rb
+- SamplePuffsApp/app/controllers/users.rb
+- SamplePuffsApp/app/models/comment.rb
+- SamplePuffsApp/app/models/post.rb
+- SamplePuffsApp/app/models/user.rb
+- SamplePuffsApp/app/views/posts_controller/index.html.erb
+- SamplePuffsApp/app/views/users_controller/show.html.erb
+- SamplePuffsApp/config/routes.rb
+- SamplePuffsApp/db/migrate/201600202515013018__create_user.sql
+- 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
@@ -181,7 +197,6 @@ files:
 - lib/session.rb
 - lib/sql_object/associatable.rb
 - lib/sql_object/sql_object.rb
-- lib/version.rb
 - puffs.gemspec
 - template/Gemfile
 - template/app/controllers/application_controller.rb

data/lib/version.rb

@@ -1,3 +0,0 @@
-module Puffs
-  VERSION = "0.2.0"
-end