bootstrap-sass 3.0.3.0 → 3.1.0.0

data/tasks/converter/logger.rb

@@ -2,16 +2,6 @@ class Converter
   class Logger
     include Term::ANSIColor
 
-    def initialize(env)
-      @env = env
-      puts bold "Convert Bootstrap LESS to SASS"
-      puts " repo   : #{env[:repo]}"
-      puts " branch : #{env[:branch]} #{dark "#{env[:repo]}/tree/#{env[:branch_sha]}"}"
-      puts " save to: #{@env[:save_at].to_json}"
-      puts " twbs cache: #{@env[:cache_path]}"
-      puts dark "-" * 60
-    end
-
     def log_status(status)
       puts bold status
     end
@@ -20,8 +10,8 @@ class Converter
       puts "    #{magenta s}"
     end
 
-    def log_transform(*args)
-      puts "#{cyan "    #{caller[1][/`.*'/][1..-2].sub(/^block in /, '')}"}#{cyan ": #{args * ', '}" unless args.empty?}"
+    def log_transform(*args, from: caller[1][/`.*'/][1..-2].sub(/^block in /, ''))
+      puts "    #{cyan from}#{cyan ": #{args * ', '}" unless args.empty?}"
     end
 
     def log_processing(name)
@@ -51,9 +41,11 @@ class Converter
     end
 
     def puts(*args)
-      STDOUT.puts *args unless @silence
+      STDERR.puts *args unless @silence
     end
 
+    alias log puts
+
     def silence_log
       @silence = true
       yield
@@ -61,4 +53,4 @@ class Converter
       @silence = false
     end
   end
-end
+end

data/tasks/converter/network.rb

@@ -1,40 +1,14 @@
 class Converter
   module Network
-
-    def bootstrap_font_files
-      @bootstrap_font_files ||= get_paths_by_type('fonts', /\.(eot|svg|ttf|woff)$/)
-    end
-
-    def bootstrap_less_files
-      @bootstrap_less_files ||= get_paths_by_type('less', /\.less$/)
-    end
-
-    def bootstrap_js_files
-      @bootstrap_js_files ||= begin
-        files = get_paths_by_type 'js', /\.js$/
-        files.sort_by { |f|
-          case f
-            # tooltip depends on popover and must be loaded earlier
-            when /tooltip/ then
-              1
-            when /popover/ then
-              2
-            else
-              0
-          end
-        }
-      end
-    end
-
     protected
 
     def get_paths_by_type(dir, file_re)
-      files = get_json "#{@git_data_api_host}/#@repo/git/trees/#{get_tree_sha(dir)}"
+      files = get_json "https://api.github.com/repos/#@repo/git/trees/#{get_tree_sha(dir)}"
       files['tree'].select { |f| f['type'] == 'blob' && f['path'] =~ file_re }.map { |f| f['path'] }
     end
 
     def read_files(path, files)
-      full_path = "#{@git_raw_host}/#@repo/#@branch_sha/#{path}"
+      full_path = "https://raw.github.com/#@repo/#@branch_sha/#{path}"
       if (contents = read_cached_files(path, files))
         log_http_get_files files, full_path, true
       else
@@ -87,8 +61,9 @@ class Converter
 
     # get sha of the branch (= the latest commit)
     def get_branch_sha
-      cmd = "git ls-remote '#@repo_url' | awk '/#@branch/ {print $1}'"
-      puts cmd
+      return @branch if @branch =~ /\A[0-9a-f]+\z/
+      cmd = "git ls-remote 'https://github.com/#@repo' | awk '/#@branch/ {print $1}'"
+      log cmd
       @branch_sha ||= %x[#{cmd}].chomp
       raise 'Could not get branch sha!' unless $?.success?
       @branch_sha
@@ -100,11 +75,11 @@ class Converter
     end
 
     def get_trees
-      @trees ||= get_json("#{@git_data_api_host}/#@repo/git/trees/#@branch_sha")
+      @trees ||= get_json("https://api.github.com/repos/#@repo/git/trees/#@branch_sha")
     end
 
     def get_json(url)
       JSON.parse get_file(url)
     end
   end
-end
+end

data/test/compilation_test.rb

@@ -14,4 +14,4 @@ class CompilationTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/dummy/app/views/pages/root.html.slim

@@ -10,13 +10,19 @@
           li.list-group-item: a href='#three' Three
       .col-sm-3
         h2 3 columns
-        button.btn.btn-primary type='button' Button
-        button.btn.btn-primary type='button' Button
+        .btn-group
+          button.btn.btn-primary type='button' Button
+          button.btn.btn-primary type='button' Button
         h2 Icons
         ul.list-inline
           li: i.glyphicon.glyphicon-user
           li: i.glyphicon.glyphicon-bullhorn
           li: i.glyphicon.glyphicon-tint
+        table.table
+          caption Table
+          tr
+            td.danger Danger!
+            td.success Success!
       .col-sm-6
         h2 6 columns
         .panel.panel-primary: .panel-body

data/test/dummy/config/application.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'action_controller/railtie'
-require 'sprockets/railtie'
+require 'rails'
 
 Bundler.require(*Rails.groups)
+
 require 'sass-rails'
 require 'jquery-rails'
 require 'slim-rails'

data/test/gemfiles/sass_3_2.gemfile

@@ -5,7 +5,7 @@ gem 'sass', '~> 3.2.0'
 platform :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubysl-test-unit', '~> 2.0'
-  gem 'rubysl-json', '~> 2.0'
+  gem 'json', '>= 1.8.1'
   gem 'racc'
 end
 

data/test/gemfiles/sass_head.gemfile

@@ -1,13 +1,12 @@
 source "https://rubygems.org"
 
 gem 'sass', '~> 3.3.0.rc.2'
-gem 'compass', '~> 1.0.0.alpha.13'
-
+gem 'compass', '~> 1.0.0.alpha.17'
 
 platform :rbx do
   gem 'rubysl', '~> 2.0'
   gem 'rubysl-test-unit', '~> 2.0'
-  gem 'rubysl-json', '~> 2.0'
+  gem 'json', '>= 1.8.1'
   gem 'racc'
 end
 

data/test/sprockets_rails_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+require 'fileutils'
+require 'find'
+require 'shellwords'
+
+class SprocketsRailsTest < ActiveSupport::TestCase
+
+  def test_sprockets_digest_asset_refs
+    system "cd #{Shellwords.escape Rails.root.to_s} && bundle exec rake assets:precompile GEMFILE=#{Bootstrap.gem_path}/Gemfile RAILS_ENV=production"
+    Dir.glob(Rails.root.join('public', 'assets', 'app*.*')) do |path|
+      next unless path =~ /\.(css|js)$/
+      File.open(path, 'r') do |f|
+        f.read.scan /url\("?[^"]+\.(?:jpg|png|eot|woff|ttf|svg)[^"]*"?\)/ do |m|
+          assert_match /-[0-9a-f]{12,}\./, m
+        end
+      end
+    end
+  ensure
+    system "rm -rf #{Rails.root}/public/assets/ #{Rails.root}/tmp/cache/"
+  end
+end

data/vendor/assets/javascripts/bootstrap/affix.js

@@ -1,24 +1,14 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.3
+ * Bootstrap: affix.js v3.1.0
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // AFFIX CLASS DEFINITION
   // ======================
@@ -29,9 +19,10 @@
       .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
       .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
-    this.$element = $(element)
-    this.affixed  =
-    this.unpin    = null
+    this.$element     = $(element)
+    this.affixed      =
+    this.unpin        =
+    this.pinnedOffset = null
 
     this.checkPosition()
   }
@@ -42,6 +33,14 @@
     offset: 0
   }
 
+  Affix.prototype.getPinnedOffset = function () {
+    if (this.pinnedOffset) return this.pinnedOffset
+    this.$element.removeClass(Affix.RESET).addClass('affix')
+    var scrollTop = this.$window.scrollTop()
+    var position  = this.$element.offset()
+    return (this.pinnedOffset = position.top - scrollTop)
+  }
+
   Affix.prototype.checkPositionWithEventLoop = function () {
     setTimeout($.proxy(this.checkPosition, this), 1)
   }
@@ -56,9 +55,11 @@
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
 
+    if (this.affixed == 'top') position.top += scrollTop
+
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
 
     var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
                 offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
@@ -67,13 +68,23 @@
     if (this.affixed === affix) return
     if (this.unpin) this.$element.css('top', '')
 
+    var affixType = 'affix' + (affix ? '-' + affix : '')
+    var e         = $.Event(affixType + '.bs.affix')
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
     this.affixed = affix
-    this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
+    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
 
-    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
+    this.$element
+      .removeClass(Affix.RESET)
+      .addClass(affixType)
+      .trigger($.Event(affixType.replace('affix', 'affixed')))
 
     if (affix == 'bottom') {
-      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
+      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
     }
   }
 

data/vendor/assets/javascripts/bootstrap/alert.js

@@ -1,24 +1,14 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.3
+ * Bootstrap: alert.js v3.1.0
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // ALERT CLASS DEFINITION
   // ======================

data/vendor/assets/javascripts/bootstrap/button.js

@@ -1,31 +1,22 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.3
+ * Bootstrap: button.js v3.1.0
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // BUTTON PUBLIC CLASS DEFINITION
   // ==============================
 
   var Button = function (element, options) {
-    this.$element = $(element)
-    this.options  = $.extend({}, Button.DEFAULTS, options)
+    this.$element  = $(element)
+    this.options   = $.extend({}, Button.DEFAULTS, options)
+    this.isLoading = false
   }
 
   Button.DEFAULTS = {
@@ -45,25 +36,26 @@
     $el[val](data[state] || this.options[state])
 
     // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d);
-    }, 0)
+    setTimeout($.proxy(function () {
+      if (state == 'loadingText') {
+        this.isLoading = true
+        $el.addClass(d).attr(d, d)
+      } else if (this.isLoading) {
+        this.isLoading = false
+        $el.removeClass(d).removeAttr(d)
+      }
+    }, this), 0)
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
     var changed = true
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
 
     if ($parent.length) {
       var $input = this.$element.find('input')
-      if ($input.prop('type') === 'radio') {
-        // see if clicking on current one
-        if ($input.prop('checked') && this.$element.hasClass('active'))
-          changed = false
-        else
-          $parent.find('.active').removeClass('active')
+      if ($input.prop('type') == 'radio') {
+        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+        else $parent.find('.active').removeClass('active')
       }
       if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }

data/vendor/assets/javascripts/bootstrap/carousel.js

@@ -1,24 +1,14 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.3
+ * Bootstrap: carousel.js v3.1.0
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // CAROUSEL CLASS DEFINITION
   // =========================
@@ -39,9 +29,9 @@
   }
 
   Carousel.DEFAULTS = {
-    interval: 5000
-  , pause: 'hover'
-  , wrap: true
+    interval: 5000,
+    pause: 'hover',
+    wrap: true
   }
 
   Carousel.prototype.cycle =  function (e) {
@@ -78,7 +68,7 @@
   Carousel.prototype.pause = function (e) {
     e || (this.paused = true)
 
-    if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
       this.$element.trigger($.support.transition.end)
       this.cycle(true)
     }
@@ -111,13 +101,15 @@
       $next = this.$element.find('.item')[fallback]()
     }
 
-    this.sliding = true
-
-    isCycling && this.pause()
+    if ($next.hasClass('active')) return this.sliding = false
 
     var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
+    this.$element.trigger(e)
+    if (e.isDefaultPrevented()) return
 
-    if ($next.hasClass('active')) return
+    this.sliding = true
+
+    isCycling && this.pause()
 
     if (this.$indicators.length) {
       this.$indicators.find('.active').removeClass('active')
@@ -128,8 +120,6 @@
     }
 
     if ($.support.transition && this.$element.hasClass('slide')) {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
       $next.addClass(type)
       $next[0].offsetWidth // force reflow
       $active.addClass(direction)
@@ -141,10 +131,8 @@
           that.sliding = false
           setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
         })
-        .emulateTransitionEnd(600)
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
     } else {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
       $active.removeClass('active')
       $next.addClass('active')
       this.sliding = false