RubyGems - rails-footnotes - Versions diffs - 4.1.5 → 4.1.6 - Mend

rails-footnotes 4.1.5 → 4.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml +4 -4
data/.gitignore +2 -0
data/CHANGELOG +2 -0
data/lib/rails-footnotes/notes/files_note.rb +10 -22
data/lib/rails-footnotes/version.rb +1 -1
data/rails-footnotes.gemspec +1 -0
data/spec/app/assets/javascripts/foobar.js +1 -0
data/spec/app/assets/stylesheets/foobar.css +0 -0
data/spec/app/views/files/index.html.erb +0 -0
data/spec/app/views/layouts/application.html.erb +12 -0
data/spec/{views → app/views}/partials/_foo.html.erb +0 -0
data/spec/{views → app/views}/partials/index.html.erb +0 -0
data/spec/controllers/files_note_controller_spec.rb +44 -0
data/spec/controllers/footnotes_controller_spec.rb +2 -2
data/spec/controllers/log_note_controller_spec.rb +4 -4
data/spec/controllers/partials_note_controller_spec.rb +0 -1
data/spec/notes/files_note_spec.rb +0 -1
data/spec/spec_helper.rb +7 -1
metadata +30 -6

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a41c090b37697dabd6c9f5925e39efe2c63de144
-  data.tar.gz: c80e75844ceb6eddfcc436b318acf0bf4c49e736
+  metadata.gz: c57242b5f541d4d6722be87fcb7aaee885065388
+  data.tar.gz: 804664dc9f668fe41bf3cd4c0a3e05a72cf4bb2d
 SHA512:
-  metadata.gz: a13390246b039b93557322cccfc8af102fb0fce960ddd63231992757b7de4c6c697576f04d24c50a1d8cad6e32d0cefda2319bd3c7f6a98a9309cb155beb9126
-  data.tar.gz: c221e2c64876ac31bbd8f9f0c469adfd4c7670445922733fabc5e4a529fa0b4e6e8bf0bc777375a95f41ead43273fc0b37a8aca7ac14b129335edb223decd562
+  metadata.gz: 4f6e3da7e078c14fd7d4115d250a871c74e75319a4aa47373ebae0cbc3e0094770c24fac5b7ddac183df83eb5a73bcddd93037c09af387a91cc5d4403a1f5b32
+  data.tar.gz: cc4644cb39a8336493649916a3d412f03eb42ff8f8b703f88e29bbd2f6720f0e9a75e6df292a20ce5bddecd4b09a4c7b1a833b4dda4f864b57c5c8e906632510

data/.gitignore CHANGED

@@ -12,3 +12,5 @@ pkg/*
 tags
 /doc
 /myapp
+spec/tmp
+spec/log

data/CHANGELOG CHANGED

@@ -1,3 +1,5 @@
+== Footnotes v4.1.6 ==
+  * Fix incorrect handler link to css/js files (#217)*
 == Footnotes v4.1.5 ==
   * Remove use of non-existing note in initializer introduced in v4, impacting new installations *
 == Footnotes v4.1.4 ==

data/lib/rails-footnotes/notes/files_note.rb CHANGED

@@ -28,32 +28,20 @@ module Footnotes
         end
         def parse_files!
-          if Rails.version >= '3.1' && Rails.application.config.assets[:enabled]
-            asset_paths = Rails.application.config.assets.paths
-            linked_files = []
+          asset_paths = Rails.application.config.assets.paths
+          linked_files = []
-            @files.collect do |file|
-              base_name = File.basename(file)
-              asset_paths.each do |asset_path|
-                results = Dir[File.expand_path(base_name, asset_path) + '*']
-                results.each do |r|
-                  linked_files << %[<a href="#{Footnotes::Filter.prefix(r, 1, 1)}">#{File.basename(r)}</a>]
-                end
-                break if results.present?
-              end
-            end
-            @files = linked_files
-          else
-            #Original Implementation
-            @files.collect! do |filename|
-              if filename =~ %r{^/}
-                full_filename = File.join(File.expand_path(Rails.root), 'public', filename)
-                %[<a href="#{Footnotes::Filter.prefix(full_filename, 1, 1)}">#{filename}</a>]
-              else
-                %[<a href="#{filename}">#{filename}</a>]
+          @files.collect do |file|
+            base_name = File.basename(file)
+            asset_paths.each do |asset_path|
+              results = Dir[File.expand_path(base_name, asset_path) + '*']
+              results.each do |r|
+                linked_files << %[<a href="#{Footnotes::Filter.prefix(r, 1, 1)}">#{File.basename(r)}</a>]
               end
+              break if results.present?
             end
           end
+          @files = linked_files
         end
     end
   end

data/lib/rails-footnotes/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "4.1.5"
+  VERSION = "4.1.6"
 end

data/rails-footnotes.gemspec CHANGED

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 3.2"
   s.add_development_dependency "rspec-rails", '~> 2.14.0'
+  s.add_development_dependency "test-unit"
   s.add_development_dependency "capybara"
   s.files         = `git ls-files`.split("\n")

data/spec/app/assets/javascripts/foobar.js ADDED

	@@ -0,0 +1 @@
1	+ // Foobar

data/spec/app/assets/stylesheets/foobar.css ADDED

File without changes

data/spec/app/views/files/index.html.erb ADDED

File without changes

data/spec/app/views/layouts/application.html.erb ADDED

@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head>
+    <%= javascript_include_tag 'foobar' %>
+    <%= javascript_include_tag 'http://google.com/whatever.js' %>
+    <%= stylesheet_link_tag 'foobar' %>
+    <%= stylesheet_link_tag 'http://google.com/whatever.css' %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/spec/{views → app/views}/partials/_foo.html.erb RENAMED

File without changes

data/spec/{views → app/views}/partials/index.html.erb RENAMED

File without changes

data/spec/controllers/files_note_controller_spec.rb ADDED

@@ -0,0 +1,44 @@
+require 'spec_helper'
+class FilesController < ApplicationController
+    def index
+    end
+  end
+describe FilesController do
+  render_views
+  include Capybara::DSL
+  def page
+    Capybara::Node::Simple.new(response.body)
+  end
+  before :all do
+    Footnotes.enabled = true
+  end
+  after :all do
+    Footnotes.enabled = false
+  end
+  it 'includes stylesheets assets in the response' do
+    get :index
+    js_debug = first('fieldset#javascripts_debug_info div', visible: false)
+    expect(js_debug).to have_selector('li a', visible: false, count: 1)
+    expect(js_debug).to have_selector('li a', text: /foobar\.js/, visible: false)
+    link = js_debug.first('a', visible: false)
+    expect(link['href']).to eq("txmt://open?url=file://#{Rails.root.join('app', 'assets', 'javascripts', 'foobar.js')}&line=1&column=1")
+  end
+  it 'includes css assets in the response' do
+    get :index
+    css_debug = first('fieldset#stylesheets_debug_info div', visible: false)
+    expect(css_debug).to have_selector('li a', visible: false, count: 1)
+    expect(css_debug).to have_selector('li a', text: /foobar\.css/, visible: false)
+    link = css_debug.first('a', visible: false)
+    expect(link['href']).to eq("txmt://open?url=file://#{Rails.root.join('app', 'assets', 'stylesheets', 'foobar.css')}&line=1&column=1")
+  end
+end

data/spec/controllers/footnotes_controller_spec.rb CHANGED

@@ -15,7 +15,7 @@ class FootnotesController < ActionController::Base
   end
   def foo_download
-    send_file Rails.root.join('spec', 'fixtures', 'html_download.html'), :disposition => 'attachment'
+    send_file Rails.root.join('fixtures', 'html_download.html'), :disposition => 'attachment'
   end
 end
@@ -72,7 +72,7 @@ describe FootnotesController do
       it 'does not alter a html file download' do
         get :foo_download
-        response.body.should == File.open(Rails.root.join('spec', 'fixtures', 'html_download.html')).read
+        response.body.should == File.open(Rails.root.join('fixtures', 'html_download.html')).read
       end
     end

data/spec/controllers/log_note_controller_spec.rb CHANGED

@@ -3,6 +3,10 @@ require 'stringio'
 describe 'log note' do
+  def page
+    Capybara::Node::Simple.new(response.body)
+  end
   class ApplicationController < ActionController::Base
   end
@@ -14,10 +18,6 @@ describe 'log note' do
     end
   end
-  def page
-    Capybara::Node::Simple.new(response.body)
-  end
   before :all do
     Footnotes.enabled = true
   end

data/spec/controllers/partials_note_controller_spec.rb CHANGED

@@ -3,7 +3,6 @@ require 'spec_helper'
 class PartialsController < ActionController::Base
   def index
-    prepend_view_path "#{Rails.root.join('spec', 'views')}"
   end
 end

data/spec/notes/files_note_spec.rb CHANGED

@@ -5,7 +5,6 @@ require "rails-footnotes/notes/files_note"
 describe Footnotes::Notes::FilesNote do
   let(:note) do
-    Rails.stub(:version).and_return('3.0.12');
     Footnotes::Notes::FilesNote.new(double('controller', :response => double('', :body => '')))
   end

data/spec/spec_helper.rb CHANGED

@@ -4,12 +4,14 @@ begin
 rescue LoadError
 end
 ENV["RAILS_ENV"] ||= 'test'
+require "sprockets/railtie"
 require "rails-footnotes"
 module FooBar
   class Application < Rails::Application
     config.secret_key_base = 'foobar'
-    config.root = Dir.new('.')
+    config.root = Dir.new('./spec')
+    config.eager_load = false
   end
 end
@@ -17,6 +19,9 @@ ActionController::Base.class_eval do
   include Rails.application.routes.url_helpers
 end
+class ApplicationController < ActionController::Base
+end
 RSpec.configure do |config|
   Rails.application.initialize!
@@ -27,6 +32,7 @@ RSpec.configure do |config|
     get 'footnotes/foo_js'
     get 'footnotes/foo_download'
     get 'partials/index'
+    get 'files/index'
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-footnotes
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Roman V. Babenko
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,6 +42,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,13 @@ files:
 - lib/rails-footnotes/version.rb
 - rails-footnotes.gemspec
 - spec/abstract_note_spec.rb
+- spec/app/assets/javascripts/foobar.js
+- spec/app/assets/stylesheets/foobar.css
+- spec/app/views/files/index.html.erb
+- spec/app/views/layouts/application.html.erb
+- spec/app/views/partials/_foo.html.erb
+- spec/app/views/partials/index.html.erb
+- spec/controllers/files_note_controller_spec.rb
 - spec/controllers/footnotes_controller_spec.rb
 - spec/controllers/log_note_controller_spec.rb
 - spec/controllers/partials_note_controller_spec.rb
@@ -117,8 +138,6 @@ files:
 - spec/notes/javascripts_note_spec.rb
 - spec/notes/stylesheets_note_spec.rb
 - spec/spec_helper.rb
-- spec/views/partials/_foo.html.erb
-- spec/views/partials/index.html.erb
 homepage: http://github.com/josevalim/rails-footnotes
 licenses: []
 metadata: {}
@@ -145,6 +164,13 @@ summary: Every Rails page has footnotes that gives information about your applic
   and links back to your editor.
 test_files:
 - spec/abstract_note_spec.rb
+- spec/app/assets/javascripts/foobar.js
+- spec/app/assets/stylesheets/foobar.css
+- spec/app/views/files/index.html.erb
+- spec/app/views/layouts/application.html.erb
+- spec/app/views/partials/_foo.html.erb
+- spec/app/views/partials/index.html.erb
+- spec/controllers/files_note_controller_spec.rb
 - spec/controllers/footnotes_controller_spec.rb
 - spec/controllers/log_note_controller_spec.rb
 - spec/controllers/partials_note_controller_spec.rb
@@ -157,5 +183,3 @@ test_files:
 - spec/notes/javascripts_note_spec.rb
 - spec/notes/stylesheets_note_spec.rb
 - spec/spec_helper.rb
-- spec/views/partials/_foo.html.erb
-- spec/views/partials/index.html.erb