redis-i18n 0.6.1 → 0.6.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 408e9088bd2324956384915dd4ed1dec96cc90c6
+  data.tar.gz: fbf57b3ddcfb6f8b0a3fd2d5a9545236966b9b11
+SHA512:
+  metadata.gz: 13a29b594423e8df29fd478c1841e0d1662651427e3451f7c00c0ae2bba673fa1174ec3d4faa7df95a9f4a84311eb4cfc82490b0c3ec1578f026d1c5742cc502
+  data.tar.gz: afa706b4fc1a373544adebe49c1990490dcb61031480fc3280a1354c80caeab6837e8e12ef3607d9003bde860afee9d7ed25d45fbb2ef8301925f50e576f1def

data/Gemfile

@@ -1,5 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec
 
-gem 'redis-store', '1.1.0', :path => File.expand_path('../../redis-store', __FILE__)
-gem 'SystemTimer', :platform => :mri_18
+gem 'redis-store', '~> 1.1.0', path: '../redis-store'

data/README.md

@@ -1,44 +1,25 @@
 # Redis stores for I18n
 
-__`redis-i18n`__ provides a Redis backend for __I18n__. It natively supports object marshalling, timeouts, single or multiple nodes and namespaces.
+__`redis-i18n`__ provides a Redis backend for __I18n__. See the main [redis-store readme](https://github.com/jodosha/redis-store) for general guidelines.
 
-## Redis Installation
-
-### Option 1: Homebrew
-
-MacOS X users should use [Homebrew](https://github.com/mxcl/homebrew) to install Redis:
-
-    brew install redis
-
-### Option 2: From Source
-
-Download and install Redis from [http://redis.io](http://redis.io/)
-
-	wget http://redis.googlecode.com/files/redis-2.4.15.tar.gz
-    tar -zxf redis-2.4.15.tar.gz
-    mv redis-2.4.15 redis
-    cd redis
-    make
-
-## Usage
+## Installation
 
     # Gemfile
-	gem 'redis-i18n'
-
-### Backend:
+    gem 'redis-i18n'
 
-	I18n.backend = I18n::Backend::Redis.new
+### Usage
 
-#### Configuration
+If you are using redis-store with Rails, consider using the [redis-rails gem](https://github.com/jodosha/redis-store/tree/master/redis-rails) instead. For standalone usage:
 
-For advanced configuration options, please check the [Redis Store Wiki](https://github.com/jodosha/redis-store/wiki).
+    I18n.backend = I18n::Backend::Redis.new
 
 ## Running tests
 
+    gem install bundler
     git clone git://github.com/jodosha/redis-store.git
-	cd redis-store/redis-i18n
-	gem install bundler
-	bundle exec rake
+    cd redis-store/redis-i18n
+    bundle install
+    bundle exec rake
 
 If you are on **Snow Leopard** you have to run `env ARCHFLAGS="-arch x86_64" bundle exec rake`
 

data/lib/i18n/backend/redis.rb

@@ -27,7 +27,7 @@ module I18n
       #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
       #     # => instantiate a cluster
       def initialize(*addresses)
-        @store = ::Redis::Factory.create(addresses)
+        @store = ::Redis::Store::Factory.create(addresses)
       end
 
       def translate(locale, key, options = {})
@@ -58,7 +58,25 @@ module I18n
       protected
         def lookup(locale, key, scope = [], options = {})
           key = normalize_flat_keys(locale, key, scope, options[:separator])
-          @store.get "#{locale}.#{key}"
+
+          main_key = "#{locale}.#{key}"
+          if result = @store.get(main_key)
+            return result
+          end
+
+          child_keys = @store.keys("#{main_key}.*")
+          if child_keys.empty?
+            return nil
+          end
+
+          result = { }
+          subkey_part = (main_key.size + 1)..(-1)
+          child_keys.each do |child_key|
+            subkey         = child_key[subkey_part].to_sym
+            result[subkey] = @store.get child_key
+          end
+
+          result
         end
 
         def resolve_link(locale, key)

data/lib/redis/i18n/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module I18n
-    VERSION = '0.6.1'
+    VERSION = '0.6.5'
   end
 end

data/redis-i18n.gemspec

@@ -5,9 +5,9 @@ require 'redis/i18n/version'
 Gem::Specification.new do |s|
   s.name        = 'redis-i18n'
   s.version     = Redis::I18n::VERSION
-  s.authors     = ['Luca Guidi', 'Matt Horan']
+  s.authors     = ['Luca Guidi']
   s.email       = ['me@lucaguidi.com']
-  s.homepage    = 'http://jodosha.github.com/redis-store'
+  s.homepage    = 'http://redis-store.org/redis-i18n'
   s.summary     = %q{Redis store for i18n}
   s.description = %q{Redis backed store for i18n}
 
@@ -21,9 +21,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'redis-store',   '~> 1.1.0'
   s.add_runtime_dependency 'i18n',          '~> 0.6.0'
 
-  s.add_development_dependency 'rake',      '~> 0.9.2'
-  s.add_development_dependency 'bundler',   '~> 1.1'
-  s.add_development_dependency 'mocha',     '~> 0.10.0'
-  s.add_development_dependency 'minitest',  '~> 2.8.0'
-  s.add_development_dependency 'purdytest', '~> 1.0.0'
+  s.add_development_dependency 'rake',     '~> 10'
+  s.add_development_dependency 'bundler',  '~> 1.3'
+  s.add_development_dependency 'mocha',    '~> 0.14.0'
+  s.add_development_dependency 'minitest', '~> 5'
 end

data/test/i18n/backend/redis_test.rb

@@ -21,6 +21,12 @@ describe "I18n::Backend::Redis" do
     I18n.t(:"baz", :scope => :"foo.bar").must_equal(:bang)
   end
 
+  it "gets translations with count" do
+    I18n.backend.store_translations :en, :bar => { :one => :bar, :other => "%{count} bars" }
+    I18n.t(:bar, :count => 1).must_equal(:bar)
+    I18n.t(:bar, :count => 10).must_equal("10 bars")
+  end
+
   it "raises an exception when a proc translation is being saved" do
     lambda {
       I18n.backend.store_translations :en, :foo => lambda {|| }

data/test/redis/i18n/version_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe Redis::I18n::VERSION do
-  it "must be equal to 0.6.1" do
-    Redis::I18n::VERSION.must_equal '0.6.1'
+  it 'returns current version' do
+    Redis::I18n::VERSION.must_equal '0.6.5'
   end
 end

data/test/test_helper.rb

@@ -1,7 +1,5 @@
-Bundler.setup
-gem 'minitest'
-require 'minitest/spec'
+require 'bundler/setup'
 require 'minitest/autorun'
-require 'mocha'
+require 'mocha/setup'
 require 'i18n'
 require 'i18n/backend/redis'

metadata

@@ -1,21 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redis-i18n
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.5
 platform: ruby
 authors:
 - Luca Guidi
-- Matt Horan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,83 +41,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: purdytest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '5'
 description: Redis backed store for i18n
 email:
 - me@lucaguidi.com
@@ -143,32 +113,30 @@ files:
 - test/i18n/backend/redis_test.rb
 - test/redis/i18n/version_test.rb
 - test/test_helper.rb
-homepage: http://jodosha.github.com/redis-store
+homepage: http://redis-store.org/redis-i18n
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis-i18n
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redis store for i18n
 test_files:
 - test/i18n/backend/redis_test.rb
 - test/redis/i18n/version_test.rb
 - test/test_helper.rb
-has_rdoc: