oald_parser 0.2 → 0.2.1

data/lib/oald_parser/page_parser.rb

@@ -25,8 +25,10 @@ module OaldParser
   class PageParser
     def parse(page)
       parsed = Nokogiri::HTML(page)
-      if blocks_on_page?(parsed)
+      if blocks_on_page? parsed
         Page.new(parse_block(parsed), [])
+      elsif def_on_page? parsed
+        Page.new([], parse_def(parsed))      
       else
         Page.new([], parse_items(parsed))
       end
@@ -37,6 +39,10 @@ module OaldParser
       page.css('div.sd-g').first
     end
 
+    def def_on_page?(page)
+      page.css('div.h-g').first
+    end
+
     def parse_block(page)
       block_nodes = page.css('div.sd-g')
       block_nodes.collect do |block|
@@ -50,15 +56,26 @@ module OaldParser
       item_nodes = block.css('span.n-g')
       item_nodes.collect do |item|
         item_text = all_except(item, 'x-g')
-        example_nodes = item.css('span.x-g')
-        examples = example_nodes.collect{|e| e.text.strip}
-        Item.new(item_text, examples)
+        Item.new(item_text, parse_examples(item))
       end      
     end
 
+    def parse_def(page)
+      item_nodes = page.css('div.h-g')
+      item_nodes.collect do |item|
+        item_text = item.css('div.def_block').first.text.strip
+        Item.new(item_text, parse_examples(item))
+      end        
+    end
+
+    def parse_examples(item)
+      example_nodes = item.css('span.x-g')
+      example_nodes.collect{|e| e.text.strip}
+    end
+
     def all_except(item, class_name)
       elements = item.children.find_all do |c|
-        !(c.name == 'span' && c[:class] == class_name)
+        !(['span', 'div'].include?(c.name) && c[:class] == class_name)
       end
       elements.collect{|e|e.text}.join('').strip
     end

data/lib/oald_parser.rb

@@ -8,7 +8,7 @@ require_relative 'oald_parser/page_parser'
 #include OaldParser
 #
 #downloader = PageDownloader.new("http://www.oxfordadvancedlearnersdictionary.com/dictionary")
-#page = downloader.download("surface")
+#page = downloader.download("prevent")
 #parser = PageParser.new
 #parsed = parser.parse(page)
 #formatter = Formatter.new(items: 15)

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Victor Savkin
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +11:00
+date: 2010-05-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency