Merge pull request #12 from goby-lang/use-plugin

Use plugin for model instead of builtin DB library

Author: st0012

Dockerfile

@@ -1,4 +1,7 @@
-FROM gobylang/goby:v0.1.2
+FROM gobylang/goby:latest
+
+RUN go get github.com/jmoiron/sqlx
+RUN go get github.com/lib/pq
 
 ADD . ./
 

docker-compose.yml

@@ -0,0 +1,20 @@
+# docker-compose up
+
+version: '3'
+services:
+  web:
+    environment:
+      - POSTGRES_HOST=postgres
+    image: 'gobylang/todo-sample:latest'
+    links:
+      - postgres
+    ports:
+      - 3000:3000
+  postgres:
+    environment:
+      - POSTGRES_DB=goby_test
+      - POSTGRES_USER=postgres
+    image: 'postgres:latest'
+    ports:
+      - '5432'
+

model.gb

@@ -1,12 +1,6 @@
-require "db"
+require_relative "./plugin_pg"
 
-db_user = ENV["POSTGRES_USER"] || "postgres"
-db_name = ENV["POSTGRES_DB"]   || "goby_test"
-db_host = ENV["POSTGRES_HOST"] || "0.0.0.0"
-
-PG = DB.open("postgres", String.fmt("user=%s dbname=%s host=%s sslmode=disable", db_user, db_name, db_host))
-
-PG.run("create table if not exists list_items (
+PluginPG.run("create table if not exists list_items (
   id      serial primary key,
   title   varchar(40),
   checked boolean
@@ -23,37 +17,38 @@ class ListItem
   end
 
   def check
-    ListItem.db.exec('UPDATE list_items SET checked = true WHERE id = $1', @id)
+    self.class.plugin_db.exec('UPDATE list_items SET checked = true WHERE id = $1', @id)
     @checked = true
   end
 
   def uncheck
-    ListItem.db.exec('UPDATE list_items SET checked = false WHERE id = $1', @id)
+    self.class.plugin_db.exec('UPDATE list_items SET checked = false WHERE id = $1', @id)
     @checked = false
   end
 
   def update_title(title)
-    ListItem.db.exec('UPDATE list_items SET title = $1 WHERE id = $2', title, @id)
+    self.class.plugin_db.exec('UPDATE list_items SET title = $1 WHERE id = $2', title, @id)
   end
 
   def destroy
-    ListItem.db.exec('DELETE FROM list_items WHERE id = $1', @id)
+    self.class.plugin_db.exec('DELETE FROM list_items WHERE id = $1', @id)
   end
 
   def valid?
     @error.nil?
   end
 
-  def self.db
-    PG
+
+  def self.plugin_db
+    PluginPG
   end
 
   def self.all
-    self.db.query("SELECT * FROM list_items ORDER BY id DESC")
+    plugin_db.query("SELECT * FROM list_items ORDER BY id DESC")
   end
 
   def self.find(id)
-    result = self.db.query("SELECT * FROM list_items WHERE id = $1", id).first
+    result = plugin_db.query("SELECT * FROM list_items WHERE id = $1", id).first
     if result
       new({ id: result[:id], title: result[:title], checked: result[:checked] })
     end
@@ -64,7 +59,7 @@ class ListItem
       if result[:error].nil?
         title   = params[:title]
         checked = params[:checked].to_i == 1
-        resultID = self.db.exec("INSERT INTO list_items (title, checked) VALUES ($1, $2)", title, checked)
+        resultID = self.plugin_db.exec("INSERT INTO list_items (title, checked) VALUES ($1, $2)", title, checked)
         new({ id: resultID, title: title, checked: checked })
       else
         new({ error: result[:error] })

plugin_pg.gb

@@ -0,0 +1,62 @@
+require "plugin"
+
+# Create the plugin
+plugin = Plugin.generate("db") do |p|
+  p.import_pkg("", "github.com/jmoiron/sqlx")
+  p.import_pkg("_", "github.com/lib/pq")
+  p.link_function("sqlx", "Open")
+end
+
+# Some PG settings
+db_user = ENV["POSTGRES_USER"] || "postgres"
+db_name = ENV["POSTGRES_DB"]   || "goby_test"
+db_host = ENV["POSTGRES_HOST"] || "0.0.0.0"
+
+# Open PG connection using sqlx package's Open function
+conn, err = plugin.go_func("Open", "postgres", String.fmt("user=%s dbname=%s host=%s sslmode=disable", db_user, db_name, db_host))
+
+if err
+  puts(err.go_func("Error"))
+  return nil
+end
+
+class PluginDB
+  def initialize(conn)
+    @conn = conn
+  end
+
+  def run(query, *args)
+    r, err = @conn.go_func("Exec", query, *args)
+
+    if err != nil
+      puts(err.go_func("Error"))
+    end
+  end
+
+  def exec(query, *args)
+    id = 0
+    err = @conn.go_func("QueryRow", String.fmt("%s RETURNING id", query), *args).go_func("Scan", id.ptr)
+
+    if err != nil
+      puts(err.go_func("Error"))
+    else
+      id
+    end
+  end
+
+  def query(query, *args)
+    rows, err = @conn.go_func("Queryx", query, *args)
+
+    results = []
+
+    while rows.go_func("Next") do
+      row = GoMap.new
+      rows.go_func("MapScan", row)
+      results.push(row.to_hash)
+    end
+
+    results
+  end
+end
+
+PluginPG = PluginDB.new(conn)

readme.md

@@ -4,9 +4,9 @@
 
 ## Requirement
 
-- NodeJS & Yarn
-- Goby
-- PostgresDB
+- Docker
+- Docker compose
+
 ## Usage
 
 Clone it!
@@ -15,10 +15,10 @@ Clone it!
 $ git clone [email protected]:goby-lang/sample-web-app.git
 ```
 
-Go into the project directory, then open another terminal and run the command:
+Go into the project directory and run the command:
 
 ```
-$ goby server.gb
+$ docker-compose up
 ```
 
 Open `http://localhost:3000` and enjoy!

server.gb

@@ -1,5 +1,4 @@
 require "net/simple_server"
-require "file"
 require "json"
 require_relative "model"
 server = Net::SimpleServer.new("3000")