go-on-rails 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a24ab99957a404da499992b20120d30c163c5925
-  data.tar.gz: 5009bffa97b30a0bef1209ab1b1b12bd5ec727fa
+  metadata.gz: 43f78729f6b807de4949b5bfff9f06dde9854808
+  data.tar.gz: 40b116bfcb24d9e7a3d378827adc6734ce3fa673
 SHA512:
-  metadata.gz: 411466805ddf6f18e0797127a25cb30a9458bf5d3143b5fa3a8de2dadafd6ceeb6d385968ed96be02804ca311b73912dca0da3e1f02a329fa8548e272e47dcd6
-  data.tar.gz: 40ddc1ef5a221c2141820ded808ec501e8064df288c92dec7c45ee75b385e91811ed2e2e04409d745144c570ccbd57e8c7a112ef6b6c7e0e849aa117908b4f6a
+  metadata.gz: 5ab347d8b5206dbd0ddd711dbe696ce39f56bf61b5ff8d3d37b31d48edc93931beecc10587f73754a69219008078fb804016adddf6f584e746f658185207311d
+  data.tar.gz: c095725253a77157d9e19b4327d55ea72f3874243a703fec2ac88b42e5e7225bcf06821dfe9ecd79fbb9983e39b404928157d4f1bc560d725d05585baf066f9f

data/README.md

@@ -23,7 +23,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.6'
+gem 'go-on-rails', '~> 0.1.8'
 ```
 
 And then execute:

data/lib/generators/gor/gor_generator.rb

@@ -5,12 +5,7 @@ class GorGenerator < Rails::Generators::Base
   class_option :only_models, type: :boolean, default: false, aliases: '-o', description: "only generate models"
 
   def generate_gor
-    env_names = %W(dev development pro production test)
-    unless env_names.include? env_name
-      printf("Invalid env argument: Not any of %p\n\n", env_names)
-      exit
-    end
-
+    env_names = ActiveRecord::Base.configurations.keys
     rails_env = case env_name
                 when "dev"
                   "development"
@@ -20,6 +15,11 @@ class GorGenerator < Rails::Generators::Base
                   env_name
                 end
 
+    unless env_names.include? rails_env
+      printf("Invalid env argument \"%s\": Not in the available list %p\n\n", rails_env, env_names)
+      exit
+    end
+
     @models = options[:models]
     if @models.empty?
       @models = get_all_models "app/models"
@@ -31,8 +31,9 @@ class GorGenerator < Rails::Generators::Base
 
     # read the database configuration
     @db_config = {}
-    create_database_config(rails_env)
+    read_database_config(rails_env)
 
+    # iterate the models to generate Go codes
     @models.each do |m|
       begin
         klass = m.split('::').inject(Object) { |kls, part| kls.const_get(part) }
@@ -47,13 +48,12 @@ class GorGenerator < Rails::Generators::Base
       end
     end
 
+    # generate program for database connection
+    template "db.go.erb", "go_app/models/db.go"
+
     unless options[:only_models]
       # generate the main.go
       copy_file "main.go", "go_app/main.go"
-
-      # generate program for database connection
-      template "db.go.erb", "go_app/models/db.go"
-
       # generate the controllers and views dir
       template "home_controller.go.erb", "go_app/controllers/home_controller.go"
       copy_file "index.tmpl", "go_app/views/index.tmpl"
@@ -75,7 +75,7 @@ class GorGenerator < Rails::Generators::Base
     end.map { |m| m.sub(/\.rb$/,'').camelize } - ["ApplicationRecord"]
   end
 
-  def create_database_config rails_env
+  def read_database_config rails_env
     db_conf = Rails.configuration.database_configuration[rails_env]
     db_conf["host"] = "localhost" unless db_conf["host"]
     case db_conf["adapter"]

metadata

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