mw_dictionary_api 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f489f6fae5b0f1b982015d98eca2fe4ebb4a2c
-  data.tar.gz: b7d1b0ac8af7932169d75b7ba5a40c6b0ff63605
+  metadata.gz: fde666fe3da63ac495854526b7290e75c88139d0
+  data.tar.gz: 8c495dedbdec5aea75ded362b8286ad615744daf
 SHA512:
-  metadata.gz: efb2c50f4c1d612e36b1077c0455bde9bfd4df2c3b0e1b8225d8536c8a613557ae5aa12f9b35001262d86cc38c5aae17f5fe3999574616d69bef9f36b354c803
-  data.tar.gz: 2a72daf3bcbf6a2e2e4471cb6ca7c528b0193e616d07ecd91adceadd70bde7fb1403c4cf6fe5f1bb782de55148d5c30f789a3eabfbd21d24ce83c6adc7db71c7
+  metadata.gz: be5bfd04c8bc8a3d16317ee28fa398efcf0f6a45a200c0c0eacceb8ffe66f907ff84a32a8b42258477f4ecab276c05f0e240481e16d714adc48eab0fe3974631
+  data.tar.gz: 17e34ff4252c94e7c927bba6cf22212a21ade65ee34edf4cf88958dbb54584c6aa8024362e7ecbc26af221be956185103aa7e1496e90208c11363c651676b67c

data/lib/mw_dictionary_api/parsers/entry_parser.rb

@@ -49,15 +49,28 @@ module MWDictionaryAPI
       end
 
       rule :inflections do |data, opts|
-        data.xpath("in//il | in//if").each_slice(2).inject([]) do |hashes, nodes|
-          hash = Hash[nodes.map {|n| n.name.to_sym}.zip(nodes.map {|n| n.content})]
-          hash[:il] = hashes[-1][:il] if hashes[-1] and hash[:il] == "or"
-          hashes << hash
-        end.inject({}) do |inflections, hash|
-          inflections[hash[:il].to_sym] ||= []
-          inflections[hash[:il].to_sym] << hash[:if].gsub(/\W/, "")
+        inflections = data.xpath("in").inject([]) do |inflections, in_node|
+          hash = {}
+          in_node.xpath("il | if").each do |node|
+            if node.name == "il"
+              hash[:inflection_label] = node.content
+            else
+              hash[:inflected_form] = node.content.gsub(/\W/, "").force_encoding("UTF-8")
+            end
+
+            if hash.has_key? :inflected_form
+              inflections << hash
+              hash = {}
+            end
+          end
           inflections
         end
+        inflections.each_index do |index|
+          if inflections[index][:inflection_label] == "or"
+            inflections[index][:inflection_label] = inflections[index-1][:inflection_label] if index > 0
+          end
+        end
+        inflections
       end
 
       rule_helpers do

data/lib/mw_dictionary_api/result.rb

@@ -13,7 +13,7 @@ module MWDictionaryAPI
       @api_type = api_type
       @response_format = response_format
       @parser_class = parser_class
-      
+
       parse!
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mw_dictionary_api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Frank Liu