middleman-core 4.4.3 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a1d9d5037e308781c5d071bdbd012631dffec9f2439e1c73b6bf8b6e9d27ff
-  data.tar.gz: fe51eb33932856df3019ad8ad8a41a4abf80266b814da9c716f0aeeda4db74c9
+  metadata.gz: d17dfddbf442da6e1bbf5be0c19bab7de0b71357264de5bb3a421ef932ef0912
+  data.tar.gz: 6b20f531c4b57ecf0f35d7573708e8714e79c4c9b82806235243a9ae1b192029
 SHA512:
-  metadata.gz: df1e1c37ccb433f391dcc05122297f83c3a9d19bef1a8b4c8738f40d156ddd014affa6ecd583a358f9b749ad891afa4d788d7d837aef0d3c42eaa6e79d899029
-  data.tar.gz: 1cfdb65af805d4599b34b939d8dc1377a2d29f830d8aa21692e6e851cce5d6ff612d9122865aa67f8f4e142c46644b334eacccf9d0b1a9586add6d72539aac90
+  metadata.gz: a345b95ff2e21b871351e163ced5c4148459b4cd24e34e3686b3e4c29d7070b3170e3ad92b0c108a532c873637eba6272f4fcbfea3091e7abf2c25eda2fbd6d0
+  data.tar.gz: 282d36c604c623fd5d0856bb8b559a52bbb381bd09f1df1d68cfa37676826a10b7a6f6d7f674b4c783b93d0cb4cff0b1660a6db55f0b116a1a5cf9dc1a330304

data/.simplecov

@@ -1,7 +1,7 @@
-SimpleCov.start do
+SimpleCov.configure do
   add_filter '/fixtures/'
   add_filter '/features/'
   add_filter '/spec/'
   add_filter '/step_definitions/'
   add_filter '/lib/vendored-middleman-deps/'
-end
+end

data/features/i18n_builder.feature

@@ -123,8 +123,10 @@ Feature: i18n Builder
       | hello.html                                    |
     And the file "en/index.html" should contain "Howdy"
     And the file "en/hello.html" should contain "Hello World"
+    And the file "en/fallback.html" should contain "Fallback"
     And the file "es/index.html" should contain "Como Esta?"
     And the file "es/hola.html" should contain "Hola World"
+    And the file "es/fallback.html" should contain "Fallback"
 
   Scenario: Running localize with the subset config
     Given a fixture app "i18n-test-app"

data/features/i18n_link_to.feature

@@ -211,3 +211,97 @@ Feature: i18n Paths
     Then I should see 'Current: /es/article.html'
     Then I should see 'Other: /article.html'
     Then I should see 'Current with anchor: /es/article.html#test-anchor'
+
+  Scenario: Using url_for with the no mount config
+    Given a fixture app "empty-app"
+    And a file named "data/pages.yml" with:
+      """
+      - hello.html
+      """
+    And a file named "locales/en.yml" with:
+      """
+      ---
+      en:
+        msg: Hello
+      """
+    And a file named "locales/es.yml" with:
+      """
+      ---
+      es:
+        paths:
+          hello: "hola"
+        msg: Hola
+      """
+    And a file named "source/localizable/hello.html.erb" with:
+      """
+      Page: <%= t(:msg) %>
+      <% data.pages.each_with_index do |p, i| %>
+        Current: <%= url_for "/#{p}" %>
+        Other: <%= url_for "/#{p}", locale: ::I18n.locale == :en ? :es : :en %>
+      <% end %>
+      """
+    And a file named "source/localizable/article.html.erb" with:
+      """
+      Page Lang: Default
+
+      Current: <%= url_for "/article.html" %>
+      Other: <%= url_for "/article.html", locale: ::I18n.locale == :en ? :es : :en %>
+      Current with anchor: <%= url_for "/article.html", :anchor => "test-anchor" %>
+      """
+    And a file named "source/localizable/article.es.html.erb" with:
+      """
+      Page Lang: Spanish
+
+      Current: <%= url_for "/article.html" %>
+      Other: <%= url_for "/article.html", locale: :en %>
+      Current with anchor: <%= url_for "/article.html", :anchor => "test-anchor" %>
+      """
+    And a file named "source/localizable/post.en.html.erb" with:
+      """
+      Page Lang: English
+
+      Current: <%= url_for "/post.html" %>
+      Other: <%= url_for "/post.html", locale: :es %>
+      Current with anchor: <%= url_for "/post.html", :anchor => "test-anchor" %>
+      """
+    And a file named "source/localizable/post.es.html.erb" with:
+      """
+      Page Lang: Spanish
+
+      Current: <%= url_for "/post.html" %>
+      Other: <%= url_for "/post.html", locale: :en %>
+      Current with anchor: <%= url_for "/post.html", :anchor => "test-anchor" %>
+      """
+    And a file named "config.rb" with:
+      """
+      activate :i18n, mount_at_root: false
+      """
+    Given the Server is running
+    When I go to "/en/hello.html"
+    Then I should see "Page: Hello"
+    Then I should see 'Current: /en/hello.html'
+    Then I should see 'Other: /es/hola.html'
+    When I go to "/es/hola.html"
+    Then I should see "Page: Hola"
+    Then I should see 'Current: /es/hola.html'
+    Then I should see 'Other: /en/hello.html'
+    When I go to "/en/article.html"
+    Then I should see "Page Lang: Default"
+    Then I should see 'Current: /en/article.html'
+    Then I should see 'Other: /es/article.html'
+    Then I should see 'Current with anchor: /en/article.html#test-anchor'
+    When I go to "/es/article.html"
+    Then I should see "Page Lang: Spanish"
+    Then I should see 'Current: /es/article.html'
+    Then I should see 'Other: /en/article.html'
+    Then I should see 'Current with anchor: /es/article.html#test-anchor'
+    When I go to "/en/post.html"
+    Then I should see "Page Lang: English"
+    Then I should see 'Current: /en/post.html'
+    Then I should see 'Other: /es/post.html'
+    Then I should see 'Current with anchor: /en/post.html#test-anchor'
+    When I go to "/es/post.html"
+    Then I should see "Page Lang: Spanish"
+    Then I should see 'Current: /es/post.html'
+    Then I should see 'Other: /en/post.html'
+    Then I should see 'Current with anchor: /es/post.html#test-anchor'

data/fixtures/content-for-app/source/content_for_haml.html.haml

@@ -1,4 +1,4 @@
-= content_for :from_template do
-  = "I am the yielded content haml <s>with html tags</s>"
+- content_for :from_template do
+  != "I am the yielded content haml <s>with html tags</s>"
 
 %p I am in the template

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

@@ -1,4 +1,5 @@
 ---
 en:
   greetings: "Howdy"
-  hi: "Hello"
+  hi: "Hello"
+  fallback: "Fallback"

data/fixtures/i18n-test-app/source/localizable/fallback.html.erb

@@ -0,0 +1 @@
+<%= I18n.t(:fallback) %>