roda-i18n 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c49e1ba809caf572d5d75f55cbe48bedf855f80
-  data.tar.gz: eb86ad5e8c25b9c152ae1a4c56d7cbcfac084f46
+  metadata.gz: 9c2738c4186efd7bb356272c3fad656bd1a79237
+  data.tar.gz: 72a1cb79f9dbc234b12411d58e7801e935933a7e
 SHA512:
-  metadata.gz: 5d31eee8bb80bc0e147e8b94901c1be53b32c6684eb9471156e4841e3f6cbeff8234e3258f569093e26fa3276606d4d99eecbfd7d3656f7f91fa45c75ea20038
-  data.tar.gz: d9351ab146c07cd61a0c29f5b234966f5b18deeaf55aecafe7d1018e53f503a6efe54f3b002e2af74a3c24442e5f4affef48015c68b6f9d5986924a179951878
+  metadata.gz: 941708ff91f4da8c9da9d03e2dafe545d1845e9e679d0e66d249408832c8aa3ecd53dbc2dbde3b56e756b5c2091eeb0e0eb529a305154fb0857f4b8972ab6b6d
+  data.tar.gz: 4781db341bd8d1fa1154dcc68d0ca45b56f7ccb76a9a4b3be103e066a26ea521472ff7af9a7e5515bed4d11e4d0e64de0812be79d89f77a9baca7597488590b7

data/CHANGELOG.md

@@ -1,6 +1,59 @@
 # CHANGELOG
 
 
+## 0.4.0 (2018-05-08)
+
+* Merge pull request #4 from adam12/yield-matched-locale - Yield matched locale to block
+
+  > Yield the matched locale to the block, similar to a normal Roda route.
+
+* Merge pull request #5 from adam12/no-session-setting - Don't set session (BREAKING CHANGE)
+
+  I think setting the session should be done by the user inside the yielded block, using the value yielded from the match in #4, if they want that value to be set in the first place.
+
+  ```ruby
+  r.locale do |locale|
+    session[:locale] ||= locale
+  end
+  ```
+
+  If we assume that a session exists, this plugin can't be used where there is no session - ie. a Roda app that performs mailing only.
+
+  ```ruby
+  class Mailer < Roda
+    plugin :mailer
+    plugin :i18n
+
+    route do |r|
+      r.locale do  
+        r.mail "/some-path" {}
+      end
+    end
+  end
+
+  Mailer.sendmail("/en/some-path")  # FAILS! No Rack::Session available
+  ```
+
+  This is likely a breaking change for anybody relying on this functionality.
+
+* Merge pull request #6 from adam12/fix-nil - Cast potentially matched locale to string
+
+  > Without this cast, a `root` block below the `locale` block will never be reached due to an exception of calling `downcase` on `nil`.
+
+  > I didn't add a new spec as moving the `r.root` call to the bottom of the block was enough to trigger the failure.
+
+* Merge pull request #7 from zaidan/update/roda-3 - Making routes behind #locale block work
+
+  * Fix deprecated use of placeholders in string matchers
+  * Fix missing dependency on `r18n-core` < `2.2.0`
+  * Fix spec failures caused by unexpected order of `available_locales`
+  * Update dependency `roda` to `3.7`
+  * Update development dependency `rack-test` to `1.0`
+  * Update dependency `r18n-core` to `3.0.x`
+  * Update development dependency `rake` to `12.3`
+  * Remove noop check for exception
+
+
 ## 0.3.0 (2016-08-11)
 
 * Merged PR #3 by @jonduarte - Making routes behind #locale block work

data/README.md

@@ -1,6 +1,7 @@
 # Roda-i18n
 
-[![Build Status](https://travis-ci.org/kematzy/roda-i18n.svg?branch=master)](https://travis-ci.org/kematzy/roda-i18n)
+[![Gem Version](https://badge.fury.io/rb/roda-i18n.svg)](https://badge.fury.io/rb/roda-i18n)  [![Build Status](https://travis-ci.org/kematzy/roda-i18n.svg?branch=master)](https://travis-ci.org/kematzy/roda-i18n)
+
 
 Add Internationalisation (i18n) and localisation support to your [Roda](http://roda.jeremyevans.net/) 
 apps, based upon the [R18n](https://github.com/ai/r18n) gem.

data/lib/roda/i18n/version.rb

@@ -1,7 +1,7 @@
 class Roda
   
   module I18n
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
   
 end

data/lib/roda/plugins/i18n.rb

@@ -272,7 +272,7 @@ class Roda
         # This custom matcher allows us to have other routes below the r.locale .. declaration
         def _match_available_locales_only
          lambda do
-           locale = remaining_path.split("/").reject(&:empty?).first
+           locale = remaining_path.split("/").reject(&:empty?).first.to_s
            if ::R18n.available_locales.map(&:code).map(&:downcase).include?(locale.downcase)
              @captures.push(locale)
              @remaining_path = remaining_path.sub("/#{locale}", "")
@@ -291,14 +291,14 @@ class Roda
         #         t.posts.header # use translations or locales
         #       end
         #     end
+        #     r.get(:about) { erb(:about) }
         #   end
         #
         def locale(opts = {}, &blk)
           on(_match_available_locales_only, opts) do |l|
             loc = l || Roda.opts[:locale]
-            session[:locale] = loc unless session[:locale]
             ::R18n.set(loc)
-            yield if block_given?
+            yield loc if block_given?
             return # NB!! needed to enable routes below to work
           end
         end

data/roda-i18n.gemspec

@@ -32,19 +32,18 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md', "MIT-LICENSE"]
   spec.rdoc_options     += ['--quiet', '--line-numbers', '--inline-source', '--title', 'Roda-i18n: internationalisation plugin', '--main', 'README.md']
   
-  spec.add_runtime_dependency 'roda', '~> 2.5', '>= 2.5.0'
+  spec.add_runtime_dependency 'roda', '~> 3.7'
   spec.add_runtime_dependency 'tilt'  
-  spec.add_runtime_dependency 'r18n-core', '~> 2.0', '>= 2.1.4'
+  spec.add_runtime_dependency 'r18n-core', '~> 3.0'
   
   spec.add_development_dependency 'bundler', "~> 1.10"
-  spec.add_development_dependency 'rake', "~> 10.0"
+  spec.add_development_dependency 'rake', "~> 12.3"
   spec.add_development_dependency 'erubis'
   spec.add_development_dependency 'kramdown'
   spec.add_development_dependency 'minitest', '~> 5.7', '>= 5.7.0'
-  spec.add_development_dependency 'minitest-assert_errors'
   spec.add_development_dependency 'minitest-hooks', '~> 1.1', '>= 1.1.0'
   spec.add_development_dependency 'minitest-rg'
-  spec.add_development_dependency 'rack-test', '~> 0.6.3'
+  spec.add_development_dependency 'rack-test', '~> 1.0'
   spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'simplecov'
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kematzy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -50,20 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.7.0
-- !ruby/object:Gem::Dependency
-  name: minitest-assert_errors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-hooks
   requirement: !ruby/object:Gem::Requirement
@@ -194,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Roda Internationalisation plugin