localeapp 1.0.2 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmEzMjU2ZmQyMTM1NDcxY2MxNmY1MjA4ZGRiY2Y0ZTg0YjAzNjgyZQ==
+    YmVhOTI1MWRmMGYwM2YzNWYyNDU4NmM4N2Y1NGJkYWZjNTkxMmZmYQ==
   data.tar.gz: !binary |-
-    YTEwOGFlMWY2OTVjZjQ0NjRmMmE1NmQzZDMwMTkxMmQ0Y2Y0ZTMwMQ==
+    NDQ5NmMyYjJkNjk5OWNjNjAyZjhjNGEzNmFkN2VkNjM4NjQzYjJlNA==
 SHA512:
   metadata.gz: !binary |-
-    NzViMWZmNjNlNGZlOGVjZTA4M2ZiOWZkMDMyMDM0NjhlMDVkYWFmYzQ2MzNj
-    MDAzOWZlNDM0NWQ0NGJiMTBhYWQ3OGQ2M2U4ODVlYjI2MDRlMjdmODI3ZDZh
-    YjM2Nzc2YjdlOWYxNDYxNzIxNjE1ZGM4YjU4Yzc4NzNiZjRlZWE=
+    MDAyMDU3Y2NiMjYxYzE1N2Q0OGE5ZjdlYjY5NWYxZTM0MGQzMmRiOGM5M2Rj
+    MzEwYzVmYjhhNTRkNGZmOWNiODFlN2VkNTk0NThjYmIyZDBhNTkxNTIyMDZm
+    MWQzYWZjZmIzYjVlZTljMTJmMDI5Y2M3YmQ2NTU4Njk5MmRmZjM=
   data.tar.gz: !binary |-
-    NGY5MDhhNzZjNzE5MGU1NDI1OTIwODljZWJlNzU1OWIyNDU5ODc3MjhiMmE0
-    ZDVlYjI4NDkzYTBkMWE3YjVmY2I0MjE0ODZkZTRhYzAxZGFhYTEzNjQxYWI5
-    YzcwYTgwMTNiNzg0OTljYTA0ODM3Yzk1NjMyZTc1OWYxNGY2YWU=
+    NDQxNDMwZjg3MzA2MjYyODAwOWU0ZTgwMTJiYWQ0MGRjN2JhNjIyZDEwYThm
+    YjVmYzkwODUwY2IwNTg3NjRjNjZlYjFmMzI0YjEzMzQyODU0NzBiMzkwOTc1
+    YTZkNDc4ODEwNWU3ZGRlNzc1NzNkYmI4Y2Y3ZWMxMmRhZDQ5OWY=

data/.travis.yml

@@ -1,28 +1,19 @@
 before_install:
+  - gem install bundler
   - gem update bundler
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.1
   - jruby
   - jruby-head
 gemfile:
-  - gemfiles/i18n_0.3.gemfile
   - gemfiles/i18n_0.4.gemfile
   - gemfiles/i18n_0.5.gemfile
   - gemfiles/i18n_0.6.gemfile
   - gemfiles/i18n_0.7.gemfile
-matrix:
-  exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/i18n_0.3.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/i18n_0.3.gemfile
-    - rvm: 2.2
-      gemfile: gemfiles/i18n_0.3.gemfile
-    - rvm: jruby-head
-      gemfile: gemfiles/i18n_0.3.gemfile
 notifications:
   slack:
     secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "i18n-0.3" do
-  gem "i18n", "~> 0.3.0"
-  gem "activesupport", "~> 2.3.18"
-end
-
 appraise "i18n-0.4" do
   gem "i18n", "~> 0.4.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # master
 
+* Drop i18n 0.3.x and rails 2.x support
+* Remove rack dependency
+
 # Version 1.0.2
 
 * Fix a XSS vulnerability where translations keys could contain unescaped HTML (@grekko)

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 platform :jruby do
-  gem 'jruby-openssl'
+  gem 'jruby-openssl', '~> 0.6'
 end

data/README.md

@@ -21,7 +21,7 @@ Add the localeapp gem to your `Gemfile` and install it:
     echo "gem 'localeapp'" >> Gemfile
     bundle install
 
-Create a project on [Locale](https://localeapp.com) and get the api key. Then run:
+Create a project on [Locale](https://www.localeapp.com) and get the api key. Then run:
 
     bundle exec localeapp install <YOUR_API_KEY>
 
@@ -29,17 +29,8 @@ This will check everything looks good and create `config/initializers/localeapp.
 
 ### Rails 2.3
 
-Define localeapp in `config/environment.rb`:
-
-    config.gem 'localeapp'
-
-Install the gem:
-
-    rake gems:install
-
-Create a project on localeapp.com and get the api key. Then run:
-
-    localeapp install <YOUR_API_KEY>
+Rails 2.3 support has been discontinued after 1.0.2. Please use this
+version at your own risk if you really want to.
 
 ### Non rails projects
 

data/bin/localeapp

@@ -127,7 +127,7 @@ arg_name "<file>"
 command :push do |c|
   c.action do |global_options, options, args|
     if args.empty?
-      exit_now! "localeapp push requires an file or directory to push", 1
+      exit_now! "localeapp push requires a file or directory to push", 1
     else
       path = args.first
       pusher = Localeapp::CLI::Push.new(global_options)

data/gemfiles/i18n_0.4.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "i18n", "~> 0.4.0"
 
 platforms :jruby do
-  gem "jruby-openssl"
+  gem "jruby-openssl", "~> 0.6"
 end
 
 gemspec :path => "../"

data/gemfiles/i18n_0.5.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "i18n", "~> 0.5.0"
 
 platforms :jruby do
-  gem "jruby-openssl"
+  gem "jruby-openssl", "~> 0.6"
 end
 
 gemspec :path => "../"

data/gemfiles/i18n_0.6.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "i18n", "~> 0.6.0"
 
 platforms :jruby do
-  gem "jruby-openssl"
+  gem "jruby-openssl", "~> 0.6"
 end
 
 gemspec :path => "../"

data/gemfiles/i18n_0.7.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "i18n", "~> 0.7.0"
 
 platforms :jruby do
-  gem "jruby-openssl"
+  gem "jruby-openssl", "~> 0.6"
 end
 
 gemspec :path => "../"

data/lib/localeapp.rb

@@ -1,26 +1,5 @@
-# AUDIT: Find a better way of doing this
-begin
-  require 'i18n'
-rescue LoadError
-  # we're in 2.3 and we need to load rails to get the vendored i18n
-  require 'thread' # for rubygems > 1.6.0 support
-  require 'active_support'
-  # This ugliness so we can load AS in the travis env
-  @loaded_active_support = true
-end
-
-begin
-  require 'i18n/core_ext/hash'
-rescue LoadError
-  # This ugliness so we can load AS in the travis env
-  # Assume that we're in rails 2.3 and AS supplies deep_merge
-  # Load AS if we need to
-  unless @loaded_active_support
-    # we're in 2.3 and we need to load rails to get the vendored i18n
-    require 'thread' # for rubygems > 1.6.0 support
-    require 'active_support'
-  end
-end
+require 'i18n'
+require 'i18n/core_ext/hash'
 
 require 'localeapp/i18n_shim'
 require 'localeapp/version'

data/lib/localeapp/cli/install.rb

@@ -65,7 +65,7 @@ module Localeapp
           localeapp_default_code = project_data['default_locale']['code']
           @output.puts "Default Locale: #{localeapp_default_code} (#{project_data['default_locale']['name']})"
           if I18n.default_locale.to_s != localeapp_default_code
-            @output.puts "WARNING: I18n.default_locale is #{I18n.default_locale}, change in config/environment.rb (Rails 2) or config/application.rb (Rails 3)"
+            @output.puts "WARNING: I18n.default_locale is #{I18n.default_locale}, change in config/application.rb (Rails 3+)"
           end
         end
 

data/lib/localeapp/rails.rb

@@ -6,10 +6,6 @@ module Localeapp
 
       ActionController::Base.send(:include, Localeapp::Rails::Controller)
 
-      if rails_version_matches? '~> 2.3' # TODO: Check previous rails versions if required
-        require 'localeapp/rails/2_3_translation_helper_monkeypatch'
-      end
-
       # match all versions between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc on all branches
       if rails_version_matches_all?('~> 4.0.10.rc1') |
          rails_version_matches_all?('~> 4.1.0.rc1', '< 4.1.10.rc1') |

data/lib/localeapp/rails/controller.rb

@@ -2,8 +2,13 @@ module Localeapp
   module Rails
     module Controller
       def self.included(base)
-        base.before_filter :handle_translation_updates
-        base.after_filter  :send_missing_translations
+        if base.respond_to? :before_action
+          base.before_action :handle_translation_updates
+          base.after_action :send_missing_translations
+        else
+          base.before_filter :handle_translation_updates
+          base.after_filter  :send_missing_translations
+        end
       end
 
       def handle_translation_updates

data/lib/localeapp/routes.rb

@@ -1,5 +1,3 @@
-require 'rack/utils'
-
 require "localeapp/routes/base"
 require "localeapp/routes/projects"
 require "localeapp/routes/translations"

data/lib/localeapp/routes/base.rb

@@ -21,7 +21,7 @@ module Localeapp
       end
 
       def escape_key(key)
-        Rack::Utils.escape(key).gsub(/\./, '%2E')
+        URI.encode_www_form_component(key).gsub(/\./, '%2E')
       end
     end
   end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

data/localeapp.gemspec

@@ -20,17 +20,17 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('i18n')
-  s.add_dependency('json')
-  s.add_dependency('rest-client')
-  s.add_dependency('rack')
+  s.add_dependency('mime-types', '~> 2.6')
+  s.add_dependency('i18n', '~> 0.4')
+  s.add_dependency('json', '~> 1.8')
+  s.add_dependency('rest-client', '~> 1.8')
   s.add_dependency('ya2yaml')
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 3.3')
   s.add_development_dependency('yard')
-  s.add_development_dependency('RedCloth')
+  s.add_development_dependency('RedCloth', '< 4.3')
   s.add_development_dependency('aruba', '~> 0.8')
   s.add_development_dependency('cucumber', '~> 2.0')
   s.add_development_dependency('fakeweb')

data/spec/localeapp/cli/install_spec.rb

@@ -126,7 +126,8 @@ describe Localeapp::CLI::Install::DefaultInstaller, '#check_default_locale' do
   it "displays warning if I18n.default_locale doesn't match what's configured on localeapp.com" do
     allow(I18n).to receive(:default_locale).and_return(:es)
     installer.check_default_locale
-    expect(output.string).to match(%r{WARNING: I18n.default_locale is es, change in config/environment.rb \(Rails 2\) or config/application.rb \(Rails 3\)})
+    expect(output.string)
+      .to match(%r{WARNING: I18n\.default_locale is es, change in config/application\.rb \(Rails 3\+\)})
   end
 end
 

data/spec/localeapp/rails/controller_spec.rb

@@ -7,6 +7,13 @@ class TestController
   end
 end
 
+class TestActionController
+  def self.before_action(*options)
+  end
+  def self.after_action(*options)
+  end
+end
+
 require 'localeapp/rails/controller'
 
 describe Localeapp::Rails::Controller, '#handle_translation_updates' do
@@ -143,3 +150,33 @@ describe Localeapp::Rails::Controller, '#send_missing_translations' do
     @controller.send_missing_translations
   end
 end
+
+describe Localeapp::Rails::Controller, 'Rails 5 before_action support' do
+  before do
+    TestActionController.send(:include, Localeapp::Rails::Controller)
+    configuration = {
+      :synchronization_data_file => LocaleappSynchronizationData::setup,
+      :api_key => "my_key"
+    }
+    with_configuration(configuration) do
+      @controller = TestActionController.new
+    end
+    now = Time.now; allow(Time).to receive(:now).and_return(now)
+    Localeapp.configuration.environment_name = 'development'
+  end
+
+  context "#handle_translation_updates" do
+    it "calls poller.poll! when the synchronization file's polled_at has changed" do
+      Localeapp.poller.write_synchronization_data!(01234, 56789)
+      expect(Localeapp.poller).to receive(:poll!)
+      @controller.handle_translation_updates
+    end
+  end
+
+  context "#send_missing_translations" do
+    it "proceeds when configuration is enabled" do
+      expect(Localeapp.sender).to receive(:post_missing_translations)
+      @controller.send_missing_translations
+    end
+  end
+end

data/spec/localeapp/routes_spec.rb

@@ -98,6 +98,12 @@ describe Localeapp::Routes do
         expect(@routes.remove_url(:key => 'test.key')).to eq("https://test.host/v1/projects/API_KEY/translations/test%2Ekey")
       end
     end
+
+    it "URL encodes the key name" do
+      with_configuration @config do
+        expect(@routes.remove_url key: "some key").to include "some+key"
+      end
+    end
   end
 
   describe "#rename_endpoint(options = {})" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,64 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: ya2yaml
   requirement: !ruby/object:Gem::Requirement
@@ -142,16 +142,16 @@ dependencies:
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +244,6 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/update.feature
-- gemfiles/i18n_0.3.gemfile
 - gemfiles/i18n_0.4.gemfile
 - gemfiles/i18n_0.5.gemfile
 - gemfiles/i18n_0.6.gemfile
@@ -270,7 +269,6 @@ files:
 - lib/localeapp/missing_translations.rb
 - lib/localeapp/poller.rb
 - lib/localeapp/rails.rb
-- lib/localeapp/rails/2_3_translation_helper_monkeypatch.rb
 - lib/localeapp/rails/backport_translation_helper_fix_to_honor_raise_option.rb
 - lib/localeapp/rails/controller.rb
 - lib/localeapp/rails/flatten.rb

data/gemfiles/i18n_0.3.gemfile

@@ -1,12 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "i18n", "~> 0.3.0"
-gem "activesupport", "~> 2.3.18"
-
-platforms :jruby do
-  gem "jruby-openssl"
-end
-
-gemspec :path => "../"

data/lib/localeapp/rails/2_3_translation_helper_monkeypatch.rb

@@ -1,36 +0,0 @@
-# We're replacing the original method with one that doesn't set the :raise option.
-# This means the exception handler will be called and missing translations get sent to
-# localeapp. It's ugly but there's no other way to do it :(
-
-module Localeapp::TranslationHelperRails23MonkeyPatch
-  # Delegates to I18n#translate but also performs two additional functions. First, it'll catch MissingTranslationData exceptions
-  # and turn them into inline spans that contains the missing key, such that you can see in a view what is missing where.
-  #
-  # Second, it'll scope the key by the current partial if the key starts with a period. So if you call translate(".foo") from the
-  # people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo"). This makes it less repetitive
-  # to translate many keys within the same partials and gives you a simple framework for scoping them consistently. If you don't
-  # prepend the key with a period, nothing is converted.
-  def translate(keys, options = {})
-    if multiple_keys = keys.is_a?(Array)
-      ActiveSupport::Deprecation.warn "Giving an array to translate is deprecated, please give a symbol or a string instead", caller
-    end
-
-    keys = scope_keys_by_partial(keys)
-
-    translations = I18n.translate(keys, options)
-    translations = [translations] if !multiple_keys && translations.size > 1
-    translations = html_safe_translation_keys(keys, translations)
-
-    if multiple_keys || translations.size > 1
-      translations
-    else
-      translations.first
-    end
-  rescue I18n::MissingTranslationData => e
-    keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
-    content_tag('span', keys.join(', '), :class => 'translation_missing')
-  end
-  alias :t :translate
-end
-
-ActionView::Base.send(:include, ::Localeapp::TranslationHelperRails23MonkeyPatch)