lookup 1.0.0.beta3 → 1.0.0.beta7

data/Gemfile

@@ -2,9 +2,9 @@ source 'http://rubygems.org'
 gem 'activerecord', :require => "active_record"
 gem 'nokogiri'
 gem 'find_by_hash'
-gem 'sqlite3-ruby'
+gem 'sqlite3-ruby', '1.3.1'
 
 group :test do
   gem 'rspec', '~> 2.0.0.beta.20'
   gem 'webmock'
-end
+end

data/Gemfile.lock

@@ -43,5 +43,5 @@ DEPENDENCIES
   find_by_hash
   nokogiri
   rspec (~> 2.0.0.beta.20)
-  sqlite3-ruby
+  sqlite3-ruby (= 1.3.1)
   webmock

data/lib/lookup.rb

@@ -7,30 +7,48 @@ ENV['BUNDLE_GEMFILE'] = gemfile
 Bundler.require(:default)
 
 module Lookup
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta7"
   APIS = []
   
   class APINotFound < StandardError; end
 
   class << self
+    def config
+      YAML::load_file(ENV["HOME"] + "/.lookup/config")
+    end
+    
     def update!
-      puts "Updating API, this may take a minute or two. Please be patient!"
+      puts "Updating API listings this may take a minute or two. Please be patient!"
+      puts "Big APIs (like Ruby + Rails) can take some time."
+      2.times { puts " " }
       [Constant, Entry, Api].map { |klass| klass.delete_all }
+      2.times { puts " " }
+      puts "Loading the following APIs:"
+      apis = config["apis"].values
+      for api in apis
+        puts "  " + api["name"]
+      end
       
-      update_api!("Rails v3.0.0", "http://api.rubyonrails.org")
-      update_api!("Rails v2.3.8", "http://api.rubyonrails.org/v2.3.8")
-      update_api!("Ruby 1.8.7", "http://www.ruby-doc.org/core")
-      update_api!("Ruby 1.9", "http://ruby-doc.org/ruby-1.9")
+      for api in apis
+        update_api!(api["name"], api["url"])
+      end
       
     end
     
     def update_api!(name, url)
-      puts "Updating API for #{name}..."
+      puts "  Loading API for #{name}"
       api = Api.find_or_create_by_name_and_url(name, url)
       APIS << api
+      
+      print "    methods..."
       api.update_methods!
+      puts " ✓"
+      
+      print "    classes..."
       api.update_classes!
-      puts "DONE (with #{name})!"
+      puts " ✓"
+      
+      puts "  ✓ #{name}"
     end
    
     def find_constant(name, entry=nil, options={})

data/lib/models.rb

@@ -31,7 +31,11 @@ module Lookup
       # This makes it valid.
       doc = Nokogiri::HTML(doc.gsub(/<a(.*?)>(.*?)<\/a>/m) { "<a#{$1}>#{$2.gsub("<", "&lt;").gsub(">", "&gt;")}" })
       
-      doc.css("a").each do |a|
+      # All the a tags on this page are methods
+      methods = doc.css("a")
+      print " #{methods.size} to index"
+      
+      methods.each do |a|
         names = a.text.split(" ")
         next if names.empty? 
         method = names[0]
@@ -40,17 +44,22 @@ module Lookup
         url = self.url + "/classes/" + constant.gsub("::", "/") + ".html"
         constant = self.constants.find_or_create_by_name_and_url(constant, url)
         
-        url = self.url + "/" + a["href"]
+        if !/^http:\/\//.match(a["href"])
+          url = self.url + "/" + a["href"]
+        else
+          url = a["href"]
+        end
         constant.entries.find_or_create_by_name_and_url(method, url)
       end
-      
-      # entries.each_slice(100) do |methods|
-      #   LookupBase.connection.execute("INSERT INTO entries (name, url) ")
-      # end
     end
     
     def update_classes!
       doc = Nokogiri::HTML(Net::HTTP.get(URI.parse("#{url}/fr_class_index.html")))
+      
+      # All the a tags on this page are classes
+      classes = doc.css("a")
+      print " #{classes.size} to index"
+      
       doc.css("a").each do |a|
         constant = self.constants.find_or_create_by_name_and_url(a.text, self.url + "/" + a["href"])
       end

data/lookup.gemspec

@@ -21,10 +21,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   
-  s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
+  s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.0"])
   s.add_dependency(%q<nokogiri>, [">= 0"])
   s.add_dependency(%q<activerecord>, [">= 2.3.8"])
-  s.add_dependency(%q<webmock>, [">= 0"])
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/spec/lookup_spec.rb

@@ -1,10 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "Lookup" do
-  before(:all) do
-    # Lookup.update!
-  end
-  
+describe "Lookup" do  
   def find_api(name)
     Lookup::Api.find_by_name(name)
   end

data/spec/regressions_spec.rb

@@ -9,4 +9,8 @@ describe "testing for regressions" do
     lambda { Lookup.search("ActiveRecord::Base") }.should raise_error(Lookup::APINotFound)
   end
   
+  it "must have a valid URL" do
+    Lookup.search("1.9 Array#shuffle").first.url.scan("http").size.should eql(1)
+  end
+  
 end

data/spec/spec_helper.rb

@@ -39,10 +39,16 @@ stub_request(:get, "http://www.ruby-doc.org/core/fr_class_index.html").to_return
 stub_request(:get, "http://ruby-doc.org/ruby-1.9/fr_method_index.html").to_return(:body => entries("1.9"))
 stub_request(:get, "http://ruby-doc.org/ruby-1.9/fr_class_index.html").to_return(:body => classes("1.9"))
 
+stub_request(:get, "http://faker.rubyforge.org/rdoc//fr_method_index.html").to_return(:body => entries("faker"))
+stub_request(:get, "http://faker.rubyforge.org/rdoc//fr_class_index.html").to_return(:body => classes("faker"))
+
 
 require 'lookup'
 # require 'pathname'
 
 RSpec.configure do |config|
-  
+  config.before(:all) do
+    FileUtils.cp(here + "../config/lookup", ENV["HOME"] + "/.lookup/config")
+    Lookup.update!
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: lookup
 version: !ruby/object:Gem::Version 
-  hash: -1848230053
+  hash: -1848230057
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta3
-  version: 1.0.0.beta3
+  - beta7
+  version: 1.0.0.beta7
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 +10:00
+date: 2010-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 1
-        - 2
-        - 5
-        version: 1.2.5
+        - 3
+        - 0
+        version: 1.3.0
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -81,20 +81,6 @@ dependencies:
         - 8
         version: 2.3.8
   requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmock
-  type: :runtime
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
 description: A gem that provides a lazy man's ri
 email: 
 - radarlistener@gmail.com