go-on-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 116d71d0238292ffc07cf20ac48510629db81d0a
-  data.tar.gz: 2cc31cd05ad5b3683b1f3f8fbe5c8545c9ebbe25
+  metadata.gz: 890e56dfb579f5a2db328a4ee43084ce7feea0f3
+  data.tar.gz: 6c902e303478da0632649868a56c91f8b00cbeb8
 SHA512:
-  metadata.gz: 831ea5814ff101e6f6db2aad38accb6c63c9cc9177390a77edbc1fb396b8ff6696f975387a8f722d29f4452091dff4de019b3f768e69ee7561bb1556f81135f8
-  data.tar.gz: 11ab127f3ff002f793dd8cb3bc11a96926a36c96bc95c1413ac1e83efafdb561df9f0401236e312774e0b5b19639dd51e7d1181564b0e4bb7b49b50957c1fb68
+  metadata.gz: f166b780f245457d28dd1ddb96af9d32d5c40f3f447da1ddfd72deecb2290b8a9f7c9304f52772cdf94be2e7b1bb849733dc353807de047127271434dc06ee1b
+  data.tar.gz: cde88337c17f6aff8447835182796a2067c07eb8dfa4c38288bfab5e114fbf72c271c6b61318e1a78732d0072dff0676fc8281ce6978c880f10c5864a5686b87

data/README.md

@@ -13,15 +13,15 @@ Here's a simple [example(tutorial)](https://github.com/goonr/example_simple) sho
 
 ## Prerequisites
 
-* Rails development environment
-* Golang development environment
+* Rails 4.2+
+* Golang 1.4+
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'go-on-rails', '~> 0.1.1'
+gem 'go-on-rails', '~> 0.1.2'
 ```
 
 And then execute:

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

@@ -15,7 +15,11 @@ module GoOnRails
           col_name = assoc.name.to_s.camelize
           class_name = assoc.name.to_s.singularize.camelize
           unless assoc.options.empty?
-            class_name = assoc.options[:class_name] if assoc.options.key? :class_name
+            if assoc.options.key? :class_name
+              class_name = assoc.options[:class_name]
+            elsif assoc.options.key? :source
+              class_name = assoc.options[:source].to_s.camelize
+            end
           end
           type_name = "[]#{class_name}"
           info[:assoc_info][:has_many][col_name] = {class_name: class_name}
@@ -23,7 +27,13 @@ module GoOnRails
 
         when :has_one, :belongs_to
           col_name = class_name = assoc.name.to_s.camelize
-          class_name = assoc.options[:class_name] if assoc.options.key? :class_name unless assoc.options.empty?
+          unless assoc.options.empty?
+            if assoc.options.key? :class_name
+              class_name = assoc.options[:class_name]
+            elsif assoc.options.key? :source
+              class_name = assoc.options[:source].to_s.camelize
+            end
+          end
           type_name = class_name
           info[:assoc_info][assoc.macro][col_name] = {class_name: class_name}
           info[:assoc_info][assoc.macro][col_name].merge!(assoc.options) unless assoc.options.empty?

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

@@ -199,11 +199,11 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 				    <%- if v[:through] || v[:as] -%>
 						// FIXME: optimize the query
 						for i, vvv := range  _<%= param_name_plural %> {
-							_<%= v[:class_name].underscore.pluralize %>, err := <%= @model_name %>Get<%= v[:class_name].pluralize %>(vvv.Id)
+							_<%= k.underscore.pluralize %>, err := <%= @model_name %>Get<%= k.pluralize %>(vvv.Id)
 							if err != nil {
 								continue
 							}
-							vvv.<%= k %> = _<%= v[:class_name].underscore.pluralize %>
+							vvv.<%= k %> = _<%= k.underscore.pluralize %>
 						    _<%= param_name_plural %>[i] = vvv
 						}
 					<%- else -%>
@@ -345,10 +345,28 @@ func Find<%= @model_name.pluralize %>Where(where string, args ...interface{}) (<
 	return <%= param_name_plural %>, nil
 }
 
-// Find<%= @model_name.pluralize %>BySQL query use a complete SQL clause
-// with placeholders, eg: FindUsersBySQL("SELECT * FROM users WHERE first_name = ? AND age > ?", "John", 18)
+// Find<%= @model_name %>BySql query use a complete SQL clause
+// with placeholders, eg: FindUserBySql("SELECT * FROM users WHERE first_name = ? AND age > ? ORDER BY DESC LIMIT 1", "John", 18)
+// will return only One record in the table "users" whose first_name is "John" and age elder than 18
+func Find<%= @model_name %>BySql(sql string, args ...interface{}) (*<%= @model_name %>, error) {
+	stmt, err := db.Preparex(db.Rebind(sql))
+	if err != nil {
+		log.Println(err)
+		return nil, err
+	}
+	_<%= model_name_underscore %> := &<%= @model_name %>{}
+	err = stmt.Get(_<%= model_name_underscore %>, args...)
+	if err != nil {
+		log.Println(err)
+		return nil, err
+	}
+	return _<%= model_name_underscore %>, nil
+}
+
+// Find<%= @model_name.pluralize %>BySql query use a complete SQL clause
+// with placeholders, eg: FindUsersBySql("SELECT * FROM users WHERE first_name = ? AND age > ?", "John", 18)
 // will return those records in the table "users" whose first_name is "John" and age elder than 18
-func Find<%= @model_name.pluralize %>BySQL(sql string, args ...interface{}) (<%= param_name_plural %> []<%= @model_name %>, err error) {
+func Find<%= @model_name.pluralize %>BySql(sql string, args ...interface{}) (<%= param_name_plural %> []<%= @model_name %>, err error) {
 	stmt, err := db.Preparex(db.Rebind(sql))
 	if err != nil {
 		log.Println(err)
@@ -428,8 +446,8 @@ func (_<%= model_name_underscore %> *<%= @model_name %>) Create() (int64, error)
 <%- unless @struct_info[:assoc_info][:has_many].empty? -%>
 	<%- has_many = @struct_info[:assoc_info][:has_many] -%>
 	<%- has_many.each do |k, v| -%>
-// <%= v[:class_name].pluralize %>Create used to create the associated objects
-func (_<%= model_name_underscore %> *<%= @model_name %>) <%= v[:class_name].pluralize %>Create(am map[string]interface{}) error {
+// <%= k.pluralize %>Create used to create the associated objects
+func (_<%= model_name_underscore %> *<%= @model_name %>) <%= k.pluralize %>Create(am map[string]interface{}) error {
 	<%- if v[:through] -%>
 		// FIXME: use transaction to create these associated objects
 		<%= v[:class_name].underscore %>Id, err := Create<%= v[:class_name] %>(am)
@@ -452,17 +470,17 @@ func (_<%= model_name_underscore %> *<%= @model_name %>) <%= v[:class_name].plur
 	return err
 }
 
-// Get<%= v[:class_name].pluralize %> used to get associated objects
-func (_<%= model_name_underscore %> *<%= @model_name %>) Get<%= v[:class_name].pluralize %>() error {
-	_<%= v[:class_name].underscore.pluralize %>, err := <%= @model_name %>Get<%= v[:class_name].pluralize %>(_<%= model_name_underscore %>.Id)
+// Get<%= k.pluralize %> used to get associated objects
+func (_<%= model_name_underscore %> *<%= @model_name %>) Get<%= k.pluralize %>() error {
+	_<%= k.underscore.pluralize %>, err := <%= @model_name %>Get<%= k.pluralize %>(_<%= model_name_underscore %>.Id)
 	if err == nil {
-		_<%= model_name_underscore %>.<%= k %> = _<%= v[:class_name].underscore.pluralize %>
+		_<%= model_name_underscore %>.<%= k %> = _<%= k.underscore.pluralize %>
     }
     return err
 }
 
-// <%= @model_name %>Get<%= v[:class_name].pluralize %> a helper fuction used to get associated objects for <%= @model_name %>IncludesWhere()
-func <%= @model_name %>Get<%= v[:class_name].pluralize %>(id int64) ([]<%= v[:class_name] %>, error) {
+// <%= @model_name %>Get<%= k.pluralize %> a helper fuction used to get associated objects for <%= @model_name %>IncludesWhere()
+func <%= @model_name %>Get<%= k.pluralize %>(id int64) ([]<%= v[:class_name] %>, error) {
 	<%- if v[:through] -%>
 		// FIXME: use transaction to create these associated objects
 		<%- target_table = v[:class_name].underscore.pluralize -%>
@@ -472,18 +490,18 @@ func <%= @model_name %>Get<%= v[:class_name].pluralize %>(id int64) ([]<%= v[:cl
 		               INNER JOIN <%= through_table %>
 		                       ON <%= target_table %>.id = <%= through_table %>.<%= v[:class_name].underscore %>_id
 		        WHERE <%= through_table %>.<%= model_name_underscore %>_id = ?`
-		_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>BySQL(sql, id)
+		_<%= k.underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>BySql(sql, id)
 	<%- elsif v[:as] -%>
 		where := `<%= v[:as] %>_type = "<%= @model_name %>" AND <%= v[:as] %>_id = ?`
-		_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, id)
+		_<%= k.underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, id)
 	<%- else -%>
 		<%- if v[:foreign_key] -%>
-			_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= v[:foreign_key] %>", id)
+			_<%= k.underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= v[:foreign_key] %>", id)
 		<%- else -%>
-			_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= model_name_underscore %>_id", id)
+			_<%= k.underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= model_name_underscore %>_id", id)
 		<%- end -%>
 	<%- end -%>
-	return _<%= v[:class_name].underscore.pluralize %>, err
+	return _<%= k.underscore.pluralize %>, err
 }
 
 	<%- end -%>
@@ -492,7 +510,7 @@ func <%= @model_name %>Get<%= v[:class_name].pluralize %>(id int64) ([]<%= v[:cl
 <%- unless @struct_info[:assoc_info][:has_one].empty? -%>
 	<%- has_one = @struct_info[:assoc_info][:has_one] -%>
 	<%- has_one.each do |k, v| -%>
-func (_<%= model_name_underscore %> *<%= @model_name %>) Create<%= v[:class_name] %>(am map[string]interface{}) error {
+func (_<%= model_name_underscore %> *<%= @model_name %>) Create<%= k %>(am map[string]interface{}) error {
 	<%- if v[:foreign_key] -%>
 	am["<%= v[:foreign_key] %>"] = _<%= model_name_underscore %>.Id
     <%- else -%>
@@ -509,7 +527,7 @@ func (_<%= model_name_underscore %> *<%= @model_name %>) Create<%= v[:class_name
 	<%- belongs_to.each do |k, v| -%>
     <%-# don't create virtual table for polymorphic model -%>
 	<%- next if v[:polymorphic] -%>
-func (_<%= model_name_underscore %> *<%= @model_name %>) Create<%= v[:class_name] %>(am map[string]interface{}) error {
+func (_<%= model_name_underscore %> *<%= @model_name %>) Create<%= k %>(am map[string]interface{}) error {
 	<%- if v[:foreign_key] -%>
 	am["<%= v[:foreign_key] %>"] = _<%= model_name_underscore %>.Id
     <%- else -%>
@@ -655,7 +673,7 @@ func destroy<%= @model_name %>Associations(ids ...int64) {
 						// no sql.NULLType supported, just set the associated field to zero value of int64
 						<%- if opts[:through] -%>
 							sql := fmt.Sprintf("UPDATE <%= opts[:through].to_s %> SET <%= opts[:class_name].underscore %>_id = 0 WHERE <%= opts[:class_name].underscore %>_id IN (?%s)", idsHolder)
-							_, err = Update<%= opts[:through].to_s.camelize %>BySQL(sql, idsT...)
+							_, err = Update<%= opts[:through].to_s.camelize %>BySql(sql, idsT...)
 							if err != nil {
 								log.Printf("Delete associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
 							}
@@ -665,7 +683,7 @@ func destroy<%= @model_name %>Associations(ids ...int64) {
 							<%- else -%>
 								sql := fmt.Sprintf("UPDATE <%= opts[:class_name].underscore.pluralize %> SET <%= model_name_underscore %>_id = 0 WHERE <%= model_name_underscore %>_id IN (?%s)", idsHolder)
 							<%- end -%>
-							_, err = Update<%= opts[:class_name].pluralize %>BySQL(sql, idsT...)
+							_, err = Update<%= opts[:class_name].pluralize %>BySql(sql, idsT...)
 							if err != nil {
 								log.Printf("Delete associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
 							}
@@ -753,7 +771,7 @@ func (_<%= model_name_underscore %> *<%= @model_name %>) UpdateColumns(am map[st
 	return err
 }
 
-func Update<%= @model_name.pluralize %>BySQL(sql string, args ...interface{}) (int64, error) {
+func Update<%= @model_name.pluralize %>BySql(sql string, args ...interface{}) (int64, error) {
 	if sql == "" {
 		return 0, errors.New("A blank SQL clause")
 	}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-15 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