middleman-more 3.0.5 → 3.0.6

data/features/i18n_preview.feature

@@ -18,7 +18,37 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/es/hola.html"
     Then I should see "Hola World"
-    
+
+  Scenario: A template changes i18n during preview
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      activate :i18n
+      """
+    Given the Server is running at "i18n-test-app"
+    And the file "locales/en.yml" has the contents
+      """
+      ---
+      en:
+        greetings: "Howdy"
+        hi: "Hello"
+      """
+    When I go to "/"
+    Then I should see "Howdy"
+    When I go to "/hello.html"
+    Then I should see "Hello World"
+    When the file "locales/en.yml" has the contents
+      """
+      ---
+      en:
+        greetings: "How You Doin"
+        hi: "Sup"
+      """
+    When I go to "/"
+    Then I should see "How You Doin"
+    When I go to "/hello.html"
+    Then I should see "Sup World"
+
   Scenario: Running localize with the alt path config
     Given a fixture app "i18n-test-app"
     And a file named "config.rb" with:

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

@@ -13,10 +13,12 @@ module Middleman
 
           # Needed for helpers as well
           app.after_configuration do
-            ::I18n.load_path += Dir[File.join(root, locales_dir, "*.yml")]
+            locales_glob = File.join(locales_dir, "*.yml");
+
+            ::I18n.load_path += Dir[File.join(root, locales_glob)]
             ::I18n.reload!
 
-            Localizer.new(self, options)
+            Localizer.new(self, locales_glob, options)
           end
         end
         alias :included :registered
@@ -27,8 +29,9 @@ module Middleman
         attr_reader :app
         delegate :logger, :to => :app
 
-        def initialize(app, options={})
+        def initialize(app, locales_glob, options={})
           @app = app
+          @locales_glob = locales_glob
           @maps = {}
           @options = options
 
@@ -62,11 +65,20 @@ module Middleman
             :i18n,
             self
           )
+
+          @app.files.changed(&method(:on_file_changed))
+          @app.files.deleted(&method(:on_file_changed))
+        end
+
+        def on_file_changed(file)
+          if File.fnmatch(@locales_glob, file)
+            ::I18n.reload!
+          end
         end
 
         def langs
           @options[:langs] || begin
-            Dir[File.join(@app.root, @app.locales_dir, "*.yml")].map { |file|
+            Dir[File.join(@app.root, @locales_glob)].map { |file|
               File.basename(file).gsub(".yml", "")
             }.sort.map(&:to_sym)
           end

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

@@ -4,6 +4,9 @@ module Middleman
       class << self
         def registered(app, options={})
           require 'digest/sha1'
+          require 'rack/test'
+          require 'uri'
+
           exts = options[:exts] || %w(.jpg .jpeg .png .gif .js .css)
 
           # Allow specifying regexes to ignore, plus always ignore apple touch icons
@@ -36,16 +39,12 @@ module Middleman
             next unless @exts.include? resource.ext
             next if @ignore.any? { |ignore| Middleman::Util.path_match(ignore, resource.destination_path) }
 
-            if resource.template? # if it's a template, render it out
-              # Render through the Rack interface so middleware and mounted apps get a shot
-              rack_client = ::Rack::Test::Session.new(@app.class)
-              response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => true })
-              raise "#{resource.path} should be in the sitemap!" unless response.status == 200
+            # Render through the Rack interface so middleware and mounted apps get a shot
+            rack_client = ::Rack::Test::Session.new(@app.class)
+            response = rack_client.get(URI.escape(resource.destination_path), {}, { "bypass_asset_hash" => true })
+            raise "#{resource.path} should be in the sitemap!" unless response.status == 200
 
-              digest = Digest::SHA1.hexdigest(response.body)[0..7]
-            else # if it's a static file, just hash it
-              digest = Digest::SHA1.file(resource.source_file).hexdigest[0..7]
-            end
+            digest = Digest::SHA1.hexdigest(response.body)[0..7]
 
             resource.destination_path = resource.destination_path.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
           end

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

@@ -40,7 +40,7 @@ module Middleman::Extensions
     end
 
     def self.gzip_file(path)
-      input_file = File.open(path, 'r').read
+      input_file = File.open(path, 'rb').read
       output_filename = path + '.gz'
       input_file_time = File.mtime(path)
 
@@ -49,7 +49,7 @@ module Middleman::Extensions
         return
       end
 
-      File.open(output_filename, 'w') do |f|
+      File.open(output_filename, 'wb') do |f|
         gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
         gz.mtime = input_file_time.to_i
         gz.write input_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-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.5
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -632,7 +632,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4494710196171968679
+      hash: -3726525610890072589
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -641,10 +641,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4494710196171968679
+      hash: -3726525610890072589
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hand-crafted frontend development