rails-footnotes 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2343ef7d62b4ef197387788f0ff7dd42e86441
-  data.tar.gz: 72282e6373b9b1519d1cd6ba2eedea85aaf39d60
+  metadata.gz: 21fa093ff6eaf5b53695cfaed61637fa8e4c8187
+  data.tar.gz: 79e79b4486adcd087d948cc6d2d9f4959b6ac2bd
 SHA512:
-  metadata.gz: bb376b0a2f6ee0414db7c4923bd0d9d81813852241cccee6f5a0861c6f92d99f5f19b69eb2a25812694245c62048a4f75dadc46406963e4dc714bc7e1c4dbc60
-  data.tar.gz: c202eef9eb88ba4327a00c046763e5572269b863ac528bb6a58644f2bda6f29ee99902cff4102daf1da9f3fecdc052e79fc0d36aa68807fda0a91b48820f8c42
+  metadata.gz: 0873a5dbe0233b3f87b43748bfe402227116892233b09fb964c2ab692c35dc0a09e6f02f348ba5696b5bb9922b08490afabb04805be9af994a72856420581826
+  data.tar.gz: 1b88bc094b480f831319fa08b8c56fe0ac43356b5ca31ad1d492eee4cbe1bdadd438b05fc46bb22a5232fa1447398dd2a7d64e776177238e24c8f59f2f23c2cc

data/.travis.yml

@@ -1,10 +1,13 @@
-script: "bundle exec rake spec"
+cache: bundler
+sudo: false
+script: "bundle exec rake"
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.7
+  - 2.2.3
 gemfile:
-  - gemfiles/Gemfile.rails-3.2.x
+  - gemfiles/Gemfile.rails-3.2.22
   - gemfiles/Gemfile.rails-4.0.x
   - gemfiles/Gemfile.rails-4.1.x
   - gemfiles/Gemfile.rails-4.2.x
@@ -12,3 +15,11 @@ gemfile:
 matrix:
   allow_failures:
     - gemfile: gemfiles/Gemfile.rails-edge
+    - gemfile: gemfiles/Gemfile.rails-3.2.22
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails-edge
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails-edge
+    - rvm: 2.1.7
+      gemfile: gemfiles/Gemfile.rails-edge

data/CHANGELOG

@@ -1,3 +1,7 @@
+== Footnotes v4.1.8 ==
+  * Fix the issue of undefined method using Log4r and Rails 3.2
+  * Fix some rails 5 compatibility issues (#140) *
+  * Fix bad timing shown in SQL note (#145) *
 == Footnotes v4.1.7 ==
   * Fix notes not collapsing when clicking on them again (#130)*
 == Footnotes v4.1.6 ==

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Rakefile

@@ -5,12 +5,7 @@ require 'rdoc/task'
 
 desc 'Default: run tests'
 task :default => :spec
-
-desc 'Run tests for Footnotes.'
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  # t.rcov = false
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Generate documentation for Footnotes.'
 RDoc::Task.new(:rdoc) do |rdoc|

data/gemfiles/{Gemfile.rails-3.2.x → Gemfile.rails-3.2.22}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'rails', '~> 3.2.0'
+gem 'rails', '~> 3.2.22'

data/lib/rails-footnotes/extension.rb

@@ -6,8 +6,13 @@ module Footnotes
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_filter :rails_footnotes_before_filter
-      after_filter :rails_footnotes_after_filter
+      if Rails::VERSION::MAJOR >= 5
+        prepend_before_action :rails_footnotes_before_filter
+        after_action :rails_footnotes_after_filter
+      else
+        prepend_before_filter :rails_footnotes_before_filter
+        after_filter :rails_footnotes_after_filter
+      end
     end
 
     def rails_footnotes_before_filter

data/lib/rails-footnotes/notes/log_note.rb

@@ -20,7 +20,7 @@ module Footnotes
           end
         # Rails 3 don't have ActiveSupport::Logger#broadcast so we backported it
         extend_module = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger.broadcast(note_logger) : NoteLogger.broadcast(note_logger)
-        Rails.logger = self.original_logger.dup.extend(extend_module)
+        Rails.logger = self.original_logger.clone.extend(extend_module)
       end
 
       def title

data/lib/rails-footnotes/notes/params_note.rb

@@ -2,7 +2,11 @@ module Footnotes
   module Notes
     class ParamsNote < AbstractNote
       def initialize(controller)
-        @params = controller.params.symbolize_keys
+        @params = if Rails::VERSION::MAJOR >= 5
+          controller.params.to_unsafe_h
+        else
+          controller.params
+        end
       end
 
       def title

data/lib/rails-footnotes/notes/queries_note.rb

@@ -47,7 +47,7 @@ module Footnotes
             <td>
               <span id="sql_#{index}">#{print_query(event.payload[:sql])}</span>
             </td>
-            <td>#{print_name_and_time(event.payload[:name], event.duration / 1000.0)}</td>
+            <td>#{print_name_and_time(event.payload[:name], event.duration)}</td>
           </tr>
           HTML
         end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.1.7"
+  VERSION = "4.1.8"
 end

data/rails-footnotes.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2"
 
-  s.add_development_dependency "rspec-rails", '~> 3.2.1'
-  s.add_development_dependency "test-unit"
+  s.add_development_dependency "rspec-rails", '~> 3.3.2'
+  s.add_development_dependency "sprockets-rails", '~> 2.0'
   s.add_development_dependency "capybara"
 
   s.files         = `git ls-files`.split("\n")

data/spec/controllers/footnotes_controller_spec.rb

@@ -126,21 +126,3 @@ describe FootnotesController, type: :controller do
   end
 
 end
-
-
-HTML_DOCUMENT = <<EOF
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>HTML to XHTML Example: HTML page</title>
-        <link rel="Stylesheet" href="htmltohxhtml.css" type="text/css" media="screen">
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    <body>
-        <p>This is the HTML page. It works and is encoded just like any HTML page you
-         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
-         this page to view the difference between HTML and XHTML.</p>
-        <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
-    </body>
-</html>
-EOF

data/spec/footnotes_spec.rb

@@ -230,21 +230,4 @@ describe "Footnotes" do
     end
   end
 
-HTML_DOCUMENT = <<EOF
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>HTML to XHTML Example: HTML page</title>
-        <link rel="Stylesheet" href="htmltohxhtml.css" type="text/css" media="screen">
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    <body>
-        <p>This is the HTML page. It works and is encoded just like any HTML page you
-         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
-         this page to view the difference between HTML and XHTML.</p>
-        <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
-    </body>
-</html>
-EOF
-
 end

data/spec/spec_helper.rb

@@ -48,3 +48,20 @@ end
 
 require 'rspec/rails'
 require 'capybara/rails'
+
+HTML_DOCUMENT = <<EOF
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>HTML to XHTML Example: HTML page</title>
+        <link rel="Stylesheet" href="htmltohxhtml.css" type="text/css" media="screen">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    </head>
+    <body>
+        <p>This is the HTML page. It works and is encoded just like any HTML page you
+         have previously done. View <a href="htmltoxhtml2.htm">the XHTML version</a> of
+         this page to view the difference between HTML and XHTML.</p>
+        <p>You will be glad to know that no changes need to be made to any of your CSS files.</p>
+    </body>
+</html>
+EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-footnotes
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Roman V. Babenko
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,28 +34,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/Gemfile.rails-3.2.x
+- gemfiles/Gemfile.rails-3.2.22
 - gemfiles/Gemfile.rails-4.0.x
 - gemfiles/Gemfile.rails-4.1.x
 - gemfiles/Gemfile.rails-4.2.x
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails-footnotes
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Every Rails page has footnotes that gives information about your application