localeapp 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGIyOGI1YTRjMGJmMWE1ODRiMDgwNGNlZThkZWQ0MmE0ZjQ3Njk1Yw==
+  data.tar.gz: !binary |-
+    MmRjMTRkMzI5MGFiMDA1NDBkY2I2ODk1MjRlZTc5MjBkNWRkMzE4OA==
+SHA512:
+  metadata.gz: !binary |-
+    Nzg5ODJhNjUzYTFkOTU0ZGNiMTA1Mjk1YzI3MzBkYjUzZGVmZDM1YWVlZTBi
+    NmFhNjNkYjc1ZGQ1YzliNDQxZGU2YjVjZTBiNzc3YTNiMTAwNjVkMDQ4YjZl
+    MWYyOWJmYzVhYjBkYzVhZmUxODY0NjVjYmM1OTBlNmI0OTNiNjU=
+  data.tar.gz: !binary |-
+    N2NlMDQzZjhmMDVhNjc0YzJiNDhkY2Q4MjJlYWU0ZDIwMWE4ZTA0NWMzM2Rk
+    ZjcxMTVmNjhjNTUyODFiNGY3MTUxMTU3MGE3MzljZDYyYTBhYTBhY2ZkNjcz
+    YTY2MWJjNzllMWVlMzBkZTQ1YjBlMjQ5MmM0MTg2NWNlNzMxZmU=

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # master
 
+# Version 0.9.1
+
+* Fix Rails 4.1 TranslationHelper regression
+
+# Version 0.9.0
+
+* Add option to configure SSL version used
+
 # Version 0.8.1
 
 * Add the `blacklisted_keys_pattern` configuration option
@@ -126,7 +134,7 @@
 
 # Version 0.4.3
 
-* Make sure Psych is fully loaded before using it (Thanks @tenderlove) 
+* Make sure Psych is fully loaded before using it (Thanks @tenderlove)
 
 # Version 0.4.2
 
@@ -135,41 +143,33 @@
 # Version 0.4.1
 
 * Ignore HUP when backgrounded. (Thanks @xijo)
-* Add --standalone option to install to generate a .localeapp/ config
-  directory. This enables usage outside of rails.
+* Add --standalone option to install to generate a .localeapp/ config directory. This enables usage outside of rails.
 
 # Version 0.4.0
 
-* Use Psych to generate the yaml if it's available (This will completely change
-  your yaml the first time you do a localeapp pull and Psych is available)
-* Report when the directory to write the yml to doesn't exist (Thanks Robin
-  Mehner)
+* Use Psych to generate the yaml if it's available (This will completely change your yaml the first time you do a localeapp pull and Psych is available)
+* Report when the directory to write the yml to doesn't exist (Thanks Robin Mehner)
 
 # Version 0.3.2
 
-* Use yml rather than json when making api calls to localeapp.com. This avoids
-  symbols turning into strings and breaking parts of rails.
+* Use yml rather than json when making api calls to localeapp.com. This avoids symbols turning into strings and breaking parts of rails.
 
 # Version 0.3.1
 
-* Handle SocketError so we don't cause errors in client apps when they're not
-  connected to the network
+* Handle SocketError so we don't cause errors in client apps when they're not connected to the network
 * Fix bug with empty log file (Thanks Robin Mehner)
 
 # Version 0.3.0
 
 * Allow symbols for environment names in config file
-* `localeapp push` will now push all yaml files in a directory if it's given a
-  directory instead of a file. (Thanks Bartłomiej Danek)
-* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration
-  options. (Thanks again Bartłomiej Danek)
+* `localeapp push` will now push all yaml files in a directory if it's given a directory instead of a file. (Thanks Bartłomiej Danek)
+* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration options. (Thanks again Bartłomiej Danek)
 
 # Version 0.2.0
 
 * Add `localeapp add` command for sending keys and translations from the command line
 * Add `secure` configuration setting for api communications. Default: true
-* Add `ssl_verify` and `ssl_ca_file` configuration settings for ssl cert verification.
-  Off by default, see the README for more details
+* Add `ssl_verify` and `ssl_ca_file` configuration settings for ssl cert verification. Off by default, see the README for more details
 * Add `proxy` configuration setting
 
 # Version 0.1.2
@@ -185,8 +185,6 @@
 # Version 0.1.0
 
 * Added support for Heroku's Cedar stack
-* Added a safer configuration style where enabled environments are explicitly
-  defined
-* Removed some unnecessary default options from config files generated with 
-  `localeapp install`
+* Added a safer configuration style where enabled environments are explicitly defined
+* Removed some unnecessary default options from config files generated with `localeapp install`
 * Fixed `localeapp push` with no arguments

data/lib/localeapp/rails.rb

@@ -10,9 +10,13 @@ module Localeapp
         require 'localeapp/rails/2_3_translation_helper_monkeypatch'
       end
 
-      if rails_version_matches_any? '~> 3.2.16', '~> 4.0.2' # ie: after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
-        require 'localeapp/rails/force_exception_handler_in_translation_helper'
+      if rails_version_matches_any? '~> 4.1.0.rc1', '~> 4.2.0.beta1' # i.e. between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc
+        require 'localeapp/rails/4_1_translation_helper_monkeypatch'
+      end
+
+      if rails_version_matches_any? '~> 3.2.16', '>= 4.0.2' # ie: after CVE-2013-4491 patch (https://github.com/rails/rails/commit/78790e4bceedc632cb40f9597792d7e27234138a)
         require 'localeapp/rails/mimic_rails_missing_translation_display'
+        require 'localeapp/rails/force_exception_handler_in_translation_helper'
       end
 
       Localeapp.configure do |config|

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

@@ -2,7 +2,7 @@
 # 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::TranslationHelperMonkeyPatch
+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.
   #
@@ -33,4 +33,4 @@ module Localeapp::TranslationHelperMonkeyPatch
   alias :t :translate
 end
 
-ActionView::Base.send(:include, ::Localeapp::TranslationHelperMonkeyPatch)
+ActionView::Base.send(:include, ::Localeapp::TranslationHelperRails23MonkeyPatch)

data/lib/localeapp/rails/4_1_translation_helper_monkeypatch.rb

@@ -0,0 +1,76 @@
+# We're replacing the original method with one that doesn't always override the :raise option.
+# This bug was introduced in Rails here (4.1.0.rc1): https://github.com/rails/rails/pull/13832
+# and fixed here: https://github.com/rails/rails/pull/17676
+
+module Localeapp::TranslationHelperRails41MonkeyPatch
+  # Delegates to <tt>I18n#translate</tt> but also performs three additional functions.
+  #
+  # First, it will ensure that any thrown +MissingTranslation+ messages will be turned
+  # into inline spans that:
+  #
+  #   * have a "translation-missing" class set,
+  #   * contain the missing key as a title attribute and
+  #   * a titleized version of the last key segment as a text.
+  #
+  # E.g. the value returned for a missing translation key :"blog.post.title" will be
+  # <span class="translation_missing" title="translation missing: en.blog.post.title">Title</span>.
+  # This way your views will display rather reasonable strings but it will still
+  # be easy to spot missing translations.
+  #
+  # Second, it'll scope the key by the current partial if the key starts
+  # with a period. So if you call <tt>translate(".foo")</tt> from the
+  # <tt>people/index.html.erb</tt> template, you'll actually be calling
+  # <tt>I18n.translate("people.index.foo")</tt>. 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.
+  #
+  # Third, it'll mark the translation as safe HTML if the key has the suffix
+  # "_html" or the last element of the key is the word "html". For example,
+  # calling translate("footer_html") or translate("footer.html") will return
+  # a safe HTML string that won't be escaped by other HTML helper methods. This
+  # naming convention helps to identify translations that include HTML tags so that
+  # you know what kind of output to expect when you call translate in a template.
+  def translate(key, options = {})
+    options = options.dup
+    remaining_defaults = Array(options.delete(:default))
+    options[:default] = remaining_defaults.shift if remaining_defaults.first.kind_of? String
+
+    # If the user has explicitly decided to NOT raise errors, pass that option to I18n.
+    # Otherwise, tell I18n to raise an exception, which we rescue further in this method.
+    # Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
+    if options[:raise] == false || (options.key?(:rescue_format) && options[:rescue_format].nil?)
+      raise_error = false
+      options[:raise] = false
+    else
+      raise_error = options[:raise] || options[:rescue_format] || ActionView::Base.raise_on_missing_translations
+      options[:raise] = true
+    end
+
+    if html_safe_translation_key?(key)
+      html_safe_options = options.dup
+      options.except(*I18n::RESERVED_KEYS).each do |name, value|
+        unless name == :count && value.is_a?(Numeric)
+          html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+        end
+      end
+      translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
+
+      translation.respond_to?(:html_safe) ? translation.html_safe : translation
+    else
+      I18n.translate(scope_key_by_partial(key), options)
+    end
+  rescue I18n::MissingTranslationData => e
+    if remaining_defaults.present?
+      translate remaining_defaults.shift, options.merge(default: remaining_defaults)
+    else
+      raise e if raise_error
+
+      keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
+      content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
+    end
+  end
+  alias :t :translate
+end
+
+ActionView::Base.send(:include, ::Localeapp::TranslationHelperRails41MonkeyPatch)

data/lib/localeapp/rails/mimic_rails_missing_translation_display.rb

@@ -12,7 +12,7 @@ module Localeapp
         alias :old_rails_call :call
         def call(exception, locale, key, options)
           locale, key = old_rails_call(exception, locale, key, options).split(', ')
-          "<span class=\"translation_missing\" title=\"translation missing: #{key}\">#{locale}, #{key}</span>".html_safe
+          "<span class=\"translation_missing\" title=\"translation missing: #{locale}.#{key}\">#{key.titleize}</span>".html_safe
         end
 
       end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/localeapp.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('yard')
   s.add_development_dependency('RedCloth')
   s.add_development_dependency('aruba')
+  s.add_development_dependency('cucumber', '~> 1.3')
   s.add_development_dependency('fakeweb')
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.9.1
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,140 +9,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70163408135340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408135340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70163408134520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408134520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70163408133560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408133560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70163408132560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408132560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ya2yaml
-  requirement: &70163408130680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408130680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70163408128620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163408128620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70163408152860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163408152860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70163408150840 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *70163408150840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70163408148640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163408148640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70163408146900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163408146900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70163408145740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163408145740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70163408220500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163408220500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Synchronizes i18n translation keys and content with localeapp.com so
   you don't have to manage translations by hand.
 email:
@@ -204,6 +253,7 @@ files:
 - lib/localeapp/poller.rb
 - lib/localeapp/rails.rb
 - lib/localeapp/rails/2_3_translation_helper_monkeypatch.rb
+- lib/localeapp/rails/4_1_translation_helper_monkeypatch.rb
 - lib/localeapp/rails/controller.rb
 - lib/localeapp/rails/flatten.rb
 - lib/localeapp/rails/force_exception_handler_in_translation_helper.rb
@@ -248,75 +298,26 @@ files:
 homepage: http://www.localeapp.com
 licenses:
 - MIT
+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'
-      segments:
-      - 0
-      hash: 933950263317453001
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 933950263317453001
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 1.8.6
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy i18n translation management with localeapp.com
-test_files:
-- features/add.feature
-- features/bad_command.feature
-- features/help.feature
-- features/install.feature
-- features/mv.feature
-- features/pull.feature
-- features/push.feature
-- features/rm.feature
-- features/step_definitions/cli_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/update.feature
-- spec/fixtures/empty_log.yml
-- spec/fixtures/en.yml
-- spec/fixtures/es.yml
-- spec/fixtures/string_log.yml
-- spec/fixtures/symbol_log.yml
-- spec/localeapp/api_call_spec.rb
-- spec/localeapp/api_caller_spec.rb
-- spec/localeapp/cli/add_spec.rb
-- spec/localeapp/cli/daemon_spec.rb
-- spec/localeapp/cli/install_spec.rb
-- spec/localeapp/cli/pull_spec.rb
-- spec/localeapp/cli/push_spec.rb
-- spec/localeapp/cli/rename_spec.rb
-- spec/localeapp/cli/update_spec.rb
-- spec/localeapp/configuration_spec.rb
-- spec/localeapp/default_value_handler_spec.rb
-- spec/localeapp/exception_handler_spec.rb
-- spec/localeapp/key_checker_spec.rb
-- spec/localeapp/missing_translations_spec.rb
-- spec/localeapp/poller_spec.rb
-- spec/localeapp/rails/controller_spec.rb
-- spec/localeapp/routes_spec.rb
-- spec/localeapp/sender_spec.rb
-- spec/localeapp/sync_file_spec.rb
-- spec/localeapp/updater_spec.rb
-- spec/localeapp_spec.rb
-- spec/spec_helper.rb
-- spec/support/i18n/missing_translation.rb
-- spec/support/localeapp_integration_data.rb
-- spec/support/localeapp_synchronization_data.rb
+test_files: []
 has_rdoc: