bootswatch_rails 3.3.1.1 → 3.3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 671aa6de067c9920b85342dba87cbd667c1775b9
-  data.tar.gz: dbfab3e4d6add9202f376271dd351e61716048a4
+  metadata.gz: c692c14cff1d6a837c0f4b3045b4a706dfef8e5b
+  data.tar.gz: 8e2fab7ab3fa916497934f7120f76c8e80c707e6
 SHA512:
-  metadata.gz: 4569fd996eac9bfde7534ae9ff23444a1a8d861623a3ea806831d13933a23d8255256ec01422905ac8bf43dfad9f28547ac0afd8c2f25f1ef0ee0cbb2702f908
-  data.tar.gz: 1b8c93c1f25844607394774b906435650d36f5802b474653764a26ff04b2b5b1b31a1491e8bf7245d5e909a49051f193eda2c1ce5d566a4d50c8b99fcdf4ac46
+  metadata.gz: 9cae0993a82d31d23f1ec72b641018acc7f5ae01d923d63ac236d79ee281d78441f96c014c0f8fc70d3b4027efbc497d208923163f5617eb84405c1f407a7915
+  data.tar.gz: 2f5e25503117af6663a6aa44d6fa36fdebe8715db73fffc49ee2c2e194b9bce26d7afa75fb0c0f9cf17a87ca44c0efb62e2d8c9e1880579b362551f72b77f35c

data/Makefile

@@ -20,6 +20,7 @@ install: build
 	sudo rm -rf pkg
 
 build:
+	test -d datatables && git add datatables || true
 	test -d cleditor && git add cleditor || true
 	git add lib
 	git add vendor

data/generate.sh

@@ -10,7 +10,9 @@
 # Exit on error 
 set -e                  
 
-git submodule foreach git pull
+if [ "$1" != "local" ] ; then
+	git submodule foreach git pull
+fi
 
 _assets="vendor/assets"
 for _dir in fonts images javascripts stylesheets ; do
@@ -18,6 +20,11 @@ for _dir in fonts images javascripts stylesheets ; do
 	touch $_assets/$_dir/.gitkeep
 done
 
+
+#################################################################################
+###### Setup Bootswatch
+#################################################################################
+
 _themes_css=""
 _themes_raw=""
 for _file in $(ls -1 bootswatch/*/bootstrap.css) ; do
@@ -45,6 +52,80 @@ for _file in $(ls -1 bootswatch/*/bootstrap.css) ; do
 	fi
 done
 
+
+#################################################################################
+###### Setup DataTables
+#################################################################################
+
+DT_VER="1.10.4"
+DT_RESP="1.0.2"
+
+if [ "$1" != "local" ] ; then
+	wget -N -P datatables "http://datatables.net/releases/DataTables-$DT_VER.zip"
+fi
+
+rm -rf /tmp/DataTables-*
+unzip -q -d /tmp datatables/DataTables-$DT_VER.zip
+
+_src="/tmp/DataTables-$DT_VER/media/js/jquery.dataTables.js"
+_dst="$_assets/javascripts/jquery.dataTables.js"
+if ! cmp -s $_src $_dst ; then
+	echo "copy: jquery.dataTables.js"
+	cp $_src $_dst
+fi
+
+_src="/tmp/DataTables-$DT_VER/extensions/Responsive/js/dataTables.responsive.js"
+_dst="$_assets/javascripts/dataTables.responsive.js"
+if ! cmp -s $_src $_dst ; then
+	echo "copy: dataTables.responsive.js"
+	cp $_src $_dst
+fi
+
+_src="/tmp/DataTables-$DT_VER/media/css/jquery.dataTables.css"
+_dst="$_assets/stylesheets/jquery.dataTables.css"
+rm -f /tmp/css.tmp
+sed -e 's#\.\./images/#/assets/#g' $_src >/tmp/css.tmp
+if cmp -s /tmp/css.tmp $_dst ; then
+	rm -f /tmp/css.tmp
+else
+	echo "copy: jquery.dataTables.css"
+	mv /tmp/css.tmp $_dst
+fi
+
+_src="/tmp/DataTables-$DT_VER/extensions/Responsive/css/dataTables.responsive.css"
+_dst="$_assets/stylesheets/dataTables.responsive.css"
+rm -f /tmp/css.tmp
+sed -e 's#\.\./images/#/assets/#g' $_src >/tmp/css.tmp
+if cmp -s /tmp/css.tmp $_dst ; then
+	rm -f /tmp/css.tmp
+else
+	echo "copy: dataTables.responsive.css"
+	mv /tmp/css.tmp $_dst
+fi
+_themes_css="jquery.dataTables.css dataTables.responsive.css $_themes_css"
+
+
+#################################################################################
+###### Copy image files
+#################################################################################
+
+for _file in /tmp/DataTables-$DT_VER/media/images/*.png ; do
+	_file=${_file##*/}
+	_src="/tmp/DataTables-$DT_VER/media/images/$_file"
+	_dst="$_assets/images/$_file"
+	if ! cmp -s $_src $_dst ; then
+		echo "copy: $_file"
+		cp $_src $_dst
+	fi
+done
+
+rm -rf /tmp/DataTables-$DT_VER
+
+
+#################################################################################
+###### Update asset pipeline
+#################################################################################
+
 _engine="lib/bootswatch_rails/engine.rb"
 if [ -s $_engine ] ; then
 	rm -f /tmp/engine.tmp
@@ -57,10 +138,17 @@ if [ -s $_engine ] ; then
 	fi
 fi
 
+
+#################################################################################
+###### Update theme list
+#################################################################################
+
 _version="lib/bootswatch_rails/version.rb"
 if [ -s $_version ] ; then
 	rm -f /tmp/version.tmp
 	sed -e "/THEMES/s/=.*/= [$_themes_raw]/" $_version >/tmp/version.tmp
+	sed -i -e "/DATATABLES =/s/=.*/= \"$DT_VER\"/" /tmp/version.tmp
+	sed -i -e "/RESPONSIVE =/s/=.*/= \"$DT_RESP\"/" /tmp/version.tmp
 	if cmp -s /tmp/version.tmp $_version ; then
 		rm -f /tmp/version.tmp
 	else
@@ -69,6 +157,11 @@ if [ -s $_version ] ; then
 	fi
 fi
 
+
+#################################################################################
+###### Copy font files
+#################################################################################
+
 for _file in bootswatch/fonts/*.* ; do
 	_file=${_file##*/}
 	_src="bootswatch/fonts/$_file"
@@ -80,6 +173,10 @@ for _file in bootswatch/fonts/*.* ; do
 done
 
 
+#################################################################################
+###### Include CLEditor if found
+#################################################################################
+
 if [ -s cleditor/jquery.cleditor.js ] ; then
 	_src="cleditor/jquery.cleditor.js"
 	_dst="vendor/assets/javascripts/jquery.cleditor.js"

data/lib/bootswatch_rails/engine.rb

@@ -12,11 +12,39 @@ module BootswatchRails
       stylesheet_link_tag(bootswatch_url) + "\n  " + stylesheet_link_tag(fontawesome_url)
     end
 
+    def dataTables_link_tag(options = {})
+      return stylesheet_link_tag('jquery.dataTables') if !options.delete(:force) and OFFLINE
+      dataTables_url = "//cdn.datatables.net/#{BootswatchRails::DATATABLES}/css/jquery.dataTables.css"
+      stylesheet_link_tag(dataTables_url)
+    end
+
+    def dataTables_responsive_link_tag(options = {})
+      return stylesheet_link_tag('dataTables.responsive') if !options.delete(:force) and OFFLINE
+      responsive_url = "//cdn.datatables.net/responsive/#{BootswatchRails::RESPONSIVE}/css/dataTables.responsive.css"
+      stylesheet_link_tag(responsive_url)
+    end
+
     def bootstrap_include_tag(options = {})
-      return javascript_include_tag(:bootstrap, options) if !options.delete(:force) and OFFLINE
+      return javascript_include_tag(:bootstrap) 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')}'))")
+        javascript_tag("window.jQuery || document.write(unescape('#{javascript_include_tag(:bootstrap).gsub('<','%3C')}'))")
+      ].join("\n").html_safe
+    end
+
+    def dataTables_include_tag(options = {})
+      return javascript_include_tag('jquery.dataTables') if !options.delete(:force) and OFFLINE
+      dataTables_url = "//cdn.datatables.net/#{BootswatchRails::DATATABLES}/js/jquery.dataTables.js"
+      [ javascript_include_tag(dataTables_url, options),
+        javascript_tag("window.jQuery || document.write(unescape('#{javascript_include_tag('jquery.dataTables').gsub('<','%3C')}'))")
+      ].join("\n").html_safe
+    end
+
+    def dataTables_responsive_include_tag(options = {})
+      return javascript_include_tag('dataTables.responsive') if !options.delete(:force) and OFFLINE
+      responsive_url = "//cdn.datatables.net/responsive/#{BootswatchRails::RESPONSIVE}/js/dataTables.responsive.js"
+      [ javascript_include_tag(responsive_url, options),
+        javascript_tag("window.jQuery || document.write(unescape('#{javascript_include_tag('dataTables.responsive').gsub('<','%3C')}'))")
       ].join("\n").html_safe
     end
   end
@@ -26,7 +54,7 @@ module BootswatchRails
       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.precompile += %w(jquery.dataTables.css dataTables.responsive.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)
       app.config.assets.paths << File.expand_path('../../../vendor/assets/fonts', __FILE__)
     end
   end

data/lib/bootswatch_rails/version.rb

@@ -1,8 +1,10 @@
 module BootswatchRails
   BOOTSTRAP = "3.3.1"
-  BOOTSWATCH = "3.3.1"
+  BOOTSWATCH = "3.3.0"
   FONT_AWESOME = "4.2.0"
-  VERSION = "3.3.1.1"
+  DATATABLES = "1.10.4"
+  RESPONSIVE = "1.0.2"
+  VERSION = "3.3.1.2"
 
   THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 0

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

@@ -6,6 +6,8 @@ module BootswatchRails
                desc: 'Activate turbolinks (off by default)'
       class_option :ui, type: :boolean, default: false,
                desc: 'Include jQuery-ui (requires jquery-ui gem)'
+      class_option :dt, type: :boolean, default: false,
+               desc: 'Include the jQuery DataTables plugin'
       class_option :cdn, type: :string, default: 'none',
                banner: 'none, google, microsoft, jquery or yandex',
                desc: 'Use CDN (requires jquery[-ui]-rails-cdn gems)'
@@ -43,6 +45,7 @@ module BootswatchRails
         initializer "bootswatch_assets.rb" do
           assets  = "jquery.js"
           assets += " jquery-ui.js" if options.ui?
+          assets += " jquery.dataTables.js dataTables.responsive.js" if options.dt?
           assets += " bootstrap.js"
           "Rails.application.config.assets.precompile += %w( #{assets} )"
         end

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

@@ -15,6 +15,10 @@
   <%- if options.ui? -%>
 //= require jquery-ui
   <%- end -%>
+  <%- if options.dt? -%>
+//= require jquery.dataTables
+//= require dataTables.responsive
+  <%- end -%>
 <%- end -%>
 //= require jquery_ujs
 <%- if options.cdn == "none" -%>

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

@@ -7,7 +7,11 @@
 
   <%%= stylesheet_link_tag 'application', media: 'all'<%= turbolinks %> %>
 <%- if options.cdn != "none" -%>
-  <%%= bootswatch_link_tag current_theme %>
+  <%- if options.dt? -%>
+  <%%= dataTables_link_tag<%= turbolinks %> %>
+  <%%= dataTables_responsive_link_tag<%= turbolinks %> %>
+  <%- end -%>
+  <%%= bootswatch_link_tag current_theme<%= turbolinks %> %>
 <%- else -%>
   <%%= stylesheet_link_tag current_theme<%= turbolinks %> %>
 <%- end -%>
@@ -16,6 +20,10 @@
   <%- if options.ui? -%>
   <%%= jquery_ui_include_tag :<%= options.cdn %><%= turbolinks %> %>
   <%- end -%>
+  <%- if options.dt? -%>
+  <%%= dataTables_include_tag<%= turbolinks %> %>
+  <%%= dataTables_responsive_include_tag<%= turbolinks %> %>
+  <%- end -%>
 <%- end -%>
   <%%= javascript_include_tag 'application'<%= turbolinks %> %>
 <%- if options.cdn != "none" -%>