mw_dictionary_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71845ea8f9e79128fd3851c7e2ea05867a0bdacd
-  data.tar.gz: 443aeee9ab04ed732822be7ccbdf4a7c858502b7
+  metadata.gz: 6c0a032dc9f83f3f619e4634d5e490de763ce307
+  data.tar.gz: dc21f9e934ba63cb7c5880661640387f7c61e3c9
 SHA512:
-  metadata.gz: 50a33b9326cdc6ad1beb9988e4622aa92caca54288dcbbee10e9ae5ba277249378b92de05df52de00569f78f4954a235d8b025316f74df43d8220cf9e9af2721
-  data.tar.gz: e0688e891cff8ec2d9a98634af147d8ab8875d9d23454cd3d6713769c29dfa7e1e16732d210a6a4ff9baf74eb67643e8da218c21d4d4e295bab529991882ca62
+  metadata.gz: df07b1c422d469841af3e73ed9500ab8f4791dc3d795ff9d56670b8658ad766530ee17500efd982f5ddd759055d17126665bcae03382e23e4c37734c1fc70bf3
+  data.tar.gz: 3cfb25667455592822ffb65cc5f6d8f536bfda9601fc945aa8b533e5bd07644666220f907f3d90ebe611ac60c7bbb58bfd297b9cf03f1f7ebb5b0122489d6a01

data/lib/mw_dictionary_api/parsers/definition_parser.rb

@@ -28,19 +28,31 @@ module MWDictionaryAPI
 
       rule :text do |data, opts|
         dt_without_vi = data[:dt].dup
-        dt_without_vi.css("vi").remove
-        dt_without_vi.content.strip
+        if dt_without_vi.respond_to? :css
+          dt_without_vi.css("vi").remove
+          dt_without_vi.content.strip
+        else
+          ""
+        end
       end
 
       rule :verbal_illustration do |data, opts|
-        data[:dt].at_css("vi").content if data[:dt].at_css("vi")
+        if data[:dt].respond_to? :at_css
+          data[:dt].at_css("vi").content if data[:dt].at_css("vi")
+        else
+          ""
+        end
       end
 
       rule :cross_reference do |data, opts|
-        data[:dt].xpath("sx").inject([]) do |xrefs, sx|
-          xrefs << sx.content
+        if data[:dt].respond_to? :xpath
+          data[:dt].xpath("sx").inject([]) do |xrefs, sx|
+            xrefs << sx.content
+          end
+        else
+          []
         end
       end
     end
   end
-end
+end

data/lib/mw_dictionary_api/parsers/entry_parser.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'ostruct'
 
 module MWDictionaryAPI
   module Parsers
@@ -38,14 +39,27 @@ module MWDictionaryAPI
       end
 
       rule :definitions do |data, opts|
-        # here we assume 
-        # 1. sense number (sn) alway appear before a definition (dt) in pairs
-        # 2. definition (dt) appear by itself
-        data.xpath("def//sn | def//dt").each_slice(2).inject([]) do |definitions, nodes|
-          hash = Hash[nodes.map {|n| n.name.to_sym}.zip(nodes.map {|n| (n.name == 'sn') ? n.content : n })]
+        nodes = data.xpath("def//sn | def//dt")
+
+        # first step we will add dummy nodes if the list of nodes is not
+        # strictly sn/dt pairs
+        nodes = add_dumy_nodes(nodes) if nodes.count % 2 != 0
+
+        # data.xpath("def//sn | def//dt")
+        nodes.each_slice(2).inject([]) do |definitions, nodes|
+          names = nodes.map { |n| n.name.to_sym }
+          values = nodes.map do |node|
+            if node.content
+              (node.name == 'sn') ? node.content : node
+            else
+              nil
+            end
+          end
+          hash = Hash[names.zip(values)]
           hash[:prev_sn] = definitions[-1][:sense_number] if definitions[-1]
           definitions << DefinitionParser.new(parser_options(opts)).parse(hash)
-        end  
+        end
+
       end
 
       rule :inflections do |data, opts|
@@ -81,7 +95,39 @@ module MWDictionaryAPI
         def parse_entity(data, tag)
           data.at_css(tag).content if data.at_css(tag)
         end
+
+        def add_dumy_nodes(nodes)
+          temp = []
+          previous_sense_number = nil
+          nodes.each do |node|
+            if temp.count == 0
+              if node.name != 'sn'
+                temp << OpenStruct.new(name: 'sn', content: '0')
+                previous_sense_number = '0'
+              else
+                previous_sense_number = node.content
+              end
+              temp << node
+            else
+              if temp[-1].name == 'sn'
+                if node.name == 'sn'
+                  temp << OpenStruct.new(name: 'dt', content: '')
+                  previous_sense_number = node.content
+                end
+                temp << node
+              else
+                if node.name == 'dt'
+                  temp << OpenStruct.new(name: 'sn', content: previous_sense_number)
+                else
+                  previous_sense_number = node.content
+                end
+                temp << node
+              end
+            end
+          end
+          temp
+        end
       end
     end
   end
-end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mw_dictionary_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Frank Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: A Simple Way to Query Merriam Webster Dictionary API
@@ -48,10 +48,10 @@ files:
 - lib/mw_dictionary_api/client.rb
 - lib/mw_dictionary_api/memory_cache.rb
 - lib/mw_dictionary_api/parsable.rb
-- lib/mw_dictionary_api/result.rb
-- lib/mw_dictionary_api/parsers/result_parser.rb
-- lib/mw_dictionary_api/parsers/entry_parser.rb
 - lib/mw_dictionary_api/parsers/definition_parser.rb
+- lib/mw_dictionary_api/parsers/entry_parser.rb
+- lib/mw_dictionary_api/parsers/result_parser.rb
+- lib/mw_dictionary_api/result.rb
 homepage: https://github.com/gniquil/mw_dictionary_api
 licenses:
 - MIT
@@ -62,17 +62,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.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Merriam Webster Dictionary API