railsstrap 3.3.4 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5416bc2743f49e2efaf0b8f0465de1639048ebf6
-  data.tar.gz: 3ade63a393fa26e1346be1bb3d092efd309ec8ec
+SHA256:
+  metadata.gz: 2b4484053d467f665b57114a7096c965a6f203637aba4cb244cb857dae9d2789
+  data.tar.gz: e3dbcf1ef81b7ad4dfc869feb5e3d90ba039bb9bf44162c49ccc2fe76c7e67fa
 SHA512:
-  metadata.gz: 4b43cd596a8d8f3973f2eabdf4a9f1739880fec3306cc0d9bd70361d0ecef5484d0caf2c21b88ae4e9ed86aafa170ec0fea73fa0e94d72df4eca13504909bde7
-  data.tar.gz: 18ec34f0580cd22086b47a4fa968a5dd350f612305c4da5539d9065a074789f4d0cf9c2c8d39031256a8f84a6998954ec23e65210753dbfa56012dc4f5129cdf
+  metadata.gz: 2d5c6d25924aabea4ac83531ceb29f6c306f5a72f978b053491cb1ffd0d3bc62dd41f02fc36aea4fd373bdc8d52f2fd9931c0e125dd0e0c0dcc1d843f3da626f
+  data.tar.gz: 579343c8f0a3c68926beb709c40100e5493639a219a19408e96cde622a072c8414400a39405c50ca14825d81248e2a15f20a5b3f1e2ce15b9f60f50860eb9136

data/lib/generators/railsstrap/install/install_generator.rb

@@ -5,9 +5,9 @@ module Railsstrap
     class InstallGenerator < ::Rails::Generators::Base
 
       source_root File.expand_path("../templates", __FILE__)
-      desc 'This generator installs Bootstrap to Asset Pipeline'
-      argument :stylesheets_type, :type => :string, :default => 'less', :banner => '*less or static'
-      class_option :'no-coffeescript', :type => :boolean, :default => false, :desc => 'Skips coffeescript replacement into app generators'
+      desc 'This generator installs Railsstrap to Asset Pipeline'
+      argument :stylesheets_type, :type => :string, :default => 'scss', :banner => '*scss or css'
+      class_option :'no-coffeescript', :type => :boolean, :default => true, :desc => 'Skips coffeescript replacement into app generators'
 
       def add_assets
 
@@ -16,23 +16,24 @@ module Railsstrap
         asset_initializer = 'config/initializers/assets.rb'
         config_asset_insert_line = "Rails.application.config.assets.precompile\s+=\s%w(.svg .eot .woff .ttf)"
 
-        if File.exists?(asset_initializer) && Rails::VERSION::MAJOR >= 4 #Must be Rails 4
+        if File.exist?(asset_initializer) && ::Rails::VERSION::MAJOR >= 4 # Must be Rails 4+
           content = File.read(asset_initializer)
           if content.match(config_asset_insert_line)
             #set up properly
             puts "Ensure config/initializers/assets.rb contains this line:\n" + config_asset_insert_line
           else
-            insert_into_file asset_initializer, config_asset_insert_line, :after => 'config.assets.precompile\n'
+            inject_into_file asset_initializer, config_asset_insert_line, :after => 'config.assets.precompile\n'
           end
-        else #Assumes Rails 3.1 then...
+        else #Assumes Rails 3.1 then (3.0 is not supported)...
           rails_three_config = 'config/environments/production.rb'
-          if File.exists?(rails_three_config) && Rails::VERSION::MAJOR <= 4
-            insert_into_file rails_three_config, config_asset_insert_line, :after => 'config.assets.precompile\n'
+          if File.exist?(rails_three_config) && ::Rails::VERSION::MAJOR <= 4
+            inject_into_file rails_three_config, config_asset_insert_line, :after => 'config.assets.precompile\n'
           end
         end
 
         if File.exist?(js_manifest)
-          insert_into_file js_manifest, "//= require bootstrap/dist/js/bootstrap\n", :after => "jquery_ujs\n"
+          puts js_manifest
+          inject_into_file js_manifest, "//= require railsstrap\n", before: 'require_tree\n'
         else
           copy_file "application.js", js_manifest
         end
@@ -42,10 +43,10 @@ module Railsstrap
           content = File.read(css_manifest)
 
           if content.match(/require_tree\s+\.\s*$/)
-            # Good enough - that'll include our bootstrap_and_overrides.css.less
+            # Good enough - that'll include our css
           else
-            style_require_block = " *= require bootstrap_and_overrides\n*=require fontawesome"
-            insert_into_file css_manifest, style_require_block, :after => "require_self\n"
+            style_require_block = " *= require railsstrap\n"
+            inject_into_file css_manifest, style_require_block, :after => "require_self\n"
           end
         else
           copy_file 'application.css', 'app/assets/stylesheets/application.css'
@@ -59,17 +60,12 @@ module Railsstrap
         else
           copy_file "bootstrap.js", "app/assets/javascripts/bootstrap.js"
         end
-        if use_less?
-          copy_file "bootstrap_and_overrides.less", "app/assets/stylesheets/bootstrap_and_overrides.css.less"
-        else
-          copy_file "bootstrap_and_overrides.css", "app/assets/stylesheets/bootstrap_and_overrides.css"
-        end
       end
 
       def add_locale
         if File.exist?("config/locales/en.railsstrap.yml")
           localez = File.read("config/locales/en.railsstrap.yml")
-          insert_into_file "config/locales/en.railsstrap.yml", localez, :after => "en\n"
+          inject_into_file "config/locales/en.railsstrap.yml", localez, :after => "en\n"
         else
           copy_file "en.railsstrap.yml", "config/locales/en.railsstrap.yml"
         end
@@ -78,19 +74,16 @@ module Railsstrap
       def cleanup_legacy
         # Remove old requires (if any) that included railsstrap/railsstrap directly:
         gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*bootstrap/bootstrap\s*\n|, "")
-        if File.exist?('app/assets/stylesheets/bootstrap_override.css.less')
+        if File.exist?('app/assets/stylesheets/bootstrap_override.css.scss') || File.exist?('app/assets/stylesheets/bootstrap_override.less')
           puts <<-EOM
           Warning:
-            app/assets/stylesheets/bootstrap_override.css.less exists
-            It should be removed, as it has been superceded by app/assets/stylesheets/bootstrap_and_overrides.css.less
+            app/assets/stylesheets/bootstrap_override exists
+            It should be removed! Please read https://getbootstrap.com/docs/4.0/getting-started/theming/
           EOM
         end
       end
 
-    private
-      def use_less?
-        (defined?(Less) && (stylesheets_type!='static') ) || (stylesheets_type=='less')
-      end
+      private
 
       def use_coffeescript?
         return false if options[:'no-coffeescript']

data/lib/generators/railsstrap/install/templates/application.css

@@ -3,8 +3,7 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require 'bootstrap'
- *= require 'railsstrap'
- *= require 'fontawesome'
+ *= require 'railsstrap.min'
  *= require_self
  *= require_tree .
 */

data/lib/generators/railsstrap/install/templates/application.js

@@ -12,9 +12,6 @@
 //
 // You can require individual railsstrap components using:
 // require railsstrap/js/[component_name].js
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap/dist/js/bootstrap.js
-// Date and Time Picker (remove *):
-//*= require datepicker/datepicker
+//= require bootstrap
+//= require railsstrap.min
 //= require_tree .

data/lib/generators/railsstrap/install/templates/bootstrap.js

@@ -1,9 +1,9 @@
-jQuery(function () {
-    $("a[rel~=popover], .has-popover").popover();
-    $("a[rel~=tooltip], .has-tooltip").tooltip();
+(function ($) {
+  $("a[rel~=popover], .has-popover").popover();
+  $("a[rel~=tooltip], .has-tooltip").tooltip();
 
-    // comment this out if you want to add the animation to an element. You may need to handle events for them to work correctly.
-    // This is just a generic example, your mileage will vary depending on what you're trying to do.
+  // comment this out if you want to add the animation to an element. You may need to handle events for them to work correctly.
+  // This is just a generic example, your mileage will vary depending on what you're trying to do.
 
 //    $("[data-animation]")(function () {
 //        e.preventDefault();
@@ -13,4 +13,4 @@ jQuery(function () {
 //            $(this).next().addClass("animated " + _easeIn);
 //        }
 //    });
-});
+})(jQuery);

data/lib/generators/railsstrap/layout/layout_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Railsstrap
@@ -5,14 +7,14 @@ module Railsstrap
     class LayoutGenerator < ::Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
       desc 'Generates a layout file with navigation.'
-      argument :layout_name, :type => :string, :default => 'application'
+      argument :layout_name, type: :string, default: 'application'
 
       attr_reader :app_name
 
       def generate_layout
         app = ::Rails.application
         @app_name = app.class.to_s.split('::').first
-        ext = app.config.generators.options[:rails][:template_engine] || :erb
+        ext = app.config.generators.options[:rails][:template_extension] || :erb
         template "layout.html.#{ext}", "app/views/layouts/#{layout_name}.html.#{ext}"
       end
     end

data/lib/generators/railsstrap/layout/templates/layout.html.erb

@@ -1,85 +1,82 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
-    <%%= csrf_meta_tags %>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title><%%= content_for?(:title) ? yield(:title) : "<%= app_name %>" %></title>
+  <%%= csrf_meta_tags %>
 
-    <%%= stylesheet_link_tag "application", :media => "all" %>
+  <%%= stylesheet_link_tag bootstrap_css %>
+  <%%= stylesheet_link_tag bootstrap_theme_css %>
+  <%%= stylesheet_link_tag font_awesome_js %>
+  <%%= stylesheet_link_tag "application", :media => "all" %>
 
-    <!-- For third-generation iPad with high-resolution Retina display: -->
-    <!-- Size should be 144 x 144 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '144x144' %>
+  <!-- Uncomment these favicon tags as you create them. https://realfavicongenerator.net/ -->
+  <!-- For third-generation iPad with high-resolution Retina display: -->
+  <!-- Size should be 144 x 144 pixels -->
+  <%%#= favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type =>
+  'image/png', :sizes => '144x144' %>
 
-    <!-- For iPhone with high-resolution Retina display: -->
-    <!-- Size should be 114 x 114 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114' %>
+  <!-- For iPhone with high-resolution Retina display: -->
+  <!-- Size should be 114 x 114 pixels -->
+  <%%#= favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type =>
+  'image/png', :sizes => '114x114' %>
 
-    <!-- For first- and second-generation iPad: -->
-    <!-- Size should be 72 x 72 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72' %>
+  <!-- For first- and second-generation iPad: -->
+  <!-- Size should be 72 x 72 pixels -->
+  <%%#= favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type =>
+  'image/png', :sizes => '72x72' %>
 
-    <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
-    <!-- Size should be 57 x 57 pixels -->
-    <%%= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png' %>
+  <!-- For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: -->
+  <!-- Size should be 57 x 57 pixels -->
+  <%%#= favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
+  %>
 
-    <!-- For all other devices -->
-    <!-- Size should be 32 x 32 pixels -->
-    <%%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
+  <!-- For all other devices -->
+  <!-- Size should be 32 x 32 pixels -->
+  <%%#= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %>
 
-    <%%= javascript_include_tag "application" %>
-
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
-    <![endif]-->
-  </head>
-  <body>
-
-    <div class="navbar navbar-default navbar-static-top">
-      <div class="container">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#"><%= app_name %></a>
-        <div class="navbar-collapse collapse navbar-responsive-collapse">
-          <ul class="nav navbar-nav">
-            <li><%%= link_to "Link1", "/path1"  %></li>
-            <li><%%= link_to "Link2", "/path2"  %></li>
-            <li><%%= link_to "Link3", "/path3"  %></li>
-          </ul>
-        </div>
-      </div>
+</head>
+<body>
+<%%= navbar variant: :primary, text_variant: :dark, position: :fixed_top do %>
+  <%%= vertical do %>
+    <%%= content_tag :span, <%= app_name %>, class: 'navbar-brand' %>
+  <%% end %>
+  <%%= horizontal do %>
+    <%%= nav do %>
+      <%%= link_to 'Home', '/', class: 'nav-item' %>
+      <%%= link_to 'Profile', '/profile', class: 'nav-item' %>
+    <%% end %>
+  <%% end %>
+<%% end %>
+<div class="container pt-3">
+  <div class="row">
+    <div class="col-lg-9">
+      <%%= bootstrap_flash  %>
+      <%%= yield %>
     </div>
+    <div class="col-lg-3">
+      <%%= card title: 'Sidebar' do %>
+        <%%= content_tag :div, class: 'card-body' do %>
+          <%%= nav do %>
+            <%%= link_to "Link1", "/path1" %>
+            <%%= link_to "Link2", "/path2" %>
+            <%%= link_to "Link3", "/path3" %>
+          <%% end %>
+        <%% end %>
+      <%% end %>
+    </div>
+  </div>
 
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-9">
-          <%%= bootstrap_flash %>
-          <%%= yield %>
-        </div>
-        <div class="col-lg-3">
-          <div class="well sidebar-nav">
-            <h3>Sidebar</h3>
-            <ul class="nav nav-list">
-              <li class="nav-header">Sidebar</li>
-              <li><%%= link_to "Link1", "/path1"  %></li>
-              <li><%%= link_to "Link2", "/path2"  %></li>
-              <li><%%= link_to "Link3", "/path3"  %></li>
-            </ul>
-          </div><!--/.well -->
-        </div><!--/span-->
-      </div><!--/row-->
-
-      <footer>
-        <p>&copy; Company <%= Date.today.year %></p>
-      </footer>
-
-    </div> <!-- /container -->
+  <footer class="fixed-bottom">
+    <p>&copy; <%= app_name %> <%= Date.today.year %></p>
+  </footer>
 
-  </body>
+</div> <!-- /container -->
+<%%= content_tag :script, nil, src: jquery_js %>
+<%%= content_tag :script, nil, src: popper_js %>
+<%%= content_tag :script, nil, src: bootstrap_js %>
+<%%= javascript_include_tag "application" %>
+</body>
 </html>

data/lib/generators/railsstrap/layout/templates/layout.html.haml

@@ -1,5 +1,5 @@
 !!! 5
-%html(lang="en")
+%html(lang="en" class="fontawesome-i2svg-pending")
   %head
     %meta(charset="utf-8")
     %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
@@ -47,4 +47,4 @@
               %li= link_to "Link 2", "/path2"
               %li= link_to "Link 3", "/path3"
       %footer
-        %p &copy; Company <%= Date.today.year %>
+        %p &copy; <%= app_name %> <%= Date.today.year %>

data/lib/generators/railsstrap/layout/templates/layout.html.slim

@@ -1,5 +1,5 @@
 doctype html
-html lang="en"
+html lang="en" class="fontawesome-i2svg-pending"
   head
     meta charset="utf-8"
     meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
@@ -13,24 +13,24 @@ html lang="en"
     = favicon_link_tag 'apple-touch-icon-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png'
     = favicon_link_tag 'favicon.ico', :rel => 'shortcut icon'
     = javascript_include_tag "application"
-    /! Le HTML5 shim, for IE6-8 support of HTML elements
+      /! Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
       = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
 
 
   body
     .navbar.navbar-default.navbar-static-top
-        .container
-          button.navbar-toggle type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse"
-            span.icon-bar
-            span.icon-bar
-            span.icon-bar
-          a.navbar-brand href="#"<%= app_name %>
-          .navbar-collapse.collapse.navbar-responsive-collapse
-            ul.nav.navbar-nav
-              li= link_to "Link 1", "/path1"
-              li= link_to "Link 2", "/path2"
-              li= link_to "Link 3", "/path3"
+      .container
+        button.navbar-toggle type="button" data-toggle="collapse" data-target=".navbar-responsive-collapse"
+          span.icon-bar
+          span.icon-bar
+          span.icon-bar
+        a.navbar-brand href="#"<%= app_name %>
+        .navbar-collapse.collapse.navbar-responsive-collapse
+          ul.nav.navbar-nav
+            li= link_to "Link 1", "/path1"
+            li= link_to "Link 2", "/path2"
+            li= link_to "Link 3", "/path3"
 
     .container
       .row
@@ -47,4 +47,4 @@ html lang="en"
               li= link_to "Link 3", "/path3"
 
       footer
-        p &copy; Company <%= Date.today.year %>
+        p &copy; <%= app_name %> <%= Date.today.year %>

data/lib/generators/railsstrap/partial/partial_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Railsstrap
@@ -5,8 +7,8 @@ module Railsstrap
     class PartialGenerator < ::Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
       desc 'Generates railsstrap HTML partials'
-      argument :component_name, :type => :string, :default => 'application',
-               :banner => 'navbar, navbar-devise, carousel'
+      argument :component_name, type: :string, default: 'application',
+               banner: 'navbar, navbar-devise, carousel'
 
       attr_reader :app_name
 

data/lib/generators/railsstrap/partial/templates/_login.html.erb

@@ -21,7 +21,7 @@
     </div>
   <% end -%>
 
-  <%= f.submit 'Sign in', :class => 'btn btn-default' %>
+  <%= f.submit 'Sign in', :class => 'btn btn-primary' %>
 
 <% end %>
 

data/lib/generators/railsstrap/scaffold/scaffold_generator.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/generated_attribute'
+
+module Railsstrap
+  module Generators
+    class Base < ::Rails::Generators::NamedBase #:nodoc:
+      protected
+
+      def format
+        :html
+      end
+
+      def handler
+        :erb
+      end
+    end
+
+    class ScaffoldGenerator < Base # :nodoc:
+      include ::Rails::Generators::ResourceHelpers
+
+      source_root File.expand_path('../templates', __FILE__)
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+
+      class_option :excluded_columns, type: :array, required: false
+
+      def initialize(args, *options)
+        super(args, *options)
+        initialize_views_variables
+      end
+
+      def initialize_views_variables
+        @base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules
+        @controller_routing_path = @controller_file_path.gsub(/\//, '_')
+        @resource_name ||= @controller_class_nesting + "::#{@base_name.singularize.camelize}"
+        @resource_name = @resource_name.camelize
+        @model_name = @resource_name.downcase.gsub('::', '')
+      end
+
+      attr_reader :resource_name
+
+      def excluded_columns_pattern
+        [
+          /.*_checksum/,
+          /.*_count/,
+        ]
+      end
+
+      def excluded_columns
+        options['excluded_columns'] || []
+      end
+
+      def rescue_block(exception = Exception)
+        yield if block_given?
+      rescue exception => e
+        say e.message, :red
+        exit
+      end
+
+      def extract_modules
+        modules = controller_name.include?('/') ? controller_name.split('/') : controller_name.split('::')
+        name = modules.pop
+        path = modules.map(&:underscore)
+        file_path = (path + [name.underscore]).join('/')
+        nesting = modules.map(&:camelize).join('::')
+        [name, path, file_path, nesting, modules.size]
+      end
+
+      def copy_views
+        generate_views
+      end
+
+      def generate_views
+        options.engine == generate_erb
+      end
+
+      def selected_views
+        {
+          "index.html.#{ext}" => File.join('app/views', @controller_file_path, "index.html.#{ext}"),
+          "new.html.#{ext}" => File.join('app/views', @controller_file_path, "new.html.#{ext}"),
+          "edit.html.#{ext}" => File.join('app/views', @controller_file_path, "edit.html.#{ext}"),
+          "#{form_builder}_form.html.#{ext}" => File.join('app/views', @controller_file_path, "_form.html.#{ext}"),
+          "show.html.#{ext}" => File.join('app/views', @controller_file_path, "show.html.#{ext}")
+        }
+      end
+
+      def generate_erb
+        selected_views.each do |template_name, output_path|
+          template template_name, output_path
+        end
+      end
+
+      def ext
+        ::Rails.application.config.generators.options[:rails][:template_extension] || :erb
+      end
+
+      def form_builder
+        defined?(::SimpleForm) ? 'simple_form/' : ''
+      end
+    end
+  end
+end