copy_tuner_client 0.1.1.beta18 → 0.1.1.beta19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.1.1.beta18)
+    copy_tuner_client (0.1.1.beta19)
       i18n (>= 0.5.0)
       json
 

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

@@ -24,6 +24,8 @@ Copyray.init = do ->
     new Copyray.Overlay
     # Go ahead and do a pass on the DOM to find templates.
     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."
 
@@ -77,6 +79,9 @@ Copyray.hide = ->
 Copyray.toggleSettings = ->
   Copyray.Overlay.instance().settings.toggle()
 
+Copyray.addToggleButton = ->
+  $('body').append("<a href='javascript:Copyray.show()' class='copyray-toggle-button'>Open CopyTuner</a>")
+
 # Wraps a DOM element that Copyray is tracking. This is subclassed by
 # Copyray.Blurbsspecimen
 class Copyray.Specimen
@@ -107,7 +112,7 @@ class Copyray.Specimen
     @constructor.all.splice(idx, 1) unless idx == -1
 
   isVisible: ->
-    @$contents.length and @$contents.is(':visible')
+    @$contents.length
 
   makeBox: ->
     @bounds = util.computeBoundingBox(@$contents)

data/app/assets/stylesheets/copyray.css

@@ -79,3 +79,20 @@
     color: #fff;
   }
 
+a.copyray-toggle-button {
+  display: block;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  color: white;
+  background: black;
+  padding: 16px 20px;
+  border-radius: 0 10px 0 0;
+  opacity: 0;
+  transition: opacity 0.6s ease-in-out;
+  z-index: 10000;
+}
+
+a.copyray-toggle-button:hover {
+  opacity: 1;
+}

data/lib/copy_tuner_client/configuration.rb

@@ -110,6 +110,12 @@ module CopyTunerClient
     # @return [Regexp] Regular expression to exclude keys.
     attr_accessor :exclude_key_regexp
 
+    # @return [Regexp] Copyray js injection pattern for debug
+    attr_accessor :copyray_js_injection_regexp_for_debug
+
+    # @return [Regexp] Copyray js injection pattern for precompiled
+    attr_accessor :copyray_js_injection_regexp_for_precompiled
+
     alias_method :secure?, :secure
 
     # Instantiated from {CopyTunerClient.configure}. Sets defaults.
@@ -127,6 +133,17 @@ module CopyTunerClient
       self.sync_interval_staging = 0
       self.secure = false
       self.test_environments = %w(test cucumber)
+
+      # Matches:
+      #   <script src="/assets/jquery.js"></script>
+      #   <script src="/assets/jquery-min.js"></script>
+      #   <script src="/assets/jquery.min.1.9.1.js"></script>
+      self.copyray_js_injection_regexp_for_debug = /<script[^>]+\/jquery([-.]{1}[\d\.]+)?([-.]{1}min)?\.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

@@ -37,15 +37,9 @@ module CopyTunerClient
 
     def append_js!(html)
       regexp = if ::Rails.application.config.assets.debug
-                 # 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[^>]+\/jquery([-.]{1}[\d\.]+)?([-.]{1}min)?\.js[^>]+><\/script>/
+                 CopyTunerClient.configuration.copyray_js_injection_regexp_for_debug
                else
-                 # Matches:
-                 #   <script src="/application-xxxxxxx.js"></script>
-                 /<script[^>]+\/application-[\w]+\.js[^>]+><\/script>/
+                 CopyTunerClient.configuration.copyray_js_injection_regexp_for_precompiled
                end
       html.sub(regexp) do
         "#{$~}\n" + helpers.javascript_include_tag(:copyray)

data/lib/copy_tuner_client/process_guard.rb

@@ -30,7 +30,7 @@ module CopyTunerClient
     end
 
     def spawner?
-      passenger_spawner? || unicorn_spawner?
+      passenger_spawner? || unicorn_spawner? || delayed_job_spawner?
     end
 
     def passenger_spawner?
@@ -41,11 +41,17 @@ module CopyTunerClient
       $0.include?("unicorn") && !caller.any? { |line| line.include?("worker_loop") }
     end
 
+    def delayed_job_spawner?
+      $0.include?('delayed_job')
+    end
+
     def register_spawn_hooks
       if defined?(PhusionPassenger)
         register_passenger_hook
       elsif defined?(Unicorn::HttpServer)
         register_unicorn_hook
+      elsif defined?(Delayed::Worker)
+        register_delayed_hook
       end
     end
 
@@ -68,6 +74,19 @@ module CopyTunerClient
       end
     end
 
+    def register_delayed_hook
+      @logger.info("Registered Delayed::Job start hook")
+      poller = @poller
+
+      Delayed::Worker.class_eval do
+        alias_method :start_without_copy_tuner, :start
+        define_method :start do
+          poller.start
+          start_without_copy_tuner
+        end
+      end
+    end
+
     def register_exit_hooks
       at_exit do
         @cache.flush
@@ -86,16 +105,6 @@ module CopyTunerClient
             job_was_performed
           end
         end
-      elsif defined?(Delayed::Worker)
-        @logger.info("Registered Delayed::Job start hook")
-        poller = @poller
-        Delayed::Worker.class_eval do
-          alias_method :start_without_copy_tuner, :start
-          define_method :start do
-            poller.start
-            start_without_copy_tuner
-          end
-        end
       end
     end
   end

data/lib/copy_tuner_client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta18
+  version: 0.1.1.beta19
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -386,3 +386,4 @@ test_files:
 - spec/support/fake_unicorn.rb
 - spec/support/middleware_stack.rb
 - spec/support/writing_cache.rb
+has_rdoc: