go-on-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890e56dfb579f5a2db328a4ee43084ce7feea0f3
-  data.tar.gz: 6c902e303478da0632649868a56c91f8b00cbeb8
+  metadata.gz: 1a79eacecb3518a5d6a275b966c46c772af15a74
+  data.tar.gz: 631f955570f113bb767e83809287f5c39cc8433c
 SHA512:
-  metadata.gz: f166b780f245457d28dd1ddb96af9d32d5c40f3f447da1ddfd72deecb2290b8a9f7c9304f52772cdf94be2e7b1bb849733dc353807de047127271434dc06ee1b
-  data.tar.gz: cde88337c17f6aff8447835182796a2067c07eb8dfa4c38288bfab5e114fbf72c271c6b61318e1a78732d0072dff0676fc8281ce6978c880f10c5864a5686b87
+  metadata.gz: b131b9b03ecca48ba7081d7bd8e27e9228c6c7effaff59e5c0d4defb1634b5c3824d45366bf20fe7cb7ff179ef69bd8906686d19ccdb585054efbc909dbc1efc
+  data.tar.gz: 7a93441d049b69b48288561088ebebeca048e96ccc309c7e868a656df1fb051556722e982e4b90ee677fa02e965f7f3106a98517be78ee09d80499c571ee752b

data/README.md

@@ -21,7 +21,7 @@ Here's a simple [example(tutorial)](https://github.com/goonr/example_simple) sho
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'go-on-rails', '~> 0.1.2'
+gem 'go-on-rails', '~> 0.1.3'
 ```
 
 And then execute:
@@ -118,6 +118,10 @@ The `dev` branch has a whole Rails environment for development: models, seeds fo
 - 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)
 - Send me a pull request. Bonus points for topic branches.
 
+### Testing
+
+Run `rails db:seed` to use the data defined in `db/seeds.rb`. And change to `go_app/models` directory to run `go test` to test generated models-related functions.
+
 ## License
 
 See the [LICENSE](https://github.com/goonr/go-on-rails/blob/master/MIT-LICENSE) file.

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

@@ -22,8 +22,11 @@ module GoOnRails
             end
           end
           type_name = "[]#{class_name}"
-          info[:assoc_info][:has_many][col_name] = {class_name: class_name}
-          info[:assoc_info][:has_many][col_name].merge!(assoc.options) unless assoc.options.empty?
+          if col_name && type_name && (self.models.include? class_name)
+            info[:struct_body] << sprintf("%s %s `%s`\n", col_name, type_name, tags.join(" "))
+            info[:assoc_info][:has_many][col_name] = {class_name: class_name}
+            info[:assoc_info][:has_many][col_name].merge!(assoc.options) unless assoc.options.empty?
+          end
 
         when :has_one, :belongs_to
           col_name = class_name = assoc.name.to_s.camelize
@@ -35,13 +38,13 @@ module GoOnRails
             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?
+          if col_name && type_name && (self.models.include? class_name)
+            info[:struct_body] << sprintf("%s %s `%s`\n", col_name, type_name, tags.join(" "))
+            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?
+          end
         end
         info[:has_assoc_dependent] = true if assoc.options.key? :dependent
-        if col_name && type_name && (self.models.include? class_name)
-          info[:struct_body] << sprintf("%s %s `%s`\n", col_name, type_name, tags.join(" "))
-        end
       end
       info
     end

data/lib/generators/gor/gor_generator.rb

@@ -20,20 +20,21 @@ class GorGenerator < Rails::Generators::Base
                   env_name
                 end
 
-    models = options[:models]
-    if models.empty?
-      models = get_all_models "app/models"
+    @models = options[:models]
+    if @models.empty?
+      @models = get_all_models "app/models"
     else
-      models.map!(&:camelize)
+      @models.map!(&:camelize)
     end
-    puts "The models: #{models} and Rails env [#{rails_env}] will be used to generate Golang App!"
+    puts "Rails env: [#{rails_env}]"
+    puts "The models: #{@models} will be converted to a Golang App!"
 
-    models.each do |m|
+    @models.each do |m|
       begin
         klass = m.split('::').inject(Object) { |kls, part| kls.const_get(part) }
         if klass < ActiveRecord::Base && !klass.abstract_class?
           @model_name = klass.to_s
-          convertor = GoOnRails::Convertor.new(klass, models)
+          convertor = GoOnRails::Convertor.new(klass, @models)
           @struct_info = convertor.convert
           template "gor_model.go.erb", "go_app/models/gor_#{@model_name.underscore}.go"
         end
@@ -66,7 +67,7 @@ class GorGenerator < Rails::Generators::Base
   def get_all_models model_dir
     Dir.chdir(model_dir) do
       Dir["**/*.rb"]
-    end.map { |m| m.sub(/\.rb$/,'').camelize }
+    end.map { |m| m.sub(/\.rb$/,'').camelize } - ["ApplicationRecord"]
   end
 
   def create_database_config rails_env

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

@@ -220,7 +220,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 						for _, vv := range _<%= v[:class_name].underscore.pluralize %> {
 							for i, vvv := range  _<%= param_name_plural %> {
 								<%- if v[:foreign_key] -%>
-									if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
+									if vv.<%= v[:foreign_key].to_s.camelize %> == vvv.Id {
 										vvv.<%= k %> = append(vvv.<%= k %>, vv)
 									}
 								<%- else -%>
@@ -251,7 +251,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 					for _, vv := range _<%= v[:class_name].underscore.pluralize %> {
 						for i, vvv := range  _<%= param_name_plural %> {
 							<%- if v[:foreign_key] -%>
-								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
+								if vv.<%= v[:foreign_key].to_s.camelize %> == vvv.Id {
 									vvv.<%= k %> = vv
 								}
 							<%- else -%>

data/lib/go/on/rails.rb

@@ -0,0 +1,8 @@
+module Go
+  module On
+    module Rails
+    end
+  end
+end
+
+require 'go/on/rails/railtie'

data/lib/go/on/rails/railtie.rb

@@ -0,0 +1,5 @@
+class Go::On::Rails::Railtie < Rails::Railtie
+  rake_tasks do
+    load "tasks/gor.rake"
+  end
+end

data/lib/tasks/gor.rake

@@ -12,6 +12,7 @@ namespace :gor do
     puts 'Installation completed!'
   end
 
+  desc 'Gofmt the generated codes on models'
   task :fmt do
     go_files = Rails.root.join('go_app', 'models/*.go').to_s
     system "gofmt -w #{go_files} > /dev/null 2>&1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-27 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
@@ -31,6 +31,8 @@ files:
 - lib/generators/gor/templates/home_controller.go.erb
 - lib/generators/gor/templates/index.tmpl
 - lib/generators/gor/templates/main.go
+- lib/go/on/rails.rb
+- lib/go/on/rails/railtie.rb
 - lib/tasks/gor.rake
 homepage: https://github.com/goonr/go-on-rails
 licenses: