roda-i18n 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61da5676e50ba7ef694e025bfd717c279c0dfe01
-  data.tar.gz: 57e1b41f3d7856e464e51542fa9c6172f6fe93bc
+  metadata.gz: 7c49e1ba809caf572d5d75f55cbe48bedf855f80
+  data.tar.gz: eb86ad5e8c25b9c152ae1a4c56d7cbcfac084f46
 SHA512:
-  metadata.gz: 741426239b80ef746c01ba0e3551855af218b12412147d8117da8a2524eba80502b7c934bca41ae1ad6cbbeaa2f1375581c08f639fe233776dbf69a397227437
-  data.tar.gz: 931482a0bbd46455887a2f67affc4a93c13329db1acf73c723e386f3cdf29aaecbe4f340cbcabee2ea4f2bdd8f83fc3f22243714eb4734966d602067befe3f17
+  metadata.gz: 5d31eee8bb80bc0e147e8b94901c1be53b32c6684eb9471156e4841e3f6cbeff8234e3258f569093e26fa3276606d4d99eecbfd7d3656f7f91fa45c75ea20038
+  data.tar.gz: d9351ab146c07cd61a0c29f5b234966f5b18deeaf55aecafe7d1018e53f503a6efe54f3b002e2af74a3c24442e5f4affef48015c68b6f9d5986924a179951878

data/.gitignore

@@ -1,4 +1,9 @@
-tmp
-Gemfile.lock
-coverage
-pkg
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+ - 2.2.2
+ - 2.3.0
+ # - jruby
+ # - rbx-2
+before_install: 
+  - gem install bundler -v 1.12.5
+
+# uncomment and edit the following line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/CHANGELOG.md

@@ -0,0 +1,25 @@
+# CHANGELOG
+
+
+## 0.3.0 (2016-08-11)
+
+* Merged PR #3 by @jonduarte - Making routes behind #locale block work
+
+* Added Travis CI support (all builds passing)
+
+* Change r18n-core gem to version 2.1.4
+
+* Add alias for rake test
+
+
+## 0.2.0 (2015-11-24)
+
+* Mainly internal build and setup improvements
+
+
+## 0.1.0 (2015-09-13)
+
+* Initial public release
+  
+  * Big Thank You to @jeremyevans for his assistance in creating this initial version.
+  

data/Gemfile

@@ -1,19 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in roda-tags.gemspec
+# Specify your gem's dependencies in roda-i18n.gemspec
 gemspec
-
-# gem 'roda', '~> 2.5.1'
-# gem 'r18n-core'
-#
-# group :test do
-#   gem 'minitest'
-#   gem 'minitest-hooks'
-#   gem "rack-test"
-#
-#   gem 'tilt'
-#   gem 'erubis'
-#   gem 'kramdown'
-#
-#   gem 'simplecov', :require => false
-# end

data/README.md

@@ -1,5 +1,7 @@
 # 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.
 
@@ -180,7 +182,7 @@ end
 <br>
 
 
-### ``#i18n_set_locale_from(type)` - (request method)
+### `#i18n_set_locale_from(type)` - (request method)
 
 Obtains the locale from either ENV, HTTP (browser), Params or Session values.
 
@@ -331,6 +333,10 @@ Som form of built-in support for storing / loading translations from a Sequel ba
 
 * Inspiration and assistance by [Jeremy Evans](github.com/jeremyevans). Many thanks Jeremy!! 
 
+* Code fixes and improvements by:
+
+   * [Jonathan Duarte](github.com/jonduarte). Many thanks Jonathan
+
 
 ## Licence
 

data/Rakefile

@@ -1,21 +1,29 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:spec) do |t|
-  t.libs << "spec"
-  t.libs << "lib"
+  t.libs << 'spec'
+  t.libs << 'lib'
   t.test_files = FileList['spec/**/*_spec.rb']
 end
 
 task :default => :spec
+task :test => :spec
 
-desc "Run specs with coverage"
+desc 'Run specs with coverage'
 task :coverage do
   ENV['COVERAGE'] = '1'
   Rake::Task['spec'].invoke
+    # `open coverage/index.html` # if OSX
 end
 
-desc "Run Rubocop report"
+desc 'Run Rubocop report'
 task :rubocop do
-  `rubocop -f html -o ./Rubocop-report.html lib/`
+  res = `which rubocop`
+  if res != ""
+    `rubocop -f html -o ./rubocop/report.html lib/`
+      # `open rubocop/report.html` # if OSX
+  else
+    puts "\nERROR: 'rubocop' gem is not installed or available. Please install with 'gem install rubocop'."
+  end
 end

data/lib/roda/i18n/version.rb

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

data/lib/roda/plugins/i18n.rb

@@ -266,6 +266,20 @@ class Roda
           # return # NB!! needed to enable routes below to work
         end
         
+        # Match only paths that contain one available locale from the ::R18n.available_locales
+        # list, otherwise skip it.
+        #
+        # 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
+           if ::R18n.available_locales.map(&:code).map(&:downcase).include?(locale.downcase)
+             @captures.push(locale)
+             @remaining_path = remaining_path.sub("/#{locale}", "")
+           end
+         end
+        end
+        
         # Sets the locale based upon <tt>:locale</tt> prefixed routes
         #  
         #   route do |r|
@@ -280,8 +294,8 @@ class Roda
         #   end
         #
         def locale(opts = {}, &blk)
-          on(':locale', opts) do |l|
-            loc = l || self.class.opts[:locale]
+          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?

data/roda-i18n.gemspec

@@ -6,13 +6,13 @@ require 'roda/i18n/version'
 Gem::Specification.new do |spec|
   spec.name           = 'roda-i18n'
   spec.version        = ::Roda::I18n::VERSION
-  spec.authors        = ["Kematzy"]
-  spec.email          = ["kematzy@gmail.com"]
+  spec.authors        = ['Kematzy']
+  spec.email          = ['kematzy@gmail.com']
   
-  spec.summary        = "Roda Internationalisation plugin"
+  spec.summary        = 'Roda Internationalisation plugin'
   spec.description    = "The Roda-i18n plugin enables easy addition of internationalisation (i18n) and localisation support in Roda apps"
-  spec.homepage       = "http://github.com/kematzy/roda-i18n"
-  spec.license        = "MIT"
+  spec.homepage       = 'http://github.com/kematzy/roda-i18n'
+  spec.license        = 'MIT'
   
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
@@ -29,21 +29,22 @@ Gem::Specification.new do |spec|
   
   spec.platform         = Gem::Platform::RUBY
   spec.has_rdoc         = true
-  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.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 'tilt'  
-  spec.add_runtime_dependency "r18n-core", '~> 2.0', '>= 2.0.3'
+  spec.add_runtime_dependency 'r18n-core', '~> 2.0', '>= 2.1.4'
   
   spec.add_development_dependency 'bundler', "~> 1.10"
   spec.add_development_dependency 'rake', "~> 10.0"
   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-hooks", '~> 1.1', '>= 1.1.0'
+  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', '~> 0.6.3'
   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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kematzy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roda
@@ -53,7 +53,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,20 @@ 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
@@ -227,6 +241,8 @@ extra_rdoc_files:
 - MIT-LICENSE
 files:
 - ".gitignore"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -262,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Roda Internationalisation plugin