go-on-rails 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893993277d5b0ef18340c36e309155b3e34cf3d4
-  data.tar.gz: 68709edcb71c6e4f1f8ce3dffb25ae4276e2623d
+  metadata.gz: ca05e99e94cb8cfda6430e5c757669ebad458d58
+  data.tar.gz: 5f2b5a426d3f4c36263edb3d98d79d4c7d94f7e7
 SHA512:
-  metadata.gz: a443051416f1b2352355b3be7e4875ed3c5919c82aff0f599cfddbf68b9979547fe270d5468201eb5c94190a0e38332575f7f44f42ca117917c4862a387655fd
-  data.tar.gz: de5c41b9abc3fb7849dbeb9271c0d965ce083376cec0e74c602af7a7898753ced6ad8cb3ae2d90880a15f98bb6041da9149d7a4e3181acee7de3662c6b92f120
+  metadata.gz: 4d2874934773f3139d68ed4cccbde2c22631be8e2048541b3b702687f73bebdcb655ba493d420069df61da34becdb9f6b2fab2cfd97a5be402fe5ccef2e0afbc
+  data.tar.gz: 0c05600084919d689bef80208d4582323ca8e3cb141cfc7d4e3645c9071ff8aba357b57bb14fcda7f6fa2c01b03dfb31313fd331d05203c5b45dd803f2cf8722

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.7'
+gem 'go-on-rails', '~> 0.0.8'
 ```
 
 And then execute:
@@ -72,6 +72,7 @@ And the gem is still under development, so there're a lot of known issues.
 * the generated Golang codes includes the association between models, basic relations like has_many, has_one, belongs_to have been supported
 * so some association functions is available
 * and the :dependent action is triggered when destroying some related model
+* some validation like presense, length restriction and format are supported
 * databases specific functions between mysql, postgres are not covered yet
 * model callbacks are not available
 * sql.NullType not supported yet, so you'd better in the migrations set those columns "not null" with a default value that's consistent with Golang's zero value specification, such as "" default for string and text typed column, and 0 default for int, etc.
@@ -86,7 +87,7 @@ When I had the idea to convert Rails app or build Golang app with Rails tools, I
 
 There're two branches at present: `master` and `dev`.
 
-The branch `master` has the files only for the generator needs, as the `dev` branch has a whole Rails environment for development: models, seeds for testing, and under `go_app` directory there's a file named `modles_test.go` used to test generated Golang codes.
+The `dev` branch has a whole Rails environment for development: models, seeds for testing, and under `go_app` directory there's a file named `modles_test.go` used to test generated Golang codes.
 
 - Fork the project switch to branch `dev`.
 - Make your feature addition or bug fix.

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

@@ -11,7 +11,7 @@ module GoOnRails
     def get_schema_info
       info = {struct_body: "", has_assoc_dependent: false, assoc_info: {has_many: {}, has_one: {}, belongs_to: {}}}
       self.klass.reflect_on_all_associations.each do |assoc|
-        tags = ["json:\"#{assoc.name.to_s},omitempty\" db:\"#{assoc.name.to_s}\""]
+        tags = ["json:\"#{assoc.name.to_s},omitempty\" db:\"#{assoc.name.to_s}\" valid:\"-\""]
         case assoc.macro
         when :has_many
           col_name = assoc.name.to_s.camelize

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

@@ -33,12 +33,13 @@ module GoOnRails
 
       self.max_col_size = get_max_col_size
       self.max_type_size = get_max_type_size
+      validation = GoOnRails::Validator.new(self.klass)
 
       self.klass.columns.each_with_index do |col, index|
         tags = []
 
         # add struct tag
-        tags << struct_tag(col)
+        tags << struct_tag(col, validation)
 
         col_type = col.type.to_s
         struct_info[:has_datetime_type] = true if %w(datetime time).include? col_type
@@ -88,11 +89,12 @@ module GoOnRails
       builder.get_schema_info
     end
 
-    def struct_tag(col)
-      "json:\"#{col.name},omitempty\" db:\"#{col.name}\""
+    def struct_tag(col, validation)
+      valid_tags = validation.build_validator_tag(col)
+      "json:\"#{col.name},omitempty\" db:\"#{col.name}\" #{valid_tags}"
     end
-
   end
 end
 
 require_relative 'association'
+require_relative 'validator'

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

@@ -0,0 +1,60 @@
+module GoOnRails
+  class Validator
+    TAG_DELIM = ","
+
+    def initialize(klass)
+      @klass = klass
+    end
+    attr_reader :klass
+
+    def build_validator_tag(col)
+      # ignore checking for some automaticly created fields
+      return "valid:\"-\"" if %w(id created_at updated_at).include?(col.name)
+      tags = []
+
+      validators = self.klass.validators_on col.name
+
+      validators.each do |validator|
+        tags.concat get_validation(validator, col)
+      end
+
+      tags << 'optional' if col.null && !tags.empty? && tags.exclude?('required')
+
+      if tags.present?
+        return "valid:\"#{tags.uniq.join(TAG_DELIM)}\""
+      else
+        return "valid:\"-\""
+      end
+    end
+
+    def get_validation(validator, col)
+        rules = []
+        case validator.class.to_s
+        when "ActiveRecord::Validations::PresenceValidator"
+          rules << "required"
+        when "ActiveModel::Validations::FormatValidator"
+          if validator.options && validator.options[:with] && ['string', 'text'].include?(col.type.to_s)
+            re = $1 || ".*" if validator.options[:with].inspect =~ /\/(.*)\//
+            rules << "matches(#{re})"
+          end
+        when "ActiveModel::Validations::NumericalityValidator"
+          if validator.options && validator.options[:only_integer]
+            rules << "IsInt"
+          else
+            rules << "IsNumeric"
+          end
+        when "ActiveRecord::Validations::LengthValidator"
+          if validator.options && ['string', 'text'].include?(col.type.to_s)
+            if validator.options[:is]
+              min = max = validator.options[:is]
+            else
+              min = validator.options[:minimum] ? validator.options[:minimum] : 0
+              max = validator.options[:maximum] ? validator.options[:maximum] : 4_294_967_295
+            end
+            rules << sprintf("length(%d|%d)", min, max)
+          end
+        end
+        rules
+    end
+  end
+end

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

@@ -16,6 +16,8 @@ import (
 	<%- if @struct_info[:has_datetime_type] -%>
 	"time"
     <%- end -%>
+
+	"github.com/asaskevich/govalidator"
 )
 
 type <%= @model_name %> struct {
@@ -318,6 +320,15 @@ func Create<%= @model_name %>(am map[string]interface{}) (int64, error) {
 }
 
 func (var_<%= model_name_underscore %> *<%= @model_name %>) Create() error {
+	ok, err := govalidator.ValidateStruct(var_<%= model_name_underscore %>)
+	if !ok {
+		errMsg := "Validate <%= @model_name %> struct error: Unknown error"
+		if err != nil {
+			errMsg = "Validate <%= @model_name %> struct error: " + err.Error()
+		}
+		log.Println(errMsg)
+		return errors.New(errMsg)
+	}
 <%- unless @struct_info[:timestamp_cols].empty? -%>
 	t := time.Now()
 	<%- @struct_info[:timestamp_cols].each do |c| -%>
@@ -325,7 +336,7 @@ func (var_<%= model_name_underscore %> *<%= @model_name %>) Create() error {
     <%- end -%>
 <%- end -%>
     sql := `INSERT INTO <%= table_name %> (<%= col_names.join(",") %>) VALUES (:<%= col_names.join(",:") %>)`
-    _, err := db.NamedExec(sql, var_<%= model_name_underscore %>)
+    _, err = db.NamedExec(sql, var_<%= model_name_underscore %>)
     return err
 }
 
@@ -561,6 +572,15 @@ func destroy<%= @model_name %>Associations(ids ...int64) {
 <%- end -%>
 
 func (var_<%= model_name_underscore %> *<%= @model_name %>) Save() error {
+	ok, err := govalidator.ValidateStruct(var_<%= model_name_underscore %>)
+	if !ok {
+		errMsg := "Validate <%= @model_name %> struct error: Unknown error"
+		if err != nil {
+			errMsg = "Validate <%= @model_name %> struct error: " + err.Error()
+		}
+		log.Println(errMsg)
+		return errors.New(errMsg)
+	}
 	if var_<%= model_name_underscore %>.Id == 0 {
 		return errors.New("Invalid Id field: it can't be a zero value")
 	}
@@ -570,7 +590,7 @@ func (var_<%= model_name_underscore %> *<%= @model_name %>) Save() error {
 	sqlFmt := `UPDATE <%= table_name %> SET %s WHERE id = %v`
 	<%- save_col_names = col_names - ["created_at"] -%>
 	sqlStr := fmt.Sprintf(sqlFmt, "<%= save_col_names.zip(save_col_names).map{|c| c.join(" = :")}.join(", ") %>", var_<%= model_name_underscore %>.Id)
-    _, err := db.NamedExec(sqlStr, var_<%= model_name_underscore %>)
+    _, err = db.NamedExec(sqlStr, var_<%= model_name_underscore %>)
     return err
 }
 

data/lib/tasks/gor.rake

@@ -8,7 +8,8 @@ namespace :gor do
     github.com/gorilla/mux \
     github.com/mattn/go-sqlite3 \
     github.com/go-sql-driver/mysql \
-    github.com/lib/pq"
+    github.com/lib/pq \
+    github.com/asaskevich/govalidator"
     puts 'Installation completed!'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-05 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
@@ -23,6 +23,7 @@ files:
 - lib/generators/gor/USAGE
 - lib/generators/gor/go-on-rails/association.rb
 - lib/generators/gor/go-on-rails/converter.rb
+- lib/generators/gor/go-on-rails/validator.rb
 - lib/generators/gor/gor_generator.rb
 - lib/generators/gor/templates/db.go.erb
 - lib/generators/gor/templates/favicon.ico