copy_tuner_client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4361ccce3ca459c59cce845b2dcd51fb3fdb4a80
-  data.tar.gz: cda2e1366b4a19985c97bff1e1d9cda1363e8074
+  metadata.gz: c098cb6d7890bf5a323384b2d54c93b003cd1970
+  data.tar.gz: 6173b84b9849c4287d60383c001c7d8bec529b6d
 SHA512:
-  metadata.gz: 192a9c5167a77aed0aaf0967b4ea7b27644ffebce0c38baf3606d339e9858c148213fd16bbd898f0b30f1656e98b4f697b2ae68d55cc7c98a6e2f8d9cf3ff22d
-  data.tar.gz: 28ecce1a14681689c2b2c9d19e3a66b67ac71ff41d2307b440774320636aea33e0c34f121bf3128db2b74a244f492cc7991bb5e0af4a36ac86b86ab4b54baee0
+  metadata.gz: e0fa49fa3e7d61bc70f9c0f850545152662ea373af0e4b01e25ab9831ca08e489a04c7812d0f7a3b70ba8529a0bf0668373405c54b5641cc3f9458f1bcee8834
+  data.tar.gz: ce85993d4cc05cd4cf46b186d1667d490e9679a9d6e0f5853ed5d3cd624a582ddc399266fc4170d97e4f8764f7b91e0830f2a4e03dd06ba7fca59f3d9bcf3a4a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.4.1
+- bug fixes
+  - js injection failed if jquery is not used. #33
+  - Fix some js error. #34
+  - Wrong key is displayed if scoped option is used. #35
+
+- deprecation
+  - config.copyray_js_injection_regexp_for_debug is no loger needed.
+  - config.copyray_js_injection_regexp_for_precompiled  is no loger needed.
+
 ## 0.4.0
 - Remove jQuery dependency.
 
@@ -13,7 +23,7 @@
 
 ## 0.3.2
 - Support I18n.t :scope option.
-- Update copyray_js_injection_regexp_for_debug. 
+- Update copyray_js_injection_regexp_for_debug.
 
 ## 0.3.1
 - Add search box to copyray bar.

data/Gemfile.lock

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

data/README.md

@@ -17,7 +17,7 @@ Create config/initializers/copy_tuner.rb
 CopyTunerClient.configure do |config|
   config.api_key = 'YOUR-API-KEY'
   config.host = 'COPY-TUNER-HOST-NAME'
-  
+
   # I18n keys and messages will be sent to server if the locale matches
   config.locales = [:ja, :en]
 end
@@ -33,6 +33,16 @@ bundle exec rake copy_tuner:export
 
 これで、`config/locales/copy_tuner.yml` に翻訳ファイルが作成されます。
 
+## IE等のレガシーブラウザ対応が必要な場合
+
+以下のスクリプトタグを追加する。(必要なpolyfillを個別に読み込んでも可)
+
+```
+<script src="https://ft-polyfill-service.herokuapp.com/v2/polyfill.min.js"></script>
+```
+
+[Polyfill service](https://cdn.polyfill.io/v2/docs/)
+
 Development
 =================
 
@@ -53,3 +63,9 @@ Development
     $ bundle exec rake install    # install to local gem
     $ bundle exec rake release    # release gem to rubygems.org
 
+## CoffeeScript
+
+```
+$ npm run watch   # Watch files for changes, rerunning the specified command when any file is updated.
+$ npm run build   # Compile a .coffee script into a .js JavaScript file of the same name.
+```

data/app/assets/javascripts/copyray.js

@@ -304,7 +304,7 @@
         right: Number.NEGATIVE_INFINITY,
         bottom: Number.NEGATIVE_INFINITY
       };
-      elements.forEach(function(element) {
+      Array.from(elements).forEach(function(element) {
         var frame;
         if (!isVisible(element)) {
           return;

data/lib/copy_tuner_client/configuration.rb

@@ -128,6 +128,14 @@ module CopyTunerClient
 
     alias_method :secure?, :secure
 
+    def copyray_js_injection_regexp_for_debug=(value)
+      logger.warn 'DEPRECATION WARNING: copyray_js_injection_regexp_for_debug is deprecated'
+    end
+
+    def copyray_js_injection_regexp_for_precompiled=(value)
+      logger.warn 'DEPRECATION WARNING: copyray_js_injection_regexp_for_precompiled is deprecated'
+    end
+
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
     def initialize
       self.client_name = 'CopyTuner Client'
@@ -146,20 +154,6 @@ module CopyTunerClient
       self.s3_host = 'copy-tuner-data-prod.s3.amazonaws.com'
       self.disable_copyray_comment_injection = false
 
-      # 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>
-      #   <script src="/assets/jquery2.self-a4777c1acac0a74340755725342901a54ed000955bf6f5320491b8b2514c86ec.js?body=1" data-turbolinks-track="true"></script>
-      #   <script src="/assets/jquery-09abf132254111788afa8aca28fc7872.js?body=1"></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
 

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -45,7 +45,7 @@ module CopyTunerClient
     end
 
     def inject_copy_tuner_bar(html)
-      html.sub(/<body[^>]*>/) { "#{$~}\n#{render_copy_tuner_bar}" }
+      html.sub(/<body[^>]*>/) { "#{Regexp.last_match}\n#{render_copy_tuner_bar}" }
     end
 
     def render_copy_tuner_bar
@@ -60,17 +60,12 @@ module CopyTunerClient
     end
 
     def append_css(html)
-      html.sub(/<body[^>]*>/) { "#{$~}\n#{css_tag}" }
+      html.sub(/<body[^>]*>/) { "#{Regexp.last_match}\n#{css_tag}" }
     end
 
     def append_js(html)
-      regexp = if ::Rails.application.config.assets.debug
-                 CopyTunerClient.configuration.copyray_js_injection_regexp_for_debug
-               else
-                 CopyTunerClient.configuration.copyray_js_injection_regexp_for_precompiled
-               end
-      html.sub(regexp) do
-        "#{$~}\n" + helpers.javascript_include_tag(:copyray)
+      html.sub(%r{</body>}) do
+       "#{helpers.javascript_include_tag(:copyray)}\n#{Regexp.last_match}"
       end
     end
 

data/lib/copy_tuner_client/engine.rb

@@ -14,7 +14,15 @@ module CopyTunerClient
           def translate_with_copyray_comment(key, options = {})
             source = translate_without_copyray_comment(key, options)
             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))
+              separator = options[:separator] || I18n.default_separator
+              scope = options[:scope]
+              normalized_key =
+                if key.to_s.first == '.'
+                  scope_key_by_partial(key)
+                else
+                  I18n.normalize_keys(nil, key, scope, separator).join(separator)
+                end
+              CopyTunerClient::Copyray.augment_template(source, normalized_key)
             else
               source
             end

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/configuration_spec.rb

@@ -190,18 +190,6 @@ describe CopyTunerClient::Configuration do
     expect(prefixed_logger).to be_a(CopyTunerClient::PrefixedLogger)
     expect(prefixed_logger.original_logger).to eq(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>' }
-    it { is_expected.to match '<script src="/assets/jquery-09abf132254111788afa8aca28fc7872.js?body=1"></script>' }
-  end
 end
 
 shared_context 'stubbed configuration' do

data/src/copyray.coffee

@@ -211,7 +211,7 @@ util =
       right  : Number.NEGATIVE_INFINITY
       bottom : Number.NEGATIVE_INFINITY
 
-    elements.forEach((element) ->
+    Array.from(elements).forEach((element) ->
       return unless isVisible(element)
       frame = getOffset(element)
       frame.right  = frame.left + element.offsetWidth

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - SonicGarden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n