go-on-rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87622b584504d99202fecac4cf0f4c6caadd3ba0
-  data.tar.gz: 6a0bbbe2d109dd4d4c7f694314c09ddcab6c6ff6
+  metadata.gz: 893993277d5b0ef18340c36e309155b3e34cf3d4
+  data.tar.gz: 68709edcb71c6e4f1f8ce3dffb25ae4276e2623d
 SHA512:
-  metadata.gz: 54af6ad25951016830e0d5561d6d9baa80ff2644736c2f4d1ed286b3880f3dd2a9876e19a6bac242081aac17b67be8a2ad9817f47e0970e193ae60431a7b012c
-  data.tar.gz: 38b7bd772720660cd9ef5372086e866c0fe5297f364c4f766c2fd711e66a218c4dc3c4195ca2b16e9257ab3af59e3d4d9e56d2a4c8082d2718ccf899576c2965
+  metadata.gz: a443051416f1b2352355b3be7e4875ed3c5919c82aff0f599cfddbf68b9979547fe270d5468201eb5c94190a0e38332575f7f44f42ca117917c4862a387655fd
+  data.tar.gz: de5c41b9abc3fb7849dbeb9271c0d965ce083376cec0e74c602af7a7898753ced6ad8cb3ae2d90880a15f98bb6041da9149d7a4e3181acee7de3662c6b92f120

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.5'
+gem 'go-on-rails', '~> 0.0.7'
 ```
 
 And then execute:
@@ -84,7 +84,11 @@ When I had the idea to convert Rails app or build Golang app with Rails tools, I
 
 ## Contributing
 
-- Fork the project.
+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.
+
+- Fork the project switch to branch `dev`.
 - Make your feature addition or bug fix.
 - Add tests for it. This is important so I don't break it in a future version unintentionally.
 - Commit, do not mess with Rakefile or version (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)

data/lib/generators/gor/gor_generator.rb

@@ -97,4 +97,4 @@ class GorGenerator < Rails::Generators::Base
   end
 end
 
-require_relative 'go_on_rails/converter'
+require_relative 'go-on-rails/converter'

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

@@ -118,30 +118,42 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 				<%- has_many = @struct_info[:assoc_info][:has_many] -%>
 				<%- has_many.each do |k, v| -%>
 				case "<%= k.underscore.pluralize %>":
-					<%- if v[:foreign_key] -%>
-						where := fmt.Sprintf("<%= v[:foreign_key] %> IN (?%s)", idsHolder)
-					<%- else -%>
-						where := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
-					<%- end -%>
-					var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, ids...)
-					if err != nil {
-						log.Printf("Error when query associated objects: %v\n", assoc)
-						continue
-					}
-					for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
+				    <%- if v[:through] -%>
+						// FIXME: optimize the query
 						for i, vvv := range  var_<%= param_name_plural %> {
-							<%- if v[:foreign_key] -%>
-								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
-									vvv.<%= k %> = append(vvv.<%= k %>, vv)
-								}
-							<%- else -%>
-								if vv.<%= @model_name.camelize %>Id == vvv.Id {
-									vvv.<%= k %> = append(vvv.<%= k %>, vv)
-								}
-							<%- end -%>
-							var_<%= param_name_plural %>[i].<%= k %> = vvv.<%= k %>
+							var_<%= v[:class_name].underscore.pluralize %>, err := <%= @model_name %>Get<%= v[:class_name].pluralize %>(vvv.Id)
+							if err != nil {
+								continue
+							}
+							vvv.<%= k %> = var_<%= v[:class_name].underscore.pluralize %>
+						    var_<%= param_name_plural %>[i] = vvv
 						}
-					}
+					<%- else -%>
+						<%- if v[:foreign_key] -%>
+							where := fmt.Sprintf("<%= v[:foreign_key] %> IN (?%s)", idsHolder)
+						<%- else -%>
+							where := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
+						<%- end -%>
+						var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, ids...)
+						if err != nil {
+							log.Printf("Error when query associated objects: %v\n", assoc)
+							continue
+						}
+						for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
+							for i, vvv := range  var_<%= param_name_plural %> {
+								<%- if v[:foreign_key] -%>
+									if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
+										vvv.<%= k %> = append(vvv.<%= k %>, vv)
+									}
+								<%- else -%>
+									if vv.<%= @model_name.camelize %>Id == vvv.Id {
+										vvv.<%= k %> = append(vvv.<%= k %>, vv)
+									}
+								<%- end -%>
+								var_<%= param_name_plural %>[i].<%= k %> = vvv.<%= k %>
+						    }
+					    }
+				    <%- end -%>
 				<%- end -%>
 			<%- end -%>
 			<%- unless @struct_info[:assoc_info][:has_one].empty? -%>
@@ -340,25 +352,30 @@ func (var_<%= model_name_underscore %> *<%= @model_name %>) <%= v[:class_name].p
 }
 
 func (var_<%= model_name_underscore %> *<%= @model_name %>) Get<%= v[:class_name].pluralize %>() error {
+	var_<%= v[:class_name].underscore.pluralize %>, err := <%= @model_name %>Get<%= v[:class_name].pluralize %>(var_<%= model_name_underscore %>.Id)
+	if err == nil {
+		var_<%= model_name_underscore %>.<%= k %> = var_<%= v[:class_name].underscore.pluralize %>
+    }
+    return err
+}
+
+func <%= @model_name %>Get<%= v[:class_name].pluralize %>(id int64) ([]<%= v[:class_name] %>, error) {
 	<%- if v[:through] -%>
 		// FIXME: use transaction to create these associated objects
-		<%= v[:class_name].underscore %>_ids, err := <%= v[:through].to_s.singularize.camelize %>IntCol("<%= v[:class_name].underscore %>_id", "<%= model_name_underscore %>_id = ?", var_<%= model_name_underscore %>.Id)
-		if err != nil {
-			return err
-		}
-		var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>(<%= v[:class_name].underscore %>_ids...)
+		<%- target_table = v[:class_name].underscore.pluralize -%>
+		<%- through_table = v[:through].to_s.pluralize -%>
+		sql := "SELECT `<%= target_table %>`.* FROM `<%= target_table %>` INNER JOIN `<%= through_table %>` ON `<%= target_table %>`.`id` = `<%= through_table %>`.`<%= v[:class_name].underscore %>_id` WHERE `<%= through_table %>`.`<%= model_name_underscore %>_id` = ?"
+		var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>BySql(sql, id)
 	<%- else -%>
 		<%- if v[:foreign_key] -%>
-			var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= v[:foreign_key] %>", var_<%= model_name_underscore %>.Id)
+			var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= v[:foreign_key] %>", id)
 		<%- else -%>
-			var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= model_name_underscore %>_id", var_<%= model_name_underscore %>.Id)
+			var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>By("<%= model_name_underscore %>_id", id)
 		<%- end -%>
 	<%- end -%>
-	if err == nil {
-		var_<%= model_name_underscore %>.<%= k %> = var_<%= v[:class_name].underscore.pluralize %>
-    }
-    return err
+	return var_<%= v[:class_name].underscore.pluralize %>, err
 }
+
 	<%- end -%>
 <%- end -%>
 

metadata

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