middleman-more 3.1.0.beta.2 → 3.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1df77f4d11379ce20fec027e19c1bdbe25ebe5f
-  data.tar.gz: 23137fa1344a5ce4a2fd3b2b2b487d9fef92664d
+  metadata.gz: e8d70a64e249ff6df7795667ef05024a708f3a60
+  data.tar.gz: 96958acceab755073342eda0410ba132ce751ded
 SHA512:
-  metadata.gz: 549c6712e66858016fddceedf9aadce140159a6258098535a69f15beddcc7cf79d579413549ed329a1ac270a3d089cef0d10002b2927b435a2706b4e429076cf
-  data.tar.gz: 156fbf13a8828514215da7688a96d72edd4bc7b7ad53c747563aa3ded4fa64460bccfe917c3b50158a4b9aa8ac5981b9e0a9f9b0bc19222d41f9910a3baca014
+  metadata.gz: ddb8512c1b091fffd6a30cd975c5464129febb07b776596a7770f4cf4024d642b2d37d6b143b02a91975bfc50436c97fff189b5b9019c9538d7d218970a87fbe
+  data.tar.gz: 390cacdf49c818ffc2ae284b7298b85d9cd4aefc5b6d2b670d9f2bdaf632babfafc2e3a13c4cc6d50c35ff8325d707f45f78eb2c3aeeff77f2453f74035e3141

data/features/i18n_builder.feature

@@ -12,14 +12,22 @@ Feature: i18n Builder
     Then the following files should exist:
       | index.html                                    |
       | hello.html                                    |
+      | morning.html                                  |
       | es/index.html                                 |
       | es/hola.html                                  |
+      | es/manana.html                                |
+      | CNAME                                         |
+      | password.txt                                  |
     Then the following files should not exist:
       | en/index.html                                 |
     And the file "index.html" should contain "Howdy"  
     And the file "hello.html" should contain "Hello World"
+    And the file "morning.html" should contain "Good morning"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
+    And the file "es/manana.html" should contain "Buenos días"
+    And the file "CNAME" should contain "test.github.com"
+    And the file "password.txt" should contain "hunter2"
     
   Scenario: Running localize with the alt path config
     Given a fixture app "i18n-test-app"

data/features/i18n_preview.feature

@@ -12,12 +12,18 @@ Feature: i18n Preview
     Then I should see "Howdy"
     When I go to "/hello.html"
     Then I should see "Hello World"
+    When I go to "/morning.html"
+    Then I should see "Good morning"
     When I go to "/en/index.html"
     Then I should see "File Not Found"
+    When I go to "/en/morning.html"
+    Then I should see "File Not Found"
     When I go to "/es/index.html"
     Then I should see "Como Esta?"
     When I go to "/es/hola.html"
     Then I should see "Hola World"
+    When I go to "/es/manana.html"
+    Then I should see "Buenos días"
 
   Scenario: A template changes i18n during preview
     Given a fixture app "i18n-test-app"
@@ -119,8 +125,14 @@ Feature: i18n Preview
     Then I should see "Como Esta?"
     When I go to "/hola.html"
     Then I should see "Hola World"
+    When I go to "/manana.html"
+    Then I should see "Buenos días"
     When I go to "/hello.html"
     Then I should see "File Not Found"
+    When I go to "/en/morning.html"
+    Then I should see "Good morning"
+    When I go to "/es/manana.html"
+    Then I should see "File Not Found"
     When I go to "/es/index.html"
     Then I should see "File Not Found"
     When I go to "/es/hola.html"

data/fixtures/i18n-test-app/locales/es.yml

@@ -2,6 +2,7 @@
 es:
   paths:
     hello: "hola"
+    morning: "manana"
   
   greetings: "Como Esta?"
-  hi: "Hola"
+  hi: "Hola"

data/fixtures/i18n-test-app/source/CNAME

@@ -0,0 +1 @@
+test.github.com

data/fixtures/i18n-test-app/source/morning.en.html.erb

@@ -0,0 +1 @@
+Good morning

data/fixtures/i18n-test-app/source/morning.es.html.erb

@@ -0,0 +1 @@
+Buenos días

data/fixtures/i18n-test-app/source/password.txt

@@ -0,0 +1 @@
+hunter2

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

@@ -14,7 +14,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
     app.helpers ::Padrino::Helpers::RenderHelpers
     app.helpers ::Padrino::Helpers::NumberHelpers
     # app.helpers ::Padrino::Helpers::TranslationHelpers
-    app.helpers ::Padrino::Helpers::Breadcrumbs
+    # app.helpers ::Padrino::Helpers::Breadcrumbs
 
     app.config.define_setting :relative_links, false, 'Whether to generate relative links instead of absolute ones'
   end

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

@@ -17,6 +17,8 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     end
 
     app.config.define_setting :locales_dir, "locales", 'The directory holding your locale configurations'
+
+    app.send :include, LocaleHelpers
   end
 
   def after_configuration
@@ -71,7 +73,7 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     app.files.deleted(&method(:on_file_changed))
   end
 
-  helpers do 
+  helpers do
     def t(*args)
       ::I18n.t(*args)
     end
@@ -108,43 +110,73 @@ class Middleman::CoreExtensions::Internationalization < ::Middleman::Extension
     new_resources = []
 
     resources.each do |resource|
-      next unless File.fnmatch(File.join(options[:templates_dir], "**"), resource.path)
+      # If it's a "localizable template"
+      if File.fnmatch?(File.join(options[:templates_dir], "**"), resource.path)
+        page_id = File.basename(resource.path, File.extname(resource.path))
+        langs.each do |lang|
+          # Remove folder name
+          path = resource.path.sub(options[:templates_dir], "")
+          new_resources << build_resource(path, resource.path, page_id, lang)
+        end
+      elsif result = parse_locale_extension(resource.path)
+        lang, path, page_id = result
+        new_resources << build_resource(path, resource.path, page_id, lang)
+      end
+    end
 
-      page_id = File.basename(resource.path, File.extname(resource.path))
+    resources + new_resources
+  end
 
-      old_locale = ::I18n.locale
-      langs.map do |lang|
-        ::I18n.locale = lang
+  private
 
-        localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id, :fallback => [])
-        path = resource.path.sub(options[:templates_dir], "")
+  # Parse locale extension filename
+  # @return [lang, path, basename]
+  # will return +nil+ if no locale extension
+  def parse_locale_extension(path)
+    path_bits = path.split('.')
+    return nil if path_bits.size < 3
 
-        # Build lang path
-        if @mount_at_root == lang
-          prefix = "/"
-        else
-          replacement = options[:lang_map].has_key?(lang) ? options[:lang_map][lang] : lang
-          prefix = options[:path].sub(":locale", replacement.to_s)
-        end
+    lang = path_bits.delete_at(-2).to_sym
+    return nil unless langs.include?(lang)
 
-        path = ::Middleman::Util.normalize_path(
-          File.join(prefix, path.sub(page_id, localized_page_id))
-        )
+    path = path_bits.join('.')
+    basename = File.basename(path_bits[0..-2].join('.'))
 
-        @_localization_data[path] = [lang, path, localized_page_id]
+    [lang, path, basename]
+  end
 
-        p = ::Middleman::Sitemap::Resource.new(
-          app.sitemap,
-          path
-        )
-        p.proxy_to(resource.path)
+  def build_resource(path, source_path, page_id, lang)
+    old_locale = ::I18n.locale
+    ::I18n.locale = lang
 
-        new_resources << p
-      end
-      ::I18n.locale = old_locale
+    localized_page_id = ::I18n.t("paths.#{page_id}", :default => page_id, :fallback => [])
 
+    if @mount_at_root == lang
+      prefix = "/"
+    else
+      replacement = options[:lang_map].fetch(lang, lang)
+      prefix = options[:path].sub(":locale", replacement.to_s)
     end
 
-    resources + new_resources
+    path = ::Middleman::Util.normalize_path(
+       File.join(prefix, path.sub(page_id, localized_page_id))
+    )
+
+    @_localization_data[path] = [lang, path, localized_page_id]
+
+    p = ::Middleman::Sitemap::Resource.new(app.sitemap, path)
+    p.proxy_to(source_path)
+
+    ::I18n.locale = old_locale
+
+    p
+  end
+
+  module LocaleHelpers
+    # Access the list of languages supported by this Middleman application
+    # @return [Array<Symbol>]
+    def langs
+      extensions[:i18n].langs
+    end
   end
 end

data/middleman-more.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.4.0"])
   s.add_dependency("kramdown", ["~> 1.0.0"])
-  s.add_dependency("i18n", ["~> 0.6.4"])
-  s.add_dependency("padrino-helpers", ["0.11.1"])
+  s.add_dependency("i18n", ["~> 0.6.1"])
+  s.add_dependency("padrino-helpers", ["0.10.7"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-more
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.2
+  version: 3.1.0.beta.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta.2
+        version: 3.1.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0.beta.2
+        version: 3.1.0.beta.3
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.10.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.10.7
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -325,9 +325,13 @@ files:
 - fixtures/i18n-force-locale/source/index.haml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
+- fixtures/i18n-test-app/source/CNAME
 - fixtures/i18n-test-app/source/layout.erb
 - fixtures/i18n-test-app/source/localizable/hello.html.erb
 - fixtures/i18n-test-app/source/localizable/index.html.erb
+- fixtures/i18n-test-app/source/morning.en.html.erb
+- fixtures/i18n-test-app/source/morning.es.html.erb
+- fixtures/i18n-test-app/source/password.txt
 - fixtures/i18n-test-app/source/stylesheets/site.css
 - fixtures/ignore-app/source/about.html.erb
 - fixtures/ignore-app/source/images/icon/messages.png
@@ -802,9 +806,13 @@ test_files:
 - fixtures/i18n-force-locale/source/index.haml
 - fixtures/i18n-test-app/locales/en.yml
 - fixtures/i18n-test-app/locales/es.yml
+- fixtures/i18n-test-app/source/CNAME
 - fixtures/i18n-test-app/source/layout.erb
 - fixtures/i18n-test-app/source/localizable/hello.html.erb
 - fixtures/i18n-test-app/source/localizable/index.html.erb
+- fixtures/i18n-test-app/source/morning.en.html.erb
+- fixtures/i18n-test-app/source/morning.es.html.erb
+- fixtures/i18n-test-app/source/password.txt
 - fixtures/i18n-test-app/source/stylesheets/site.css
 - fixtures/ignore-app/source/about.html.erb
 - fixtures/ignore-app/source/images/icon/messages.png