copy_tuner_client 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ce18bb5cd5f08708524ef88f338b9387166d31
-  data.tar.gz: ac5bed0056db2efbbd9623983381b2ba303e9f0f
+  metadata.gz: 9bfc2b0438d95dfd78e642cbd01634341a49dda1
+  data.tar.gz: 3404e74efd31b4fb22bfa9d7e2d07f40508fd170
 SHA512:
-  metadata.gz: 9c074c3aeebabde185d4ed3fb87514f4ce2c67bed97a0a01446bd59b92170c6c14e69f15c982bd5cb84491b4f3f49bbd37440668f62fe7f021316bf8ad714130
-  data.tar.gz: 0b03bfe6a24e9ae00bf1445f0c9a760b6c32666dd19372b8e977fcc147b8a78458b7ce17c2b29d630055412eedc6ffe4d01ad3d4a4f29fa71638ebe1b565839c
+  metadata.gz: d1766da6789da799a6b657f711244009c702ac078421b3fe14e69c827bc33643a7a39017bda3f8264965f03ddc399ceb01c9a20234671e3409a965e315de539d
+  data.tar.gz: 58c5aa8d6ab6c6af3b400f4171303e485a30acd2bc43c1f9779d1f3651435e5cbe960dbdede61135436c9924f87f33274cc4b13fbf7eda128505c3a764add976

data/.gitignore

@@ -17,3 +17,4 @@ pkg
 *.gem
 .bundle
 *.gemfile.lock
+.idea/

data/.travis.yml

@@ -2,12 +2,12 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
 
 gemfile:
-  - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
 
 before_install:
-  - gem update bundler
+  - gem update bundler

data/Appraisals

@@ -1,15 +1,11 @@
-appraise '3.2' do
-  gem 'rails', '3.2.22'
-end
-
 appraise '4.0' do
   gem 'rails', '4.0.13'
 end
 
 appraise '4.1' do
-  gem 'rails', '4.1.13'
+  gem 'rails', '4.1.15'
 end
 
 appraise '4.2' do
-  gem 'rails', '4.2.4'
+  gem 'rails', '4.2.6'
 end

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## 0.3.0
+- Use https as default.
+- Download blurbs from S3.
+- Add toolbar.
+- "Translations in this page" menu.

data/Gemfile.lock

@@ -1,57 +1,64 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.2.3)
+    copy_tuner_client (0.3.0)
       i18n (>= 0.5.0)
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.12)
-      actionpack (= 3.1.12)
-      mail (~> 2.4.4)
-    actionpack (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
+      globalid (>= 0.3.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
+      builder (~> 3.1)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
+      arel (~> 6.0)
+    activesupport (4.2.6)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.4.0)
-    ansi (1.5.0)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (2.2.3)
+    arel (6.0.3)
     aruba (0.6.2)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bourne (1.6.0)
       mocha (~> 1.1)
-    builder (3.0.4)
+    builder (3.2.2)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
+    concurrent-ruby (1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     cucumber (1.3.20)
@@ -67,51 +74,59 @@ GEM
     ffi (1.9.10)
     gherkin (2.12.2)
       multi_json (~> 1.3)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     hashdiff (0.3.0)
-    hike (1.2.3)
     i18n (0.7.0)
     json (1.8.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
-    mime-types (1.25.1)
-    minitest (4.7.5)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.3)
+    multi_json (1.12.1)
     multi_test (0.1.2)
-    polyglot (0.3.5)
-    rack (1.3.10)
-    rack-cache (1.6.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.1.12)
-      actionmailer (= 3.1.12)
-      actionpack (= 3.1.12)
-      activerecord (= 3.1.12)
-      activeresource (= 3.1.12)
-      activesupport (= 3.1.12)
-      bundler (~> 1.0)
-      railties (= 3.1.12)
-    railties (3.1.12)
-      actionpack (= 3.1.12)
-      activesupport (= 3.1.12)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.6)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (11.1.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (11.2.2)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -127,24 +142,23 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.0.5)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
-    thor (0.14.6)
+      rack (>= 1, < 3)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.9.7)
-      ansi
-      minitest (~> 4)
-    tzinfo (0.3.49)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     webmock (2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -160,14 +174,13 @@ DEPENDENCIES
   bourne
   copy_tuner_client!
   cucumber (~> 1.3.16)
-  rails (~> 3.1.0)
+  rails (~> 4.2.6)
   rake
   rspec (~> 2.3)
   sham_rack
   sinatra
   sqlite3
   thin
-  turn
   webmock
   yard
 

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

@@ -26,6 +26,7 @@ Copyray.init = do ->
     Copyray.findBlurbs()
 
     Copyray.addToggleButton()
+
     # Ready to rock.
     console?.log "Ready to Copyray. Press #{if is_mac then 'cmd+shift+k' else 'ctrl+shift+k'} to scan your UI."
 
@@ -71,10 +72,12 @@ Copyray.open = (url) ->
 # Show the Copyray overlay
 Copyray.show = (type = null) ->
   Copyray.Overlay.instance().show(type)
+  Copyray.showBar()
 
 # Hide the Copyray overlay
 Copyray.hide = ->
   Copyray.Overlay.instance().hide()
+  Copyray.hideBar()
 
 Copyray.toggleSettings = ->
   Copyray.Overlay.instance().settings.toggle()
@@ -172,6 +175,7 @@ class Copyray.Overlay
     Copyray.isShowing = false
     @$overlay.detach()
     @reset()
+    Copyray.hideBar()
 
 # Utility methods.
 util =
@@ -213,3 +217,37 @@ util =
       width  : boxFrame.right - boxFrame.left
       height : boxFrame.bottom - boxFrame.top
     }
+
+Copyray.showBar = ->
+  $('#copy-tuner-bar').show()
+  $('.copyray-toggle-button').hide()
+
+Copyray.hideBar = ->
+  $('#copy-tuner-bar').hide()
+  $('.copyray-toggle-button').show()
+  $('#copy-tuner-bar-log-menu').hide()
+
+Copyray.createLogMenu = ->
+  $tbody = $('#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) ->
+    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.append $td1, $td2
+      $tbody.append $tr
+  $tbody.on 'click', '.js-copy-tuner-blurb-link', (e) ->
+    e.preventDefault()
+  $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.createLogMenu()
+  $('#copy-tuner-bar-log-menu').toggle()

data/app/assets/stylesheets/copyray.css

@@ -96,3 +96,73 @@ a.copyray-toggle-button {
 a.copyray-toggle-button:hover {
   opacity: 1;
 }
+
+#copy-tuner-bar {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  height: 40px;
+  padding: 0 8px;
+  background: #222;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 200;
+  color: #fff;
+  z-index: 2147483647;
+  box-shadow: 0 -1px 0 rgba(255,255,255,0.1), inset 0 2px 6px rgba(0,0,0,0.8);
+  background-image: linear-gradient(rgba(0,0,0,0), rgba(0,0,0,0.3));
+}
+
+#copy-tuner-bar-log-menu {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 40px;
+  max-height: calc(100vh - 40px);
+  background: #222;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #fff;
+  z-index: 2147483647;
+  overflow-y: auto;
+}
+
+#copy-tuner-bar-log-menu__tbody td {
+  padding: 2px 8px;
+}
+
+#copy-tuner-bar-log-menu__tbody tr:hover {
+  background: #444
+}
+
+#copy-tuner-bar-log-menu__tbody a {
+  color: #fff
+}
+
+#copy-tuner-bar-log-menu__tbody a:hover, #copy-tuner-bar-log-menu__tbody a:focus {
+  color: #fff;
+  text-decoration: underline;
+}
+
+.copy-tuner-bar-button {
+  position: relative;
+  display: inline-block;
+  color: #fff;
+  margin: 8px 1px;
+  height: 24px;
+  line-height: 24px;
+  padding: 0 8px;
+  font-size: 14px;
+  cursor: pointer;
+  vertical-align: middle;
+  background-color: #444;
+  background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2));
+  border-radius: 2px;
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5), inset 0 1px 0 rgba(255, 255, 255, 0.2), inset 0 0 2px rgba(255, 255, 255, 0.2);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.4);
+}
+
+.copy-tuner-bar-button:hover, .copy-tuner-bar-button:focus {
+  color: #fff;
+  text-decoration: none;
+  background-color: #555;
+}

data/app/views/_copy_tuner_bar.html.erb

@@ -0,0 +1,11 @@
+<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>
+</div>
+<div id="copy-tuner-bar-log-menu" style="display:none">
+  <table>
+    <tbody id="copy-tuner-bar-log-menu__tbody" class="is-not-initialized">
+    </tbody>
+  </table>
+</div>

data/copy_tuner_client.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'aruba', '~> 0.6.0'
   s.add_development_dependency 'bourne'
   s.add_development_dependency 'cucumber', '~> 1.3.16'
-  s.add_development_dependency 'rails', '~> 3.1.0'
+  s.add_development_dependency 'rails', '~> 4.2.6'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.3'
   s.add_development_dependency 'sham_rack'
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'thin'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'turn'
   s.authors = ['SonicGarden']
   s.email  = 'info@sonicgarden.jp'
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/features/step_definitions/rails_steps.rb

@@ -37,6 +37,7 @@ When /^I configure the copy_tuner client with api key "([^"]*)"$/ do |api_key|
       config.api_key = "#{api_key}"
       config.polling_delay = 1
       config.host = 'localhost'
+      config.s3_host = 'localhost'
       config.secure = false
       config.sync_interval = 0
       config.port = #{FakeCopyTunerApp.port}

data/gemfiles/4.1.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.1.13"
+gem "rails", "4.1.15"
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.2.4"
+gem "rails", "4.2.6"
 
 gemspec :path => "../"

data/lib/copy_tuner_client/client.rb

@@ -28,7 +28,7 @@ module CopyTunerClient
     # @option options [String] :ca_file path to root certificate file for ssl verification
     def initialize(options)
       [:api_key, :host, :port, :public, :http_read_timeout,
-        :http_open_timeout, :secure, :logger, :ca_file].each do |option|
+        :http_open_timeout, :secure, :logger, :ca_file, :s3_host].each do |option|
         instance_variable_set "@#{option}", options[option]
       end
     end
@@ -44,7 +44,7 @@ module CopyTunerClient
     # @yield [Hash] downloaded blurbs
     # @raise [ConnectionError] if the connection fails
     def download
-      connect do |http|
+      connect(s3_host) do |http|
         request = Net::HTTP::Get.new(uri(download_resource))
         request['If-None-Match'] = @etag
         response = http.request(request)
@@ -64,7 +64,7 @@ module CopyTunerClient
     # @param data [Hash] the blurbs to upload
     # @raise [ConnectionError] if the connection fails
     def upload(data)
-      connect do |http|
+      connect(host) do |http|
         response = http.post(uri('draft_blurbs'), data.to_json, 'Content-Type' => 'application/json')
         check response
         log 'Uploaded missing translations'
@@ -74,7 +74,7 @@ module CopyTunerClient
     # Issues a deploy, marking all draft content as published for this project.
     # @raise [ConnectionError] if the connection fails
     def deploy
-      connect do |http|
+      connect(host) do |http|
         response = http.post(uri('deploys'), '')
         check response
         log 'Deployed'
@@ -84,7 +84,7 @@ module CopyTunerClient
     private
 
     attr_reader :host, :port, :api_key, :http_read_timeout,
-      :http_open_timeout, :secure, :logger, :ca_file
+      :http_open_timeout, :secure, :logger, :ca_file, :s3_host
 
     def public?
       @public
@@ -96,13 +96,13 @@ module CopyTunerClient
 
     def download_resource
       if public?
-        'published_blurbs'
+        'published_blurbs.json'
       else
-        'draft_blurbs'
+        'draft_blurbs.json'
       end
     end
 
-    def connect
+    def connect(host)
       http = Net::HTTP.new(host, port)
       http.open_timeout = http_open_timeout
       http.read_timeout = http_read_timeout

data/lib/copy_tuner_client/configuration.rb

@@ -18,7 +18,7 @@ module CopyTunerClient
         :client_version, :port, :protocol, :proxy_host, :proxy_pass,
         :proxy_port, :proxy_user, :secure, :polling_delay, :sync_interval,
         :sync_interval_staging, :sync_ignore_path_regex, :logger,
-        :framework, :middleware, :disable_middleware, :disable_test_translation, :ca_file, :exclude_key_regexp].freeze
+        :framework, :middleware, :disable_middleware, :disable_test_translation, :ca_file, :exclude_key_regexp, :s3_host].freeze
 
     # @return [String] The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -110,6 +110,9 @@ module CopyTunerClient
     # @return [Regexp] Regular expression to exclude keys.
     attr_accessor :exclude_key_regexp
 
+    # @return [String] The S3 host to connect to (defaults to +copy-tuner-us.s3.amazonaws.com+).
+    attr_accessor :s3_host
+
     # @return [Regexp] Copyray js injection pattern for debug
     attr_accessor :copyray_js_injection_regexp_for_debug
 
@@ -131,20 +134,23 @@ module CopyTunerClient
       self.polling_delay = 300
       self.sync_interval = 60
       self.sync_interval_staging = 0
-      self.secure = false
+      self.secure = true
       self.test_environments = %w(test cucumber)
+      self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
 
       # Matches:
       #   <script src="/assets/jquery.js"></script>
       #   <script src="/assets/jquery-min.js"></script>
       #   <script src="/assets/jquery.min.1.9.1.js"></script>
       #   <script src="/assets/jquery.self-xxxxxx.js"></script>
-      self.copyray_js_injection_regexp_for_debug = /<script[^>]+\/jquery([-.]{1}[\d\.]+)?([-.]{1}min)?(\.self\-[\da-f]++)?\.js[^>]+><\/script>/
+      #   <script src="/assets/jquery2.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" data-turbolinks-track="true"></script>
+      self.copyray_js_injection_regexp_for_debug = /<script[^>]+\/jquery[23]?([-.]{1}[\d\.]+)?([-.]{1}min(\.[\d\.]+)?)?(\.self\-[\da-f]+)?\.js[^>]+><\/script>/
 
       # Matches:
       #   <script src="/application-xxxxxxx.js"></script>
       #   <script src="/application.js"></script>
       self.copyray_js_injection_regexp_for_precompiled = /<script[^>]+\/application.*\.js[^>]+><\/script>/
+
       @applied = false
     end
 
@@ -226,7 +232,7 @@ module CopyTunerClient
       end
 
       @applied = true
-      logger.info "Client #{VERSION} ready"
+      logger.info "Client #{VERSION} ready (s3_download)"
       logger.info "Environment Info: #{environment_info}"
 
       unless test?

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -7,10 +7,13 @@ module CopyTunerClient
     end
 
     def call(env)
+      CopyTunerClient::TranslationLog.clear
       status, headers, response = @app.call(env)
       if html_headers?(status, headers) && body = response_body(response)
-        body = append_css!(body)
-        body = append_js!(body)
+        body = append_css(body)
+        body = append_js(body)
+        body = append_translation_logs(body)
+        body = inject_copy_tuner_bar(body)
         content_length = body.bytesize.to_s
         if ActionDispatch::Response === response
           response.body = [body]
@@ -31,11 +34,32 @@ module CopyTunerClient
       ActionController::Base.helpers
     end
 
-    def append_css!(html)
+    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>" }
+    end
+
+    def inject_copy_tuner_bar(html)
+      html.sub(/<body[^>]*>/) { "#{$~}\n#{render_copy_tuner_bar}" }
+    end
+
+    def render_copy_tuner_bar
+      if ApplicationController.respond_to?(:render)
+        # Rails 5
+        ApplicationController.render(:partial => "/copy_tuner_bar").html_safe
+      else
+        # Rails <= 4.2
+        ac = ActionController::Base.new
+        ac.render_to_string(:partial => '/copy_tuner_bar').html_safe
+      end
+    end
+
+    def append_css(html)
       html.sub(/<body[^>]*>/) { "#{$~}\n#{css_tag}" }
     end
 
-    def append_js!(html)
+    def append_js(html)
       regexp = if ::Rails.application.config.assets.debug
                  CopyTunerClient.configuration.copyray_js_injection_regexp_for_debug
                else

data/lib/copy_tuner_client/engine.rb

@@ -1,4 +1,5 @@
 require 'copy_tuner_client/copyray'
+require 'copy_tuner_client/translation_log'
 
 module CopyTunerClient
   # Connects to integration points for Rails 3 applications
@@ -19,6 +20,7 @@ module CopyTunerClient
           if CopyTunerClient.configuration.enable_middleware?
             alias_method_chain :translate, :copyray_comment
             alias :t :translate
+            CopyTunerClient::TranslationLog.install_hook
           end
         end
       end

data/lib/copy_tuner_client/translation_log.rb

@@ -0,0 +1,37 @@
+module CopyTunerClient
+  class TranslationLog
+    def self.translations
+      Thread.current[:translations] ||= {}
+    end
+
+    def self.clear
+      Thread.current[:translations] = {}
+    end
+
+    def self.add(key, result)
+      translations[key] = result unless translations.key? key
+    end
+
+    def self.install_hook
+      I18n.class_eval do
+        class << self
+          def translate_with_copy_tuner_hook(*args)
+            key = args[0]
+            result = translate_without_copy_tuner_hook(*args)
+
+            if key.is_a?(Array)
+              key.zip(result).each { |k, v| CopyTunerClient::TranslationLog.add(k, v) unless v.is_a?(Array) }
+            else
+              CopyTunerClient::TranslationLog.add(key, result) unless result.is_a?(Array)
+            end
+            result
+          end
+          if CopyTunerClient.configuration.enable_middleware?
+            alias_method_chain :translate, :copy_tuner_hook
+            alias :t :translate
+          end
+        end
+      end
+    end
+  end
+end

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/client_spec.rb

@@ -4,6 +4,7 @@ describe CopyTunerClient do
   def build_client(config = {})
     config[:logger] ||= FakeLogger.new
     default_config = CopyTunerClient::Configuration.new.to_hash
+    default_config[:s3_host] = 'copy-tuner.com'
     CopyTunerClient::Client.new(default_config.update(config))
   end
 

data/spec/copy_tuner_client/configuration_spec.rb

@@ -33,7 +33,7 @@ describe CopyTunerClient::Configuration do
   it { should have_config_option(:client_version).overridable.default(CopyTunerClient::VERSION) }
   it { should have_config_option(:client_name).overridable.default('CopyTuner Client') }
   it { should have_config_option(:client_url).overridable.default('https://rubygems.org/gems/copy_tuner_client') }
-  it { should have_config_option(:secure).overridable.default(false) }
+  it { should have_config_option(:secure).overridable.default(true) }
   it { should have_config_option(:host).overridable.default('copy-tuner.com') }
   it { should have_config_option(:http_open_timeout).overridable.default(5) }
   it { should have_config_option(:http_read_timeout).overridable.default(5) }
@@ -190,6 +190,17 @@ describe CopyTunerClient::Configuration do
     prefixed_logger.should be_a(CopyTunerClient::PrefixedLogger)
     prefixed_logger.original_logger.should == logger
   end
+
+  describe 'copyray_js_injection_regexp_for_debug' do
+    let(:config) { CopyTunerClient::Configuration.new }
+    subject { config.copyray_js_injection_regexp_for_debug }
+
+    it { is_expected.to match '<script src="/assets/jquery.js"></script>' }
+    it { is_expected.to match '<script src="/assets/jquery-min.js"></script>' }
+    it { is_expected.to match '<script src="/assets/jquery.min.1.9.1.js"></script>' }
+    it { is_expected.to match '<script src="/assets/jquery/jquery.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" data-turbolinks-track="true"></script>' }
+    it { is_expected.to match '<script src="/assets/jquery2.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" data-turbolinks-track="true"></script>' }
+  end
 end
 
 shared_examples_for 'applied configuration' do

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ Dir.glob(File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')).each do |file
 end
 
 WebMock.disable_net_connect!
-ShamRack.mount FakeCopyTunerApp.new, 'copy-tuner.com', 80
+ShamRack.mount FakeCopyTunerApp.new, 'copy-tuner.com', 443
 
 RSpec.configure do |config|
   config.include ClientSpecHelpers

data/spec/support/client_spec_helpers.rb

@@ -3,6 +3,7 @@ module ClientSpecHelpers
     CopyTunerClient.configuration = nil
     CopyTunerClient.configure(false) do |config|
       config.api_key = 'abc123'
+      config.s3_host = 'copy-tuner.com'
     end
   end
 end

data/spec/support/fake_copy_tuner_app.rb

@@ -43,14 +43,14 @@ class FakeCopyTunerApp < Sinatra::Base
     end
   end
 
-  get '/api/v2/projects/:api_key/published_blurbs' do |api_key|
+  get '/api/v2/projects/:api_key/published_blurbs.json' do |api_key|
     with_project(api_key) do |project|
       etag project.etag
       project.published.to_json
     end
   end
 
-  get '/api/v2/projects/:api_key/draft_blurbs' do |api_key|
+  get '/api/v2/projects/:api_key/draft_blurbs.json' do |api_key|
     with_project(api_key) do |project|
       etag project.etag
       project.draft.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +220,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: turn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: info@sonicgarden.jp
 executables: []
@@ -245,19 +231,20 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/javascripts/copyray.js.coffee
 - app/assets/stylesheets/copyray.css
+- app/views/_copy_tuner_bar.html.erb
 - copy_tuner_client.gemspec
 - features/rails.feature
 - features/step_definitions/copycopter_server_steps.rb
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
 - features/support/rails_server.rb
-- gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
@@ -277,6 +264,7 @@ files:
 - lib/copy_tuner_client/rails.rb
 - lib/copy_tuner_client/request_sync.rb
 - lib/copy_tuner_client/simple_form_extention.rb
+- lib/copy_tuner_client/translation_log.rb
 - lib/copy_tuner_client/version.rb
 - lib/tasks/copy_tuner_client_tasks.rake
 - spec/copy_tuner_client/cache_spec.rb

data/gemfiles/3.2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "3.2.22"
-
-gemspec :path => "../"