railz_lite 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7acea7b75dc9f8d1e05768f9c6c172f6e7984307824c69e9eb6b3c1055b993a
-  data.tar.gz: 74bbe9fc95b69704453b158f4ca9d1625778942aefa23a0ecfbe4b7332ba79f3
+  metadata.gz: d9913416758845461437f605307b2a10be934ed1da34652947f9a2dcbfdb1caa
+  data.tar.gz: 33c8f9a302c65d3f4f55ebcd1682458de7a856d2c0c66c4fc6e1c614d64792e6
 SHA512:
-  metadata.gz: 939f6f260cb17e847feb26d256f688eb1105bd35707c96c61036f32f609cedeb432e298c853112985f350be35561fd9526f4d0138ba2c1a2b74cef6b4c65ef18
-  data.tar.gz: ec8d14870fe345b88359148e42c766c77c04f57747cd5f21381cd0dd654ccab5ceb30348b858c6b5e200072032d14e8c289368b78d1e1d8184e5b364180b266d
+  metadata.gz: 900a8e1808fdfc07b4c5638c1a7fb0cc3357c15fe9eaf8a563c8b56596716fc12ba038a75df0fe462ddd7f2bffc42c6367c6743e9184fe4d63c3be5e8cd384ec
+  data.tar.gz: 56cdd5db6f1d0b008f1ad9b34e24047da258601bd57b8d76723bf1ccd8a76bbad486c1ec7df5503965d3d0f1b1d3e7fb8e7939974e71739bfbee4d94ca762144

data/lib/railz_lite/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'railz_lite'
 require 'railz_lite/generators/project'
+require 'railz_lite/models/db_connection'
 
 module RailzLite
   class CLI < Thor
@@ -9,14 +10,20 @@ module RailzLite
       RailzLite::Generators::Project.start([project_name])
     end
 
-    desc 'server', 'Starts up a puma server within RailzLite project'
+    desc 'server', 'Starts up a puma server within RailzLite project. Also initializes '
     def server
       file =  File.join(Dir.pwd, 'config', 'server.rb')
       if File.exist?(file)
+        DBConnection.start # load our db connection
         system('ruby', file)
       else
         raise "File not found at #{file}"
       end
     end
+
+    desc 'db_reset', 'Restarts the database and reads db/app.sql file'
+    def db_reset
+      DBConnection.reset
+    end
   end
 end

data/lib/railz_lite/controllers/controller_base.rb

@@ -45,8 +45,8 @@ module RailzLite
     # use ERB and binding to evaluate templates
     # pass the rendered html to render_content
     def render(template_name)
-      dir_path = File.dirname(__FILE__)
-      file_path = File.join(dir_path, '..', 'views', "#{self.class.name.underscore}", "#{template_name.to_s}.html.erb")
+      dir_path = Dir.pwd
+      file_path = File.join(dir_path, 'views', "#{self.class.name.underscore.split('_controller').first}", "#{template_name.to_s}.html.erb")
       file = File.read(file_path)
       template = ERB.new(file).result(binding)
       render_content(template, 'text/html')

data/lib/railz_lite/controllers/static.rb

@@ -61,7 +61,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 = Dir.pwd
+    File.join(dir, path)
   end
 end

data/lib/railz_lite/generators/project.rb

@@ -11,7 +11,6 @@ module RailzLite
       end
 
       def self.destination_root
-        puts "destination for folder #{Dir.pwd}"
         Dir.pwd
       end
       
@@ -24,15 +23,19 @@ module RailzLite
       end
 
       def add_server
-        template("#{project_name}/server.rb", "config/server.rb")
+        template('server.rb', "#{project_name}/config/server.rb")
       end
 
-      def add_views
-        empty_directory("#{project_name}/views")
+      def add_welcome_view
+        template('welcome_view.index.html.erb', "#{project_name}/views/welcome/index.html.erb")
       end
 
       def add_public
-        empty_directory("#{project_name}/public")
+        copy_file('winter_fox_large.jpg', "#{project_name}/public/winter_fox_large.jpg")
+      end
+
+      def create_sql_file
+        create_file("#{project_name}/db/app.sql")
       end
     end
   end

data/lib/railz_lite/generators/templates/server.rb

@@ -2,10 +2,17 @@ require 'rack'
 require 'railz_lite/controllers/static'
 require 'railz_lite/controllers/show_exceptions'
 require 'railz_lite/controllers/router'
+require 'railz_lite'
+
+# example controller config
+ class WelcomeController < RailzLite::ControllerBase
+   def index; end
+ end
 
 router = Router.new
 router.draw do
   # add routes here
+  get Regexp.new('^/$'), WelcomeController, :index
 end
 
 app = Proc.new do |env|

data/lib/railz_lite/generators/templates/welcome_view.index.html.erb

@@ -0,0 +1,12 @@
+<div style="
+    width: 50%;
+    margin: 0 auto;
+    margin-top: 18px;
+    text-align: center;
+    ">
+  <h1>Welcome To Railz Lite!</h1>
+
+  <img src="../public/winter_fox_large.jpg" />
+
+  <h3>For guidelines on how to build an app with this framework see <a href="https://github.com/bryanqb07/railz_lite">here</a>.</h3>
+</div>

data/lib/railz_lite/models/associatable.rb

@@ -46,34 +46,32 @@ class HasManyOptions < AssocOptions
   end
 end
 
-module Associatable
-  def belongs_to(name, options = {})
-    options = BelongsToOptions.new(name, options)
-    assoc_options[name] = options
-    define_method(name) do
-     foreign_key = send(options.foreign_key)
-     primary_key = options.primary_key
-     params = [[primary_key, foreign_key]].to_h
-     options.model_class.where(params).first
+module RailzLite
+  module Associatable
+    def belongs_to(name, options = {})
+      options = BelongsToOptions.new(name, options)
+      assoc_options[name] = options
+      define_method(name) do
+        foreign_key = send(options.foreign_key)
+        primary_key = options.primary_key
+        params = [[primary_key, foreign_key]].to_h
+        options.model_class.where(params).first
+      end
     end
-  end
 
-  def has_many(name, options = {})
-    options = HasManyOptions.new(name, self.name, options)
-    define_method(name) do
-     foreign_key = options.foreign_key
-     primary_key = send(options.primary_key)
-     params = [[foreign_key, primary_key]].to_h
-     options.model_class.where(params)
+    def has_many(name, options = {})
+      options = HasManyOptions.new(name, self.name, options)
+      define_method(name) do
+        foreign_key = options.foreign_key
+        primary_key = send(options.primary_key)
+        params = [[foreign_key, primary_key]].to_h
+        options.model_class.where(params)
+      end
     end
-  end
 
-  def assoc_options
-    @assoc_options ||= {}
-    @assoc_options
+    def assoc_options
+      @assoc_options ||= {}
+      @assoc_options
+    end
   end
 end
-
-class SQLObject
-  extend Associatable
-end

data/lib/railz_lite/models/db_connection.rb

@@ -1,12 +1,15 @@
 require 'sqlite3'
 
-PRINT_QUERIES = ENV['PRINT_QUERIES'] == 'true'
-# https://tomafro.net/2010/01/tip-relative-paths-with-file-expand-path
-ROOT_FOLDER = File.join(File.dirname(__FILE__), '..')
-SQL_FILE = File.join(ROOT_FOLDER, 'app.sql')
-DB_FILE = File.join(ROOT_FOLDER, 'app.db')
-
 class DBConnection
+  PRINT_QUERIES = ENV['PRINT_QUERIES'] == 'true'
+  ROOT_FOLDER = Dir.pwd
+  SQL_FILE = File.join(ROOT_FOLDER, 'db', 'app.sql')
+  DB_FILE = File.join(ROOT_FOLDER, 'db', 'app.db')
+
+  def self.start
+    DBConnection.open(DB_FILE)
+  end
+
   def self.open(db_file_name)
     @db = SQLite3::Database.new(db_file_name)
     @db.results_as_hash = true

data/lib/railz_lite/models/searchable.rb

@@ -1,10 +1,10 @@
 require_relative 'db_connection'
-require_relative 'sql_object'
 
-module Searchable
-  def where(params)
-    where_line = params.keys.map { |attr_name| "#{attr_name} = ?" }.join(" AND ")
-    results = DBConnection.execute(<<-SQL, *params.values)
+module RailzLite
+  module Searchable
+    def where(params)
+      where_line = params.keys.map { |attr_name| "#{attr_name} = ?" }.join(" AND ")
+      results = DBConnection.execute(<<-SQL, *params.values)
       SELECT
         *
       FROM
@@ -12,10 +12,7 @@ module Searchable
       WHERE
         #{where_line}
     SQL
-    results.map { |attrs| self.new(attrs) }
+      results.map { |attrs| self.new(attrs) }
+    end
   end
 end
-
-class SQLObject
-  extend Searchable
-end

data/lib/railz_lite/models/sql_object.rb

@@ -1,8 +1,13 @@
 require_relative 'db_connection'
+require_relative 'associatable'
+require_relative 'searchable'
 require 'active_support/inflector'
 
 module RailzLite
   class SQLObject
+    extend RailzLite::Associatable
+    extend RailzLite::Searchable
+
     def self.columns
       @columns ||= DBConnection.execute2(<<-SQL)
       SELECT

data/lib/railz_lite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailzLite
-  VERSION = "0.1.6"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railz_lite
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - bryan lynch
@@ -141,7 +141,6 @@ email:
 - bml312@nyu.edu
 executables:
 - railz_lite
-- railz_lite.rb~
 extensions: []
 extra_rdoc_files: []
 files:
@@ -156,7 +155,6 @@ files:
 - bin/console
 - bin/setup
 - exe/railz_lite
-- exe/railz_lite.rb~
 - lib/railz_lite.rb
 - lib/railz_lite/cli.rb
 - lib/railz_lite/controllers/controller_base.rb
@@ -166,19 +164,17 @@ files:
 - lib/railz_lite/controllers/show_exceptions.rb
 - lib/railz_lite/controllers/static.rb
 - lib/railz_lite/controllers/templates/rescue.html.erb
-- lib/railz_lite/controllers/templates/rescue.html.erb~
 - lib/railz_lite/generators/project.rb
 - lib/railz_lite/generators/project.rb~
 - lib/railz_lite/generators/templates/application_controller.rb~
 - lib/railz_lite/generators/templates/server.rb
+- lib/railz_lite/generators/templates/welcome_view.index.html.erb
+- lib/railz_lite/generators/templates/winter_fox_large.jpg
 - lib/railz_lite/models/associatable.rb
-- lib/railz_lite/models/associatable.rb~
 - lib/railz_lite/models/associatable2.rb
-- lib/railz_lite/models/associatable2.rb~
 - lib/railz_lite/models/attr_accessor_object.rb
 - lib/railz_lite/models/db_connection.rb
 - lib/railz_lite/models/searchable.rb
-- lib/railz_lite/models/searchable.rb~
 - lib/railz_lite/models/sql_object.rb
 - lib/railz_lite/models/validatable.rb
 - lib/railz_lite/version.rb

data/exe/railz_lite.rb~

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-puts "hello world"

data/lib/railz_lite/models/associatable.rb~

@@ -1,79 +0,0 @@
-require_relative '02_searchable'
-require 'active_support/inflector'
-
-class AssocOptions
-  attr_accessor(
-    :foreign_key,
-    :class_name,
-    :primary_key
-  )
-
-  def model_class
-    class_name.constantize
-  end
-
-  def table_name
-    model_class.table_name
-  end
-end
-
-class BelongsToOptions < AssocOptions
-  def initialize(name, options = {})
-    foreign_key_sym = "#{name}_id".to_sym
-    class_name_val = name.to_s.camelcase.singularize
-    send("primary_key=", :id)
-    send("foreign_key=", foreign_key_sym)
-    send("class_name=", class_name_val)
-
-    options.each do |attr, val|
-      send("#{attr}=", val)
-    end
-  end
-end
-
-class HasManyOptions < AssocOptions
-  def initialize(name, self_class_name, options = {})
-    foreign_key_sym = "#{self_class_name.underscore}_id".to_sym
-    class_name_val = name.to_s.camelcase.singularize
-
-    send("primary_key=", :id)
-    send("foreign_key=", foreign_key_sym)
-    send("class_name=", class_name_val)
-
-    options.each do |attr, val|
-      send("#{attr}=", val)
-    end
-  end
-end
-
-module Associatable
-  def belongs_to(name, options = {})
-    options = BelongsToOptions.new(name, options)
-    assoc_options[name] = options
-    define_method(name) do
-     foreign_key = send(options.foreign_key)
-     primary_key = options.primary_key
-     params = [[primary_key, foreign_key]].to_h
-     options.model_class.where(params).first
-    end
-  end
-
-  def has_many(name, options = {})
-    options = HasManyOptions.new(name, self.name, options)
-    define_method(name) do
-     foreign_key = options.foreign_key
-     primary_key = send(options.primary_key)
-     params = [[foreign_key, primary_key]].to_h
-     options.model_class.where(params)
-    end
-  end
-
-  def assoc_options
-    @assoc_options ||= {}
-    @assoc_options
-  end
-end
-
-class SQLObject
-  extend Associatable
-end

data/lib/railz_lite/models/associatable2.rb~

@@ -1,35 +0,0 @@
-require_relative '03_associatable'
-
-module Associatable
-  def has_one_through(name, through_name, source_name)
-    define_method(name) do
-      through_options = self.class.assoc_options[through_name]
-      source_options =
-        through_options.model_class.assoc_options[source_name]
-
-      through_table = through_options.table_name
-      through_pk = through_options.primary_key
-      through_fk = through_options.foreign_key
-
-      source_table = source_options.table_name
-      source_pk = source_options.primary_key
-      source_fk = source_options.foreign_key
-
-      key_val = self.send(through_fk)
-      results = DBConnection.execute(<<-SQL, key_val)
-        SELECT
-          #{source_table}.*
-        FROM
-          #{through_table}
-        JOIN
-          #{source_table}
-        ON
-          #{through_table}.#{source_fk} = #{source_table}.#{source_pk}
-        WHERE
-          #{through_table}.#{through_pk} = ?
-      SQL
-
-      source_options.model_class.parse_all(results).first
-    end
-  end
-end

data/lib/railz_lite/models/searchable.rb~

@@ -1,21 +0,0 @@
-require_relative 'db_connection'
-require_relative '01_sql_object'
-
-module Searchable
-  def where(params)
-    where_line = params.keys.map { |attr_name| "#{attr_name} = ?" }.join(" AND ")
-    results = DBConnection.execute(<<-SQL, *params.values)
-      SELECT
-        *
-      FROM
-        #{self.table_name}
-      WHERE
-        #{where_line}
-    SQL
-    results.map { |attrs| self.new(attrs) }
-  end
-end
-
-class SQLObject
-  extend Searchable
-end