rdoc_osx_dictionary 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.0.1 / 2012-01-11
+
+* 3 bug fixes:
+
+  * Changed the way entries were indexed to remove errant duplicate entries.
+  * Fixed a bunch of 1.9.3 warnings.
+  * Fixed problems on case insensitive file systems. :(
+
 === 2.0.0 / 2011-12-15
 
 * 1 major enhancement:

data/README.txt

@@ -1,6 +1,7 @@
 = rdoc_osx_dictionary
 
-* http://rubyforge.org/projects/seattlerb
+home :: https://github.com/seattlerb/rdoc_osx_dictionary
+rdoc :: http://docs.seattlerb.org/rdoc_osx_dictionary
 
 == DESCRIPTION:
 

data/lib/rdoc_osx_dictionary.rb

@@ -14,7 +14,7 @@ ENV['LANG'] = ""
 ENV['LC_ALL'] = "C"
 
 class RDoc::OSXDictionary
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   EXCLUDE = {
   }
@@ -71,10 +71,8 @@ class RDoc::OSXDictionary
     m_seen = {} # HACK: known issue: on a case insensitive FS we're losing files
 
     File.open(path, "w") do |f|
-      c_result, m_result = [], []
-
+      m_result = []
       m_seen.clear
-      seen_system = false
 
       fullname  = klass
 
@@ -116,10 +114,16 @@ class RDoc::OSXDictionary
         f.puts class_details(name, fullname, cdesc, level)
 
         cdesc.method_list.each do |method|
-          next if m_seen[method.full_name.downcase]
-          method = store.load_method klass, method.full_name
-          m_result << display_method_info(method, from)
-          m_seen[method.full_name.downcase] = true
+          fullname = method.full_name
+          key      = id from, fullname
+
+          next if m_seen[key]
+
+          method = store.load_method klass, fullname
+
+          # HACK: after load_method, parent_name is not full name, pass down key
+          m_result << display_method_info(method, from, key)
+          m_seen[key] = true
         end
       end # stores.each
 
@@ -162,15 +166,11 @@ class RDoc::OSXDictionary
     result
   end
 
-  def display_method_info definition, from
-    klass     = definition.parent_name
-
+  def display_method_info definition, from, key
     fullname  = definition.full_name
     name      = definition.name
-    singleton = definition.singleton
     params    = definition.arglists
     comment   = to_html.convert definition.comment
-    type      = singleton ? "defs" : "def"
 
     return if name =~ /_reduce_\d+/
 
@@ -181,8 +181,8 @@ class RDoc::OSXDictionary
     comment = comment.gsub(/<span[^>]+>/, '').gsub(/<\/span>/, '')
     comment = comment.gsub(/(<pre[^>]*>)\s*\n/, '\1')
 
-    result = <<-"EOD".gsub(/^ {6}/, '')
-      <d:entry id="#{id type, klass, name}" d:title="#{fullname.munge}">
+    return <<-"EOD".gsub(/^ {6}/, '')
+      <d:entry id="#{key}" d:title="#{fullname.munge}">
         <d:index d:value="#{fullname.munge}"/>
         <d:index d:value="#{name.munge}"/>
         <h1>#{fullname.munge}</h1>
@@ -205,14 +205,14 @@ class RDoc::OSXDictionary
   end
 
   def d_header
-    result = <<-"EOD".gsub(/^ {6}/, '')
+    return <<-"EOD".gsub(/^ {6}/, '')
       <?xml version="1.0" encoding="UTF-8"?>
       <d:dictionary xmlns="http://www.w3.org/1999/xhtml" xmlns:d="http://www.apple.com/DTDs/DictionaryService-1.0.rng">
     EOD
   end
 
   def d_footer classes, sources
-    result = <<-"EOD".gsub(/^ {6}/, '')
+    return <<-"EOD".gsub(/^ {6}/, '')
       <d:entry id="front_back_matter" d:title="Front/Back Matter">
         <h1><b>RubyGems Dictionary</b></h1>
 
@@ -247,7 +247,7 @@ class RDoc::OSXDictionary
     l_seen = {}
 
     dict.sort.each do |klass, stores|
-      path = "#{base}/dict/#{klass}.xml"
+      path = "#{base}/dict/#{klass.downcase}.xml"
 
       next if $q and klass !~ /^(String|Array|Bignum)/
 
@@ -270,8 +270,6 @@ class RDoc::OSXDictionary
 
     return unless dirty unless force
 
-    dict_src_path = "#{base}/RubyGemsDictionary.xml"
-
     seen = {}
 
     classes = {}
@@ -284,16 +282,19 @@ class RDoc::OSXDictionary
       end
     end
 
+    dict_src_path = "#{base}/RubyGemsDictionary.xml"
+
     File.open(dict_src_path, "w") do |xml|
       xml.puts d_header
 
       dict.sort.each do |klass, stores|
         next if $q and klass !~ /^(String|Array|Bignum)/
 
-        next if seen[klass]
-        seen[klass] = true
+        next if seen[klass.downcase]
+        seen[klass.downcase] = true
+
+        path = "#{base}/dict/#{klass.downcase}.xml"
 
-        path = "#{base}/dict/#{klass}.xml"
         body = File.read path rescue nil
         if body then
           xml.puts body

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc_osx_dictionary
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-12-15 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 2
-        - 8
-        version: "2.8"
+        - 9
+        version: "2.9"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -83,21 +83,6 @@ dependencies:
         version: "2.12"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id004
 description: |-
   rdoc via Apple's Dictionary.app. Automatically builds and installs an
   Apple Dictionary with all rdoc nicely formatted.
@@ -123,8 +108,7 @@ files:
 - data/RubyGemsInfo.plist
 - lib/rdoc_osx_dictionary.rb
 - lib/rubygems_plugin.rb
-- .gemtest
-homepage: http://rubyforge.org/projects/seattlerb
+homepage: https://github.com/seattlerb/rdoc_osx_dictionary
 licenses: []
 
 post_install_message: 
@@ -154,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: rdoc via Apple's Dictionary.app