wiki-yggdrasil 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d98f4adb30690fdb9cdfaf32ca421661a505f0d9205bf562da1803883778264
-  data.tar.gz: dbe00e299a43054e3689dab547f8af00fe206939f3fd2499e403c8dcdf60b19e
+  metadata.gz: bc95b7532698990234e748a8b3ba5753e6d9a6b129a14c292ca99c17f6fcdfd4
+  data.tar.gz: af3575d78d2f1cc313ab38bda507bc09227942fbaded2dd8127eab3316aeca6d
 SHA512:
-  metadata.gz: 9654979e2f9dbdcd22faf165a99153d5961be2cf194ca5be8a18491fc5cc436646ddbbab9876ffe9aeff6c7a1d1bfa94056c83603d6f7e1991ee7b633f2486f4
-  data.tar.gz: cc9cd17f77311fbb7a4792f04d0cba54561b9d29a1d3ba6ed18a712e09ddc6f0d39cfc4c0845db6b214f6f6da1b3ced7670495c8e1e971c404b34affc31be505
+  metadata.gz: b93fab2fd30a9a1e2b778f82f0c2b3103cc0f4f15277d34bb36b245a5becdc71ff97172daaa275bd38c1d0f2ee8b295239053dae9885f1d3634d98daf4aa1041
+  data.tar.gz: f887259620bf814d809b4c301ba595eaace9c51bac4d6e8ee65242df973566df13f26e5ee5c0c85cfd2c14f0feed5efb76419211a5fe2f4d25fc3ea33ddec8e7

data/.ruby-version

@@ -0,0 +1 @@
+2.6.1

data/README.md

@@ -1,10 +1,6 @@
 # Wiki::Yggdrasil
 ![Travis CI Build](https://travis-ci.org/alex0112/wiki-yggdrasil.svg?branch=master)
 
-You.  You're up late at night again reading up on some obscure mathematical topic.  You find yourself with *so many* open tabs on Wikipedia.  Wouldn't it be nice if you could just pick an article, and then view a tree of the articles it references?
-
-Introducing Wiki::Yggdrasil.  Named after the tree in Norse mythology that drinks from the well of all wisdom, Wiki::Yggdrasil is here to help you drink just as deeply from the well of wisdom that is Wikipedia.
-
 Wiki::Yggdrasil takes a Wikipedia URI as an argument, and proceeds to spider out a dependency tree of referenced articles.
 
 ## Usage
@@ -38,10 +34,7 @@ The preceeding code produces a structure as follows:
 {:name=>"Ragnarök", :children=>[]}
 ```
 
-## FAQ
-
-### This is taking a long time.  Is that normal?
-Yes.  This is normal. Any Yggdrasil object created with a depth of three or higher will likely take a few minutes to scrape the necessary information.
+_Note: Any Yggdrasil object created with a depth of three or higher will likely take a few minutes to scrape the necessary information._
 
 ## Installation
 

data/lib/wiki/article.rb

@@ -18,14 +18,15 @@ module Wiki::Yggdrasil
       @summary ||= Nokogiri::HTML(Nokogiri::HTML(open(self.uri)).to_s.split('<div id="toc" class="toc">')[0]).css('p') ## TODO: Cleanup
     end
 
-    def child_links
+    def child_links(help: false)
       formatted_links = format_links
-      validated_links =  formatted_links.select { |uri| Wiki::Yggdrasil::Article.is_valid_wiki_article?(uri: uri) }
+      validated_links = formatted_links.select { |uri| Wiki::Yggdrasil::Article.is_valid_wiki_article?(uri: uri) }
+      
       @child_links  ||= validated_links
     end
 
-    def scrape_all_summary_links
-      self.summary.css('p a')
+    def scrape_links(help_links: false) ## TODO test help_links param in spec
+      help_links ? self.summary.css('p a') : self.summary.css('p a[href!="/wiki/Help:IPA/English"]')
     end
 
     def name
@@ -33,16 +34,20 @@ module Wiki::Yggdrasil
       ## TODO: Cleanup
     end
     
-    def format_links(anchors: self.scrape_all_summary_links)
+    def format_links(anchors: self.scrape_links)
       uris = anchors.map do |anchor|
         anchor.nil? || anchor['href'].nil? ? next : 'https://en.wikipedia.org' << anchor['href'] ## nil href attributes are often self refs (but possibly not always). Ignore them.
+        ## TODO: take care of this in .scrape_links with a css selector (like the Help:IPA links)
       end
 
       uris.compact
     end
 
+    def self.remove_italic_tags(uri_list)
+      
+    end
+    
     def self.is_valid_wiki_article?(uri:)
-      ## Is this URI a wikipedia article?
       uri =~ /.*wikipedia\.org\/wiki\/.+/ ? true : false
     end
     

data/lib/wiki/yggdrasil.rb

@@ -13,26 +13,31 @@ module Wiki
       end
 
       def children(depth: 4, article_children: self.root.child_links)
-        get_children = lambda do |depth, article_children|
-          article_children.map do |uri|
-            article = Wiki::Yggdrasil::Article.new(uri: uri)
-            if (depth == 1)
-              {
-                name: article.name,
-                children: [],
-              }
-            else
-              {
-                name: article.name,
-                children: get_children.call(depth - 1, article.child_links),
-              }
-            end
+        @children ||= { name: self.root.name, children: recursive_scrape(depth: depth), index: 0, depth: 0 }
+      end
+
+      def recursive_scrape(depth: 1, children: @root.child_links)
+        children.each_with_index.map do |uri, index|
+          article = Wiki::Yggdrasil::Article.new(uri: uri)
+          if (depth == 1)
+            {
+              name: article.name,
+              index: index + 1,
+              level: depth,
+              children: [],
+            }
+          else
+            {
+              name: article.name,
+              index: index + 1,
+              level: depth,
+              children: recursive_scrape(depth - 1, article.child_links),
+            }
           end
         end
-        
-        @children ||= { name: self.root.name, children: get_children.call(depth, article_children) }
       end
-
     end
+
   end
+
 end

data/lib/wiki/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 module Wiki
   module Yggdrasil
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/wiki-yggdrasil.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "nokogiri", "~> 1.8.2"
   
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "2.0.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiki-yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - alex0112
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -107,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Scrape Wikipedia articles and generate a json tree