phi 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc5b80eec01076e27957545b9c28aef657a88610
-  data.tar.gz: a6275b29ab48fcbc8b914d090e9e5366fcdc4916
+  metadata.gz: 67472b5ea068074087a0459cecd0d51ea0266d64
+  data.tar.gz: a3584eeae79e4ab9ac6fb92401e531c83b6e4358
 SHA512:
-  metadata.gz: e9f10750166283b46a4c8467bfc252ceabe7415bbec4b768814a5e56cc300ed62eae56cef6dbb1e7578ea12ebdeda6a29c2ba01b9cd3cd832049930caab1a859
-  data.tar.gz: 6d196f84282ba0779c842f5a526a8aaff4b6675b922c3f749943e3e2471906975e1cf3501f8cb76989c842ea754732b3c151c363920a3628cb3e51fbb1acd509
+  metadata.gz: 9e267801a9bf28ae83927da2cfc59dac9b53659b661df3751c7620fbd01cea6aa8369e8f1b259cd3191836f7bc7c3350a0d58dd67ec11c46be815d00fcd1a751
+  data.tar.gz: 3f3b51b719297a05949107661bda2a15143b3dd108fc0b445bc910464f9cd0e57dd5270a92c323cb152075e147369a53745c146529e88fc3243cfc9f977c4155

data/.gitignore

@@ -2,6 +2,8 @@
 *.rbc
 .bundle
 .config
+.ruby-gemset
+.ruby-version
 .yardoc
 Gemfile.lock
 InstalledFiles

data/lib/phi.rb

@@ -8,6 +8,7 @@ module Phi
 end
 
 require 'phi/losophy'
+require 'phi/losophy/logger'
 require 'phi/losophy/page'
 require 'phi/losophy/page/node'
 require 'phi/losophy/pages'

data/lib/phi/cli.rb

@@ -12,8 +12,9 @@ module Phi
     end
 
     def run
-      i = Phi::Losophy.new(term).index
-      puts "The Philosophy Index of #{term} is #{i}."
+      Phi::Losophy.new(term).tap { |phi| puts "The Philosophy Index of #{term} is #{phi.index}." }
+    rescue
+      puts "Philosophy index cannot be calculated"
     end
 
   end

data/lib/phi/losophy/logger.rb

@@ -0,0 +1,27 @@
+module Phi
+  class Losophy
+    module Logger
+
+      def each
+        super
+        log "Found Philosophy"
+      rescue Pages::MaximumPages, Pages::InfiniteLoop => e
+        log e.message
+        raise e
+      rescue => e
+        log "An unexpected error has occurred: #{e.message}"
+        raise e
+      end
+
+      def current_page=(*)
+        super
+        log "Now browsing #{current_page.term}"
+      end
+
+      def log(message)
+        puts message
+      end
+
+    end
+  end
+end

data/lib/phi/losophy/page.rb

@@ -21,12 +21,12 @@ module Phi
         "#<#{self.class.name}:#{term}>"
       end
 
-      private
-
       def next_term
         Node.new(html.css(selector)).anchor.attr("href")[6..-1]
       end
 
+      private
+
       def selector
         %q{#mw-content-text > p:first}# > a:first[href^='/wiki']}
       end

data/lib/phi/losophy/pages.rb

@@ -3,32 +3,17 @@ module Phi
     class Pages
       include Enumerable 
       extend Forwardable
-      
+      prepend Logger
+
       attr_reader :losophy, :pages, :browsed
 
       def initialize(losophy)
         @losophy = losophy
         @pages   = []
-        @browsed = []
       end
 
       def each 
-        until current_page.philosophy?
-          if browsed?
-            puts "#{current_page.term} has entered ani infinite loop and will not hit philosophy"
-            puts "The Philosophy Index in this case will reflect the pages from #{term} to the loop causing #{current_page.term}"
-            break
-          else 
-            puts "Now browsing #{current_page.term}"
-            yield self.next
-            guard_max_pages!
-          end
-        end
-          puts "Found Philosophy" unless browsed? 
-      end
-
-      def browsed?
-        browsed.include? current_page.term
+        yield self.next until current_page.philosophy?
       end
 
       def current_page
@@ -36,12 +21,13 @@ module Phi
       end
 
       def next
-        browsed << current_page.term
+        infinite_loop!
+        max_pages!
         self.current_page = current_page.next
       end
 
       private
- 
+
       def_delegators :losophy, :term, :connection
 
       def first_page
@@ -52,12 +38,18 @@ module Phi
         pages << @current_page = page
       end
 
-      def guard_max_pages!
-        return if pages.count <= Phi.max
-        raise MaximumPages.new("max pages (#{pages.count}) have been crawled")
+      def max_pages!
+        return if pages.count < Phi.max
+        raise MaximumPages.new("Max pages (#{pages.count}) have been crawled")
+      end
+
+      def infinite_loop!
+        return unless pages.map(&:term).include? current_page.next_term
+        raise InfiniteLoop.new("#{current_page.next_term} would enter an infinite loop and will not hit philosophy")
       end
 
       MaximumPages = Class.new(StandardError)
+      InfiniteLoop = Class.new(StandardError)
     end
   end
 end

data/lib/phi/version.rb

@@ -1,3 +1,3 @@
 module Phi
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/spec/phi/losophy_spec.rb

@@ -9,7 +9,7 @@ describe Phi::Losophy do
   end
 
   it "can calculate the index" do 
-    expect(instance.index).to eq 19
+    expect(instance.index).to eq 18
   end
 
   it "injects the term correctly" do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phi
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Lee Wangenheim
@@ -10,90 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.32'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.32'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -106,8 +106,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,6 +116,7 @@ files:
 - lib/phi.rb
 - lib/phi/cli.rb
 - lib/phi/losophy.rb
+- lib/phi/losophy/logger.rb
 - lib/phi/losophy/page.rb
 - lib/phi/losophy/page/node.rb
 - lib/phi/losophy/pages.rb
@@ -135,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line function to output the Philosophy Index of a Wikipedia article.