r5 0.4.0.5 → 0.5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e51a305bbe68045557d44fc95cef0cf139b41c
-  data.tar.gz: 16f5fe3d847c194b03a532f77a219bef1ba41e99
+  metadata.gz: e9844737f65bfd08394e29d9bf930e609c7c08b5
+  data.tar.gz: d83246c42147ce6cf5e5b2c5c515b0a3cbe67c28
 SHA512:
-  metadata.gz: 1afc1d4340b94b766d31b70d41e7d70a492fb30a3125dc751ad6664dc9eb8a9d8d21d68573c214f33881b6efeef137cc8dd17d2aab511ac775cb692ced7a0ec1
-  data.tar.gz: 0b10759baabd02fe5be00cfe608a76e78ff8ef96af131d0f017e3cbc789d13d2b0f9914a50ecf0d2bc9b21653bb4a6ee2873f7577e444646af08c37a3202e33a
+  metadata.gz: eac970f627638122800a615eca0d3caeb0bbb1e053acb9ccb544ef71764ddf494bffdce118ba5311892464bda8121620fad7ba0e06b02360549030a199906095
+  data.tar.gz: 7bcf153616f3391cc96594d192644c2e9a6575ee3f3845fee585307e1705952d0cacc13a5f3e25a31dc9af9929dbbbb89136fd17bb42e54ac3be3474588bdf64

data/lib/r5/installations/default.rb

@@ -1,17 +1,17 @@
 # DEFAULT SETTINGS
-copy '.ruby-version'
-gsub_file "#{@project_path}/.ruby-version", /version/, RUBY_VERSION
+
+# gsub_file "#{@project_path}/.ruby-version", /version/, RUBY_VERSION
 apply 'recipes/gemfile.rb'
 run 'bundle install'
 
+# run 'bundle exec rails webpacker:install'
+# system "yarn add @rails/webpacker@4.0.0-pre.2"
+# system "yarn add webpack-cli -D"
+
 copy 'config/initializers/html_helpers.rb'
 copy 'config/locales/cs.yml'
-# copy 'app/assets/stylesheets/theme.css'
-# copy 'app/assets/stylesheets/custom.css.scss'
-# copy 'app/assets/stylesheets/timepress.css.scss'
-# only for bootstrap
-#copy 'app/assets/stylesheets/bootstrap-variables.scss'
-#copy 'app/assets/stylesheets/bootstrap-generators.scss'
+copy 'app/assets/javascripts/custom.js'
+copy 'app/assets/stylesheets/custom.css.scss'
 
 apply 'recipes/bootstrap_app.rb'
 apply 'recipes/upload_app.rb'
@@ -42,6 +42,7 @@ apply 'recipes/timepress_specifics.rb'
 apply 'recipes/add_rack_mini_profiler.rb'
 gsub_file layout_file, 'PROJECT_NAME', @project_name
 apply 'recipes/gitignore.rb'
+#copy '.ruby-version'
 run 'git init'
 run 'git add .'
 run "git commit -a -m 'Initial commit'"

data/lib/r5/recipes/devise.rb

@@ -7,7 +7,7 @@ run 'rails g devise:install'
 run 'rails g devise User'
 
 insert_into_file "#{@project_path}/app/controllers/application_controller.rb",
-                 after: "protect_from_forgery with: :exception\n" do <<-RUBY
+                 after: "class ApplicationController < ActionController::Base\n" do <<-RUBY
     before_action :configure_permitted_parameters, if: :devise_controller?
     before_action :authenticate_user!
 

data/lib/r5/recipes/gemfile.rb

@@ -4,7 +4,7 @@ gsub_file gemfile, "gem 'sqlite3'", "gem 'mysql2'"
 insert_into_file gemfile, after: "group :development, :test do\n" do
   <<EOF
   gem 'rspec-rails'
-  gem 'factory_girl_rails'
+  gem 'factory_bot'
   gem 'timecop'
   gem 'guard-rspec'
   gem 'spring-commands-rspec'
@@ -34,6 +34,8 @@ end
 
 # make content_tag temporarily available
 gem 'record_tag_helper', '~> 1.0'
+gem "jquery-rails"
+# gem 'webpacker', '>= 4.0.x'
 EOF
 end
 

data/lib/r5/recipes/materialize.rb

@@ -1,73 +1,26 @@
-add_gem 'materialize-sass'
+add_gem 'materialize-sass', "~> 1.0.0.rc1"
 add_gem 'material_icons'
 
 run 'bundle install'
+# system "yarn add jquery moment snackbarjs"
 
-system "yarn add jquery moment"
+remove_file "#{@project_path}/app/assets/stylesheets/application.css"
 
-insert_into_file "#{@project_path}/app/assets/stylesheets/application.css",
-before: "\n *= require_tree ." do <<-TXT
-  
-  *= require materialize
-  *= require material_icons
+create_file "#{@project_path}/app/assets/stylesheets/application.scss" do <<-TXT
+@import "materialize/components/color-variables";
+$primary-color: color("grey", "base") !default;
+$secondary-color: color("green", "base") !default;
+$link-color: color("green", "base") !default;
+@import "materialize";
+@import "material_icons";
 TXT
 end
 
+
 insert_into_file "#{@project_path}/app/assets/javascripts/application.js",
 before: "\n//= require_tree ." do <<-TXT
-  
-  //= require materialize-sprockets
+  \n
+  //= require materialize
+  //= require jquery
 TXT
 end
-
-create_file "#{@project_path}/config/webpack/custom.js" do <<-JS
-  const webpack = require('webpack')
-  
-  module.exports = {
-    resolve: {
-      alias: {
-        jquery: 'jquery/src/jquery',
-      }
-    },
-  }
-  
-  // config/webpack/development.js
-  const merge = require('webpack-merge')
-  const environment = require('./environment')
-  const customConfig = require('./custom')
-  
-  module.exports = merge(environment.toWebpackConfig(), customConfig)
-JS
-end
-
-insert_into_file "#{@project_path}/app/javascript/packs/application.js",
-                 after: "console.log('Hello World from Webpacker')" do <<-JS
-                 
-import jQuery from 'jquery'
-window.jQuery = jQuery
-
-let ready;
-ready = function() {
-  // $(".datepicker").datetimepicker({locale: 'cs', format: 'D. M. YYYY'});
-};
-// Fire javascript after turbolinks event
-$(document).on('turbolinks:load', ready);
-JS
-end
-
-insert_into_file "#{@project_path}/config/webpack/environment.js",
-                 after: "const { environment } = require('@rails/webpacker')" do <<-JS
-
-  const webpack = require('webpack')
-  
-  // Add an additional plugin of your choosing : ProvidePlugin
-  environment.plugins.set(
-    'Provide',
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-      jquery: 'jquery',
-    })
-  )
-JS
-end

data/lib/r5/starter.rb

@@ -13,8 +13,8 @@ class Starter < Thor
       create_config_file
     end
 
-    if (system "rails -v").nil? or (%x[rails -v] =~ /Rails 5.1.*/).nil?
-      say "You didn't install Rails or have version lower than 5.1 Please install proper version.", :red
+    if (system "rails -v").nil? or (%x[rails -v] =~ /Rails 5.2.*/).nil?
+      say "You didn't install Rails or have version lower than 5.2 Please install proper version.", :red
       abort
     end
 
@@ -58,8 +58,7 @@ class Starter < Thor
   method_options type: :string
   def new project_name
     @project_name = project_name
-    run "rails new #{@project_name} -T --skip-bundle --webpack"
-    #run 'rake webpacker:install'
+    run "rails new #{@project_name} -T --skip-bundle"
 
     @project_path = "#{@dir}/#{@project_name}"
     @project_label = @project_name.capitalize.gsub('_', ' ')
@@ -73,9 +72,9 @@ class Starter < Thor
       apply "installations/#{options[:type]}.rb"
     end
 
-    run 'gem install foreman'
-    copy 'Procfile'
-    say 'Start your application with foreman start', :green
+    # run 'gem install foreman'
+    # copy 'Procfile'
+    say 'Start your application with rails s', :green
   end
 
   desc 'add_timepress_specifics', 'add datepicker and other timepress specific things'
@@ -174,9 +173,9 @@ class Starter < Thor
       remove_file "#{@project_path}/#{filename}"
     end
 
-    def add_gem name
+    def add_gem name, version=""
       append_to_file "#{@project_path}/Gemfile" do
-        "\ngem '#{name}'"
+         version == "" ? "\ngem '#{name}'" : "\ngem '#{name}', '#{version}'"
       end
     end
 

data/lib/r5/template/app/assets/javascripts/custom.js

@@ -0,0 +1,10 @@
+var ready;
+ready = function() {
+  M.AutoInit();
+  $.each( flashMessages, function(key, value){
+    M.toast({html: value, classes: key})
+  });
+};
+
+// Fire javascript after turbolinks event
+$(document).on('turbolinks:load', ready);

data/lib/r5/template/app/assets/stylesheets/custom.css.scss

@@ -125,4 +125,15 @@ table.table.table-striped tr.highlight_row td {
   /* 4px */
 }
 
+.snackbar.error {
+  //background-color: red;
+}
+.snackbar.alert {
+  //background-color: yellow;
+  //color: black;
+}
+.snackbar.notice {
+  //background-color: green;
+}
+
 

data/lib/r5/template/app/views/layouts/application_materialize.html.erb

@@ -12,9 +12,8 @@
     <%= javascript_include_tag "https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js", "https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js" %>
   <![endif]-->
 
-  <%= javascript_pack_tag 'application' %>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
@@ -30,7 +29,7 @@
         <a href="#" class="brand-logo right">Logo</a>
         <ul id="nav-mobile" class="hide-on-med-and-down">
           <%= menu_item 'example', '#', /example(?!new)/  %>
-          <li><a class="dropdown-button" href="#!" data-activates="user-details">
+          <li><a class="dropdown-trigger" href="#!" data-target="user-details">
             Přihlášen: <%= current_user.display_name %><i class="material-icons right">arrow_drop_down</i>
             </a>
           </li>
@@ -38,16 +37,13 @@
       </div>
     </nav>
   <% end %>
-  
-  <div class="container container-large content">
-    <% flash.each do |name, msg| %>
-      <%= content_tag :div, :class => "alert alert-#{ name == :error ? "danger" : "success" } alert-dismissable" do %>
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-        <%= msg %>
-      <% end %>
-    <% end %>
 
+  <div class="container container-large content">
     <%= yield %>
   </div>
+
+  <%= javascript_tag do %>
+    window.flashMessages = $.parseJSON('<%=j flash.to_hash.to_json.html_safe %>');
+  <% end %>
 </body>
 </html>

data/lib/r5/version.rb

@@ -1,3 +1,3 @@
 module R5
-  VERSION = "0.4.0.5"
+  VERSION = "0.5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r5
 version: !ruby/object:Gem::Version
-  version: 0.4.0.5
+  version: 0.5.0.0
 platform: ruby
 authors:
 - mousse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - lib/r5/template/app/assets/fonts/glyphicons-halflings-regular.ttf
 - lib/r5/template/app/assets/fonts/glyphicons-halflings-regular.woff
 - lib/r5/template/app/assets/fonts/glyphicons-halflings-regular.woff2
+- lib/r5/template/app/assets/javascripts/custom.js
 - lib/r5/template/app/assets/javascripts/main.js.rb
 - lib/r5/template/app/assets/stylesheets/bootstrap-generators.scss
 - lib/r5/template/app/assets/stylesheets/bootstrap-variables.scss
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails generator using Thor gem for private usage mostly