copy_tuner_client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bfc2b0438d95dfd78e642cbd01634341a49dda1
-  data.tar.gz: 3404e74efd31b4fb22bfa9d7e2d07f40508fd170
+  metadata.gz: 15965d36a12789bda029ce93db59815b091aa1a6
+  data.tar.gz: 6468475b0087640533d917d0b9adc9b1ef58b2b7
 SHA512:
-  metadata.gz: d1766da6789da799a6b657f711244009c702ac078421b3fe14e69c827bc33643a7a39017bda3f8264965f03ddc399ceb01c9a20234671e3409a965e315de539d
-  data.tar.gz: 58c5aa8d6ab6c6af3b400f4171303e485a30acd2bc43c1f9779d1f3651435e5cbe960dbdede61135436c9924f87f33274cc4b13fbf7eda128505c3a764add976
+  metadata.gz: c0fe5ce9e0350fee38039f699433df6b2a3efcc21b38d8738656328d9b22aa3c22d50dba9876d462d7fae3c1a67335239aa9928ba191491f69a80afd9c22e24f
+  data.tar.gz: 78f7e7c05c685d7293ebf2524aab33197f24f642fb4eaed440774a3df93f10844baf37c090ccebcba9179db53b8f0bac287ca0ebc549c6cfcfa2b86f36c3459d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1
+- Add search box to copyray bar.
+- Add disable_copyray_comment_injection to configuration.
+
 ## 0.3.0
 - Use https as default.
 - Download blurbs from S3.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.3.0)
+    copy_tuner_client (0.3.1)
       i18n (>= 0.5.0)
       json
 

data/app/assets/javascripts/copyray.js.coffee

@@ -221,25 +221,28 @@ util =
 Copyray.showBar = ->
   $('#copy-tuner-bar').show()
   $('.copyray-toggle-button').hide()
+  Copyray.focusSearchBox()
 
 Copyray.hideBar = ->
   $('#copy-tuner-bar').hide()
   $('.copyray-toggle-button').show()
-  $('#copy-tuner-bar-log-menu').hide()
+  $('.js-copy-tuner-bar-log-menu').hide()
 
 Copyray.createLogMenu = ->
-  $tbody = $('#copy-tuner-bar-log-menu__tbody.is-not-initialized')
+  $tbody = $('.js-copy-tuner-bar-log-menu__tbody.is-not-initialized')
   return if $tbody.length == 0
   $tbody.removeClass('is-not-initialized')
   baseUrl = $('[data-copy-tuner-url]').data('copy-tuner-url')
   log = $('[data-copy-tuner-translation-log').data('copy-tuner-translation-log')
-  $.each log, (k, v) ->
+  keys = Object.keys(log).sort()
+  $.each keys, (_, k) ->
+    v = log[k]
     if v != ''
       url = "#{baseUrl}/blurbs/#{k}/edit"
       $a = $("<a href='#{url}' class='js-copy-tuner-blurb-link'>").text k
       $td1 = $('<td>').append $a
       $td2 = $('<td>').text v
-      $tr = $("<tr class='js-copy-tuner-blurb-row'>")
+      $tr = $("<tr class='copy-tuner-bar-log-menu__row js-copy-tuner-blurb-row'>")
       $tr.append $td1, $td2
       $tbody.append $tr
   $tbody.on 'click', '.js-copy-tuner-blurb-link', (e) ->
@@ -247,7 +250,33 @@ Copyray.createLogMenu = ->
   $tbody.on 'click', '.js-copy-tuner-blurb-row', ->
     Copyray.open $(@).find('a').attr('href')
 
-$(document).on 'click', '.copy-tuner-bar-open-log', (e) ->
-  e.preventDefault()
+Copyray.focusSearchBox = ->
+  $('.js-copy-tuner-bar-search').focus()
+
+Copyray.toggleLogMenu = ->
   Copyray.createLogMenu()
-  $('#copy-tuner-bar-log-menu').toggle()
+  $('.js-copy-tuner-bar-log-menu').toggle()
+
+$(document).on 'click', '.js-copy-tuner-bar-open-log', (e) ->
+  e.preventDefault()
+  Copyray.toggleLogMenu()
+
+do ->
+  timer = null
+  lastKeyword = ''
+  $(document).on 'focus', '.js-copy-tuner-bar-search', ->
+    lastKeyword = $(@).val()
+  $(document).on 'keyup', '.js-copy-tuner-bar-search', ->
+    keyword = $.trim($(@).val())
+    if lastKeyword != keyword
+      Copyray.toggleLogMenu() if !$('.js-copy-tuner-bar-log-menu').is(':visible')
+      clearTimeout(timer)
+      timer = setTimeout ->
+        if keyword == ''
+          $('.js-copy-tuner-blurb-row').show()
+        else
+          $('.js-copy-tuner-blurb-row').hide()
+          $(".js-copy-tuner-blurb-row td:contains(#{keyword})").closest('.js-copy-tuner-blurb-row').show()
+      , 500
+      lastKeyword = keyword
+

data/app/assets/stylesheets/copyray.css

@@ -130,12 +130,16 @@ a.copyray-toggle-button:hover {
   padding: 2px 8px;
 }
 
+#copy-tuner-bar-log-menu__tbody tr {
+  cursor: pointer;
+}
+
 #copy-tuner-bar-log-menu__tbody tr:hover {
-  background: #444
+  background: #444;
 }
 
 #copy-tuner-bar-log-menu__tbody a {
-  color: #fff
+  color: #fff;
 }
 
 #copy-tuner-bar-log-menu__tbody a:hover, #copy-tuner-bar-log-menu__tbody a:focus {
@@ -166,3 +170,16 @@ a.copyray-toggle-button:hover {
   text-decoration: none;
   background-color: #555;
 }
+
+.copy-tuner-bar__search {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  border: none;
+  border-radius: 2px;
+  background-image: linear-gradient(rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
+  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 0 2px rgba(0, 0, 0, 0.2);
+  padding: 2px 8px;
+  vertical-align: middle;
+  color: black;
+}

data/app/views/_copy_tuner_bar.html.erb

@@ -1,11 +1,12 @@
 <div id="copy-tuner-bar" style="display:none">
   <%= link_to 'CopyTuner', CopyTunerClient.configuration.project_url, class: 'copy-tuner-bar-button', target: '_blank' %>
   <a href="/copytuner" target="_blank" class="copy-tuner-bar-button">Sync</a>
-  <a href="javascript:void(0)" class="copy-tuner-bar-open-log copy-tuner-bar-button">Translations in this page</a>
+  <a href="javascript:void(0)" class="copy-tuner-bar-open-log copy-tuner-bar-button js-copy-tuner-bar-open-log">Translations in this page</a>
+  <input type="text" class="copy-tuner-bar__search js-copy-tuner-bar-search" placeholder="search">
 </div>
-<div id="copy-tuner-bar-log-menu" style="display:none">
+<div id="copy-tuner-bar-log-menu" class="js-copy-tuner-bar-log-menu" style="display:none">
   <table>
-    <tbody id="copy-tuner-bar-log-menu__tbody" class="is-not-initialized">
+    <tbody id="copy-tuner-bar-log-menu__tbody" class="js-copy-tuner-bar-log-menu__tbody is-not-initialized">
     </tbody>
   </table>
 </div>

data/lib/copy_tuner_client/configuration.rb

@@ -119,6 +119,9 @@ module CopyTunerClient
     # @return [Regexp] Copyray js injection pattern for precompiled
     attr_accessor :copyray_js_injection_regexp_for_precompiled
 
+    # @return [Boolean] To disable Copyray comment injection, set true
+    attr_accessor :disable_copyray_comment_injection
+
     alias_method :secure?, :secure
 
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
@@ -137,6 +140,7 @@ module CopyTunerClient
       self.secure = true
       self.test_environments = %w(test cucumber)
       self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
+      self.disable_copyray_comment_injection = false
 
       # Matches:
       #   <script src="/assets/jquery.js"></script>

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -35,9 +35,13 @@ module CopyTunerClient
     end
 
     def append_translation_logs(html)
-      json = CopyTunerClient::TranslationLog.translations.to_json
-      # Use block to avoid back reference \?
-      html.sub('</body>') { "<div data-copy-tuner-translation-log='#{ERB::Util.html_escape json}' data-copy-tuner-url='#{CopyTunerClient.configuration.project_url}'></div></body>" }
+      if CopyTunerClient::TranslationLog.initialized?
+        json = CopyTunerClient::TranslationLog.translations.to_json
+        # Use block to avoid back reference \?
+        html.sub('</body>') { "<div data-copy-tuner-translation-log='#{ERB::Util.html_escape json}' data-copy-tuner-url='#{CopyTunerClient.configuration.project_url}'></div></body>" }
+      else
+        html
+      end
     end
 
     def inject_copy_tuner_bar(html)

data/lib/copy_tuner_client/engine.rb

@@ -11,7 +11,7 @@ module CopyTunerClient
         ActionView::Helpers::TranslationHelper.class_eval do
           def translate_with_copyray_comment(key, options = {})
             source = translate_without_copyray_comment(key, options)
-            if options[:rescue_format] == :html or options[:rescue_format].nil?
+            if !CopyTunerClient.configuration.disable_copyray_comment_injection && (options[:rescue_format] == :html || options[:rescue_format].nil?)
               CopyTunerClient::Copyray.augment_template(source, scope_key_by_partial(key))
             else
               source
@@ -20,10 +20,13 @@ module CopyTunerClient
           if CopyTunerClient.configuration.enable_middleware?
             alias_method_chain :translate, :copyray_comment
             alias :t :translate
-            CopyTunerClient::TranslationLog.install_hook
           end
         end
       end
+
+      if CopyTunerClient.configuration.enable_middleware?
+        CopyTunerClient::TranslationLog.install_hook
+      end
     end
 
     initializer "copy_tuner.assets.precompile", group: :all do |app|

data/lib/copy_tuner_client/simple_form_extention.rb

@@ -11,7 +11,7 @@ if defined?(SimpleForm)
     def label_translation_with_copyray_comment
       source = label_translation_without_copyray_comment
 
-      if object.class.respond_to?(:lookup_ancestors)
+      if !CopyTunerClient.configuration.disable_copyray_comment_injection && object.class.respond_to?(:lookup_ancestors)
         attributes_scope = "#{object.class.i18n_scope}.attributes"
         defaults = object.class.lookup_ancestors.map do |klass|
           "#{attributes_scope}.#{klass.model_name.i18n_key}.#{reflection_or_attribute_name}"

data/lib/copy_tuner_client/translation_log.rb

@@ -1,15 +1,19 @@
 module CopyTunerClient
   class TranslationLog
     def self.translations
-      Thread.current[:translations] ||= {}
+      Thread.current[:translations]
     end
 
     def self.clear
       Thread.current[:translations] = {}
     end
 
+    def self.initialized?
+      !Thread.current[:translations].nil?
+    end
+
     def self.add(key, result)
-      translations[key] = result unless translations.key? key
+      translations[key] = result if initialized? && !translations.key?(key)
     end
 
     def self.install_hook

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.1'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n