peek 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0c9cfcf72331e9ea4fb4a99a13a8e310272134
-  data.tar.gz: fcaa0f1ca750e39bd0b6cf811182ed5555295a85
+  metadata.gz: bbed54bce4732314dfcdd567b7dc6a6e1a9239d8
+  data.tar.gz: 1f88f52c9afe97f73d1eed6b92146ee052d638f8
 SHA512:
-  metadata.gz: 2d03e97811b3ed67445097715013e9443f0ec39e7a7119856d3427e0638ca23638120ea382948881f4776102f7d305ebbdacefc933402d6a464a1439d0a25569
-  data.tar.gz: 93cdb21287730faf3b08fb1c2fabb692cbba9551cc2c14d09af66863537799da751e4c06d9352fabda102fcc16efe1a932e9ed073374fdc897a289ca0bd0e2ba
+  metadata.gz: b8c62b3b22c484f9b9df0de921df6419f66b3aeb81cea9574cbb217776c5e0d6ed7db4753d33e9933cf6446232e717a48056272acedbde3fe5a9db4691408d7d
+  data.tar.gz: a68133cfbbc341dbb4fe1518df040748fb2882c8ff326ef14b786ea88db930a0ab0c13e5c48fcaa70560253d724732ce16d69ec0e553f18deca6f2a28945a97c

data/.travis.yml

@@ -1,2 +1,12 @@
-before_install:
-  - gem install bundler
+language: ruby
+
+rvm:
+  - 2.3.1
+  - 2.2.5
+
+gemfile:
+  - Gemfile # Rails 5
+  - Gemfile-rails42
+
+notifications:
+  email: false

data/CHANGELOG.md

@@ -82,3 +82,11 @@
 - Add dependency for coffee-rails for Rails. - [#80](https://github.com/peek/peek/pull/80) [@cllns](https://github.com/cllns)
 - Fix deprecation warnings for `helper_method` for future versions of Rails past Rails v5. - [#85](https://github.com/peek/peek/pull/85) [@mgrachev](https://github.com/mgrachev)
 - Listen to Turbolinks v5 `turbolinks:load` JS event to trigger peek updates. - [#88](https://github.com/peek/peek/pull/88) [@lucasmazza](https://github.com/lucasmazza)
+
+# 1.0
+
+- Rails 4+ compatibility
+  - Update `before_filter` to `before_action` @mkcode
+  - Replace GIFs with colors @tarebyte
+- Remove CoffeeScript @dewski
+- Use Ruby JSON syntax for hashes

data/Gemfile

@@ -4,18 +4,18 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'json', '~> 1.8.2'
+gem 'json', '~> 2.0', '>= 2.0.2'
 
-gem 'rails', '~> 4.0.0.rc1'
+gem 'rails', '~> 5.0', '>= 5.0.0.1'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.0.rc1'
+gem 'sass-rails', '~> 5.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.2'
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby

data/Gemfile-rails42

@@ -0,0 +1,27 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in peek.gemspec
+gemspec
+
+gem 'rake'
+gem 'json', '~> 1.8.3'
+
+gem 'rails', '~> 4.2.7.1'
+
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0.0'
+
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.1.0'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'

data/README.md

@@ -1,6 +1,6 @@
 # Peek
 
-[![Build Status](https://travis-ci.org/peek/peek.png?branch=master)](https://travis-ci.org/peek/peek) [![Gem Version](https://badge.fury.io/rb/peek.png)](http://badge.fury.io/rb/peek) [![Inline docs](http://inch-ci.org/github/peek/peek.png)](http://inch-ci.org/github/peek/peek)
+[![Build Status](https://travis-ci.org/peek/peek.svg?branch=master)](https://travis-ci.org/peek/peek) [![Gem Version](https://badge.fury.io/rb/peek.svg)](http://badge.fury.io/rb/peek) [![Inline docs](http://inch-ci.org/github/peek/peek.svg)](http://inch-ci.org/github/peek/peek)
 
 Take a peek into your Rails application.
 
@@ -34,7 +34,7 @@ file:
 ```ruby
 Some::Application.routes.draw do
   mount Peek::Railtie => '/peek'
-  root :to => 'home#show'
+  root to: 'home#show'
 end
 ```
 
@@ -42,7 +42,7 @@ To pick which views you want to see in your Peek bar, just create a file at
 `config/initializers/peek.rb` that has a list of the views you'd like to include:
 
 ```ruby
-Peek.into Peek::Views::Git, :nwo => 'github/janky'
+Peek.into Peek::Views::Git, nwo: 'github/janky'
 Peek.into Peek::Views::Mysql2
 Peek.into Peek::Views::Redis
 Peek.into Peek::Views::Dalli
@@ -125,8 +125,8 @@ Peeked::Application.configure do
 
   # Redis with options
   config.peek.adapter = :redis, {
-    :client => Redis.new,
-    :expires_in => 60 * 30 # => 30 minutes in seconds
+    client: Redis.new,
+    expires_in: 60 * 30 # => 30 minutes in seconds
   }
 
   # Memcache with no options
@@ -134,8 +134,8 @@ Peeked::Application.configure do
 
   # Memcache with options
   config.peek.adapter = :memcache, {
-    :client => Dalli::Client.new,
-    :expires_in => 60 * 30 # => 30 minutes in seconds
+    client: Dalli::Client.new,
+    expires_in: 60 * 30 # => 30 minutes in seconds
   }
 
   # Elasticsearch with no options
@@ -143,10 +143,10 @@ Peeked::Application.configure do
 
   # Elasticsearch with options
   config.peek.adapter = :elasticsearch, {
-    :client => Elasticsearch::Client.new,
-    :expires_in => 60 * 30, # => 30 minutes in seconds
-    :index => 'peek_requests_index',
-    :type => 'peek_request'
+    client: Elasticsearch::Client.new,
+    expires_in: 60 * 30, # => 30 minutes in seconds
+    index: 'peek_requests_index',
+    type: 'peek_request'
   }
 
   # ...
@@ -203,6 +203,7 @@ end
 - [peek-dalli](https://github.com/peek/peek-dalli)
 - [peek-delayed_job](https://github.com/18F/peek-delayed_job)
 - [peek-faraday](https://github.com/grk/peek-faraday)
+- [peek-flexirest](https://github.com/andyjeffries/peek-flexirest)
 - [peek-gc](https://github.com/peek/peek-gc)
 - [peek-git](https://github.com/peek/peek-git)
 - [peek-host](https://github.com/jacobbednarz/peek-host)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 desc 'Default: run tests'
-task :default => :test
+task default: :test
 
 desc 'Run Peek tests.'
 Rake::TestTask.new do |t|

data/app/assets/javascripts/peek.js

@@ -0,0 +1,86 @@
+//= require peek/vendor/jquery.tipsy
+
+var requestId;
+
+requestId = null;
+
+(function($) {
+  var fetchRequestResults, getRequestId, initializeTipsy, peekEnabled, toggleBar, updatePerformanceBar;
+  getRequestId = function() {
+    if (requestId != null) {
+      return requestId;
+    } else {
+      return $('#peek').data('request-id');
+    }
+  };
+  peekEnabled = function() {
+    return $('#peek').length;
+  };
+  updatePerformanceBar = function(results) {
+    var key, label;
+    for (key in results.data) {
+      for (label in results.data[key]) {
+        $("[data-defer-to=" + key + "-" + label + "]").text(results.data[key][label]);
+      }
+    }
+    return $(document).trigger('peek:render', [getRequestId(), results]);
+  };
+  initializeTipsy = function() {
+    return $('#peek .peek-tooltip, #peek .tooltip').each(function() {
+      var el, gravity;
+      el = $(this);
+      gravity = el.hasClass('rightwards') || el.hasClass('leftwards') ? $.fn.tipsy.autoWE : $.fn.tipsy.autoNS;
+      return el.tipsy({
+        gravity: gravity
+      });
+    });
+  };
+  toggleBar = function(event) {
+    var wrapper;
+    if ($(event.target).is(':input')) {
+      return;
+    }
+    if (event.which === 96 && !event.metaKey) {
+      wrapper = $('#peek');
+      if (wrapper.hasClass('disabled')) {
+        wrapper.removeClass('disabled');
+        return document.cookie = "peek=true; path=/";
+      } else {
+        wrapper.addClass('disabled');
+        return document.cookie = "peek=false; path=/";
+      }
+    }
+  };
+  fetchRequestResults = function() {
+    return $.ajax('/peek/results', {
+      data: {
+        request_id: getRequestId()
+      },
+      success: function(data, textStatus, xhr) {
+        return updatePerformanceBar(data);
+      },
+      error: function(xhr, textStatus, error) {}
+    });
+  };
+  $(document).on('keypress', toggleBar);
+  $(document).on('peek:update', initializeTipsy);
+  $(document).on('peek:update', fetchRequestResults);
+  $(document).on('pjax:end', function(event, xhr, options) {
+    if (xhr != null) {
+      requestId = xhr.getResponseHeader('X-Request-Id');
+    }
+    if (peekEnabled()) {
+      return $(this).trigger('peek:update');
+    }
+  });
+  $(document).on('page:change turbolinks:load', function() {
+    if (peekEnabled()) {
+      return $(this).trigger('peek:update');
+    }
+  });
+  return $(function() {
+    if (peekEnabled()) {
+      return $(this).trigger('peek:update');
+    }
+  });
+})(jQuery);

data/app/assets/stylesheets/peek.scss

@@ -1,6 +1,3 @@
-//= depend_on_asset 'peek/bar/production.gif'
-//= depend_on_asset 'peek/bar/staging.gif'
-//= depend_on_asset 'peek/bar/development.gif'
 //= require peek/vendor/tipsy
 
 #peek {
@@ -20,15 +17,15 @@
   }
 
   &.production {
-    background: image-url('peek/bar/production.gif') repeat 0 0;
+    background-color: #222;
   }
 
   &.staging {
-    background: image-url('peek/bar/staging.gif') repeat 0 0;
+    background-color: #291430;
   }
 
   &.development {
-    background: image-url('peek/bar/development.gif') repeat 0 0;
+    background-color: #4c1210;
   }
 
   .wrapper {

data/app/controllers/peek/results_controller.rb

@@ -1,14 +1,14 @@
 module Peek
   class ResultsController < ApplicationController
-    before_filter :restrict_non_access
+    before_action :restrict_non_access
 
     def show
       respond_to do |format|
         format.json do
           if request.xhr?
-            render :json => Peek.adapter.get(params[:request_id])
+            render json: Peek.adapter.get(params[:request_id])
           else
-            render :nothing => true, :status => :not_found
+            render nothing: true, status: :not_found
           end
         end
       end

data/app/views/peek/_bar.html.erb

@@ -3,7 +3,7 @@
   <div class="wrapper">
     <% Peek.views.each do |view| %>
       <div id="<%= view.dom_id %>" class="view">
-        <%= render view.partial_path, :view => view %>
+        <%= render view.partial_path, view: view %>
       </div>
     <% end %>
   </div>

data/config/routes.rb

@@ -1,3 +1,3 @@
 Peek::Railtie.routes.draw do
-  get '/results' => 'results#show', :as => :results
+  get '/results' => 'results#show', as: :results
 end

data/lib/peek.rb

@@ -66,8 +66,8 @@ module Peek
 
   def self.results
     results = {
-      :context => {},
-      :data => Hash.new { |h, k| h[k] = {} }
+      context: {},
+      data: Hash.new { |h, k| h[k] = {} }
     }
 
     views.each do |view|

data/lib/peek/controller_helpers.rb

@@ -3,7 +3,7 @@ module Peek
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_action :set_peek_request_id, :if => :peek_enabled?
+      prepend_before_action :set_peek_request_id, if: :peek_enabled?
       helper_method :peek_enabled? if respond_to? :helper_method
     end
 

data/lib/peek/version.rb

@@ -1,3 +1,3 @@
 module Peek
-  VERSION = '0.2.0'
+  VERSION = '1.0.1'
 end

data/peek.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'railties', '>= 3.0.0'
+  gem.add_dependency 'railties', '>= 4.0.0'
   gem.add_dependency 'concurrent-ruby', '>= 0.9.0'
   gem.add_dependency 'concurrent-ruby-ext', '>= 0.9.0'
-  gem.add_dependency 'coffee-rails'
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -10,5 +10,7 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
+//= require jquery
+//= require jquery_ujs
 //= require peek
 //= require_tree .

data/test/dummy/app/controllers/application_controller.rb

@@ -4,6 +4,10 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   def peek_enabled?
-    true
+    if defined?(@peek_enabled)
+      !!@peek_enabled
+    else
+      true
+    end
   end
 end

data/test/dummy/app/controllers/home_controller.rb

@@ -1,4 +1,11 @@
 class HomeController < ApplicationController
-  def show
+  def enabled
+    @peek_enabled = true
+    render :show
+  end
+
+  def disabled
+    @peek_enabled = false
+    render :show
   end
 end

data/test/dummy/app/views/home/show.html.erb

@@ -1,2 +1,5 @@
 <h1>Home#show</h1>
 <p>Find me in app/views/home/show.html.erb</p>
+
+<%= debug({ peek_enabled: @peek_enabled }) %>
+<%= debug cookies %>

data/test/dummy/app/views/peek/_test_view.html.erb

@@ -0,0 +1 @@
+<strong><span data-defer-to="<%= view.defer_key %>-number">...</span></strong> number

data/test/dummy/config/initializers/peek.rb

@@ -0,0 +1,3 @@
+require_relative '../../../dummy/lib/test_view'
+
+Peek.into TestView

data/test/dummy/config/routes.rb

@@ -1,3 +1,8 @@
 Dummy::Application.routes.draw do
-  root :to => 'home#show'
+  mount Peek::Railtie => 'peek'
+
+  get '/enabled' => 'home#enabled'
+  get '/disabled' => 'home#disabled'
+
+  root to: 'home#enabled'
 end

data/test/dummy/lib/test_view.rb

@@ -0,0 +1,20 @@
+require 'concurrent/atomics'
+
+class TestView < Peek::Views::View
+  class << self
+    attr_accessor :counter
+  end
+  self.counter = Concurrent::AtomicReference.new(0)
+
+  def results
+    self.class.counter.update { |value| value + 1 }
+
+    {
+      number: self.class.counter.value
+    }
+  end
+
+  def partial_path
+    "peek/test_view"
+  end
+end

data/test/peek_test.rb

@@ -37,19 +37,19 @@ describe Peek do
     end
 
     it "should be able to append views" do
-      Peek.into Staff, :username => 'dewski'
+      Peek.into Staff, username: 'dewski'
       assert_kind_of Staff, Peek.views.first
     end
 
     it "should be able to append views with options" do
-      Peek.into Staff, :username => 'dewski'
+      Peek.into Staff, username: 'dewski'
       @staff = Peek.views.first
       assert_kind_of Staff, @staff
       assert_equal 'dewski', @staff.username
     end
 
     it "should only return enabled views" do
-      Peek.into Staff, :username => false
+      Peek.into Staff, username: false
       assert_equal [], Peek.views
     end
   end
@@ -60,7 +60,7 @@ describe Peek do
     end
 
     it "should clear any current views" do
-      Peek.into Staff, :username => 'dewski'
+      Peek.into Staff, username: 'dewski'
       assert_kind_of Staff, Peek.views.first
       Peek.reset
       assert_equal [], Peek.views

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peek
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Garrett Bjerkhoel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Take a peek into your Rails application.
 email:
 - me@garrettbjerkhoel.com
@@ -77,13 +63,11 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile-rails42
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/assets/images/peek/bar/development.gif
-- app/assets/images/peek/bar/production.gif
-- app/assets/images/peek/bar/staging.gif
-- app/assets/javascripts/peek.coffee
+- app/assets/javascripts/peek.js
 - app/assets/javascripts/peek/vendor/jquery.tipsy.js
 - app/assets/stylesheets/peek.scss
 - app/assets/stylesheets/peek/vendor/tipsy.scss
@@ -111,6 +95,7 @@ files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/home/show.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/peek/_test_view.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -124,11 +109,13 @@ files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/peek.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/lib/test_view.rb
 - test/dummy/log/.keep
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -172,6 +159,7 @@ test_files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/home/show.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/peek/_test_view.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -185,11 +173,13 @@ test_files:
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/peek.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/lib/test_view.rb
 - test/dummy/log/.keep
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -198,3 +188,4 @@ test_files:
 - test/peek/views/view_test.rb
 - test/peek_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/app/assets/javascripts/peek.coffee

@@ -1,71 +0,0 @@
-#= require peek/vendor/jquery.tipsy
-
-requestId = null
-
-do ($ = jQuery) ->
-
-  getRequestId = ->
-    if requestId? then requestId else $('#peek').data('request-id')
-
-  peekEnabled = ->
-    $('#peek').length
-
-  updatePerformanceBar = (results) ->
-    for key of results.data
-      for label of results.data[key]
-        $("[data-defer-to=#{key}-#{label}]").text results.data[key][label]
-    $(document).trigger 'peek:render', [getRequestId(), results]
-
-  initializeTipsy = ->
-    $('#peek .peek-tooltip, #peek .tooltip').each ->
-      el = $(this)
-      gravity = if el.hasClass('rightwards') || el.hasClass('leftwards')
-        $.fn.tipsy.autoWE
-      else
-        $.fn.tipsy.autoNS
-
-      el.tipsy
-        gravity: gravity
-
-  toggleBar = (event) ->
-    return if $(event.target).is ':input'
-
-    if event.which == 96 && !event.metaKey
-      wrapper = $('#peek')
-      if wrapper.hasClass 'disabled'
-        wrapper.removeClass 'disabled'
-        document.cookie = "peek=true; path=/";
-      else
-        wrapper.addClass 'disabled'
-        document.cookie = "peek=false; path=/";
-
-  fetchRequestResults = ->
-    $.ajax '/peek/results',
-      data:
-        request_id: getRequestId()
-      success: (data, textStatus, xhr) ->
-        updatePerformanceBar data
-      error: (xhr, textStatus, error) ->
-        # Swallow the error
-
-  $(document).on 'keypress', toggleBar
-
-  $(document).on 'peek:update', initializeTipsy
-  $(document).on 'peek:update', fetchRequestResults
-
-  # Fire the event for our own listeners.
-  $(document).on 'pjax:end', (event, xhr, options) ->
-    if xhr?
-      requestId = xhr.getResponseHeader 'X-Request-Id'
-
-    if peekEnabled()
-      $(this).trigger 'peek:update'
-
-  # Also listen to turbolinks page change event
-  $(document).on 'page:change turbolinks:load', ->
-    if peekEnabled()
-      $(this).trigger 'peek:update'
-
-  $ ->
-    if peekEnabled()
-      $(this).trigger 'peek:update'