middleman-sculptor 0.18 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf09f9383fa48238a2f29b1f7b67fe61952733e
-  data.tar.gz: 8b3d7898f5d7c37b9cfc2b1132dcd6b4c9338ac6
+  metadata.gz: aa9a6e73f7ff4761c5a1dac786799c0d3d6b118d
+  data.tar.gz: b44097a3eba2b1a5b03bac9c5ac5dd6195be0514
 SHA512:
-  metadata.gz: 721f9ed36324c92f88a9ece6b0f94bca2a60fc8c113b19f276e776d1f90bc99a6750e3ab11f1a19d4acd5d76b984ff701f3dfea32194951b8b25da9623dc2dbe
-  data.tar.gz: ef9dd3683a766b86399418589e06d0610e0616d6aa91ece7c43266c0821efa319913c5c7549276fe2d39c7377d65de67d0adeb84fcbc27f1f3da30aadb578063
+  metadata.gz: 83a012ee624d8583086333d0fe51bcbd8f28c0e576856ee1fca4060ab9603a4e65c55fec920b5031a535632cf9c9adb2ad2c8ec448fc0337917270321443c909
+  data.tar.gz: 9a54a6d89b9240ff87090401a62c643c727571529d3cab07c0c3f3456ed69f32f84cc9023593e986e3143e222b8784e816a999255b140ad43a4d3e886c9f5123

data/lib/middleman-sculptor/sprockets_patch.rb

@@ -31,18 +31,18 @@ module Middleman
       # Intercept requests to /javascripts and /stylesheets and pass to sprockets
       our_sprockets = self.environment
 
-      [app.config[:js_dir], app.config[:css_dir], app.config[:images_dir], app.config[:fonts_dir]].each do |dir|
+      # # PATCH: Run Sprockets on any `scripts/styles` directory in `source`
+      paths = [app.config[:js_dir], app.config[:css_dir], app.config[:images_dir], app.config[:fonts_dir]]
+      extended_paths = Dir.glob("#{app.source}/**/*.{scss,js}")
+        .map { |p| Pathname.new(p).dirname.to_s }
+        .map { |p| p.sub("#{app.source}/", '') }
+        .select{|p| p.match /styles|scripts$/ }
+        .reject{|p| p.match /assets|glyptotheque/ }
+
+      (paths + extended_paths).uniq.each do |dir|
+        our_sprockets.append_path(dir)
         app.map("/#{dir}") { run our_sprockets }
       end
-
-      # PATCH: Pass any `scripts` directory in `source` through Sprockets
-      Dir.glob("#{app.root}/**/scripts").each do |dir|
-        relative_dir = (dir.split('/') - (app.root.split('/') << app.source)).join('/')
-        if app.config[:js_dir] != relative_dir
-          our_sprockets.append_path(dir) # Append custom JS path into our sprockets path
-          app.map("/#{relative_dir}") { run our_sprockets }
-        end
-      end
     end
   end
 end

data/lib/middleman-sculptor/template/source/assets/styles/glyptotheque/_model.scss

@@ -37,7 +37,7 @@
 
   > .glypto-model-stage {
     position: relative;
-    padding: 1px;
+    padding: 10px;
 
     & + .glypto-model-utils {
       transition: $_transition;
@@ -74,7 +74,6 @@
 
     > figure {
       @include clearfix;
-      padding: 10px;
     }
 
     > iframe {

data/lib/middleman-sculptor/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sculptor
-    VERSION = "0.18"
+    VERSION = "0.19"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sculptor
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.19'
 platform: ruby
 authors:
 - Tyom Semonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core