anjlab-bootstrap-rails 0.0.4 → 0.0.5

data/Rakefile

@@ -11,7 +11,7 @@ task "update-twitter" do
   bootstrap_scss = File.read("vendor/assets/stylesheets/bootstrap.scss")
 
   bootstrap_scss.gsub!(/@VERSION/, "v#{boostrap_version}")
-  bootstrap_scss.gsub!(/@DATE/, Time.now.to_s)
+  bootstrap_scss.gsub!(/^.*@DATE.*/, " *")
 
   File.open("vendor/assets/stylesheets/bootstrap.scss", "w") do |f|
     f.write(bootstrap_scss)
@@ -23,9 +23,19 @@ task "update-twitter" do
     cp file, "vendor/assets/javascripts/", :verbose => true
   end
 
-  bootstrap_js = js_files.map{|f| "//= require #{File.basename(f)}"}.join("\n")
+  js_priorities = {}
+  js_files.each {|f| js_priorities[File.basename(f)] = 0}
+
+  # popover depend on twipsy
+  js_priorities["bootstrap-twipsy.js"]  = 1
+  js_priorities["bootstrap-popover.js"] = 2
+  
+  js_list = js_priorities.to_a.sort {|a,b| a[1] <=> b[1]}.map{|p| p[0]}
+  
   File.open("vendor/assets/javascripts/bootstrap.js", "w") do |f|
     f.write "// Bootstrap v#{boostrap_version}\n"
-    f.write(bootstrap_js)
+    js_list.each do |js|
+      f.write "//= #{js}\n"
+    end
   end
 end

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/vendor/assets/javascripts/bootstrap.js

@@ -1,8 +1,8 @@
 // Bootstrap v1.3.0
-//= require bootstrap-alerts.js
-//= require bootstrap-dropdown.js
-//= require bootstrap-modal.js
-//= require bootstrap-popover.js
-//= require bootstrap-scrollspy.js
-//= require bootstrap-tabs.js
-//= require bootstrap-twipsy.js
+//= bootstrap-alerts.js
+//= bootstrap-dropdown.js
+//= bootstrap-modal.js
+//= bootstrap-tabs.js
+//= bootstrap-scrollspy.js
+//= bootstrap-twipsy.js
+//= bootstrap-popover.js

data/vendor/assets/stylesheets/bootstrap.scss

@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: 2011-09-20 11:28:01 +0400
+ *
  */
 
 // CSS Reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70348637392800 !ruby/object:Gem::Requirement
+  requirement: &70237370741920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348637392800
+  version_requirements: *70237370741920
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70348637392280 !ruby/object:Gem::Requirement
+  requirement: &70237370740840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70348637392280
+  version_requirements: *70237370740840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70348637391760 !ruby/object:Gem::Requirement
+  requirement: &70237370740040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70348637391760
+  version_requirements: *70237370740040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348637391240 !ruby/object:Gem::Requirement
+  requirement: &70237370738320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70348637391240
+  version_requirements: *70237370738320
 description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
   projects
 email: