inline_forms 5.0.20 → 5.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81675de0a6f199e9558ffcad307ec20cdb66965
-  data.tar.gz: a60ab75bf6140e339fccb29c249143e7a586481d
+  metadata.gz: 2e59e18d87dd2a20edd0b3196d9929839b7f5b7b
+  data.tar.gz: b369c07c0a608fd042ef40b0d55fbd0115ef3d4d
 SHA512:
-  metadata.gz: d84fc21d1c4db2302cb415e58c5222b2d5635ec7339b2fef78543bc47e5515333e351d25544b9550ddfd34e2b8293ebad707bf9c16bbec287f8fab58bb7e6f8d
-  data.tar.gz: 3f070fc2fa9559fb6a078c091dd05e57638541982ee6e4ac162ebf607e84a1d029f9735b04c4823bc223bb76e8a99b12844a49719271f07c3bb779a69efca08c
+  metadata.gz: 7703368ccb58471d9f86ba1444d51ed8d6d8a15c72edf6ccf3515ede5b47fcac4eff51efb658f23d448f783c035eba3017511a5406ae54723e1c26fe812e5cb2
+  data.tar.gz: 5b9961fecdba9f8b800b7e26649c06a78c1e55b1af077f261ffc7fc5958be5f85c7d28266d1770f086aad1ed63ca7d2e94c56cd8c6af92e9ce44bbca4d9d848f

data/.gitignore

@@ -17,3 +17,8 @@ pkg
 # other (Lemuel I think)
 .project
 .vscode
+
+# Builds
+*.gem
+
+Gemfile.lock

data/bin/inline_forms

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 module InlineForms
   require File.join(File.dirname(__FILE__), "../lib/inline_forms/version.rb")
-
+  require 'securerandom'
+  
   # what is this?
   Signal.trap("INT") { puts; exit }
 

data/bin/inline_forms_installer_core.rb

@@ -48,6 +48,7 @@ gem_group :development do
   gem 'capistrano-rails', '~> 1.3', require: false
   gem 'capistrano-bundler', '~> 1.3', require: false
   gem 'capistrano-rvm', require: false
+  gem "capistrano3-unicorn"
 end
 
 say "- Running bundle..."
@@ -69,18 +70,17 @@ else
   create_file "config/database.yml", <<-END_DATABASEYML.strip_heredoc
   development:
     adapter: mysql2
-    database: #{app_name}_dev
-    username: #{app_name}
-    password: #{app_name}
-
+    database: <%= ENV["DATABASE_NAME"] %>
+    username: <%= ENV["DATABASE_USER"] %>
+    password: <%= ENV["DATABASE_PASSWORD"] %>
   END_DATABASEYML
 end
 append_file "config/database.yml", <<-END_DATABASEYML.strip_heredoc
   production:
     adapter: mysql2
-    database: #{app_name}_prod
-    username: #{app_name}
-    password: #{app_name}444
+    database: <%= ENV["DATABASE_NAME"] %>
+    username: <%= ENV["DATABASE_USER"] %>
+    password: <%= ENV["DATABASE_PASSWORD"] %>
 END_DATABASEYML
 
 say "- Devise install..."
@@ -158,7 +158,7 @@ USERS_CONTROLLER
 
 say "- Create User Model..."
 create_file "app/models/user.rb", <<-USER_MODEL.strip_heredoc
-  class User < ActiveRecord::Base
+  class User < ApplicationRecord
 
     # devise options
     devise :database_authenticatable
@@ -535,12 +535,16 @@ DEVISE_MAILER_STUFF
 # capify
 say "- Capify..."
 run 'bundle exec cap install'
-#remove_file "config/deploy.rb" # remove the file capify created!
-#copy_file File.join(GENERATOR_PATH,'lib/generators/templates/deploy.rb'), "config/deploy.rb"
+remove_file "config/deploy.rb" # remove the file capify created!
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/capistrano/deploy.rb'), "config/deploy.rb"
+remove_file "config/deploy/production.rb" # remove the production file capify created!
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/capistrano/production.rb'), "config/deploy/production.rb"
+remove_file "Capfile" # remove the Capfile file capify created!
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/capistrano/Capfile'), "Capfile"
 
 # Unicorn
 say "- Unicorn Config..."
-copy_file File.join(GENERATOR_PATH,'lib/generators/templates/unicorn.rb'), "config/unicorn.rb"
+copy_file File.join(GENERATOR_PATH,'lib/generators/templates/unicorn/production.rb'), "config/unicorn/production.rb"
 
 
 # Git
@@ -556,14 +560,15 @@ GITIGNORE
 
 say "- Installing Figaro..."
 run 'bundle exec figaro install'
+remove_file "config/application.yml"
 copy_file File.join(GENERATOR_PATH,'lib/generators/templates/application.yml.blank'), "config/application.yml"
 copy_file File.join(GENERATOR_PATH,'lib/generators/templates/application.yml.blank'), "config/application.yml.blank"
 
 say "- Installing config/secrets.yml..."
 remove_file "config/secrets.yml"
-create_file "config/secrets.yml", <<-END_SECRETS_YML.strip_heredoc(2)
+create_file "config/secrets.yml", <<-END_SECRETS_YML.strip_heredoc
   development:
-    secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+    secret_key_base: #{SecureRandom.hex(64)}
 
   test:
     secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
@@ -605,6 +610,7 @@ if ENV['install_example'] == 'true'
 else
   # run tests
   run "rspec" if ENV['runtest']
+  say "- Don't forget: add your secret key base in config/application.yml \n"
 end
 # done!
 say "\nDone! Now make your tables with 'bundle exec rails g inline_forms ...", :yellow

data/lib/generators/USAGE

@@ -12,7 +12,7 @@ This will create:
       create  db/migrate/20110204074707_inline_forms_create_things.rb
 
       app/models/thing.rb:
-        class Thing < ActiveRecord::Base
+        class Thing < ApplicationRecord
           def _presentation
             #define your presentation here
           end

data/lib/generators/inline_forms_generator.rb

@@ -43,7 +43,7 @@ module InlineForms
       def attribute_type
         SPECIAL_COLUMN_TYPES.merge(RELATIONS).has_key?(type) ? type : DEFAULT_FORM_ELEMENTS[type] || :unknown
       end
-      
+
       def special_relation?
         SPECIAL_RELATIONS.has_key?(type)
       end
@@ -73,7 +73,7 @@ module InlineForms
     argument :attributes, :type => :array,  :banner => "[name:form_element]..."
 
     source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-  
+
     # using flags.
     def set_some_flags
       @flag_not_accessible_through_html   = true
@@ -107,7 +107,7 @@ module InlineForms
         @inline_forms_attribute_list  = String.new
 
         for attribute in attributes
-          if attribute.column_type  == :belongs_to 
+          if attribute.column_type  == :belongs_to
             ## :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
             @belongs_to << '  belongs_to :'         + attribute.name + "\n"
           end
@@ -175,7 +175,7 @@ module InlineForms
           end
         ROUTE
       end
-    end 
+    end
 
     def generate_migration
       if @flag_create_migration
@@ -199,6 +199,7 @@ module InlineForms
             end
           end
         end
+        @primary_key_option = @create_id ? '' : ', id: false'
         template "migration.erb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
       end
     end
@@ -214,14 +215,14 @@ module InlineForms
           :after => "ActionView::CompiledTemplates::MODEL_TABS = %w("
       end
     end
-    
+
     def generate_test
       template "test.erb", "test/unit/#{test_file_name}.rb"
     end
 
     def generate_controller
       template "controller.erb", "app/controllers/#{controller_file_name}.rb" if @flag_create_controller
-    end 
+    end
 
 
     private
@@ -240,11 +241,11 @@ module InlineForms
     def controller_file_name
       controller_name.underscore
     end
-    
+
     def test_name
       name + 'Test'
     end
-    
+
     def test_file_name
       test_name.underscore
     end

data/lib/generators/templates/application.yml.blank

@@ -3,6 +3,9 @@ SECRET_TOKEN:
 
 DEPLOY_USER:
 DEPLOY_HOST:
+DEPLOY_APPLICATION:
+DEPLOY_REPO_URL:
+DEPLOY_DIRECTORY:
 
 development:
   ACTION_MAILER_SMTP_SETTINGS_ADDRESS:

data/lib/generators/templates/capistrano/Capfile

@@ -0,0 +1,44 @@
+# Load ENV vars via Figaro
+require 'figaro'
+Figaro.application = Figaro::Application.new(environment: 'production', path: File.expand_path('../config/application.yml', __FILE__))
+Figaro.load
+
+# Load DSL and set up stages
+require "capistrano/setup"
+
+# Include default deployment tasks
+require "capistrano/deploy"
+
+# Load the SCM plugin appropriate to your project:
+#
+# require "capistrano/scm/hg"
+# install_plugin Capistrano::SCM::Hg
+# or
+# require "capistrano/scm/svn"
+# install_plugin Capistrano::SCM::Svn
+# or
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+require "capistrano/rvm"
+# require "capistrano/rbenv"
+# require "capistrano/chruby"
+require "capistrano/bundler"
+require "capistrano/rails/assets"
+require "capistrano/rails/migrations"
+# require "capistrano/passenger"
+require "capistrano3/unicorn"
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

data/lib/generators/templates/capistrano/deploy.rb

@@ -0,0 +1,39 @@
+set :application, ENV['DEPLOY_APPLICATION']
+set :repo_url, ENV['DEPLOY_REPO_URL']
+set :bundle_binstubs, nil
+
+# Default deploy_to directory is /var/www/my_app_name
+set :deploy_to, ENV['DEPLOY_DIRECTORY']
+
+# Default value for :linked_files is []
+set :linked_files, fetch(:linked_files, [])
+  .push("config/database.yml", "config/secrets.yml", "config/application.yml")
+# Default value for linked_dirs is []
+set :linked_dirs, fetch(:linked_dirs, [])
+  .push("log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system", "vendor/bundle")
+
+# Default value for keep_releases is 5
+set :keep_releases, 5
+
+before 'deploy:check', 'figaro:upload'
+after "deploy:publishing", "deploy:restart"
+
+# Restart unicorn
+namespace :deploy do
+  task :restart do
+    invoke "unicorn:restart"
+  end
+end
+
+# Uploads secrets.yml, database.yml and application.yml files
+namespace :figaro do
+  task :upload do
+    on roles(:all) do
+      execute "mkdir -p #{shared_path}/config"
+
+      upload! 'config/secrets.yml', "#{shared_path}/config/secrets.yml"
+      upload! 'config/database.yml', "#{shared_path}/config/database.yml"
+      upload! 'config/application.yml', "#{shared_path}/config/application.yml"
+    end
+  end
+end

data/lib/generators/templates/capistrano/production.rb

@@ -0,0 +1,7 @@
+set :user, ENV["DEPLOY_USER"]
+set :deploy_via, :remote_cache
+set :conditionally_migrate, true
+set :rails_env, "production"
+
+# Server IP
+server ENV["DEPLOY_HOST"], user: fetch(:user), port: fetch(:port), roles: %w(web app db)

data/lib/generators/templates/migration.erb

@@ -1,8 +1,7 @@
-class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration
+class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration[5.0]
 
   def self.up
-    #create_table :<%= table_name + ", :id => " + @create_id.to_s %> do |t|
-    create_table :<%= table_name %> do |t|
+    create_table :<%= table_name + @primary_key_option %> do |t|
 <%= @columns -%>
       t.timestamps
     end

data/lib/generators/templates/model.erb

@@ -1,4 +1,4 @@
-class <%= name %> < ActiveRecord::Base
+class <%= name %> < ApplicationRecord
   attr_reader :per_page
   @per_page = 7
   attr_writer :inline_forms_attribute_list

data/lib/generators/templates/unicorn/production.rb

@@ -0,0 +1,39 @@
+# Load ENV vars via Figaro
+require 'figaro'
+Figaro.application = Figaro::Application.new(environment: 'production', path: File.expand_path('../../../config/application.yml', __FILE__))
+Figaro.load
+
+app_path = "#{ENV['DEPLOY_DIRECTORY']}/current"
+working_directory app_path
+
+pid "#{app_path}/tmp/pids/unicorn.pid"
+
+stderr_path "#{app_path}/log/unicorn.err.log"
+stdout_path "#{app_path}/log/unicorn.out.log"
+
+worker_processes 3
+timeout 30
+preload_app true
+
+listen "#{app_path}/tmp/sockets/unicorn.sock", backlog: 64
+
+before_exec do |_|
+  ENV["BUNDLE_GEMFILE"] = File.join(app_path, "Gemfile")
+end
+
+before_fork do |server, worker|
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+
+  old_pid = "#{app_path}/tmp/pids/unicorn.pid.oldbin"
+
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+    end
+  end
+end
+
+after_fork do |server, worker|
+  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+end

data/lib/inline_forms.rb

@@ -49,7 +49,7 @@ module InlineForms
   #  rails g inline_forms Example name:string price:integer
   # will result in the following model:
   #
-  #    class Example < ActiveRecord::Base
+  #    class Example < ApplicationRecord
   #      def inline_forms_attribute_list
   #        {
   #          :name  => [ "name", :text_field ],
@@ -91,7 +91,7 @@ module InlineForms
   SPECIAL_COLUMN_TYPES = {
     :associated => :no_migration
   }
-  
+
   # RELATIONS defines a mapping between AR::Migrations columns and the Model.
   #
   # When a column has the type of :references or :belongs_to, then

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "5.0.20"
+  VERSION = "5.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.0.20
+  version: 5.0.21
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -256,12 +256,14 @@ files:
 - lib/generators/templates/_inline_forms_tabs.html.erb
 - lib/generators/templates/abstract_mysql2_adapter.rb
 - lib/generators/templates/application.yml.blank
+- lib/generators/templates/capistrano/Capfile
+- lib/generators/templates/capistrano/deploy.rb
+- lib/generators/templates/capistrano/production.rb
 - lib/generators/templates/controller.erb
-- lib/generators/templates/deploy.rb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
 - lib/generators/templates/test.erb
-- lib/generators/templates/unicorn.rb
+- lib/generators/templates/unicorn/production.rb
 - lib/inline_forms.rb
 - lib/inline_forms/version.rb
 - lib/locales/inline_forms.en.yml

data/lib/generators/templates/deploy.rb

@@ -1,82 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require "bundler/capistrano"
-require "rvm/capistrano"
-
-load 'deploy/assets'
-
-set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
-set :rvm_install_ruby_params, '--1.9'      # for jruby/rbx default to 1.9 mode https://github.com/wayneeseguin/rvm-capistrano/commit/663252851a9d6294439a9b501cebe66f8c3150f7
-
-set :application, "YOUR_APPLICATION_NAME"
-set :domain,      "YOUR_HOST_NAME"
-set :user,        "YOUR_USERNAME_ON_THE_HOST"
-
-set :bundle_flags,       "--deployment"
-
-set :use_sudo,    false
-
-set :deploy_to,   "/var/www/ror/#{application}"
-
-set :repository,  "file:///home/#{user}/git-repos/#{application}.git"
-set :local_repository, "ssh://#{user}@#{domain}/home/#{user}/git-repos/#{application}.git"
-set :scm,         "git"
-
-
-role :app, domain
-role :web, domain
-role :db,  domain, :primary => true
-
-before :deploy do
-  system "bundle install"
-  system "git commit -a"
-  system "git push"
-end
-
-before 'deploy:setup', 'rvm:install_rvm'
-before 'deploy:setup', 'rvm:install_ruby'
-before  "deploy:assets:precompile", "deploy:fix_stuff"
-
-
-namespace :deploy do
-  desc "Zero-downtime restart of Unicorn"
-  task :zero_restart, :except => { :no_release => true } do
-    run "kill -s USR2 `cat #{shared_path}/pids/unicorn.pid`"
-  end
-
-  desc "Downtime restart of Unicorn"
-  task :restart, :except => { :no_release => true } do
-    run "kill -s KILL `cat #{shared_path}/pids/unicorn.pid`"
-    sleep 10
-    run "rvm rvmrc trust #{current_release}"
-    run "cd #{current_path} ; bundle exec r200_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
-  end
-
-
-  desc "Start unicorn"
-  task :start, :except => { :no_release => true } do
-    run "rvm rvmrc trust #{current_release}"
-    run "cd #{current_path} ; bundle exec r200_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
-  end
-
-  desc "Stop unicorn"
-  task :stop, :except => { :no_release => true } do
-    run "kill -s QUIT `cat #{shared_path}/pids/unicorn.pid`"
-  end
-
-  desc "Kill unicorn"
-  task :kill, :except => { :no_release => true } do
-    run "kill -s KILL `cat #{shared_path}/pids/unicorn.pid`"
-  end
-
-  desc "Fix Stuff."
-  task :fix_stuff do
-    run "cd #{shared_path} && mkdir -p log"
-    run "cd #{shared_path} && mkdir -p sockets"
-    run "ln -s #{shared_path}/sockets #{release_path}/tmp/sockets"
-    run "cd #{shared_path} && mkdir -p uploads"
-    run "ln -s #{shared_path}/uploads #{release_path}/public/uploads"
-  end
-
-
-end

data/lib/generators/templates/unicorn.rb

@@ -1,47 +0,0 @@
-APP_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__)))
-
-if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
-  begin
-    #rvm_path = File.dirname(File.dirname(ENV['MY_RUBY_HOME']))
-    #rvm_lib_path = File.join(rvm_path, 'lib')
-    #$LOAD_PATH.unshift rvm_lib_path
-    require 'rvm'
-    RVM.use_from_path! APP_ROOT
-  rescue LoadError
-    raise "RVM ruby lib is currently unavailable."
-  end
-end
-
-ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', File.dirname(__FILE__))
-require 'bundler/setup'
-
-worker_processes 4
-working_directory APP_ROOT
-
-preload_app true
-
-timeout 30
-
-listen APP_ROOT + "/tmp/sockets/unicorn.sock", :backlog => 64
-
-pid APP_ROOT + "/tmp/pids/unicorn.pid"
-
-stderr_path APP_ROOT + "/log/unicorn.stderr.log"
-stdout_path APP_ROOT + "/log/unicorn.stdout.log"
-
-before_fork do |server, worker|
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
-
-  old_pid = Rails.root + '/tmp/pids/unicorn.pid.oldbin'
-  if File.exists?(old_pid) && server.pid != old_pid
-    begin
-      Process.kill("QUIT", File.read(old_pid).to_i)
-    rescue Errno::ENOENT, Errno::ESRCH
-      puts "Old master alerady dead"
-    end
-  end
-end
-
-after_fork do |server, worker|
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
-end