phraseapp-in-context-editor-ruby 1.4.0 → 3.2.0

data/lib/phraseapp-in-context-editor-ruby/delegate/i18n_delegate.rb

@@ -1,24 +1,16 @@
-# -*- encoding : utf-8 -*-
-
-require 'phraseapp-in-context-editor-ruby/cache'
-require 'phraseapp-in-context-editor-ruby/hash_flattener'
-require 'phraseapp-in-context-editor-ruby/delegate'
-require 'phraseapp-in-context-editor-ruby/api_wrapper'
-require 'phraseapp-in-context-editor-ruby/displayable_key_identifier'
-
-require 'set'
+require_relative "../delegate"
 
 module PhraseApp
   module InContextEditor
     module Delegate
       class I18nDelegate < Base
-        attr_accessor :key, :display_key, :options, :api_client, :fallback_keys, :original_args
+        attr_accessor :key, :display_key
 
-        def initialize(key, options={}, original_args=nil)
+        def initialize(key, options = {}, original_args = nil)
           @key = key
           @options = options
           @original_args = original_args
-          @display_key = DisplayableKeyIdentifier.new(api_wrapper).identify(@key, @options)
+          @display_key = @key
           super(decorated_key_name)
         end
 
@@ -27,54 +19,16 @@ module PhraseApp
           if @key.respond_to?(args.first)
             to_s.send(*args)
           else
-            data = translation_or_subkeys
+            data = [@key]
             if data.respond_to?(args.first)
               data.send(*args, &block)
             else
               self.class.log "You tried to execute the missing method ##{args.first} on key #{@key} which is not supported. Please make sure you treat your translations as strings only."
-              original_translation = ::I18n.translate_without_phraseapp(*@original_args)
+              original_translation = ::I18n.translate_without_phraseapp(*@original_args, **@options)
               original_translation.send(*args, &block)
             end
           end
         end
-
-        private
-
-        def translation_or_subkeys
-          return nil if @key.nil? || @key.to_s == ""
-
-          keys = api_wrapper.keys_with_prefix(@key)
-          return nil unless keys.present?
-
-          if keys.size == 1
-            translation_content_for_key(keys.first)
-          else
-            translation_hash = keys.inject({}) do |hash, key|
-              hash[key.name] = translation_content_for_key(key)
-              hash
-            end
-
-            PhraseApp::InContextEditor::HashFlattener.expand_flat_hash(translation_hash, @key)
-          end
-        end
-
-        def translation_content_for_key(key)
-          default_translations = api_wrapper.default_translation(key)
-          return unless default_translations.present?
-
-          if key.plural
-            default_translations.inject({}) do |hash, translation|
-              hash[translation.plural_suffix.to_sym] = translation.content
-              hash
-            end
-          else
-            default_translations.first.content
-          end
-        end
-
-        def api_wrapper
-          @api_wrapper ||= InContextEditor::ApiWrapper.new
-        end
       end
     end
   end

data/lib/phraseapp-in-context-editor-ruby/delegate.rb

@@ -1,17 +1,15 @@
-# -*- encoding : utf-8 -*-
-
 module PhraseApp
   module InContextEditor
     module Delegate
       class Base < String
         def to_s
-          "#{decorated_key_name}"
+          decorated_key_name.to_s
         end
-        alias :camelize :to_s
-        alias :underscore :to_s
-        alias :classify :to_s
-        alias :dasherize :to_s
-        alias :tableize :to_s
+        alias_method :camelize, :to_s
+        alias_method :underscore, :to_s
+        alias_method :classify, :to_s
+        alias_method :dasherize, :to_s
+        alias_method :tableize, :to_s
 
         # Delegate .html_safe from accessing Delegate object as if it was a hash,
         # but instead perform it on the resulting string
@@ -19,23 +17,24 @@ module PhraseApp
 
         def self.log(message)
           message = "phrase: #{message}"
-          if defined?(Rails) and Rails.respond_to?(:logger)
+          if defined?(Rails) && Rails.respond_to?(:logger)
             Rails.logger.warn(message)
           else
-            $stderr.puts message
+            warn message
           end
         end
 
-      protected
+        protected
+
         def decorated_key_name
           "#{PhraseApp::InContextEditor.prefix}phrase_#{normalized_display_key}#{PhraseApp::InContextEditor.suffix}"
         end
 
         def normalized_display_key
-          unless @display_key.nil?
-            @display_key.gsub("<", "[[[[[[html_open]]]]]]").gsub(">", "[[[[[[html_close]]]]]]")
-          else
+          if @display_key.nil?
             @display_key
+          else
+            @display_key.gsub("<", "[[[[[[html_open]]]]]]").gsub(">", "[[[[[[html_close]]]]]]")
           end
         end
       end

data/lib/phraseapp-in-context-editor-ruby/engine.rb

@@ -1,14 +1,13 @@
-# -*- encoding : utf-8 -*-
-require 'phraseapp-in-context-editor-ruby'
-require 'i18n'
+require "phraseapp-in-context-editor-ruby"
+require "i18n"
 
 if defined? Rails
   module PhraseApp
     module InContextEditor
       class Engine < Rails::Engine
-        initializer 'phraseapp-in-context-editor-ruby', before: :disable_dependency_loading do |app|
-          require 'phraseapp-in-context-editor-ruby/adapters/i18n'
-          require 'phraseapp-in-context-editor-ruby/adapters/fast_gettext'
+        initializer "phraseapp-in-context-editor-ruby", before: :disable_dependency_loading do |app|
+          require "phraseapp-in-context-editor-ruby/adapters/i18n"
+          require "phraseapp-in-context-editor-ruby/adapters/fast_gettext"
 
           ActionView::Base.send :include, PhraseApp::InContextEditor::ViewHelpers
         end

data/lib/phraseapp-in-context-editor-ruby/version.rb

@@ -1,5 +1,3 @@
-module PhraseApp
-  module InContextEditor
-    VERSION = "1.4.0"
-  end
+module PhraseappInContextEditor
+  VERSION = "3.2.0"
 end

data/lib/phraseapp-in-context-editor-ruby/view_helpers.rb

@@ -1,35 +1,42 @@
-require 'json'
+require "json"
 
 module PhraseApp
   module InContextEditor
     module ViewHelpers
-      def phraseapp_in_context_editor_js(opts={})
+      def load_in_context_editor(opts = {})
         return "" unless PhraseApp::InContextEditor.enabled?
 
         # stringify to reduce possible errors when passing symbols
-        js_default_options = PhraseApp::InContextEditor.js_options.inject({}) { |conf, (k,v)| conf[k.to_s] = v; conf}
-        opts = opts.nil? ? {} : opts.inject({}) { |conf, (k,v)| conf[k.to_s] = v; conf}
+        opts = opts.nil? ? {} : opts.each_with_object({}) { |(k, v), conf|
+                                  conf[k.to_s] = v
+                                }
 
         # js options
         configuration = {
-          'projectId' => PhraseApp::InContextEditor.project_id,
-          'prefix' => PhraseApp::InContextEditor.prefix,
-          'suffix' => PhraseApp::InContextEditor.suffix,
-          'apiBaseUrl' => "#{PhraseApp::InContextEditor.api_host}/api/v2",
-        }.merge(js_default_options).merge(opts)
+          "projectId" => PhraseApp::InContextEditor.project_id,
+          "accountId" => PhraseApp::InContextEditor.account_id,
+          "datacenter" => PhraseApp::InContextEditor.datacenter,
+          "prefix" => PhraseApp::InContextEditor.prefix,
+          "suffix" => PhraseApp::InContextEditor.suffix,
+          "origin" => PhraseApp::InContextEditor.origin
+        }.merge(opts)
 
-        snippet = <<-eos
-          <script>
-            window.PHRASEAPP_CONFIG = #{configuration.to_json};
-            (function() {
-              var phraseapp = document.createElement('script'); phraseapp.type = 'text/javascript'; phraseapp.async = true;
-              phraseapp.src = ['#{PhraseApp::InContextEditor.js_use_ssl ? 'https' : 'http'}://', '#{PhraseApp::InContextEditor.js_host}#{PhraseApp::InContextEditor.js_path}?', new Date().getTime()].join('');
-              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(phraseapp, s);
-            })();
-          </script>
-        eos
+        snippet = <<-EOS
+        <script nonce='#{content_security_policy_nonce}'>
+          window.PHRASEAPP_CONFIG = #{configuration.to_json};
+          (function() {
+            let phraseapp = document.createElement('script');
+            phraseapp.type = 'module';
+            phraseapp.async = true;
+            phraseapp.src = "https://d2bgdldl6xit7z.cloudfront.net/latest/ice/index.js";
+            let script = document.getElementsByTagName('script')[0];
+            script.parentNode.insertBefore(phraseapp, script);
+          })();
+        </script>
+        EOS
         snippet.respond_to?(:html_safe) ? snippet.html_safe : snippet
       end
+      alias_method :phraseapp_in_context_editor_js, :load_in_context_editor
     end
   end
 end

data/lib/phraseapp-in-context-editor-ruby.rb

@@ -1,10 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'phraseapp-ruby'
-require 'request_store'
+require "request_store"
 
 module PhraseApp
   module InContextEditor
-    autoload :Config, 'phraseapp-in-context-editor-ruby/config'
+    autoload :Config, "phraseapp-in-context-editor-ruby/config"
 
     class << self
       def config
@@ -31,20 +29,12 @@ module PhraseApp
         config.project_id
       end
 
-      def access_token
-        config.access_token
+      def account_id
+        config.account_id
       end
 
-      def skip_ssl_verification
-        config.skip_ssl_verification
-      end
-
-      def cache_key_segments_initial
-        config.cache_key_segments_initial
-      end
-
-      def cache_lifetime
-        config.cache_lifetime
+      def datacenter
+        config.datacenter
       end
 
       def ignored_keys
@@ -63,28 +53,8 @@ module PhraseApp
         !config.enabled
       end
 
-      def js_use_ssl
-        config.js_use_ssl
-      end
-
-      def js_host
-        config.js_host
-      end
-
-      def js_path
-        config.js_path
-      end
-
-      def js_options
-        config.js_options
-      end
-
-      def api_host
-        config.api_host
-      end
-
-      def api_client
-        config.api_client
+      def origin
+        config.origin
       end
     end
 
@@ -92,8 +62,8 @@ module PhraseApp
       yield(PhraseApp::InContextEditor::Config)
     end
 
-    def self.with_config(config_options={}, &block)
-      original_config = self.config.dup
+    def self.with_config(config_options = {}, &block)
+      original_config = config.dup
       config.assign_values(config_options)
       yield
     ensure
@@ -101,17 +71,16 @@ module PhraseApp
     end
   end
 
-  autoload :ViewHelpers, 'phraseapp-in-context-editor-ruby/view_helpers'
+  autoload :ViewHelpers, "phraseapp-in-context-editor-ruby/view_helpers"
 
-  require 'phraseapp-in-context-editor-ruby/version'
-  require 'phraseapp-in-context-editor-ruby/engine'
-  require 'phraseapp-in-context-editor-ruby/delegate'
-  require 'phraseapp-in-context-editor-ruby/backend_service'
-  require 'phraseapp-in-context-editor-ruby/view_helpers'
+  require "phraseapp-in-context-editor-ruby/engine"
+  require "phraseapp-in-context-editor-ruby/delegate"
+  require "phraseapp-in-context-editor-ruby/backend_service"
+  require "phraseapp-in-context-editor-ruby/view_helpers"
 end
 
 # Only load adapters directly if non-rails app, otherwise use engine
 unless defined? Rails
-  require 'phraseapp-in-context-editor-ruby/adapters/i18n'
-  require 'phraseapp-in-context-editor-ruby/adapters/fast_gettext'
+  require "phraseapp-in-context-editor-ruby/adapters/i18n"
+  require "phraseapp-in-context-editor-ruby/adapters/fast_gettext"
 end