phraseapp-in-context-editor-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ae6ef70fa4072380878a8d87ba09db29b3396c
-  data.tar.gz: 884def723e04307e01571e8cdb7f940be394f8a6
+  metadata.gz: 604cd00f00973ae2d407cb71c7a30368f9bea5ad
+  data.tar.gz: 29d19946b640f989bede4f58f901de106f514235
 SHA512:
-  metadata.gz: b4129e3f07d82ce6111f0bf8c21a680a55f05a62298f4666ccdc3b4f3c078d780ebf35a09214db1548ef4c4851972c215fc4a62e233b9f48a050d83fe6db6dc0
-  data.tar.gz: 9eb68a07a6f6a16bee3cc9a0870d49753e804d64f0eab191fd17a2bd3a1c6c89476c788c6ac708e598219875a47cca85ee3dccb265da189514b311f19abf2843
+  metadata.gz: 828075464a99ba279d918bfb7402b47fd76d669cb425cfb031af26d1e267525eba43f24f56234c3dae3ccc65b8e0d5901c2d91cd148af78be141626ca8bb058b
+  data.tar.gz: 1d4af8782257326396c0847adc79161389b8e3f0bdd5872c7e6954af83de303a0e3e34eaf97d369d89ef4245778efdce282c17cfdd3c89da3866eb101a7b26f1

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

@@ -20,18 +20,18 @@ module PhraseApp
       end
 
       def keys_with_prefix(prefix)
-        params = PhraseApp::RequestParams::KeysListParams.new(q:"#{prefix}*")
+        params = PhraseApp::RequestParams::KeysSearchParams.new(q:"#{prefix}*")
         keys_list(params)
       end
 
       def keys_by_names(names)
         names = names.join(',')
-        params = PhraseApp::RequestParams::KeysListParams.new(:q => "name:#{names}")
+        params = PhraseApp::RequestParams::KeysSearchParams.new(:q => "name:#{names}")
         keys_list(params)
       end
 
       def keys_list(params)
-        PhraseApp::InContextEditor::ApiCollection.new(@api_client, "keys_list", project_id, params).collection
+        PhraseApp::InContextEditor::ApiCollection.new(@api_client, "keys_search", project_id, params).collection
       end
 
       def blacklisted_keys

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

@@ -34,7 +34,7 @@ module PhraseApp
               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)
               original_translation.send(*args, &block)
             end
           end

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

@@ -1,5 +1,5 @@
 module PhraseApp
   module InContextEditor
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

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

@@ -1,27 +1,30 @@
+require 'json'
+
 module PhraseApp
   module InContextEditor
     module ViewHelpers
-      def phraseapp_in_context_editor_js
+      def phraseapp_in_context_editor_js(opts={})
         return "" unless PhraseApp::InContextEditor.enabled?
 
-        js_config = ["projectId: '#{PhraseApp::InContextEditor.project_id}'"]
-        if PhraseApp::InContextEditor.api_host.present? && PhraseApp::InContextEditor.api_host != "https://api.phraseapp.com"
-          js_config << "apiBaseUrl: '#{PhraseApp::InContextEditor.api_host}/api/v2'"
-        end
+        opts = opts.nil? ? {} : opts.inject({}) { |conf, (k,v)| conf[k.to_s] = v; conf} # stringify to reduce possible errors when passing symbols
+        configuration = {
+          'projectId' => PhraseApp::InContextEditor.project_id,
+          'prefix' => PhraseApp::InContextEditor.prefix,
+          'suffix' => PhraseApp::InContextEditor.suffix,
+          'apiBaseUrl' => "#{PhraseApp::InContextEditor.api_host}/api/v2",
+        }.merge(opts)
 
-        js = <<-eos
-                <script>
-                  window.PHRASEAPP_CONFIG = {
-                        #{js_config.join(', ')}
-                      };
-                  (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}/assets/in-context-editor/2.0/app.js?', new Date().getTime()].join('');
-                    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(phraseapp, s);
-                  })();
-                </script>
-             eos
-        js.respond_to?(:html_safe) ? js.html_safe : js
+        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}/assets/in-context-editor/2.0/app.js?', new Date().getTime()].join('');
+              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(phraseapp, s);
+            })();
+          </script>
+        eos
+        snippet.respond_to?(:html_safe) ? snippet.html_safe : snippet
       end
     end
   end

data/phraseapp-in-context-editor-ruby.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency('json', '~> 1.8')
   s.add_dependency('i18n', '~> 0.7')
-  s.add_dependency('phraseapp-ruby', '~> 1.1')
+  s.add_dependency('phraseapp-ruby', '~> 1.2')
   s.add_development_dependency('rspec', '~> 3.2')
   s.add_development_dependency('webmock', '~> 1.21')
   s.add_development_dependency('vcr', '~> 2.9')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp-in-context-editor-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dynport GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: phraseapp-in-context-editor-ruby
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Translation management solution for web and mobile applications
 test_files: []
-has_rdoc: