padrino-assets 0.2.0 → 0.2.1

data/README.md

@@ -30,13 +30,13 @@ end
 
 By default, Sprockets is configured to load assets from your project's `app/assets` and `lib/assets` directories. Any files stored in these directories are readily available to the included helpers and will be served by the Sprockets middleware.
 
-The following directories are no longer used and will instead be served statically:
+Because of this the following directories are no longer used and will instead be served statically:
 
 * `public/images`
 * `public/stylesheets`
 * `public/javascripts`
 
-Because of this you should now be storing your assets in the following directories:
+You should now be storing your assets in the following directories:
 
 * `app/assets/images`
 * `app/assets/stylesheets`

data/Rakefile

@@ -1 +1,7 @@
-require 'bundler/gem_tasks'
+require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new do |test|
+  test.test_files = FileList['test/**/test_*.rb']
+  test.verbose = true
+end

data/lib/padrino-assets/helpers.rb

@@ -35,8 +35,8 @@
           tag(:link, options.reverse_merge(href: asset_path(source, :css)))
         end.join("\n")
       end
-      alias_method :include_stylesheets,    :include_stylesheet
-      alias_method :stylesheet_include_tag, :include_stylesheet
+      alias_method :include_stylesheets, :include_stylesheet
+      alias_method :stylesheet_link_tag, :include_stylesheet
 
       ##
       # Returns an HTML script tag for the specified sources
@@ -298,9 +298,11 @@
       # @since 0.1.0
       # @api public
       def is_uri?(source)
-        !!(source =~ %r(^[a-z]+://|^//?))
+        !!(source =~ URI_REGEXP)
       end
 
+      URI_REGEXP = %r[^[a-z]+://|^//?]
+
       ##
       # Returns a modified asset source based on the current application settings
       #

data/lib/padrino-assets/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Assets
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/padrino-assets.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'sprockets', '~> 2.3.0'
-
   s.add_dependency 'padrino-core'
   s.add_dependency 'padrino-helpers'
+
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'webrat'
 end

data/test/test.rb

@@ -0,0 +1,52 @@
+require 'webrat'
+require 'padrino-assets'
+require 'minitest/pride'
+require 'minitest/autorun'
+
+Padrino::Assets.load_paths << File.dirname(__FILE__) + '/fixtures/assets/**'
+
+module MiniTest
+  class Spec
+    class << self
+      alias_method :context, :describe
+    end
+
+    def app
+      @app ||= Sinatra.new(Padrino::Application) do
+        register Padrino::Assets
+        set :environment, :test
+      end
+    end
+
+    def settings
+      app.settings
+    end
+
+    def request
+      nil
+    end
+  end
+
+  module Assertions
+    include Webrat::Matchers
+
+    def assert_has_tag(tag, html, attributes)
+      selector = HaveSelector.new(tag, attributes)
+      assert selector.matches?(html), selector.failure_message
+    end
+
+    def refute_has_tag(tag, html, attributes)
+      selector = HaveSelector.new(tag, attributes)
+      refute selector.matches?(html), selector.failure_message
+    end
+  end
+
+  module Expectations
+    infect_an_assertion :assert_has_tag, :must_have_tag
+    infect_an_assertion :refute_has_tag, :wont_have_tag
+  end
+end
+
+class Object
+  include MiniTest::Expectations
+end

data/test/test_helpers.rb

@@ -0,0 +1,200 @@
+require_relative 'test'
+
+describe 'Helpers' do
+  include Padrino::Helpers::OutputHelpers
+  include Padrino::Helpers::TagHelpers
+  include Padrino::Assets::Helpers
+
+  describe 'assets_path' do
+    it 'should prepend :assets_host when present' do
+      app.set :assets_host, 'http://www.test.com'
+      asset = asset_path('application.css')
+      asset.must_equal 'http://www.test.com/assets/application.css'
+    end
+
+    it 'should allow :assets_host to use a Proc' do
+      app.set :assets_host, ->(asset, request) { 'http://test.com' }
+      asset = asset_path('application.css')
+      asset.must_equal 'http://test.com/assets/application.css'
+    end
+
+    it 'should pass the current source to :assets_host when a Proc is used' do
+      app.set :assets_host, ->(source, request) do
+        if source =~ /application.css/
+          'http://true.com'
+        else
+          'http://false.com'
+        end
+      end
+      asset = asset_path('application.css')
+      asset.must_equal 'http://true.com/assets/application.css'
+    end
+
+    it 'should append extension when provided' do
+      asset = asset_path(:application, :css)
+      asset.must_equal '/assets/application.css'
+    end
+
+    it 'should not append extension when one is present' do
+      asset = asset_path('application.css', :css)
+      asset.wont_equal '/assets/application.css.css'
+    end
+
+    it 'should prepend :assets_prefix when present' do
+      app.set :assets_prefix, '/test'
+      asset = asset_path('application.css')
+      asset.must_equal '/test/application.css'
+    end
+
+    it 'should prepend a forward slash to :assets_prefix when missing' do
+      app.set :assets_prefix, 'test'
+      asset = asset_path('application.css')
+      asset.must_equal '/test/application.css'
+    end
+
+    it 'should not interfere with a direct URI' do
+      asset = asset_path('/application.css')
+      asset.must_equal '/application.css'
+
+      asset = asset_path('//test.com/application.css')
+      asset.must_equal '//test.com/application.css'
+
+      asset = asset_path('http://test.com/application.css')
+      asset.must_equal 'http://test.com/application.css'
+    end
+  end
+
+  describe 'is_uri?' do
+    it 'should return true when given an absolute URI' do
+      is_uri?('https://example.com/application.css').must_equal true
+      is_uri?('http://example.com/application.css').must_equal true
+      is_uri?('ftp://example.com/application.css').must_equal true
+    end
+
+    it 'should return true when given a reference URI' do
+      is_uri?('//example.com/assets/application.css').must_equal true
+      is_uri?('/assets/application.css').must_equal true
+    end
+
+    it 'should return false when given a host without a protocol' do
+      is_uri?('example.com/assets/application.css').must_equal false
+    end
+
+    it 'should return false when given an asset' do
+      is_uri?('application.css').must_equal false
+    end
+  end
+
+  describe 'include_stylesheet' do
+    it 'should accept multiple sources' do
+      stylesheets = include_stylesheets :application, :theme
+      stylesheets.must_have_tag :link, href: '/assets/application.css'
+      stylesheets.must_have_tag :link, href: '/assets/theme.css'
+    end
+
+    it 'should accept multiple sources with attributes' do
+      stylesheets = include_stylesheets :application, :theme, media: 'handheld'
+      stylesheets.must_have_tag :link, href: '/assets/application.css', media: 'handheld'
+      stylesheets.must_have_tag :link, href: '/assets/theme.css', media: 'handheld'
+    end
+
+    it 'should accept a single source' do
+      stylesheet = include_stylesheet :application
+      stylesheet.must_have_tag :link, href: '/assets/application.css'
+    end
+
+    it 'should accept a single source with attributes' do
+      stylesheet = include_stylesheet :application, media: 'handheld'
+      stylesheet.must_have_tag :link, href: '/assets/application.css', media: 'handheld'
+    end
+
+    it 'should allow a source with an extension' do
+      stylesheet = include_stylesheet 'application.css'
+      stylesheet.wont_have_tag :link, hreg: '/assets/application.css.css'
+    end
+
+    it 'should be aliased for compatibility' do
+      respond_to?(:stylesheet_link_tag).must_equal true
+    end
+  end
+
+  describe 'include_javascript' do
+    it 'should accept multiple sources' do
+      javascripts = include_javascripts :application, :jquery
+      javascripts.must_have_tag :script, src: '/assets/application.js'
+      javascripts.must_have_tag :script, src: '/assets/jquery.js'
+    end
+
+    it 'should accept a single source' do
+      javascripts = include_javascript :application
+      javascripts.must_have_tag :script, src: '/assets/application.js'
+    end
+
+    it 'should be aliased for compatibility' do
+      respond_to?(:javascript_include_tag).must_equal true
+    end
+  end
+
+  describe 'image' do
+    it 'should accept multiple sources' do
+      images = images 'application.jpg', 'application.png'
+      images.must_have_tag :img, src: '/assets/application.jpg'
+      images.must_have_tag :img, src: '/assets/application.png'
+    end
+
+    it 'should accept multiple sources with attributes' do
+      images = images 'application.jpg', 'application.png', width: '40', height: '40'
+      images.must_have_tag :img, src: '/assets/application.jpg', width: '40', height: '40'
+      images.must_have_tag :img, src: '/assets/application.png', width: '40', height: '40'
+    end
+
+    it 'should accept a single source' do
+      image = image 'application.jpg'
+      image.must_have_tag :img, src: '/assets/application.jpg'
+    end
+
+    it 'should accept a single source with attributes' do
+      image = image 'application.jpg', width: '40', height: '40'
+      image.must_have_tag :img, width: '40', height: '40'
+    end
+
+    it 'should allow you to set the width and height with size' do
+      image = image 'application.jpg', size: '40x40'
+      image.must_have_tag :img, width: '40', height: '40'
+    end
+
+    it 'should allow you to set the width' do
+      image = image 'application.jpg', width: '40'
+      image.must_have_tag :img, width: '40'
+    end
+
+    it 'should allow you to set the height' do
+      image = image 'application.jpg', height: '40'
+      image.must_have_tag :img, height: '40'
+    end
+
+    it 'should allow you to set the alternate text' do
+      image = image 'application.jpg', alt: 'My Little Pony'
+      image.must_have_tag :img, alt: 'My Little Pony'
+    end
+
+    it 'should automatically set an alternate text when none present' do
+      image = image 'application.jpg'
+      image.must_have_tag :img, alt: 'application'
+    end
+
+    it 'should allow you to set the class' do
+      image = image 'application.jpg', class: 'image'
+      image.must_have_tag :img, class: 'image'
+    end
+
+    it 'should allow you to set the identifier' do
+      image = image 'application.jpg', id: 'logo'
+      image.must_have_tag :img, id: 'logo'
+    end
+
+    it 'should be aliased for compatibility' do
+      respond_to?(:image_tag).must_equal true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &9246510 !ruby/object:Gem::Requirement
+  requirement: &8090840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *9246510
+  version_requirements: *8090840
 - !ruby/object:Gem::Dependency
   name: padrino-core
-  requirement: &9246250 !ruby/object:Gem::Requirement
+  requirement: &8090580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9246250
+  version_requirements: *8090580
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
-  requirement: &9245990 !ruby/object:Gem::Requirement
+  requirement: &8090300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9245990
+  version_requirements: *8090300
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &8090060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *8090060
+- !ruby/object:Gem::Dependency
+  name: webrat
+  requirement: &8089830 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *8089830
 description: A plugin for the Padrino web framework which uses Sprockets to manage
   and compile assets
 email:
@@ -67,6 +89,8 @@ files:
 - lib/tasks/compress.rake
 - lib/tasks/precompile.rake
 - padrino-assets.gemspec
+- test/test.rb
+- test/test_helpers.rb
 homepage: https://github.com/Cirex/padrino-assets
 licenses: []
 post_install_message: 
@@ -92,5 +116,7 @@ signing_key:
 specification_version: 3
 summary: A plugin for the Padrino web framework which uses Sprockets to manage and
   compile assets
-test_files: []
+test_files:
+- test/test.rb
+- test/test_helpers.rb
 has_rdoc: