go-on-rails 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca05e99e94cb8cfda6430e5c757669ebad458d58
-  data.tar.gz: 5f2b5a426d3f4c36263edb3d98d79d4c7d94f7e7
+  metadata.gz: 2ea55ef1523d312ab11f84c0caeb0fd5b8e9f37f
+  data.tar.gz: 8f35e3d8a97a4c5f969b528c6b3da4478e33da3a
 SHA512:
-  metadata.gz: 4d2874934773f3139d68ed4cccbde2c22631be8e2048541b3b702687f73bebdcb655ba493d420069df61da34becdb9f6b2fab2cfd97a5be402fe5ccef2e0afbc
-  data.tar.gz: 0c05600084919d689bef80208d4582323ca8e3cb141cfc7d4e3645c9071ff8aba357b57bb14fcda7f6fa2c01b03dfb31313fd331d05203c5b45dd803f2cf8722
+  metadata.gz: fc3f84d037c2f9fa9b63df087539a414a6f8ee1fd9846832b9a6de103c7a0d16ac0306f885a48350a8a5569f1c71ecc80021864dbc4560c98b9bf87a44b8d3bc
+  data.tar.gz: 22da36278793791b9cc4518e33ac3f01a81ca76a33570e264df5b1d07e4813ff964b8f68c30b7b58a34c57d9ec0ba1163e35c0e303863fba6241b31f4810429a

data/README.md

@@ -21,7 +21,7 @@ One or more examples will be given later on.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'go-on-rails', '~> 0.0.8'
+gem 'go-on-rails', '~> 0.0.9'
 ```
 
 And then execute:

data/lib/generators/gor/go-on-rails/validator.rb

@@ -43,6 +43,12 @@ module GoOnRails
           else
             rules << "IsNumeric"
           end
+        when "ActiveModel::Validations::InclusionValidator"
+          [:in, :within].each do |i|
+            if validator.options && validator.options[i]
+              rules << "in(#{validator.options[i].join('|')})" if ['string', 'text'].include?(col.type.to_s)
+            end
+          end
         when "ActiveRecord::Validations::LengthValidator"
           if validator.options && ['string', 'text'].include?(col.type.to_s)
             if validator.options[:is]

data/lib/generators/gor/templates/gor_model.go.erb

@@ -38,6 +38,52 @@ func Find<%= @model_name %>(id int64) (*<%= @model_name %>, error) {
 	return &var_<%= model_name_underscore %>, nil
 }
 
+// First<%= @model_name %> find the first one <%= model_name_underscore %> by id ASC order
+func First<%= @model_name %>() (*<%= @model_name %>, error) {
+	var_<%= model_name_underscore %> := <%= @model_name %>{}
+	err := db.Get(&var_<%= model_name_underscore %>, db.Rebind(`SELECT * FROM <%= table_name %> ORDER BY id ASC LIMIT 1`))
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return nil, err
+	}
+	return &var_<%= model_name_underscore %>, nil
+}
+
+// First<%= @model_name.pluralize %> find the first N <%= model_name_underscore.pluralize %> by id ASC order
+func First<%= @model_name.pluralize %>(n uint32) ([]<%= @model_name %>, error) {
+	var_<%= param_name_plural %> := []<%= @model_name %>{}
+	sql := fmt.Sprintf("SELECT * FROM <%= table_name %> ORDER BY id ASC LIMIT %v", n)
+	err := db.Select(&var_<%= param_name_plural %>, db.Rebind(sql))
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return nil, err
+	}
+	return var_<%= param_name_plural %>, nil
+}
+
+// Last<%= @model_name %> find the last one <%= model_name_underscore %> by id DESC order
+func Last<%= @model_name %>() (*<%= @model_name %>, error) {
+	var_<%= model_name_underscore %> := <%= @model_name %>{}
+	err := db.Get(&var_<%= model_name_underscore %>, db.Rebind(`SELECT * FROM <%= table_name %> ORDER BY id DESC LIMIT 1`))
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return nil, err
+	}
+	return &var_<%= model_name_underscore %>, nil
+}
+
+// Last<%= @model_name.pluralize %> find the last N <%= model_name_underscore.pluralize %> by id DESC order
+func Last<%= @model_name.pluralize %>(n uint32) ([]<%= @model_name %>, error) {
+	var_<%= param_name_plural %> := []<%= @model_name %>{}
+	sql := fmt.Sprintf("SELECT * FROM <%= table_name %> ORDER BY id DESC LIMIT %v", n)
+	err := db.Select(&var_<%= param_name_plural %>, db.Rebind(sql))
+	if err != nil {
+		log.Printf("Error: %v\n", err)
+		return nil, err
+	}
+	return var_<%= param_name_plural %>, nil
+}
+
 // Find<%= @model_name.pluralize %> find one or more <%= model_name_underscore.pluralize %> by one or more ids
 func Find<%= @model_name.pluralize %>(ids ...int64) ([]<%= @model_name %>, error) {
 	if len(ids) == 0 {
@@ -429,15 +475,16 @@ func (var_<%= model_name_underscore %> *<%= @model_name %>) Destroy() error {
 }
 
 func Destroy<%= @model_name %>(id int64) error {
+	<%- if @struct_info[:has_assoc_dependent] -%>
+	// Destroy association objects at first
+	// Not care if exec properly temporarily
+	destroy<%= @model_name %>Associations(id)
+    <%- end -%>
 	stmt, err := db.Preparex(db.Rebind(`DELETE FROM <%= table_name %> WHERE id = ?`))
 	_, err = stmt.Exec(id)
 	if err != nil {
 		return err
 	}
-	<%- if @struct_info[:has_assoc_dependent] -%>
-	// not care if exec properly temporarily
-	destroy<%= @model_name %>Associations(id)
-    <%- end -%>
 	return nil
 }
 
@@ -447,6 +494,11 @@ func Destroy<%= @model_name.pluralize %>(ids ...int64) (int64, error) {
 		log.Println(msg)
 		return 0, errors.New(msg)
 	}
+	<%- if @struct_info[:has_assoc_dependent] -%>
+	// Destroy association objects at first
+	// Not care if exec properly temporarily
+	destroy<%= @model_name %>Associations(ids...)
+	<%- end -%>
 	idsHolder := strings.Repeat(",?", len(ids)-1)
 	sql := fmt.Sprintf(`DELETE FROM <%= table_name %> WHERE id IN (?%s)`, idsHolder)
 	idsT := []interface{}{}
@@ -462,10 +514,6 @@ func Destroy<%= @model_name.pluralize %>(ids ...int64) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	<%- if @struct_info[:has_assoc_dependent] -%>
-	// not care if exec properly temporarily
-	destroy<%= @model_name %>Associations(ids...)
-	<%- end -%>
 	return cnt, nil
 }
 
@@ -481,6 +529,11 @@ func Destroy<%= @model_name.pluralize %>Where(where string, args ...interface{})
 	}
 	<%- if @struct_info[:has_assoc_dependent] -%>
 	ids, x_err := <%= @model_name %>IdsWhere(where, args...)
+	if x_err != nil {
+		log.Printf("Delete associated objects error: %v\n", x_err)
+	} else {
+		destroy<%= @model_name %>Associations(ids...)
+	}
 	<%- end -%>
 	stmt, err := db.Preparex(db.Rebind(sql))
 	result, err := stmt.Exec(args...)
@@ -491,13 +544,6 @@ func Destroy<%= @model_name.pluralize %>Where(where string, args ...interface{})
 	if err != nil {
 		return 0, err
 	}
-	<%- if @struct_info[:has_assoc_dependent] -%>
-	if x_err != nil {
-		log.Printf("Delete associated objects error: %v\n", err)
-	} else {
-		destroy<%= @model_name %>Associations(ids...)
-	}
-	<%- end -%>
 	return cnt, nil
 }
 

data/lib/generators/gor/templates/home_controller.go.erb

@@ -1,13 +1,14 @@
 package controller
 
 import (
-	"html/template"
 	"net/http"
+
+	"gopkg.in/gin-gonic/gin.v1"
 	// you can import models
 	//m "../models"
 )
 
-func HomeHandler(w http.ResponseWriter, r *http.Request) {
+func HomeHandler(c *gin.Context) {
 	// you can use model functions to do CRUD
 	//
 	// user, _ := m.FindUser(1)
@@ -26,6 +27,5 @@ func HomeHandler(w http.ResponseWriter, r *http.Request) {
 	golangVer := "<%= `go version`.chomp rescue "Failed to get" %>"
 
 	envs := Envs{GoOnRailsVer: gorVer, GolangVer: golangVer}
-	t, _ := template.ParseFiles("views/index.tmpl")
-	t.Execute(w, envs)
+	c.HTML(http.StatusOK, "index.tmpl", envs)
 }

data/lib/generators/gor/templates/main.go

@@ -2,28 +2,26 @@ package main
 
 import (
 	"flag"
-	"log"
-	"net/http"
-	"os"
 
 	c "./controllers"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
+	"gopkg.in/gin-gonic/gin.v1"
 )
 
 func main() {
 	// The app will run on port 3000 by default, you can custom it with the flag -port
 	servePort := flag.String("port", "3000", "Http Server Port")
 	flag.Parse()
-	log.Printf("The application starting on the port: [%v]\n", *servePort)
 
-	// Here we are instantiating the gorilla/mux router
-	r := mux.NewRouter()
-	// Then we bind some route to some handler(controller action)
-	r.HandleFunc("/", c.HomeHandler)
+	// Here we are instantiating the router
+	r := gin.Default()
+	// Switch to "release" mode in production
+	// gin.SetMode(gin.ReleaseMode)
+	r.LoadHTMLGlob("views/*")
 	// Create a static assets router
-	r.PathPrefix("/public/").Handler(http.StripPrefix("/public/", http.FileServer(http.Dir("./public/"))))
-
+	// r.Static("/assets", "./public/assets")
+	r.StaticFile("/favicon.ico", "./public/favicon.ico")
+	// Then we bind some route to some handler(controller action)
+	r.GET("/", c.HomeHandler)
 	// Let's start the server
-	http.ListenAndServe(":"+*servePort, handlers.LoggingHandler(os.Stdout, r))
+	r.Run(":" + *servePort)
 }

data/lib/tasks/gor.rake

@@ -4,8 +4,7 @@ namespace :gor do
     puts 'Beginning to install Go deps...'
     system "go get \
     github.com/jmoiron/sqlx \
-    github.com/gorilla/handlers \
-    github.com/gorilla/mux \
+    gopkg.in/gin-gonic/gin.v1 \
     github.com/mattn/go-sqlite3 \
     github.com/go-sql-driver/mysql \
     github.com/lib/pq \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies: []
 description: Modeling, developing and testing your Golang app with your familiar Rails
   tools like rails generate, db migration, console etc. It is more meant to help integrating