lookup 1.1.1 → 1.1.3

data/Gemfile

@@ -1,8 +1,7 @@
 source :gemcutter
 
 group :test do
-  gem 'rspec', '~> 2.0.0.beta.20'
-  gem 'webmock'
+  
 end
 
 # Specify your gem's dependencies in lookup.gemspec

data/Gemfile.lock

@@ -1,57 +1,52 @@
 PATH
   remote: .
   specs:
-    lookup (1.1.0)
+    lookup (1.1.2)
       activerecord (>= 2.3.8)
       nokogiri
       sqlite3-ruby (>= 1.2.5)
-      webmock
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    addressable (2.2.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.7)
+    addressable (2.2.6)
+    arel (2.0.10)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    i18n (0.4.1)
-    nokogiri (1.4.3.1)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
-    webmock (1.3.5)
-      addressable (>= 2.1.1)
+    i18n (0.5.0)
+    nokogiri (1.4.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.2)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.27)
+    webmock (1.6.4)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 2.3.8)
   bundler (>= 1.0.0)
   lookup!
-  nokogiri
-  rspec (~> 2.0.0.beta.20)
-  sqlite3-ruby (>= 1.2.5)
-  webmock
+  rspec (~> 2.1)
+  webmock (~> 1.6)

data/bin/lookup

@@ -46,9 +46,8 @@ def display_results(results, search_string)
   end
 end
 
-local_lib=Pathname.new(File.expand_path(File.dirname(__FILE__))) + "../lib/lookup.rb"
-if File.exists?(local_lib)
-  require local_lib
+if (local_lib = Pathname.new(File.expand_path('../../lib/lookup.rb', __FILE__))).file?
+  require local_lib.to_s
 else
   require 'rubygems'
   require 'lookup' 

data/config/lookup

@@ -1,15 +1,15 @@
 apis:
   faker:
     name: Faker
-    url: "http://faker.rubyforge.org/rdoc/"
+    url: "http://faker.rubyforge.org/rdoc"
     
-  v3.0.0:
-    name: Rails v3.0.0
+  v3.0:
+    name: Rails v3.0
     url: "http://api.rubyonrails.org"
 
-  v2.3.8:
-    name: Rails v2.3.8
-    url: "http://api.rubyonrails.org/v2.3.8"
+  v2.3:
+    name: Rails v2.3
+    url: "http://api.rubyonrails.org/v2.3.10"
 
   1.8:
     name: Ruby 1.8

data/lib/lookup.rb

@@ -19,7 +19,7 @@ end
 module Lookup
   APIS = []
   
-  class APINotFound < StandardError; end
+  class APINotFound < Exception; end
 
   class << self
     
@@ -134,13 +134,13 @@ module Lookup
     end
           
     def search(msg, options={})
-      options[:api] ||= msg.split.first
+      first_word = msg.split.first
+      options[:api] ||= first_word if apis.keys.include?(first_word)
       api_check = lambda { |options| (!apis.keys.map(&:to_s).include?(options[:api]) && !options[:api].is_a?(Api)) }
       # to_s because yaml interprets "1.8" as a literal 1.8
       # And because I'm super, super lazy
-      if !@attempted_ruby && api_check.call(options)
+      if api_check.call(options)
         # Attempt a current Ruby lookup
-        @attempted_ruby = true
         api = case RUBY_VERSION
           when /^1.8/
             "1.8"
@@ -150,7 +150,9 @@ module Lookup
         search(msg, options.merge!(:api => api)) if api 
       end
       
-      options[:api] = Api.find_by_name!(apis[options[:api]]["name"]) unless options[:api].is_a?(Api)
+      options[:api] = Api.find_by_name!(apis[options[:api]]["name"]) if (options[:api] && apis[options[:api]].try(:[], "name")) && !options[:api].is_a?(Api)
+      
+      raise Lookup::APINotFound, "Could not determine what API the lookup is for" unless options[:api]
       
       # We want to retain message.
       msg = msg.gsub(/^(.*?)\s/, "")
@@ -193,4 +195,4 @@ module Lookup
   end
 end
 
-require 'lookup/models'
+require File.expand_path('../lookup/models', __FILE__)

data/lib/lookup/version.rb

@@ -1,3 +1,3 @@
 module Lookup
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/lookup.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rspec", "~> 2.1"
+  s.add_development_dependency "webmock", "~> 1.6"
   
   s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
   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/config

@@ -1,15 +1,15 @@
 apis:
   faker:
     name: Faker
-    url: "http://faker.rubyforge.org/rdoc/"
+    url: "http://faker.rubyforge.org/rdoc"
     
-  v3.0.0:
-    name: Rails v3.0.0
+  v3.0:
+    name: Rails v3.0
     url: "http://api.rubyonrails.org"
 
-  v2.3.8:
-    name: Rails v2.3.8
-    url: "http://api.rubyonrails.org/v2.3.8"
+  v2.3:
+    name: Rails v2.3
+    url: "http://api.rubyonrails.org/v2.3.10"
 
   1.8:
     name: Ruby 1.8

data/spec/lookup_spec.rb

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

data/spec/regressions_spec.rb

@@ -12,5 +12,8 @@ describe "testing for regressions" do
   it "must have a valid URL" do
     Lookup.search("1.9 Array#shuffle").first.url.scan("http").size.should eql(1)
   end
-  
+
+  it "must have an API specified for constant + method" do
+    lambda { Lookup.search("String#=~") }.should raise_error(Lookup::APINotFound)
+  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ ENV['HOME'] = File.dirname(__FILE__)
 require 'rubygems'
 require 'bundler'
 
-Bundler.require(:default, :test)
+Bundler.require(:default, :development)
 
 def here
   Pathname.new(File.dirname(__FILE__))
@@ -22,7 +22,7 @@ def classes(api)
   File.read(apis + api + "classes.html")
 end
 
-include WebMock
+include WebMock::API
 
 WebMock.disable_net_connect!
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: lookup
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+  prerelease: 
+  version: 1.1.3
 platform: ruby
 authors: []
 
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 +10:00
+date: 2011-05-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,74 +21,64 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
-  type: :runtime
+        version: "2.1"
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: webmock
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
+        version: "1.6"
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
+        version: 1.2.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: nokogiri
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.8
+  type: :runtime
+  version_requirements: *id006
 description: Lazy man's RI
 email: []
 
@@ -149,25 +134,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Lazy man's RI