radiant-help-extension 1.1.1 → 1.1.2

data/app/controllers/admin/help_controller.rb

@@ -1,11 +1,11 @@
 class Admin::HelpController < ApplicationController
   include ActiveSupport::CoreExtensions::String::Inflections
-  
+
   # only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
   #   :when => :admin,
   #   :denied_url => { :controller => 'help', :action => 'index' },
   #   :denied_message => 'You must have administrative privileges to perform this action.'
-  
+
   def index
     @role = 'all'
     @docs = HelpDoc.find_for(:all)
@@ -52,7 +52,7 @@ class Admin::HelpController < ApplicationController
       @doc_path = HelpDoc.find_for(@role,params[:extension_name]).first
     else
       @doc_path = @docs.first
-      @doc_name = @doc_path[/[(\w+)]\/(\w+)\/HELP/, 1].titleize
+      @doc_name = @template.doc_extension_dir(@doc_path).titleize
     end
     @doc = HelpDoc.formatted_contents_from(@doc_path)
   end

data/app/helpers/admin/help_helper.rb

@@ -16,7 +16,12 @@ module Admin::HelpHelper
   end
   
   def doc_extension_dir(doc)
-    doc[/[(\w+)]\/(\w+)\/HELP/, 1]
+    dir = doc[/[(\w+)]\/(\w+)\/HELP/, 1] # vendored
+    if dir.blank?                        # gemified
+      path_ary = doc.split('/')
+      dir = path_ary[path_ary.count-2].sub('radiant-','').sub(/-extension-.*/,'')
+    end
+    dir
   end
   
   def all_tags

data/app/models/help_doc.rb

@@ -2,20 +2,16 @@ require 'rdoc'
 
 class HelpDoc
   
-  def self.find_for(role_type, extension_dir="**")
+  def self.find_for(role_type, extension_dir='')
     results = [] 
-    doc_name = ''
-    doc_name = "_#{role_type.to_s}" unless role_type.to_s == 'all'
-    Dir["#{RAILS_ROOT}/vendor/extensions/#{extension_dir}/HELP#{doc_name}*"].each do |ext_help|
-      case role_type.to_s
-      when 'all'
-        re_matcher = /HELP(\.[\w]+)?$/
-      else
-        re_matcher = /HELP_[\S]+(\.[\w]+)?$/
+    if extension_dir.blank?
+      Radiant::ExtensionLoader.enabled_extension_paths.each do |ext_path|
+        results << help_docs(ext_path, role_type)
       end
-      results << ext_help if re_matcher.match(ext_help)
+    else
+      results << help_docs(Radiant::ExtensionPath.for(extension_dir), role_type)
     end
-    results
+    results.reject(&:blank?).flatten
   end
   
   def self.formatted_contents_from(doc_path)
@@ -35,8 +31,27 @@ class HelpDoc
   def self.parsed_markdown(doc_path)
     MarkdownFilter.filter(File.read(doc_path))
   end
-  
+
   def self.parsed_textile(doc_path)
     ::RedCloth.new(File.read(doc_path)).to_html
   end
+
+  private
+
+  def self.help_docs(ext_path, role_type)
+    results = []
+    doc_name = ''
+    doc_name = "_#{role_type.to_s}" unless role_type.to_s == 'all'
+    Dir["#{ext_path}/HELP#{doc_name}*"].each do |ext_help|
+      case role_type.to_s
+      when 'all'
+        re_matcher = /HELP(\.[\w]+)?$/
+      else
+        re_matcher = /HELP_[\S]+(\.[\w]+)?$/
+      end
+      results << ext_help if re_matcher.match(ext_help)
+    end
+    results
+  end
+
 end

data/lib/{radiant-help-extension.rb → radiant_help_extension.rb}

@@ -1,5 +1,5 @@
 module RadiantHelpExtension
-  VERSION     = "1.1.1"
+  VERSION     = "1.1.2"
   SUMMARY     = "Help for Radiant CMS"
   DESCRIPTION = "Help Documentation for Radiant CMS!"
   URL         = "https://github.com/saturnflyer/radiant-help-extension"

data/radiant-help-extension.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "radiant-help-extension"
+require "radiant_help_extension"
 
 Gem::Specification.new do |s|
   s.name        = "radiant-help-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant-help-extension
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Help Documentation for Radiant CMS!
 email:
@@ -44,7 +44,7 @@ files:
 - features/support/paths.rb
 - HELP_developer.rdoc
 - help_extension.rb
-- lib/radiant-help-extension.rb
+- lib/radiant_help_extension.rb
 - lib/tasks/help_extension_tasks.rake
 - radiant-help-extension.gemspec
 - Rakefile