middleman-sprockets 3.3.3 → 3.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +0 -1
- data/features/bower.feature +6 -0
- data/fixtures/bower-multiple-assets-app/.bowerrc +4 -0
- data/fixtures/bower-multiple-assets-app/bower.json +7 -0
- data/fixtures/bower-multiple-assets-app/config.rb +7 -0
- data/fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/.bower.json +34 -0
- data/fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/bower.json +26 -0
- data/fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/img/close.png +0 -0
- data/fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/js/lightbox.js +2 -0
- data/fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/package.json +37 -0
- data/lib/middleman-sprockets/extension.rb +11 -15
- data/lib/middleman-sprockets/version.rb +1 -1
- data/middleman-sprockets.gemspec +3 -3
- metadata +36 -21
- data/Gemfile-v4 +0 -34
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: da0c873bca7f5d7e5562e8f36d35ae877cc41ce4
|
|
4
|
+
data.tar.gz: dd0febefda9fd3882e81439e65983d65591e5cf1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 951fa2b2bbad2244b3633d307af8d61b63a49785577a4a07a7649a7f01603be159250526af6169c5aa2490e1de48ba0fb6e55133ff6044692ce9d32a04aa10cf
|
|
7
|
+
data.tar.gz: b79fb12ddf15c807b22f1c23f533e040dcb57b3df94bbfc9a666eb4e24dc6ad27d5e4ad956e83b40b424e9eb18f6b0ea7794b80a6ee7cd3030941d3ee5b85820
|
data/.travis.yml
CHANGED
data/features/bower.feature
CHANGED
|
@@ -22,3 +22,9 @@ Feature: Bower
|
|
|
22
22
|
Given a successfully built app at "bower-app"
|
|
23
23
|
When I cd to "build"
|
|
24
24
|
Then a file named "javascripts/underscore/underscore.js" should exist
|
|
25
|
+
|
|
26
|
+
Scenario: Multiple assets can be added to the build with import_asset from bower dir and are placed in the correct directory
|
|
27
|
+
Given a successfully built app at "bower-multiple-assets-app"
|
|
28
|
+
When I cd to "build"
|
|
29
|
+
Then a file named "images/lightbox2/img/close.png" should exist
|
|
30
|
+
Then a file named "javascripts/lightbox2/js/lightbox.js" should exist
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "lightbox",
|
|
3
|
+
"homepage": "http://lokeshdhakar.com/projects/lightbox2/",
|
|
4
|
+
"authors": [
|
|
5
|
+
"Lokesh Dhakar <lokesh.dhakar@gmail.com>"
|
|
6
|
+
],
|
|
7
|
+
"description": "The original Lightbox script. Uses jQuery.",
|
|
8
|
+
"main": "js/lightbox.js",
|
|
9
|
+
"keywords": [
|
|
10
|
+
"lightbox",
|
|
11
|
+
"overlay",
|
|
12
|
+
"jquery",
|
|
13
|
+
"gallery",
|
|
14
|
+
"images"
|
|
15
|
+
],
|
|
16
|
+
"license": "CC BY 2.5",
|
|
17
|
+
"ignore": [
|
|
18
|
+
"**/.*",
|
|
19
|
+
"Gruntfile.js",
|
|
20
|
+
"node_modules",
|
|
21
|
+
"bower_components",
|
|
22
|
+
"test",
|
|
23
|
+
"tests"
|
|
24
|
+
],
|
|
25
|
+
"_release": "05ffb8e6d5",
|
|
26
|
+
"_resolution": {
|
|
27
|
+
"type": "branch",
|
|
28
|
+
"branch": "master",
|
|
29
|
+
"commit": "05ffb8e6d524762ded286b0c33cebab5347cf34a"
|
|
30
|
+
},
|
|
31
|
+
"_source": "https://github.com/dg-vrnetze/revealjs-lightbox2.git",
|
|
32
|
+
"_target": "*",
|
|
33
|
+
"_originalSource": "https://github.com/dg-vrnetze/revealjs-lightbox2.git"
|
|
34
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "lightbox",
|
|
3
|
+
"version": "2.7.1",
|
|
4
|
+
"homepage": "http://lokeshdhakar.com/projects/lightbox2/",
|
|
5
|
+
"authors": [
|
|
6
|
+
"Lokesh Dhakar <lokesh.dhakar@gmail.com>"
|
|
7
|
+
],
|
|
8
|
+
"description": "The original Lightbox script. Uses jQuery.",
|
|
9
|
+
"main": "js/lightbox.js",
|
|
10
|
+
"keywords": [
|
|
11
|
+
"lightbox",
|
|
12
|
+
"overlay",
|
|
13
|
+
"jquery",
|
|
14
|
+
"gallery",
|
|
15
|
+
"images"
|
|
16
|
+
],
|
|
17
|
+
"license": "CC BY 2.5",
|
|
18
|
+
"ignore": [
|
|
19
|
+
"**/.*",
|
|
20
|
+
"Gruntfile.js",
|
|
21
|
+
"node_modules",
|
|
22
|
+
"bower_components",
|
|
23
|
+
"test",
|
|
24
|
+
"tests"
|
|
25
|
+
]
|
|
26
|
+
}
|
|
Binary file
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "lightbox",
|
|
3
|
+
"version": "2.7.1",
|
|
4
|
+
"author": "Lokesh Dhakar",
|
|
5
|
+
"description": "Lightbox is small javascript library used to overlay images on top of the current page. It's a snap to setup and works on all modern browsers.",
|
|
6
|
+
"keywords": [
|
|
7
|
+
"lightbox",
|
|
8
|
+
"lightbox2",
|
|
9
|
+
"overlay",
|
|
10
|
+
"image",
|
|
11
|
+
"gallery"
|
|
12
|
+
],
|
|
13
|
+
"homepage": "http://lokeshdhakar.com/projects/lightbox2/",
|
|
14
|
+
"repository": {
|
|
15
|
+
"type": "git",
|
|
16
|
+
"url": "https://github.com/lokesh/lightbox2.git"
|
|
17
|
+
},
|
|
18
|
+
"bugs": {
|
|
19
|
+
"url": "https://github.com/lokesh/lightbox2/issues"
|
|
20
|
+
},
|
|
21
|
+
"licenses": [
|
|
22
|
+
{
|
|
23
|
+
"type": "Creative Commons Attribution 2.5 License",
|
|
24
|
+
"url": "http://creativecommons.org/licenses/by/2.5/"
|
|
25
|
+
}
|
|
26
|
+
],
|
|
27
|
+
"devDependencies": {
|
|
28
|
+
"grunt": "~0.4.2",
|
|
29
|
+
"grunt-contrib-compass": "^0.7.2",
|
|
30
|
+
"grunt-contrib-watch": "^0.5.3",
|
|
31
|
+
"grunt-contrib-connect": "^0.7.1",
|
|
32
|
+
"grunt-ftp-deploy": "^0.1.1",
|
|
33
|
+
"grunt-contrib-uglify": "~0.4.0",
|
|
34
|
+
"grunt-contrib-jshint": "~0.9.2",
|
|
35
|
+
"grunt-exec": "~0.4.5"
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -37,20 +37,12 @@ module Middleman
|
|
|
37
37
|
include ::Middleman::Sprockets::AssetTagHelpers
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
-
def before_configuration
|
|
41
|
-
if defined?(::Middleman::ConfigContext)
|
|
42
|
-
app.add_to_config_context :sprockets, &method(:environment)
|
|
43
|
-
end
|
|
44
|
-
end
|
|
45
|
-
|
|
46
40
|
def after_configuration
|
|
47
41
|
::Tilt.register ::Sprockets::EjsTemplate, 'ejs'
|
|
48
42
|
::Tilt.register ::Sprockets::EcoTemplate, 'eco'
|
|
49
43
|
::Tilt.register ::Sprockets::JstProcessor, 'jst'
|
|
50
44
|
|
|
51
|
-
|
|
52
|
-
app.template_extensions :jst => :js, :eco => :js, :ejs => :js
|
|
53
|
-
end
|
|
45
|
+
app.template_extensions :jst => :js, :eco => :js, :ejs => :js
|
|
54
46
|
|
|
55
47
|
if app.config.defines_setting?(:debug_assets) && !options.setting(:debug_assets).value_set?
|
|
56
48
|
options[:debug_assets] = app.config[:debug_assets]
|
|
@@ -91,18 +83,18 @@ module Middleman
|
|
|
91
83
|
|
|
92
84
|
resources_list = []
|
|
93
85
|
environment.paths.each do |load_path|
|
|
94
|
-
|
|
86
|
+
candidate_dir = nil
|
|
95
87
|
export_all = false
|
|
96
88
|
if load_path.end_with?('/images')
|
|
97
|
-
|
|
89
|
+
candidate_dir = @app.config[:images_dir]
|
|
98
90
|
export_all = true
|
|
99
91
|
elsif load_path.end_with?('/fonts')
|
|
100
|
-
|
|
92
|
+
candidate_dir = @app.config[:fonts_dir]
|
|
101
93
|
export_all = true
|
|
102
94
|
elsif load_path.end_with?('/stylesheets')
|
|
103
|
-
|
|
95
|
+
candidate_dir = @app.config[:css_dir]
|
|
104
96
|
elsif load_path.end_with?('/javascripts')
|
|
105
|
-
|
|
97
|
+
candidate_dir = @app.config[:js_dir]
|
|
106
98
|
end
|
|
107
99
|
|
|
108
100
|
environment.each_entry(load_path) do |path|
|
|
@@ -113,7 +105,10 @@ module Middleman
|
|
|
113
105
|
|
|
114
106
|
# For all imported assets that aren't in an obvious directory, figure out their
|
|
115
107
|
# type (and thus output directory) via extension.
|
|
116
|
-
output_dir
|
|
108
|
+
output_dir = if candidate_dir
|
|
109
|
+
candidate_dir
|
|
110
|
+
else
|
|
111
|
+
case File.extname(path)
|
|
117
112
|
when '.js', '.coffee'
|
|
118
113
|
@app.config[:js_dir]
|
|
119
114
|
when '.css', '.sass', '.scss', '.styl', '.less'
|
|
@@ -123,6 +118,7 @@ module Middleman
|
|
|
123
118
|
when '.ttf', '.woff', '.eot', '.otf'
|
|
124
119
|
@app.config[:fonts_dir]
|
|
125
120
|
end
|
|
121
|
+
end
|
|
126
122
|
|
|
127
123
|
if !output_dir
|
|
128
124
|
raise ::Sprockets::FileNotFound, "couldn't find an appropriate output directory for '#{path}' - halting because it was explicitly requested via 'import_asset'"
|
data/middleman-sprockets.gemspec
CHANGED
|
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
|
|
|
15
15
|
s.files = `git ls-files -z`.split("\0")
|
|
16
16
|
s.test_files = `git ls-files -z -- {fixtures,features}/*`.split("\0")
|
|
17
17
|
s.require_paths = ["lib"]
|
|
18
|
-
s.add_dependency("middleman-core", ["
|
|
19
|
-
s.add_dependency("sprockets", ["~> 2.
|
|
20
|
-
s.add_dependency("sprockets-sass", ["~> 1.
|
|
18
|
+
s.add_dependency("middleman-core", ["~> 3.3"])
|
|
19
|
+
s.add_dependency("sprockets", ["~> 2.12.1"])
|
|
20
|
+
s.add_dependency("sprockets-sass", ["~> 1.2.0"])
|
|
21
21
|
s.add_dependency("sprockets-helpers", ["~> 1.1.0"])
|
|
22
22
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: middleman-sprockets
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.3.
|
|
4
|
+
version: 3.3.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thomas Reynolds
|
|
@@ -10,62 +10,62 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2014-
|
|
13
|
+
date: 2014-07-30 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: middleman-core
|
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
|
18
18
|
requirements:
|
|
19
|
-
- -
|
|
19
|
+
- - ~>
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: '3.
|
|
21
|
+
version: '3.3'
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
24
|
version_requirements: !ruby/object:Gem::Requirement
|
|
25
25
|
requirements:
|
|
26
|
-
- -
|
|
26
|
+
- - ~>
|
|
27
27
|
- !ruby/object:Gem::Version
|
|
28
|
-
version: '3.
|
|
28
|
+
version: '3.3'
|
|
29
29
|
- !ruby/object:Gem::Dependency
|
|
30
30
|
name: sprockets
|
|
31
31
|
requirement: !ruby/object:Gem::Requirement
|
|
32
32
|
requirements:
|
|
33
|
-
- -
|
|
33
|
+
- - ~>
|
|
34
34
|
- !ruby/object:Gem::Version
|
|
35
|
-
version:
|
|
35
|
+
version: 2.12.1
|
|
36
36
|
type: :runtime
|
|
37
37
|
prerelease: false
|
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
|
39
39
|
requirements:
|
|
40
|
-
- -
|
|
40
|
+
- - ~>
|
|
41
41
|
- !ruby/object:Gem::Version
|
|
42
|
-
version:
|
|
42
|
+
version: 2.12.1
|
|
43
43
|
- !ruby/object:Gem::Dependency
|
|
44
44
|
name: sprockets-sass
|
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|
|
46
46
|
requirements:
|
|
47
|
-
- -
|
|
47
|
+
- - ~>
|
|
48
48
|
- !ruby/object:Gem::Version
|
|
49
|
-
version: 1.
|
|
49
|
+
version: 1.2.0
|
|
50
50
|
type: :runtime
|
|
51
51
|
prerelease: false
|
|
52
52
|
version_requirements: !ruby/object:Gem::Requirement
|
|
53
53
|
requirements:
|
|
54
|
-
- -
|
|
54
|
+
- - ~>
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
|
-
version: 1.
|
|
56
|
+
version: 1.2.0
|
|
57
57
|
- !ruby/object:Gem::Dependency
|
|
58
58
|
name: sprockets-helpers
|
|
59
59
|
requirement: !ruby/object:Gem::Requirement
|
|
60
60
|
requirements:
|
|
61
|
-
- -
|
|
61
|
+
- - ~>
|
|
62
62
|
- !ruby/object:Gem::Version
|
|
63
63
|
version: 1.1.0
|
|
64
64
|
type: :runtime
|
|
65
65
|
prerelease: false
|
|
66
66
|
version_requirements: !ruby/object:Gem::Requirement
|
|
67
67
|
requirements:
|
|
68
|
-
- -
|
|
68
|
+
- - ~>
|
|
69
69
|
- !ruby/object:Gem::Version
|
|
70
70
|
version: 1.1.0
|
|
71
71
|
description: Sprockets support for Middleman
|
|
@@ -77,12 +77,11 @@ executables: []
|
|
|
77
77
|
extensions: []
|
|
78
78
|
extra_rdoc_files: []
|
|
79
79
|
files:
|
|
80
|
-
-
|
|
81
|
-
-
|
|
80
|
+
- .gitignore
|
|
81
|
+
- .travis.yml
|
|
82
82
|
- CHANGELOG.md
|
|
83
83
|
- CONTRIBUTING.md
|
|
84
84
|
- Gemfile
|
|
85
|
-
- Gemfile-v4
|
|
86
85
|
- LICENSE.md
|
|
87
86
|
- README.md
|
|
88
87
|
- Rakefile
|
|
@@ -133,6 +132,14 @@ files:
|
|
|
133
132
|
- fixtures/bower-json-app/config.rb
|
|
134
133
|
- fixtures/bower-json-app/source/javascripts/application.js.coffee
|
|
135
134
|
- fixtures/bower-json-app/source/javascripts/bower.json
|
|
135
|
+
- fixtures/bower-multiple-assets-app/.bowerrc
|
|
136
|
+
- fixtures/bower-multiple-assets-app/bower.json
|
|
137
|
+
- fixtures/bower-multiple-assets-app/config.rb
|
|
138
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/.bower.json
|
|
139
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/bower.json
|
|
140
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/img/close.png
|
|
141
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/js/lightbox.js
|
|
142
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/package.json
|
|
136
143
|
- fixtures/glob-app/config.rb
|
|
137
144
|
- fixtures/glob-app/source/stylesheets/main.css.scss
|
|
138
145
|
- fixtures/glob-app/source/stylesheets/module1/_i-am-mod.scss
|
|
@@ -210,12 +217,12 @@ require_paths:
|
|
|
210
217
|
- lib
|
|
211
218
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
212
219
|
requirements:
|
|
213
|
-
- -
|
|
220
|
+
- - '>='
|
|
214
221
|
- !ruby/object:Gem::Version
|
|
215
222
|
version: '0'
|
|
216
223
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
217
224
|
requirements:
|
|
218
|
-
- -
|
|
225
|
+
- - '>='
|
|
219
226
|
- !ruby/object:Gem::Version
|
|
220
227
|
version: '0'
|
|
221
228
|
requirements: []
|
|
@@ -272,6 +279,14 @@ test_files:
|
|
|
272
279
|
- fixtures/bower-json-app/config.rb
|
|
273
280
|
- fixtures/bower-json-app/source/javascripts/application.js.coffee
|
|
274
281
|
- fixtures/bower-json-app/source/javascripts/bower.json
|
|
282
|
+
- fixtures/bower-multiple-assets-app/.bowerrc
|
|
283
|
+
- fixtures/bower-multiple-assets-app/bower.json
|
|
284
|
+
- fixtures/bower-multiple-assets-app/config.rb
|
|
285
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/.bower.json
|
|
286
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/bower.json
|
|
287
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/img/close.png
|
|
288
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/js/lightbox.js
|
|
289
|
+
- fixtures/bower-multiple-assets-app/vendor/assets/components/lightbox2/package.json
|
|
275
290
|
- fixtures/glob-app/config.rb
|
|
276
291
|
- fixtures/glob-app/source/stylesheets/main.css.scss
|
|
277
292
|
- fixtures/glob-app/source/stylesheets/module1/_i-am-mod.scss
|
data/Gemfile-v4
DELETED
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
source "https://rubygems.org"
|
|
2
|
-
|
|
3
|
-
gem "middleman-cli", :github => "middleman/middleman", :branch => "master"
|
|
4
|
-
gem "middleman-core", :github => "middleman/middleman", :branch => "master"
|
|
5
|
-
gem "middleman-templates", :github => "middleman/middleman", :branch => "master"
|
|
6
|
-
|
|
7
|
-
# Specify your gem's dependencies in middleman-sprockets.gemspec
|
|
8
|
-
gemspec
|
|
9
|
-
|
|
10
|
-
gem "rake", "~> 10.0.3", :require => false
|
|
11
|
-
gem "yard", "~> 0.8.0", :require => false
|
|
12
|
-
|
|
13
|
-
# Test tools
|
|
14
|
-
gem "cucumber"
|
|
15
|
-
gem "fivemat", "~> 1.2.1"
|
|
16
|
-
gem "aruba"
|
|
17
|
-
gem "rspec", "~> 2.14"
|
|
18
|
-
gem "builder", "~> 3.0"
|
|
19
|
-
|
|
20
|
-
# For actual tests
|
|
21
|
-
# Make sure to lock down the versions of the asset gems
|
|
22
|
-
# so they don't cause asset hashes to change.
|
|
23
|
-
gem "railties", "~> 4.1.0"
|
|
24
|
-
gem "jquery-rails", "3.1.0", :require => false
|
|
25
|
-
gem "bootstrap-sass", "3.1.1.0", :require => false
|
|
26
|
-
|
|
27
|
-
gem "jquery_mobile_rails", "1.4.1", :require => false
|
|
28
|
-
|
|
29
|
-
gem "ejs", "~> 1.1.1"
|
|
30
|
-
gem "eco", "~> 1.0.0"
|
|
31
|
-
gem "erubis", "~> 2.7.0"
|
|
32
|
-
|
|
33
|
-
# Code Quality
|
|
34
|
-
gem "cane", :platforms => [:mri_19, :mri_20], :require => false
|