rails_apps_composer 3.1.24 → 3.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4120bda3f8a5cfc6d3e9a767538e58a78f972b8
-  data.tar.gz: 0a46cd79d4a6ccab482506fa92435151af8d6139
+  metadata.gz: e9378b5f445e8c2241ffa12cef249bb3a3678a53
+  data.tar.gz: eb00acbda79ab1f171b5338e741631674602f0b2
 SHA512:
-  metadata.gz: 9d051b902569d869207cf451229e2acbf191e4945ba22bd278bde2d0e736139cb7cea8cc81df6bf0be9c98d4009d6a16d76d0874fb42b11d4f72e9e2a0fc3263
-  data.tar.gz: 04f69cb6f1b9ad5e5ec55cb03306164b1bfcdd9b839c563e9cb1a50e330397176935f27cd915b07ac2ccc97f949249d60728210cbee7c3c8f04311fd4d660521
+  metadata.gz: 21367b0cdb2da7e2e1e18e88942ce920edd065b05835a70634630fb79d6161518b53bca2ccc971f086863f18b14c7a8e824ca58fe7b9a9a8845e96220f4a97a0
+  data.tar.gz: 36ce7622cdf5e696bc93e66b20f9837da74936eca46aaa9500d09cfa37433e05956d3c13da3bba28c1a1bd228dd0491a3fcf875f647ce0602fc7dcc293f5d229

data/recipes/frontend.rb

@@ -17,6 +17,12 @@ stage_two do
       generate 'layout:install foundation4 -f'
     when 'foundation5'
       generate 'layout:install foundation5 -f'
+    else
+      case prefs[:jquery]
+        when 'gem', 'yarn'
+        say_wizard "modifying application.js for jQuery"
+        insert_into_file('app/assets/javascripts/application.js', "//= require jquery\n", :before => /^ *\/\/= require rails-ujs/, :force => false)
+      end
   end
 
   ### GIT ###

data/recipes/gems.rb

@@ -89,6 +89,14 @@ case prefs[:frontend]
     add_gem 'foundation-rails', '~> 5.5'
 end
 
+## jQuery
+case prefs[:jquery]
+  when 'gem'
+    add_gem 'jquery-rails'
+  when 'yarn'
+    run 'bundle exec yarn add jquery'
+end
+
 ## Pages
 case prefs[:pages]
   when 'about'

data/recipes/learn_rails.rb

@@ -16,6 +16,7 @@ if prefer :apps4, 'learn-rails'
   prefs[:email] = 'sendgrid'
   prefs[:form_builder] = false
   prefs[:frontend] = 'bootstrap3'
+  prefs[:jquery] = 'gem'
   prefs[:layouts] = 'none'
   prefs[:pages] = 'none'
   prefs[:github] = false
@@ -36,7 +37,6 @@ if prefer :apps4, 'learn-rails'
   add_gem 'high_voltage'
   add_gem 'gibbon'
   add_gem 'minitest-spec-rails', :group => :test
-  add_gem 'minitest-rails-capybara', :group => :test
   gsub_file 'Gemfile', /gem 'sqlite3'\n/, ''
   add_gem 'sqlite3', :group => :development
 

data/recipes/setup.rb

@@ -47,6 +47,19 @@ if recipes.include? 'frontend'
     ["Simple CSS", "simple"]] unless prefs.has_key? :frontend
 end
 
+## jQuery
+if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 1
+  if prefs[:frontend] == 'none'
+    prefs[:jquery] = multiple_choice "Add jQuery?", [["No", "none"],
+      ["Add jquery-rails gem", "gem"],
+      ["Add using yarn", "yarn"]] unless prefs.has_key? :jquery
+  else
+    prefs[:jquery] = multiple_choice "How to install jQuery?",
+      [["Add jquery-rails gem", "gem"],
+      ["Add using yarn", "yarn"]] unless prefs.has_key? :jquery
+  end
+end
+
 ## Email
 if recipes.include? 'email'
   unless prefs.has_key? :email

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "3.1.24"
+  VERSION = "3.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 3.1.24
+  version: 3.1.25
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n