bootswatch_rails 3.2.0.43 → 3.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17c04c6d5d38256f8b147ba8a594f005ffa9675e
-  data.tar.gz: cee591c5b6b1506bdb5e48497a4829fee86b08d0
+  metadata.gz: e5ab991aeefb9e0f9f94bd1770a88fff5d261118
+  data.tar.gz: cdd6fa031c64bac29026a74dc5093362b3fd9bdb
 SHA512:
-  metadata.gz: e3001fc7b7b1e3359cf47c40b97e62ad36682d1e237e66fc30d0f74aca10e27aa64508e73e4a58a9fcb93acd168e72c98733e3889d5116b1b085be14048062f4
-  data.tar.gz: 7f53cb1906d49693470dedfd663fc86eb9d99e0ac3c51cd10421f6f26f4162ad23184428c989f3d793480bf78535e5be5fea8fdde1e6b4260e6733fc5e5d51c3
+  metadata.gz: c5f457f23fa82daa60321973aa974de4a3feb9f1cc6e2c7115e2ff7fe4370f1f61936cbc1e6fa5330ecfc7ac45b43db876af048d15d4f2a8519d5a903a34a834
+  data.tar.gz: fe94dda766ccd6c3a6583c2f16ce80241e0232694205a9525615b5f3216a8cfdb02928b51ba0924dbadf2bb69f6fcbe06de9b5f302e52420a108c94ae2c3ec18

data/generate.sh

@@ -48,7 +48,7 @@ done
 _engine="lib/bootswatch_rails/engine.rb"
 if [ -s $_engine ] ; then
 	rm -f /tmp/engine.tmp
-	sed -e "/assets.precompile/s/=.*/= %w(bootstrap.js $_themes_css)/" $_engine >/tmp/engine.tmp
+	sed -e "/assets.precompile/s/=.*/= %w($_themes_css)/" $_engine >/tmp/engine.tmp
 	if cmp -s /tmp/engine.tmp $_engine ; then
 		rm -f /tmp/engine.tmp
 	else

data/lib/bootswatch_rails/engine.rb

@@ -1,7 +1,32 @@
+require_relative "version"
+
 module BootswatchRails
+  module ActionViewExtensions
+    OFFLINE = (Rails.env.development? or Rails.env.test?)
+
+    def bootswatch_link_tag(theme = nil, options = {})
+      theme ||= BootswatchRails::THEMES[BootswatchRails::DEFAULT].to_s
+      return stylesheet_link_tag(theme) if !options.delete(:force) and OFFLINE
+      bootswatch_url = "//maxcdn.bootstrapcdn.com/bootswatch/<%= BootswatchRails::BOOTSTRAP %>/#{theme}/bootstrap.min.css"
+      fontawesome_url = "//maxcdn.bootstrapcdn.com/font-awesome/<%= BootswatchRails::FONT_AWESOME %>/css/font-awesome.min.css"
+      stylesheet_link_tag(bootswatch_url) + "\n  " + stylesheet_link_tag(fontawesome_url)
+    end
+
+    def bootstrap_include_tag(options = {})
+      return javascript_include_tag(:bootstrap, options) if !options.delete(:force) and OFFLINE
+      bootstrap_url = "//maxcdn.bootstrapcdn.com/bootstrap/#{BootswatchRails::BOOTSTRAP}/js/bootstrap.min.js"
+      [ javascript_include_tag(bootstrap_url, options),
+        javascript_tag("window.jQuery || document.write(unescape('#{javascript_include_tag(:bootstrap, options).gsub('<','%3C')}'))")
+      ].join("\n").html_safe
+    end
+  end
+
   class Engine < Rails::Engine
-    initializer "BootswatchRails themes" do |app|
-      app.config.assets.precompile += %w(bootstrap.js amelia.css cerulean.css cosmo.css custom.css cyborg.css darkly.css flatly.css journal.css lumen.css paper.css readable.css sandstone.css simplex.css slate.css spacelab.css superhero.css united.css yeti.css)
+    initializer "BootswatchRails" do |app|
+      ActiveSupport.on_load(:action_view) do
+        include BootswatchRails::ActionViewExtensions
+      end
+      app.config.assets.precompile += %w(cerulean.css cosmo.css custom.css cyborg.css darkly.css flatly.css journal.css lumen.css paper.css readable.css sandstone.css simplex.css slate.css spacelab.css superhero.css united.css yeti.css)
       app.config.assets.paths << File.expand_path('../../../vendor/assets/fonts', __FILE__)
     end
   end

data/lib/bootswatch_rails/version.rb

@@ -1,8 +1,8 @@
 module BootswatchRails
-  BOOTSTRAP = "3.2.0"
+  BOOTSTRAP = "3.3.0"
   FONT_AWESOME = "4.2.0"
-  VERSION = "3.2.0.43"
+  VERSION = "3.3.0.1"
 
-  THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
-  DEFAULT = 1
+  THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
+  DEFAULT = 0
 end

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

@@ -4,11 +4,17 @@ module BootswatchRails
       desc "Setup application to use bootswatch.com"
       class_option :turbolinks, type: :boolean, default: false,
                desc: 'Activate turbolinks (off by default)'
+      class_option :ui, type: :boolean, default: false,
+               desc: 'Include jQuery-ui (requires jquery-ui gem)'
+      class_option :cdn, type: :string, default: 'none',
+               banner: 'none, google, microsoft, jquery or yandex',
+               desc: 'Use CDN (requires jquery[-ui]-rails-cdn gems)'
       source_root File.expand_path("../templates", __FILE__)
 
       def update_application_controller
         file = "app/controllers/application_controller.rb"
         inject_into_file file, "\n\n  private", after: /protect_from_forgery.*$/
+
         lines = [
           "",
           "  def default_theme",
@@ -17,7 +23,7 @@ module BootswatchRails
           "  helper_method :default_theme",
           "",
           "  def current_theme",
-          "    @current_theme = current_user.theme if current_user.present?",
+          "    @current_theme = current_user.theme if logged_in?",
           "    @current_theme ||= default_theme",
           "  end",
           "  helper_method :current_theme",
@@ -26,6 +32,22 @@ module BootswatchRails
         inject_into_file file, lines.join("\n"), before: /^end$/
       end
 
+      def copy_application_js
+        file = "app/assets/javascripts/application.js"
+        remove_file file
+        template "application.js", file
+      end
+
+      def setup_assets_precompile
+        return unless options.cdn?
+        initializer "bootswatch_assets.rb" do
+          assets  = "jquery.js"
+          assets += " jquery-ui.js" if options.ui?
+          assets += " bootstrap.js"
+          "Rails.application.config.assets.precompile += %w( #{assets} )"
+        end
+      end
+
       def copy_directories
         directory "app", force: true
         directory "config"
@@ -36,13 +58,10 @@ module BootswatchRails
         template "head.html.erb", "app/views/layouts/_head.html.erb"
       end
 
-      def remove_turbolinks
-        return if options.turbolinks?
-        # comment_lines "Gemfile", /gem 'turbolinks/
-        file = "app/assets/javascripts/application.js"
-        gsub_file file, /^\/\/= require turbolinks\s/, ""
-        file = "app/views/layouts/_head.html.erb"
-        gsub_file file, /, 'data-turbolinks-track' => true/, ""
+      protected
+
+      def turbolinks
+        options.turbolinks? ? ", 'data-turbolinks-track' => true" : ""
       end
     end
   end

data/lib/generators/bootswatch_rails/install/templates/app/views/layouts/application.html.erb

@@ -7,20 +7,13 @@
 
     <div class="container" id="main-content">
       <div class="row">
-<%- if current_user -%>
         <div class="col-md-9">
           <%= render 'layouts/flash' %>
           <%= yield %>
         </div>
-        <div class="well col-md-3">
+        <div class="col-md-3 well">
           <%= render 'layouts/sidebar' %>
         </div>
-<%- else -%>
-        <div class="col-md-12">
-          <%= render 'layouts/flash' %>
-          <%= yield %>
-        </div>
-<%- end -%>
       </div>
     </div>
 

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

@@ -0,0 +1,23 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+<%- unless options.cdn? -%>
+//= require jquery
+  <%- if options.ui? -%>
+//= require jquery-ui
+  <%- end -%>
+<%- end -%>
+//= require jquery_ujs
+<%- unless options.cdn? -%>
+//= require bootstrap
+<%- end -%>
+//= require_tree .

data/lib/generators/bootswatch_rails/install/templates/head.html.erb

@@ -4,17 +4,22 @@
 
   <title><%%= content_for?(:title) ? yield(:title) : app_name %></title>
 
-  <%%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
-<%%- if Rails.env.production? -%>
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootswatch/<%= BootswatchRails::BOOTSTRAP %>/<%%= current_theme %>/bootstrap.min.css">
-  <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/<%= BootswatchRails::FONT_AWESOME %>/css/font-awesome.min.css">
-  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <script src="//maxcdn.bootstrapcdn.com/bootstrap/<%= BootswatchRails::BOOTSTRAP %>/js/bootstrap.min.js"></script>
-<%%- else -%>
-  <%%= stylesheet_link_tag current_theme, 'data-turbolinks-track' => true %>
-  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%%= javascript_include_tag 'bootstrap', 'data-turbolinks-track' => true %>
-<%%- end -%>
+  <%%= stylesheet_link_tag 'application', media: 'all'<%= turbolinks %> %>
+<%- if options.cdn != "none" -%>
+  <%%= bootswatch_link_tag current_theme %>
+<%- else -%>
+  <%%= stylesheet_link_tag current_theme<%= turbolinks %> %>
+<%- end -%>
+<%- if options.cdn != "none" -%>
+  <%%= jquery_include_tag :<%= options.cdn %><%= turbolinks %> %>
+  <%- if options.ui? -%>
+  <%%= jquery_ui_include_tag :<%= options.cdn %><%= turbolinks %> %>
+  <%- end -%>
+<%- end -%>
+  <%%= javascript_include_tag 'application'<%= turbolinks %> %>
+<%- if options.cdn != "none" -%>
+  <%%= bootstrap_include_tag<%= turbolinks %> %>
+<%- end -%>
 
   <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

data/lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb

@@ -141,7 +141,7 @@ module BootswatchRails
           "  end",
           "",
           "  def current_sysadm?",
-          "    current_#{name}.present? and current_#{name}.sysadm",
+          "    logged_in? and current_#{name}.sysadm",
           "  end",
           "  helper_method :current_sysadm?",
           ""