bootstrap-sass 3.0.2.1 → 3.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7adbd7c5c49bbaf3ac3ca916dca5a5c5fcfbdd32
-  data.tar.gz: 98f8ed3a12d41e396130826cd46bd4b3bcfa8089
+  metadata.gz: 8ae9333af752fe5ef268cfe31b0552c618fdc5d4
+  data.tar.gz: 7dee8bca5ee78f5ebec85cc6874ca004c70d3ef8
 SHA512:
-  metadata.gz: af547f0a32aef0187ddd596aa6ff90574994339b444b3f11da80e8ac4e0b35bf6dccf84974ee7a06c124c0accfad0338d4334f6772adc91e64fd56ad86195be7
-  data.tar.gz: 64d7cfa04ca0050be992dda8541a884caa5c3dd2b3ee59a337cb078a75955b729743d4c1f2169a4b0470fafe191b482a27d000178b915323733e618de2e46e81
+  metadata.gz: 2180967abbf038043dba58cae99e4eb1172e800ba90f1cab21392c3cbe2645d558bf254d2d9ec7a8a042ca11dd02f25179e90b0c6be92b20d46361784387e846
+  data.tar.gz: 6f9301b6bc8add8ec58c3cd67a031ec8ffbd1a3910419c15a1fd3551e53cbefd76f7e3271fb875e232f87e693ca4ced39730c6af91140205117befabf2593e55

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.0.0
   - 1.9.3
   - jruby
-  - rbx-19mode
+  - rbx
 gemfile:
   - test/gemfiles/sass_3_2.gemfile
   - test/gemfiles/sass_head.gemfile

data/Gemfile

@@ -1,3 +1,11 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec
+
+platform :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubysl-json', '~> 2.0'
+  gem 'rubysl-test-unit', '~> 2.0'
+  gem 'racc'
+end
+

data/README.md

@@ -16,7 +16,7 @@ In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `s
 
 ```ruby
 gem 'sass-rails', '>= 3.2' # sass-rails needs to be higher than 3.2
-gem 'bootstrap-sass', '~> 3.0.2.0'
+gem 'bootstrap-sass', '~> 3.0.3.0'
 ```
 
 `bundle install` and restart your server to make the files available through the pipeline.
@@ -36,13 +36,13 @@ require 'bootstrap-sass'
 ```
 
 ```console
-compass install bootstrap
+bundle exec compass install bootstrap
 ```
 
 If you are creating a new Compass project, you can generate it with bootstrap-sass support:
 
 ```console
-compass create my-new-project -r bootstrap-sass --using bootstrap
+bundle exec compass create my-new-project -r bootstrap-sass --using bootstrap
 ```
 
 This will create a new Compass project with the following files in it:
@@ -51,6 +51,50 @@ This will create a new Compass project with the following files in it:
 * [styles.scss](/templates/project/styles.scss) - main project SCSS file, import `variables` and `bootstrap`.
 
 
+### c. Sass-only (no Compass, nor Rails)
+
+Require the gem, and load paths and Sass helpers will be configured automatically:
+
+```ruby
+require 'bootstrap-sass'
+```
+
+When using outside ruby (e.g. as a bower package), disable ruby asset lookup helper:
+
+```sass
+$bootstrap-sass-asset-helper: false
+```
+
+
+#### JS and fonts
+
+If you are using Rails or Sprockets, see Usage.
+
+If none of Rails/Sprockets/Compass were detected the fonts will be referenced as:
+
+```sass
+"#{$icon-font-path}/#{$icon-font-name}.eot"
+```
+
+`$icon-font-path` defaults to `bootstrap/`.
+
+When not using an asset pipeline, you have to copy fonts and javascripts from the gem.
+
+```bash
+mkdir public/fonts
+cp -r $(bundle show bootstrap-sass)/vendor/assets/fonts/ public/fonts/
+mkdir public/javascripts
+cp -r $(bundle show bootstrap-sass)/vendor/assets/javascripts/ public/javascripts/
+```
+
+In ruby you can get the assets' location in the filesystem like this:
+
+```ruby
+Bootstrap.stylesheets_path
+Bootstrap.fonts_path
+Bootstrap.javascripts_path
+```
+
 ## Usage
 
 ### Sass
@@ -111,6 +155,8 @@ You can also load individual modules, provided you also require any dependencies
 //= require bootstrap/dropdown
 ```
 
+---
+
 ## Development and Contributing
 
 If you'd like to help with the development of bootstrap-sass itself, read this section.

data/Rakefile

@@ -8,9 +8,8 @@ end
 desc 'Dumps output to a CSS file for testing'
 task :debug do
   require 'sass'
-  require './lib/bootstrap-sass/compass_functions'
   require './lib/bootstrap-sass/sass_functions'
-  path = './vendor/assets/stylesheets'
+  path = Bootstrap.stylesheets_path
   %w(bootstrap).each do |file|
     engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
     File.open("./#{file}.css", 'w') { |f| f.write(engine.render) }
@@ -29,7 +28,6 @@ task :compile, :css_path do |t, args|
   lib_path = File.join(File.dirname(__FILE__), 'lib')
   $:.unshift(lib_path) unless $:.include?(lib_path)
   require 'sass'
-  require 'bootstrap-sass/compass_functions'
   require 'bootstrap-sass/sass_functions'
   require 'term/ansicolor'
 

data/lib/bootstrap-sass.rb

@@ -1,64 +1,75 @@
 module Bootstrap
   class FrameworkNotFound < StandardError; end
 
-  # Inspired by Kaminari
-  def self.load!
-    if compass?
-      require 'bootstrap-sass/compass_functions'
-      register_compass_extension
-    elsif asset_pipeline?
+  class << self
+    # Inspired by Kaminari
+    def load!
       require 'bootstrap-sass/sass_functions'
+      register_compass_extension if compass?
+
+      if rails?
+        require 'sass-rails'
+        register_rails_engine
+      end
+
+      configure_sass
     end
 
-    if rails?
-      require 'sass-rails'
-      register_rails_engine
+    # Paths
+    def gem_path
+      @gem_path ||= File.expand_path '..', File.dirname(__FILE__)
     end
 
-    unless rails? || compass?
-      raise Bootstrap::FrameworkNotFound,
-            'bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'
+    def stylesheets_path
+      File.join assets_path, 'stylesheets'
     end
 
-    bs_stylesheets = File.join(gem_path, 'vendor', 'assets', 'stylesheets')
-    ::Sass.load_paths << bs_stylesheets
-    if ::Sass::Script::Number.precision < 10
-      # see https://github.com/thomas-mcdonald/bootstrap-sass/issues/409
-      ::Sass::Script::Number.precision = 10
+    def fonts_path
+      File.join assets_path, 'fonts'
     end
-  end
 
-  private
+    def javascripts_path
+      File.join assets_path, 'javascripts'
+    end
 
-  def self.gem_path
-    @gem_path ||= File.expand_path File.join('..'), File.dirname(__FILE__)
-  end
+    def assets_path
+      @assets_path ||= File.join gem_path, 'vendor', 'assets'
+    end
 
-  def self.asset_pipeline?
-    defined?(::Sprockets)
-  end
+    # Environment detection helpers
+    def asset_pipeline?
+      defined?(::Sprockets)
+    end
 
-  def self.compass?
-    defined?(::Compass)
-  end
+    def compass?
+      defined?(::Compass)
+    end
 
-  def self.rails?
-    defined?(::Rails)
-  end
+    def rails?
+      defined?(::Rails)
+    end
 
-  def self.register_compass_extension
-    styles    = File.join gem_path, 'vendor', 'assets', 'stylesheets'
-    templates = File.join gem_path, 'templates'
-    ::Compass::Frameworks.register(
-        'bootstrap',
-        :path                  => gem_path,
-        :stylesheets_directory => styles,
-        :templates_directory   => templates
-    )
-  end
+    private
 
-  def self.register_rails_engine
-    require 'bootstrap-sass/engine'
+    def configure_sass
+      ::Sass.load_paths << stylesheets_path
+
+      # bootstrap requires minimum precision of 10, see https://github.com/thomas-mcdonald/bootstrap-sass/issues/409
+      ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
+    end
+
+    def register_compass_extension
+      ::Compass::Frameworks.register(
+          'bootstrap',
+          :path                  => gem_path,
+          :stylesheets_directory => stylesheets_path,
+          :templates_directory   => File.join(gem_path, 'templates')
+      )
+    end
+
+    def register_rails_engine
+      require 'bootstrap-sass/engine'
+    end
   end
 end
 

data/lib/bootstrap-sass/sass_functions.rb

@@ -1,14 +1,49 @@
 require 'sass'
+require 'bootstrap-sass'
 
 module Sass::Script::Functions
-  # LARS: Snatched from compass - 2011-11-29 - used for gradients in IE6-9
-  # returns an IE hex string for a color with an alpha channel
-  # suitable for passing to IE filters.
-  def ie_hex_str(color)
-    assert_type color, :Color
-    alpha = (color.alpha * 255).round
-    alphastr = alpha.to_s(16).rjust(2, '0')
-    Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
-  end
-  declare :ie_hex_str, [:color]
+  def twbs_font_path(source)
+    twbs_asset_path source, :font
+  end
+  declare :twbs_font_path, [:source]
+
+  def twbs_image_path(source)
+    twbs_asset_path source, :image
+  end
+  declare :twbs_image_path, [:source]
+
+  def twbs_asset_path(source, type)
+    url = if Bootstrap.asset_pipeline? && (context = sprockets_context)
+            context.send(:"#{type}_path", source.value)
+          elsif Bootstrap.compass?
+            send(:"#{type}_url", source, Sass::Script::Bool.new(true)).value
+          end
+
+    # sass-only
+    url ||= source.value.gsub('"', '')
+    Sass::Script::String.new(url, :string)
+  end
+  declare :twbs_asset_path, [:source]
+
+  unless Sass::Script::Functions.instance_methods.include?(:ie_hex_str)
+    # polyfill sass < 3.2.6 (taken from sass 3.2.12):
+    def ie_hex_str(color)
+      assert_type color, :Color, :color
+      alpha = (color.alpha * 255).round.to_s(16).rjust(2, '0')
+      Sass::Script::String.new("##{alpha}#{color.send(:hex_str)[1..-1]}".upcase)
+    end
+    declare :ie_hex_str, [:color]
+  end
+
+  protected
+
+  def sprockets_context
+    # Modern way to get context:
+    if options.key?(:sprockets)
+      options[:sprockets][:context]
+    # Compatibility with sprockets pre 2.10.0:
+    elsif (importer = options[:importer]) && importer.respond_to?(:context)
+      importer.context
+    end
+  end
 end

data/lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION = '3.0.2.1'
-  BOOTSTRAP_SHA = '463343af63344dbbc3db04f40b0b804baa919b7e'
+  VERSION = '3.0.3.0'
+  BOOTSTRAP_SHA = '6d03173a1aad98e75f7d33e65b411c519176c59a'
 end

data/tasks/converter/less_conversion.rb

@@ -3,7 +3,9 @@ require_relative 'char_string_scanner'
 # This module transforms LESS into SCSS.
 # It is implemented via lots of string manipulation: scanning back and forwards for regexps and doing substitions.
 # Since it does not parse the LESS into an AST, bits of it may assume LESS to be formatted a certain way, and only limited,
-# static analysis can be performed. This approach has so far been enough to automatically convert all of twbs/bootstrap.
+# static analysis can be performed. This approach has so far been mostly enough to automatically convert most all of twbs/bootstrap.
+# There is some bootstrap-specific to make up for lack of certain features in Sass 3.2 (recursion, mixin namespacing)
+# and vice versa in LESS (vararg mixins).
 class Converter
   module LessConversion
     # Some regexps for matching bits of SCSS:
@@ -31,7 +33,7 @@ class Converter
 
     # These mixins will get vararg definitions in SCSS (not supported by LESS):
     VARARG_MIXINS               = %w(
-    transition transition-transform box-shadow
+    transition transition-duration transition-property transition-transform box-shadow
   )
 
     def process_stylesheet_assets
@@ -67,6 +69,10 @@ class Converter
             file = replace_rules(file, '  @media') { |r| unindent(r, 2) }
           when 'variables.less'
             file = insert_default_vars(file)
+            file = <<-SCSS + file
+// bootstrap specific variable. set to false if not using ruby + asset pipeline / compass.
+$bootstrap-sass-asset-helper: true !default;
+            SCSS
             file = replace_all file, /(\$icon-font-path:).*(!default)/, '\1 "bootstrap/" \2'
           when 'close.less'
             # extract .close { button& {...} } rule
@@ -83,9 +89,10 @@ class Converter
           when 'thumbnails.less'
             file = extract_nested_rule file, 'a&'
           when 'glyphicons.less'
+            file  = replace_all file, /\#\{(url\(.*?\))}/, '\1'
             file = replace_rules(file, '@font-face') { |rule|
               rule = replace_all rule, /(\$icon-font-\w+)/, '#{\1}'
-              replace_all rule, /url\(/, 'font-url('
+              replace_asset_url rule, :font
             }
         end
 
@@ -109,7 +116,6 @@ class Converter
       file        = replace_less_extend(file)
       file        = replace_spin(file)
       file        = replace_image_urls(file)
-      file        = replace_image_paths(file)
       file        = replace_escaping(file)
       file        = convert_less_ampersand(file)
       file        = deinterpolate_vararg_mixins(file)
@@ -117,6 +123,10 @@ class Converter
       file
     end
 
+    def replace_asset_url(rule, type)
+      replace_all rule, /url\((.*?)\)/, "url(if($bootstrap-sass-asset-helper, twbs-#{type}-path(\\1), \\1))"
+    end
+
     # convert grid mixins LESS when => SASS @if
     def convert_grid_mixins(file)
       file = replace_rules file, /@mixin make-grid-columns/, comments: false do |css, pos|
@@ -391,15 +401,11 @@ class Converter
     end
 
     def replace_image_urls(less)
-      less.gsub(/background-image: url\("?(.*?)"?\);/) { |s| "background-image: image-url(\"#{$1}\");" }
-    end
-
-    def replace_image_paths(less)
-      less.gsub('../img/', '')
+      less.gsub(/background-image: url\("?(.*?)"?\);/) { |s| replace_asset_url s, :image }
     end
 
     def replace_escaping(less)
-      less = less.gsub(/\~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
+      less = less.gsub(/~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
       less.gsub!(/\$\{([^}]+)\}/, '$\1') # Get rid of @{} escape
       less.gsub!(/"([^"\n]*)(\$[\w\-]+)([^"\n]*)"/, '"\1#{\2}\3"') # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}")
       less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape
@@ -415,7 +421,7 @@ class Converter
       regx = /^\.badge\s*\{[\s\/\w\(\)]+(&{1}-{1})\w.*?^}$/m
 
       tmp = ''
-      less.scan(/^(\s*&)(-[\w\[\]]+\s*{.+})$/) do |ampersand, css|
+      less.scan(/^(\s*&)(-[\w\[\]]+\s*\{.+})$/) do |ampersand, css|
         tmp << ".badge#{css}\n"
       end
 
@@ -604,4 +610,4 @@ class Converter
       text
     end
   end
-end
+end

data/templates/project/manifest.rb

@@ -4,13 +4,22 @@ description 'Bootstrap for Sass'
 stylesheet 'styles.scss'
 
 # SCSS:
-bs_stylesheets = "../../vendor/assets/stylesheets/bootstrap"
+
+assets = "../../vendor/assets"
+
+bs_stylesheets = "#{assets}/stylesheets/bootstrap"
 stylesheet '_variables.scss.erb', :to => '_variables.scss', :erb => true,
            :bs_variables_path => File.expand_path("#{bs_stylesheets}/_variables.scss", File.dirname(__FILE__))
 
 # JS:
-bs_javascripts = "../../vendor/assets/javascripts/bootstrap"
+bs_javascripts = "#{assets}/javascripts/bootstrap"
 Dir.glob File.expand_path("#{bs_javascripts}/*.js", File.dirname(__FILE__)) do |path|
   file = File.basename(path)
   javascript "#{bs_javascripts}/#{file}", :to => "bootstrap/#{file}"
 end
+
+bs_fonts = "#{assets}/fonts/bootstrap"
+Dir.glob File.expand_path("#{bs_fonts}/*", File.dirname(__FILE__)) do |path|
+  file = File.basename(path)
+  font "#{bs_fonts}/#{file}", :to => "bootstrap/#{file}"
+end

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

@@ -1,7 +1,7 @@
 .container
   .panel.panel-primary
-    h1 Dummy App
-    .row
+    .panel-heading: h1 Dummy App
+    .panel-body: .row
       .col-sm-3
         h2 3 columns
         ul.list-group
@@ -11,9 +11,25 @@
       .col-sm-3
         h2 3 columns
         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
       .col-sm-6
         h2 6 columns
-        .panel.panel-primary
+        .panel.panel-primary: .panel-body
           .row
             .col-xs-4.col-xs-push-4
               .panel.panel-default: h3 This is col-xs-4 col-xs-push-4
+
+          form.form-inline
+            .form-group
+              input.sr-only for="exampleInputEmail2" Email address
+              input.form-control#exampleInputEmail2 type="email" placeholder="Enter email"
+            .checkbox
+              label
+                input type="checkbox"
+                |  Remember me
+            button.btn.btn-default type="submit" Sign in