middleman-more 3.0.10.pre.1 → 3.0.11

data/features/directory_index.feature

@@ -11,6 +11,7 @@ Feature: Directory Index
       | wildcard_leave_me_alone.html                  |
       | regular/index.html                            |
       | .htaccess                                     |
+      | .htpasswd                                     |
     Then the following files should not exist:
       | egular/index/index.html                       |
       | needs_index.html                              |

data/features/sass_cache_path.feature

@@ -1,6 +1,6 @@
-Feature: SASS .sass_cache custom location
+Feature: SASS .sass-cache custom location
 
-  Scenario: Using the default location for .sass_cache folder
+  Scenario: Using the default location for .sass-cache folder
     Given the Server is running at "sass-cache-path-default-app"
 
     When I go to "/stylesheets/plain.css"
@@ -10,10 +10,10 @@ Feature: SASS .sass_cache custom location
     #  Not sure how to test this location, as the directory is stored outside of the app root
     #  during testing, but inside app root in "production"
 
-    # Then a directory named ".sass_cache" should exist
+    # Then a directory named ".sass-cache" should exist
 
 
-  Scenario: Using a custom location for .sass_cache folder
+  Scenario: Using a custom location for .sass-cache folder
     Given the Server is running at "sass-cache-path-custom-app"
 
     When I go to "/stylesheets/plain.css"

data/fixtures/indexable-app/source/.htpasswd

@@ -0,0 +1 @@
+# .htpasswd

data/fixtures/sass-cache-path-default-app/config.rb

@@ -1,3 +1,3 @@
 
 # Using default setting
-# set :sass_cache_path, File.join(Dir.pwd, '.sass_cache')
+# set :sass_cache_path, File.join(Dir.pwd, '.sass-cache')

data/lib/middleman-more/core_extensions/i18n.rb

@@ -13,12 +13,7 @@ module Middleman
 
           # Needed for helpers as well
           app.after_configuration do
-            locales_glob = File.join(locales_dir, "*.yml");
-
-            ::I18n.load_path += Dir[File.join(root, locales_glob)]
-            ::I18n.reload!
-
-            Localizer.new(self, locales_glob, options)
+            Localizer.new(self, options)
           end
         end
         alias :included :registered
@@ -29,12 +24,19 @@ module Middleman
         attr_reader :app
         delegate :logger, :to => :app
 
-        def initialize(app, locales_glob, options={})
+        def initialize(app, options={})
           @app = app
-          @locales_glob = locales_glob
+          @locales_glob = File.join(app.locales_dir, "**", "*.{rb,yml}")
+
+          regex = @locales_glob.sub(/\./, '\.').sub(File.join("**", "*"), ".*").sub(/\//, '\/').sub("{rb,yml}", "rb|yml")
+          @locales_regex = %r{^#{regex}}
+
           @maps = {}
           @options = options
 
+          ::I18n.load_path += Dir[File.join(app.root, @locales_glob)]
+          ::I18n.reload!
+
           @lang_map      = @options[:lang_map]      || {}
           @path          = @options[:path]          || "/:locale/"
           @templates_dir = @options[:templates_dir] || "localizable"
@@ -71,7 +73,7 @@ module Middleman
         end
 
         def on_file_changed(file)
-          if File.fnmatch(@locales_glob, file)
+          if @locales_regex.match(file)
             ::I18n.reload!
           end
         end
@@ -79,7 +81,7 @@ module Middleman
         def langs
           @options[:langs] || begin
             Dir[File.join(@app.root, @locales_glob)].map { |file|
-              File.basename(file).gsub(".yml", "")
+              File.basename(file).sub(/\.yml$/, "").sub(/\.rb$/, "")
             }.sort.map(&:to_sym)
           end
         end

data/lib/middleman-more/extensions/asset_hash.rb

@@ -7,7 +7,7 @@ module Middleman
           require 'rack/test'
           require 'uri'
 
-          exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css)
+          exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css .otf .woff .eot .ttf .svg)
 
           # Allow specifying regexes to ignore, plus always ignore apple touch icons
           ignore = Array(options[:ignore]) << /^apple-touch-icon/

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.10.pre.1
-  prerelease: 7
+  version: 3.0.11
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10.pre.1
+        version: 3.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.10.pre.1
+        version: 3.0.11
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +371,7 @@ files:
 - fixtures/implied-extensions-app/source/test4.liquid
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/.htaccess
+- fixtures/indexable-app/source/.htpasswd
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
@@ -641,13 +642,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1552576789193238252
+      hash: 1634045275272907332
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1634045275272907332
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -824,6 +828,7 @@ test_files:
 - fixtures/implied-extensions-app/source/test4.liquid
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/.htaccess
+- fixtures/indexable-app/source/.htpasswd
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html