tgauge 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e8bc7c2dc687cd9ad7bcf149d6871f0b583df4
-  data.tar.gz: fede56a08aedad5dffb5eb7f8eeb5c12580e3019
+  metadata.gz: 07619a69df37ace4f1529a5b897ca6353382cce2
+  data.tar.gz: 26768915f63cc53cd2ea4dc2f50c0eebf4ff568d
 SHA512:
-  metadata.gz: 5827a7e47d6f5dcaaca9b36e05dad7d92b0a7e2f8db291458ef04260861c0f4cad7c9ce40adb4e0ce60482f17d0f53c7600b32cee1fa5685bf5b5cb625b8ed2a
-  data.tar.gz: 198685c673d66bc80f57f24beb1aa56a03066ee7d509f819ba1fed55ce11f23f842c11a80ed863ea289d9c9ef46900eaa76695c95a22adabf6bb91922f805758
+  metadata.gz: fe5386f187073c27138a395b63dca860726ec1ad987ffa3679563eb8d25402be0ae0db573bb17904ff1134df880f5e61d52e0522b6b65a01bf3586cd9774c47b
+  data.tar.gz: de1aa7a3a56fdb41a4c8901236944aecfd2db72354eaf476071fce7940bd63dac70ebd1c4dff3c4de264f926da1714885a1bdf9a8562f92e1bcfe058a969a738

data/TestProj/Gemfile

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

data/TestProj/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.7.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.9.1)
+    pg (0.19.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.4)
+    rmagick (2.16.0)
+    slop (3.6.0)
+    tgauge (0.1.7)
+      activesupport (~> 4.2, >= 4.2.5.1)
+      fileutils (~> 0.7)
+      pg (~> 0.18)
+      pry (~> 0.10.3)
+      rack (~> 1.6, >= 1.6.4)
+      thor (~> 0.19)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  tgauge
+
+BUNDLED WITH
+   1.13.0

data/TestProj/app/controllers/application_controller.rb

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

data/TestProj/app/controllers/trains_controller.rb

@@ -0,0 +1,7 @@
+class TrainsController < TGauge::TControllerBase
+  def index
+    @trains = Train.all
+
+    render_content(@trains, "application.json")
+  end
+end

data/TestProj/app/models/train.rb

@@ -0,0 +1,8 @@
+class Train < TGauge::TRecordBase
+  def index
+    @trains = Train.all
+
+    render_content(JSON.generate(@users), "application.json")
+  end
+end
+Train.finalize!

data/TestProj/config/database.yml

@@ -0,0 +1 @@
+database: TestProj

data/TestProj/config/routes.rb

@@ -0,0 +1,9 @@
+ROUTER = TGauge::Router.new
+
+ROUTER.draw do
+  #ADD ROUTES HERE
+  #EXAMPLE:
+  #get Regexp.new("^/MODEL/"), CONTROLLER, :index
+
+  get Regexp.new("^/$"), TrainsController, :index
+end

data/TestProj/db/migrations/1476832713_create_train}.sql

@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS trains (
+	id SERIAL PRIMARY KEY,
+	sound VARCHAR(255)
+)

data/TestProj/db/seeds.rb

@@ -0,0 +1,10 @@
+module TGauge
+  class Seed
+    def self.populate
+      #PUT IN SEEDS HERE
+      Train.destroy_all
+
+      Train.new({sound: "choo choo"}).save
+    end
+  end
+end

data/bin/cli.rb

@@ -6,19 +6,19 @@ module TGauge
   class Generate < Thor
     desc 'model <name>', 'generate a model.'
     def model(name)
-      File.open('./app/models/#{name.downcase}.rb', 'w') do |f|
+      File.open("./app/models/#{name.downcase}.rb", 'w') do |f|
         f.write("class #{name.capitalize} < TGauge::TRecordBase\n\n")
         f.write("end\n")
         f.write("#{name.capitalize}.finalize!")
       end
 
-      migration("Create#{name.capitalize}}")
+      migration("#{name.capitalize}")
       puts "#{name} model created"
     end
 
     desc 'controller <name>', 'generate a controller.'
     def controller(name)
-      File.open('./app/controllers/#{name.downcase}.rb', 'w') do |f|
+      File.open("./app/controllers/#{name.downcase}_controller.rb", 'w') do |f|
         f.write("class #{name.capitalize}Controller < TGauge::TControllerBase\n\n")
         f.write("end")
       end
@@ -33,7 +33,7 @@ module TGauge
       ts = Time.now.to_i
       filename = "#{ts}_#{name.underscore.downcase}"
 
-      File.open('./db/migrations/#{filename}.sql', 'w') do |f|
+      File.open("./db/migrations/#{filename}.sql", 'w') do |f|
         f.write "CREATE TABLE IF NOT EXISTS #{name} (\n"
         f.write "\tid SERIAL PRIMARY KEY,\n"
         f.write ')'
@@ -44,7 +44,7 @@ module TGauge
   class Db < Thor
     desc 'create', 'creates the DB'
     def create
-      require_relative '../lib/db_connection'
+      require_relative '../lib/db/db_connection'
       TGauge::DBConnection.reset
       puts 'db created!'
     end
@@ -53,14 +53,14 @@ module TGauge
     def migrate
       # Creates Version table if necessary,
       # then runs needed migrations in order.
-      require_relative '../lib/db_connection'
+      require_relative '../lib/db/db_connection'
       TGauge::DBConnection.migrate
       puts 'migrated!'
     end
 
     desc 'seed', 'seeds the DB'
     def seed
-      require_relative '../lib/puffs'
+      require_relative '../lib/tgauge'
       TGauge::Seed.populate
       puts 'db seeded!'
     end
@@ -102,18 +102,18 @@ module TGauge
       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('../../lib/template/app/controllers/application_controller.rb', __FILE__))
+        f.write File.read(File.expand_path('../../lib/templates/app/controllers/application_controller.rb', __FILE__))
       end
       File.open("./#{name}/config/routes.rb", 'w') do |f|
-        f.write File.read(File.expand_path('../../lib/template/config/routes.rb', __FILE__))
+        f.write File.read(File.expand_path('../../lib/templates/config/routes.rb', __FILE__))
       end
       Dir.mkdir "./#{name}/db"
       Dir.mkdir "./#{name}/db/migrations"
       File.open("./#{name}/db/seeds.rb", 'w') do |f|
-        f.write File.read(File.expand_path('../../lib/template/db/seeds.rb', __FILE__))
+        f.write File.read(File.expand_path('../../lib/templates/db/seeds.rb', __FILE__))
       end
       File.open("./#{name}/Gemfile", 'w') do |f|
-        f.write File.read(File.expand_path('../../lib/template/Gemfile', __FILE__))
+        f.write File.read(File.expand_path('../../lib/templates/Gemfile', __FILE__))
       end
     end
   end

data/lib/app/models/routes.rb

@@ -0,0 +1,7 @@
+ROUTER = TGauge::Router.new
+
+ROUTER.draw do
+  #ADD ROUTES HERE
+  #EXAMPLE:
+  #get Regexp.new("^/MODEL/$"), CONTROLLER, :index
+end

data/lib/app/models/trecord_base.rb

@@ -28,17 +28,20 @@ module TGauge
       end
     end
 
+    def self.destroy_all
+      all.each(&:destroy!)
+    end
+
     def self.columns
       # ...
       return @columns if @columns
 
       arr = DBConnection.execute(<<-SQL)
-      SELECT
-      *
-      FROM
-      #{self.table_name}
+        SELECT
+          *
+        FROM
+          #{self.table_name}
       SQL
-
       @columns = []
       arr.nfields.times do |i|
         @columns << arr.fname(i)
@@ -49,7 +52,7 @@ module TGauge
 
     def self.finalize!
       columns.each do |column|
-        # inst_var = "@" + column.to_s
+        inst_var = "@" + column.to_s
         define_method(column) do
           attributes[column]
         end
@@ -69,10 +72,10 @@ module TGauge
 
     def self.all
       objs_arr = DBConnection.execute(<<-SQL)
-      SELECT
-      #{table_name}.*
-      FROM
-      #{table_name}
+        SELECT
+          #{table_name}.*
+        FROM
+          #{table_name}
       SQL
 
       parse_all(objs_arr)
@@ -85,12 +88,12 @@ module TGauge
 
     def self.find(id)
       obj = DBConnection.execute(<<-SQL, id)
-      SELECT
-      #{table_name}.*
-      FROM
-      #{table_name}
-      WHERE
-      #{table_name}.id = ?
+        SELECT
+          #{table_name}.*
+        FROM
+          #{table_name}
+        WHERE
+          #{table_name}.id = ?
       SQL
 
       parse_all(obj).first
@@ -118,26 +121,39 @@ module TGauge
       attr_count = cols.count
       column_str = cols.join(", ")
       quest_str = Array.new(attr_count) {"?"}.join(", ")
-      debugger
+
       DBConnection.execute(<<-SQL, attribute_values)
-      INSERT INTO
-      #{table_name} (#{column_str})
-      VALUES
-      (#{quest_str})
+        INSERT INTO
+          #{table_name} (#{column_str})
+        VALUES
+          (#{quest_str})
       SQL
     end
 
+    def destroy!
+      if self.class.find(id)
+        Puffs::DBConnection.execute(<<-SQL)
+          DELETE
+          FROM
+            #{self.class.table_name}
+          WHERE
+            id = #{id}
+        SQL
+        return self
+      end
+    end
+
     def update
-      # attr_count = columns.count - 1
+      attr_count = columns.count - 1
       column_str = columns[1..-1].map { |col| "#{col} = ?" }.join(", ")
 
       DBConnection.execute(<<-SQL, attribute_values)
-      UPDATE
-      #{table_name}
-      SET
-      #{column_str}
-      WHERE
-      id = ?
+        UPDATE
+          #{table_name}
+        SET
+          #{column_str}
+        WHERE
+          id = ?
       SQL
     end
 

data/lib/db/db_connection.rb

@@ -28,60 +28,65 @@ module TGauge
           instance.exec(File.read(file))
           instance.exec(<<-SQL)
             INSERT INTO
-            migrations (filename)
+              migrations (filename)
             VALUES
-            ('#{filename}')
-          SQL
+              ('#{filename}')
+            SQL
         end
       end
     end
 
     def self.instance
-      open if @db.nil?
+      open if @postgres.nil?
 
-      @db
+      @postgres
     end
 
     def self.execute(*args)
+      args.flatten!
+
       print_query(*args)
-      instance.execute(*args)
+      query = self.number_placeholders(args.unshift[0])
+      params = args[1..-1]
+      params.flatten!
+      instance.exec(query, params)
     end
 
-    def self.last_insert_row_id
-      instance.last_insert_row_id
-    end
+    private
 
-    def self.reset
-      commands = [
-        "dropdb #{app_name}",
-        "createdb #{app_name}"
-      ]
-      commands.each { |command| `#{command}` }
+    def self.number_placeholders(query_string)
+      count = 0
+      query_string.chars.map do |char|
+        if char == "?"
+          count += 1
+          "$#{count}"
+        else
+          char
+        end
+      end.join("")
     end
 
-    private
-
     def self.ensure_migrations_table
       table = instance.exec(<<-SQL)
-      SELECT to_regclass('migrations') AS exists
+        SELECT to_regclass('migrations') AS exists
       SQL
 
       unless table[0]['exists']
         instance.exec(<<-SQL)
-        CREATE_TABLE migrations(
-        id SERIAL PRIMARY KEY,
-        filename VARCHAR(255) NOT NULL
-        )
+          CREATE TABLE migrations(
+            id SERIAL PRIMARY KEY,
+            filename VARCHAR(255) NOT NULL
+          )
         SQL
       end
     end
 
     def self.migrated_files
       Set.new instance.exec(<<-SQL).values.flatten
-      SELECT
-      filename
-      FROM
-      migrations
+        SELECT
+          filename
+        FROM
+          migrations
       SQL
     end
 

data/lib/templates/app/controllers/application_controller.rb

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

data/lib/templates/config/routes.rb

@@ -3,5 +3,5 @@ ROUTER = TGauge::Router.new
 ROUTER.draw do
   #ADD ROUTES HERE
   #EXAMPLE:
-  #get Regexp.new("^/MODEL/"), CONTROLLER, :index
+  #get Regexp.new("^/MODEL/$"), CONTROLLER, :index
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TGauge
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tgauge
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Nam Kim
@@ -147,6 +147,15 @@ files:
 - README.md
 - Rakefile
 - TGauge.gemspec
+- TestProj/Gemfile
+- TestProj/Gemfile.lock
+- TestProj/app/controllers/application_controller.rb
+- TestProj/app/controllers/trains_controller.rb
+- TestProj/app/models/train.rb
+- TestProj/config/database.yml
+- TestProj/config/routes.rb
+- TestProj/db/migrations/1476832713_create_train}.sql
+- TestProj/db/seeds.rb
 - bin/cli.rb
 - bin/console
 - bin/setup
@@ -155,6 +164,7 @@ files:
 - lib/app/controllers/session.rb
 - lib/app/controllers/tcontroller_base.rb
 - lib/app/models/associatable.rb
+- lib/app/models/routes.rb
 - lib/app/models/searchable.rb
 - lib/app/models/trecord_base.rb
 - lib/db/db_connection.rb
@@ -164,7 +174,7 @@ files:
 - lib/db/static_viewer.rb
 - lib/db/templates/error_page.html.erb
 - lib/templates/Gemfile
-- lib/templates/app/application_controller.rb
+- lib/templates/app/controllers/application_controller.rb
 - lib/templates/config/routes.rb
 - lib/templates/db/seeds.rb
 - lib/tgauge.rb

data/lib/templates/app/application_controller.rb

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