flatrack 1.3.3.alpha.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46bc478b259257db2a9cec0249e7c5c03bfdf9f
-  data.tar.gz: 722b1bdc2af56bc114fd6e9c5a1f64a09596cebc
+  metadata.gz: 4712856b901f1113021c85dcd49feb181318fbc5
+  data.tar.gz: 9234ce5891267c17e254b3953bb2219a4e4a2dfe
 SHA512:
-  metadata.gz: 3385558c579aaf170cbcc8a3276719780b17628132a6904094664a355d4f88fdb75833a153618b72f2c55174dd19e33e2d4249816b4a4510cb608ebe0ff6b877
-  data.tar.gz: 3633da3cffd350c0826aa4e41e3d6d76f19840191f236522353f12a71e9a7673c019eadce0606ecb7682bda905380ad56d2abf3f2c6ecac7bcba8ceeb53c3319
+  metadata.gz: 39da8a5e1fce769e1d847d74cbdeb8642d484650ffd5a533872ef56a442799ad7ffd1a7f8c24375487541967108ee5b0b7c13567664c59e7e8b3fac8c4d472af
+  data.tar.gz: ab7fcf8c901f5613006707a6c23432f8c6723e6ed7010300c55cf503bce952cb14554d3a7442e80e694b5ce5d8936ebd6630cf350fb942ffea7dba60ea3a642b

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.3

data/.travis.yml

@@ -2,7 +2,15 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.1
+  - 2.1.2
+  - 2.1.2
+  - 2.2.0-preview1
 cache: bundler
 after_success:
   - bundle exec inch
-  - bundle exec rubocop
+  - bundle exec rubocop
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.2.0-preview1

data/README.md

@@ -5,7 +5,7 @@
 [![Build Status](http://allthebadges.io/jwaldrip/flatrack/travis.png)](http://allthebadges.io/jwaldrip/flatrack/travis)
 [![Coverage Status](https://coveralls.io/repos/jwaldrip/flatrack/badge.png?branch=master)](https://coveralls.io/r/jwaldrip/flatrack?branch=master)
 [![Code Climate](http://allthebadges.io/jwaldrip/flatrack/code_climate.png)](http://allthebadges.io/jwaldrip/flatrack/code_climate)
-[![Inline docs](http://inch-pages.github.io/github/jwaldrip/flatrack.png)](http://inch-pages.github.io/github/jwaldrip/flatrack)
+[![Inline docs](http://inch-ci.org/github/jwaldrip/flatrack.png)](http://inch-ci.org/github/jwaldrip/flatrack)
 [![Inline docs](http://img.shields.io/badge/github-follow-blue.png)](https://github.com/jwaldrip/flatrack)
 
 ## About

data/flatrack.gemspec

@@ -34,14 +34,14 @@ based routing.
   spec.add_runtime_dependency 'tilt', '~> 1.1'
   spec.add_runtime_dependency 'activesupport', ['> 3.2', '< 4.2']
   spec.add_runtime_dependency 'sass', '~> 3.2.0'
-  spec.add_runtime_dependency 'sprockets-sass', '~> 1.0'
+  spec.add_runtime_dependency 'sprockets-sass', '~> 1.2'
   spec.add_runtime_dependency 'thor', '~> 0.18'
   spec.add_runtime_dependency 'coffee-script', '~> 2.2'
   spec.add_runtime_dependency 'rake', ['> 0.8.7', '< 10.2']
 
   # Dev Dependencies
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec', '~> 3.1'
   spec.add_development_dependency 'guard', '~> 2.5'
   spec.add_development_dependency 'guard-rspec', '~> 4.2'
   spec.add_development_dependency 'guard-bundler', '~> 2.0'

data/lib/flatrack/response.rb

@@ -44,7 +44,7 @@ class Flatrack
       renderer                = renderer_for_page(@file)
       content                 = renderer.render(view)
       @view                   = nil
-      headers['Content-Type'] = FORMATS[renderer.format.to_sym]
+      headers['Content-Type'] = FORMATS[renderer.format.to_s]
       content
     end
 

data/lib/flatrack/sass.rb

@@ -0,0 +1,12 @@
+require 'sass'
+
+class Flatrack
+  module Sass
+    extend ActiveSupport::Autoload
+
+    autoload :SassTemplate
+    autoload :ScssTemplate
+    autoload :Importer
+
+  end
+end

data/lib/flatrack/sass/functions.rb

@@ -0,0 +1,163 @@
+require 'sass'
+
+class Flatrack
+  module Sass
+    module Functions
+      # Using Sprockets::Context#asset_data_uri return a Base64-encoded `data:`
+      # URI with the contents of the asset at the specified path.
+      #
+      # === Examples
+      #
+      #   background: asset-data-uri("image.jpg"); // background: url(data:image/jpeg;base64,...);
+      #
+      def asset_data_uri(source)
+        ::Sass::Script::String.new "url(#{sprockets_context.asset_data_uri(source.value)})"
+      end
+
+      # Using Sprockets::Helpers#asset_path, return the full path
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   background: url(asset-path("image.jpg"));                // background: url("/assets/image.jpg");
+      #   background: url(asset-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
+      #
+      def asset_path(source, options = {})
+        # Work with the Sass::Rails #asset_path API
+        if options.respond_to? :value
+          kind = options.value
+          options = {}
+        end
+
+        if kind && sprockets_context.respond_to?("#{kind}_path")
+          ::Sass::Script::String.new sprockets_context.send("#{kind}_path", source.value), :string
+        else
+          ::Sass::Script::String.new sprockets_context.asset_path(source.value, map_options(options)).to_s, :string
+        end
+      end
+
+      # Using Sprockets::Helpers#asset_path, return the url CSS
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   background: asset-url("image.jpg");                // background: url("/assets/image.jpg");
+      #   background: asset-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
+      #
+      def asset_url(source, options = {})
+        ::Sass::Script::String.new "url(#{asset_path(source, options)})"
+      end
+
+      # Using Sprockets::Helpers#image_path, return the full path
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   background: url(image-path("image.jpg"));                // background: url("/assets/image.jpg");
+      #   background: url(image-path("image.jpg", $digest: true)); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
+      #
+      def image_path(source, options = {})
+        ::Sass::Script::String.new sprockets_context.image_path(source.value, map_options(options)).to_s, :string
+      end
+
+      # Using Sprockets::Helpers#image_path, return the url CSS
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   background: image-url("image.jpg");                // background: url("/assets/image.jpg");
+      #   background: image-url("image.jpg", $digest: true); // background: url("/assets/image-27a8f1f96afd8d4c67a59eb9447f45bd.jpg");
+      #
+      def image_url(source, options = {}, cache_buster = nil)
+        # Work with the Compass #image_url API
+        if options.respond_to? :value
+          case options.value
+          when true
+            return image_path source
+          else
+            options = {}
+          end
+        end
+        ::Sass::Script::String.new "url(#{image_path(source, options)})"
+      end
+
+      # Using Sprockets::Helpers#font_path, return the full path
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   src: url(font-path("font.ttf"));                // src: url("/assets/font.ttf");
+      #   src: url(font-path("font.ttf", $digest: true)); // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
+      #
+      def font_path(source, options = {})
+        ::Sass::Script::String.new sprockets_context.font_path(source.value, map_options(options)).to_s, :string
+      end
+
+      # Using Sprockets::Helpers#font_path, return the url CSS
+      # for the given +source+ as a Sass String. This supports keyword
+      # arguments that mirror the +options+.
+      #
+      # === Examples
+      #
+      #   src: font-url("font.ttf");                  // src: url("/assets/font.ttf");
+      #   src: font-url("image.jpg", $digest: true);  // src: url("/assets/font-27a8f1f96afd8d4c67a59eb9447f45bd.ttf");
+      #
+      def font_url(source, options = {})
+        # Work with the Compass #font_url API
+        if options.respond_to? :value
+          case options.value
+          when true
+            return font_path source
+          else
+            options = {}
+          end
+        end
+        ::Sass::Script::String.new "url(#{font_path(source, options)})"
+      end
+
+      protected
+
+      # Returns a reference to the Sprocket's context through
+      # the importer.
+      def sprockets_context # :nodoc:
+        options[:custom][:sprockets_context]
+      end
+
+      # Returns an options hash where the keys are symbolized
+      # and the values are unwrapped Sass literals.
+      def map_options(options = {}) # :nodoc:
+        ::Sass::Util.map_hash(options) do |key, value|
+          [key.to_sym, value.respond_to?(:value) ? value.value : value]
+        end
+      end
+    end
+  end
+end
+
+module Sass::Script::Functions
+  include Flatrack::Sass::Functions
+
+  # Hack to ensure previous API declarations (by Compass or whatever)
+  # don't take precedence.
+  [:asset_path, :asset_url, :image_path, :image_url, :font_path, :font_url, :asset_data_uri].each do |method|
+    defined?(@signatures) && @signatures.delete(method)
+  end
+
+  declare :asset_path,     [:source], :var_kwargs => true
+  declare :asset_path,     [:source, :kind]
+  declare :asset_url,      [:source], :var_kwargs => true
+  declare :asset_url,      [:source, :kind]
+  declare :image_path,     [:source], :var_kwargs => true
+  declare :image_url,      [:source], :var_kwargs => true
+  declare :image_url,      [:source, :only_path]
+  declare :image_url,      [:source, :only_path, :cache_buster]
+  declare :font_path,      [:source], :var_kwargs => true
+  declare :font_url,       [:source], :var_kwargs => true
+  declare :font_url,       [:source, :only_path]
+  declare :asset_data_uri, [:source]
+end

data/lib/flatrack/sass/importer.rb

@@ -0,0 +1,142 @@
+require 'sass/importers/base'
+require 'pathname'
+
+class Flatrack
+  module Sass
+    class Importer < ::Sass::Importers::Base
+      GLOB = /\*|\[.+\]/
+
+      # @see Sass::Importers::Base#find_relative
+      def find_relative(path, base_path, options)
+        if path =~ GLOB
+          engine_from_glob(path, base_path, options)
+        else
+          engine_from_path(path, base_path, options)
+        end
+      end
+
+      # @see Sass::Importers::Base#find
+      def find(path, options)
+        engine_from_path(path, nil, options)
+      end
+
+      # @see Sass::Importers::Base#mtime
+      def mtime(path, options)
+        if pathname = resolve(path)
+          pathname.mtime
+        end
+      rescue Errno::ENOENT
+        nil
+      end
+
+      # @see Sass::Importers::Base#key
+      def key(path, options)
+        path = Pathname.new(path)
+        ["#{self.class.name}:#{path.dirname.expand_path}", path.basename]
+      end
+
+      # @see Sass::Importers::Base#to_s
+      def to_s
+        "#{self.class.name}:#{context.pathname}"
+      end
+
+      protected
+
+      # Create a Sass::Engine from the given path.
+      def engine_from_path(path, base_path, options)
+        context = options[:custom][:sprockets_context]
+        pathname = resolve(context, path, base_path) or return nil
+        context.depend_on pathname
+        ::Sass::Engine.new evaluate(context, pathname), options.merge(
+          :filename => pathname.to_s,
+          :syntax   => syntax(pathname),
+          :importer => self
+        )
+      end
+
+      # Create a Sass::Engine that will handle importing
+      # a glob of files.
+      def engine_from_glob(glob, base_path, options)
+        context = options[:custom][:sprockets_context]
+        imports = resolve_glob(context, glob, base_path).inject('') do |imports, path|
+          context.depend_on path
+          relative_path = path.relative_path_from Pathname.new(base_path).dirname
+          imports << %(@import "#{relative_path}";\n)
+        end
+        return nil if imports.empty?
+        ::Sass::Engine.new imports, options.merge(
+          :filename => base_path.to_s,
+          :syntax   => :scss,
+          :importer => self
+        )
+      end
+
+      # Finds an asset from the given path. This is where
+      # we make Sprockets behave like Sass, and import partial
+      # style paths.
+      def resolve(context, path, base_path)
+        possible_files(context, path, base_path).each do |file|
+          context.resolve(file) { |found| return found if context.asset_requirable?(found) }
+        end
+
+        nil
+      end
+
+      # Finds all of the assets using the given glob.
+      def resolve_glob(context, glob, base_path)
+        base_path      = Pathname.new(base_path)
+        path_with_glob = base_path.dirname.join(glob).to_s
+
+        Pathname.glob(path_with_glob).sort.select do |path|
+          path != context.pathname && context.asset_requirable?(path)
+        end
+      end
+
+      # Returns all of the possible paths (including partial variations)
+      # to attempt to resolve with the given path.
+      def possible_files(context, path, base_path)
+        path      = Pathname.new(path)
+        base_path = Pathname.new(base_path).dirname
+        paths     = [ path, partialize_path(path) ]
+
+        # Find base_path's root
+        env_root_paths = context.environment.paths.map {|p| Pathname.new(p) }
+        root_path = env_root_paths.detect do |env_root_path|
+          base_path.to_s.start_with?(env_root_path.to_s)
+        end
+        root_path ||= context.root_path
+
+        # Add the relative path from the root, if necessary
+        if path.relative? && base_path != root_path
+          relative_path = base_path.relative_path_from(root_path).join path
+          paths.unshift(relative_path, partialize_path(relative_path))
+        end
+
+        paths.compact
+      end
+
+      # Returns the partialized version of the given path.
+      # Returns nil if the path is already to a partial.
+      def partialize_path(path)
+        if path.basename.to_s !~ /\A_/
+          Pathname.new path.to_s.sub(/([^\/]+)\Z/, '_\1')
+        end
+      end
+
+      # Returns the Sass syntax of the given path.
+      def syntax(path)
+        path.to_s.include?('.sass') ? :sass : :scss
+      end
+
+      # Returns the string to be passed to the Sass engine. We use
+      # Sprockets to process the file, but we remove any Sass processors
+      # because we need to let the Sass::Engine handle that.
+      def evaluate(context, path)
+        attributes = context.environment.attributes_for(path)
+        processors = context.environment.preprocessors(attributes.content_type) + attributes.engines.reverse
+        processors.delete_if { |processor| processor < Tilt::SassTemplate }
+        context.evaluate(path, :processors => processors)
+      end
+    end
+  end
+end

data/lib/flatrack/sass/sass_template.rb

@@ -0,0 +1,98 @@
+require 'tilt'
+
+class Flatrack
+  module Sass
+    class SassTemplate < Tilt::SassTemplate
+      self.default_mime_type = 'text/css'
+
+      # A reference to the current Sprockets context
+      attr_reader :context
+
+      # Determines if the Sass functions have been initialized.
+      # They can be 'initialized' without actually being added.
+      @sass_functions_initialized = false
+      class << self
+        attr_accessor :sass_functions_initialized
+        alias :sass_functions_initialized? :sass_functions_initialized
+
+        # Templates are initialized once the functions are added.
+        def engine_initialized?
+          super && sass_functions_initialized?
+        end
+      end
+
+      # Add the Sass functions if they haven't already been added.
+      def initialize_engine
+        super unless self.class.superclass.engine_initialized?
+        require 'flatrack/sass/functions'
+      end
+
+      # Define the expected syntax for the template
+      def syntax
+        :sass
+      end
+
+      # See `Tilt::Template#prepare`.
+      def prepare
+        @context = nil
+        @output  = nil
+      end
+
+      # See `Tilt::Template#evaluate`.
+      def evaluate(context, locals, &block)
+        @output ||= begin
+          @context = context
+          ::Sass::Engine.new(data, sass_options).render
+        rescue ::Sass::SyntaxError => e
+          # Annotates exception message with parse line number
+          context.__LINE__ = e.sass_backtrace.first[:line]
+          raise e
+        end
+      end
+
+      protected
+
+      # Returns a Sprockets-aware cache store for Sass::Engine.
+      def cache_store
+        return nil if context.environment.cache.nil?
+
+        if defined?(Sprockets::SassCacheStore)
+          Sprockets::SassCacheStore.new context.environment
+        else
+          CacheStore.new context.environment
+        end
+      end
+
+      # Assemble the options for the `Sass::Engine`
+      def sass_options
+        merge_sass_options(default_sass_options, options).merge(
+          :filename    => eval_file,
+          :line        => line,
+          :syntax      => syntax,
+          :cache_store => cache_store,
+          :importer    => Importer.new,
+          :custom      => { :sprockets_context => context }
+        )
+      end
+
+      # Get the default, global Sass options. Start with Compass's
+      # options, if it's available.
+      def default_sass_options
+        if defined?(Compass)
+          merge_sass_options Compass.sass_engine_options.dup, Flatrack.sass_options
+        else
+          Flatrack.sass_options.dup
+        end
+      end
+
+      # Merges two sets of `Sass::Engine` options, prepending
+      # the `:load_paths` instead of clobbering them.
+      def merge_sass_options(options, other_options)
+        if (load_paths = options[:load_paths]) && (other_paths = other_options[:load_paths])
+          other_options[:load_paths] = other_paths + load_paths
+        end
+        options.merge other_options
+      end
+    end
+  end
+end

data/lib/flatrack/sass/scss_template.rb

@@ -0,0 +1,12 @@
+class Flatrack
+  module Sass
+    class ScssTemplate < SassTemplate
+      self.default_mime_type = 'text/css'
+
+      # Define the expected syntax for the template
+      def syntax
+        :scss
+      end
+    end
+  end
+end

data/lib/flatrack/version.rb

@@ -1,5 +1,5 @@
 # Version
 class Flatrack
   # @private
-  VERSION = '1.3.3.alpha.1'
+  VERSION = '1.3.3'
 end

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ end
 require 'flatrack'
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
+Object.send(:define_method, :warn){ |*args| }
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run focus: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 1.3.3.alpha.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,11 @@ files:
 - lib/flatrack/cli/templates/stylesheet.css.scss
 - lib/flatrack/request.rb
 - lib/flatrack/response.rb
+- lib/flatrack/sass.rb
+- lib/flatrack/sass/functions.rb
+- lib/flatrack/sass/importer.rb
+- lib/flatrack/sass/sass_template.rb
+- lib/flatrack/sass/scss_template.rb
 - lib/flatrack/site.rb
 - lib/flatrack/template.rb
 - lib/flatrack/template/erubis.rb
@@ -412,9 +417,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2