rails-footnotes 3.7.5 → 3.7.6

data/.gitignore

@@ -1,6 +1,7 @@
 .*
 !.gitignore
 !.gitmodules
+!.travis.yml
 !*.example
 *.gem
 .bundle
@@ -9,3 +10,4 @@ pkg/*
 coverage
 tags
 doc
+bin

data/.travis.yml

@@ -0,0 +1,9 @@
+script: "bundle exec rake spec"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+notifications:
+  recipients:
+    - romanvbabenko@gmail.com

data/README.rdoc

@@ -31,7 +31,7 @@ In RAILS_ROOT/config/environments/development.rb (yes, you want it only in devel
 
 == Configuration
 
-For version greater then 3.7.0
+For version greater than 3.7.0
 
 If you want to add alternate logic to enable or disable footnotes,
 add something like this to config/initializers/footnotes.rb:
@@ -129,7 +129,14 @@ Then put in your environment:
 
   Footnotes::Filter.notes += [:current_user]
 
-== Colaborators
+== Display of the notes
+
+By default the notes will be showed at the bottom of your page (appended just before </body>).
+If you'd like these notes on a different place (perhaps for aesthetical reasons) you can edit one of your views and add:
+  <div id="footnotes_holder"></div>
+at an appropriate place, your notes will now appear inside div#footnotes_holder
+
+== Collaborators
 
 * Leon Li       - http://github.com/scorpio
 * Keenan Brock  - http://github.com/kbrock

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

@@ -14,7 +14,7 @@ module Footnotes
       end
 
       def valid?
-        prefix? && File.exists?(self.controller_filename)
+        prefix? && controller_filename && File.exists?(controller_filename)
       end
 
       protected
@@ -23,7 +23,7 @@ module Footnotes
         end
 
         def controller_filename
-          @controller_filename ||= Gem.find_files(self.controller_path).first # tnx https://github.com/MasterLambaster
+          @controller_filename ||= Gem.find_files(controller_path).first # tnx https://github.com/MasterLambaster
         end
 
         def controller_text

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

@@ -14,7 +14,7 @@ module Footnotes
         if @files.empty?
           ""
         else
-          "<ul><li>#{@files.join("</li><li>")}</li></ul>"
+          "<ul><li>%s</li></ul>" % @files.join("</li><li>")
         end
       end
 
@@ -28,12 +28,30 @@ module Footnotes
         end
 
         def parse_files!
-          @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>]
+          if Rails.version >= '3.1' && Rails.application.config.assets[:enabled]
+            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>]
+              end
             end
           end
         end

data/lib/rails-footnotes/version.rb

@@ -1,3 +1,3 @@
 module Footnotes
-  VERSION = "3.7.5"
+  VERSION = "3.7.6"
 end

data/spec/notes/controller_note_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+require "rails-footnotes/notes/controller_note"
+
+describe Footnotes::Notes::ControllerNote do
+  # Issue #60
+  it "should not be valid if conftroller file not exist" do
+    note = Footnotes::Notes::ControllerNote.new(mock)
+    note.stub(:controller_filename).and_return(nil)
+
+    note.should_not be_valid
+  end
+end

data/spec/notes/files_note_spec.rb

@@ -3,9 +3,15 @@ require 'action_controller'
 require "rails-footnotes/notes/files_note"
 
 describe Footnotes::Notes::FilesNote do
-  let(:note) {Footnotes::Notes::FilesNote.new(mock('controller', :response => mock('', :body => '')))}
-  subject {note}
 
-  it {should be_valid}
-  its(:row) {should eql :edit}
+  let(:note) do
+    Rails.stub(:version).and_return('3.0.12');
+    Footnotes::Notes::FilesNote.new(mock('controller', :response => mock('', :body => '')))
+  end
+
+  subject { note }
+
+  it { should be_valid }
+  its(:row) { should eql :edit }
+
 end

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ require "rails-footnotes"
 
 class Rails
   def self.logger; end
+
+  def self.version; '3.0.12'; end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,94 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails-footnotes
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 3.7.6
   prerelease: 
-  segments: 
-  - 3
-  - 7
-  - 5
-  version: 3.7.5
 platform: ruby
-authors: 
+authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70324691484480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70324691484480
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70324691483740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70324691483740
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70324691483080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: watchr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70324691483080
+- !ruby/object:Gem::Dependency
+  name: watchr
+  requirement: &70324691482220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Every Rails page has footnotes that gives information about your application and links back to your editor.
-email: 
+  prerelease: false
+  version_requirements: *70324691482220
+description: Every Rails page has footnotes that gives information about your application
+  and links back to your editor.
+email:
 - keenan@thebrocks.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec.example
+- .travis.yml
 - .watchr.example
 - CHANGELOG
 - Gemfile
@@ -126,6 +103,7 @@ files:
 - spec/abstract_note_spec.rb
 - spec/footnotes_spec.rb
 - spec/notes/assigns_note_spec.rb
+- spec/notes/controller_note_spec.rb
 - spec/notes/files_note_spec.rb
 - spec/notes/javascripts_note_spec.rb
 - spec/notes/partials_notes_spec.rb
@@ -133,41 +111,34 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/josevalim/rails-footnotes
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rails-footnotes
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Every Rails page has footnotes that gives information about your application and links back to your editor.
-test_files: 
+summary: Every Rails page has footnotes that gives information about your application
+  and links back to your editor.
+test_files:
 - spec/abstract_note_spec.rb
 - spec/footnotes_spec.rb
 - spec/notes/assigns_note_spec.rb
+- spec/notes/controller_note_spec.rb
 - spec/notes/files_note_spec.rb
 - spec/notes/javascripts_note_spec.rb
 - spec/notes/partials_notes_spec.rb