camdict 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 556f016868d71a2d1dde23319a9d59dfa60ba05c
-  data.tar.gz: cb0090a31d8f56da0d366819f0de47309d9d5dfa
+  metadata.gz: 9375049d96a36f304ae7262da7047f6c4d6e0402
+  data.tar.gz: a1256a02286a23bbd204bb0cd5de8a5670c5d12b
 SHA512:
-  metadata.gz: 3c110ea5cfe31a35bd69952f983669377a577aa1f7960ac7f69dd7d073d25ff6ff2f031b4a9ba9aa7190b169ded33dba3b06df70788bccb17be77fb93cb1196f
-  data.tar.gz: dda29ecc637f0550bddfd78b23071210649e8c9aa2d58dbc34cf14b764ec0f7e92bc5c917182bd73a4da0e62516c7cdf03dac647c1b30ce5e584ae30fba54604
+  metadata.gz: 857e3d9ee01bdf43511371ec3f1b6bf6df45185f4078e2e1e245243307322a85b9e3bda3b2a77523fa3884b14dd27c62541c1d27a02d718b447e750546bdbf02
+  data.tar.gz: b69da41647e14adefa47ee049df7b7967354f212479e6b3669d3c4e19e6a8385ae6222bd2df73becb745e3758af6e62df75c1652286f3cde459d5c796964f5d4

data/lib/camdict/client.rb

@@ -10,10 +10,11 @@ module Camdict
   # are not included.
   class Client
 
-    # Default dictionary is british. Other possible +dict+ values: 
-    # american-english, business-english, learner-english.
+    # Default dictionary is english-chinese-simplified. 
+    # Other possible +dict+ values: 
+    # british, american-english, business-english, learner-english.
     def initialize(dict=nil)
-      @dictionary = dict || "british"
+      @dictionary = dict || "english-chinese-simplified"
     end
     
 

data/lib/camdict/definition.rb

@@ -352,7 +352,24 @@ module Camdict
         if short[-1] == '-'
           center = short[1, slen-2]
           position = full.index(center[0])
-          # match left 
+          # match left and right
+          if full.index(center[-1])
+            left_matched_index  = position
+            right_matched_index = flen-1 - full.index(center[-1])
+            rev_number = center.length - (right_matched_index - 
+                                          left_matched_index + 1)
+            if left_matched_index && rev_number <= 0
+              right_index = mix_spi(basesp, right_matched_index+1..flen-1)
+              rev_right_index = revise_index(right_index, rev_number)
+              findex = mix_spi(basesp, 0..left_matched_index-1,
+                               ussp, left_matched_index+1,
+                               rev_right_index, 0)
+              ret = full[0..left_matched_index-1] + center + 
+                full[right_matched_index+1..flen-1]
+              return {baseipa: ret, sindex: findex}
+            end
+          end
+          # match left only
           if position && (slen - 2 < flen - 1 - position)
             findex = mix_spi(basesp, 0..position-1, ussp, position-1, 
               basesp, position+slen-2..flen-1)
@@ -360,7 +377,7 @@ module Camdict
             return {baseipa: ret, sindex: findex}
           end
           position = full.index(center[-1])
-          # match right
+          # match right only
           if position && (position + 1 > slen - 2)
             findex = mix_spi(basesp, 0..position-slen+2, ussp, position-slen+2,
               basesp, position+1..flen-1)
@@ -414,6 +431,22 @@ module Camdict
       end
     end
 
+    # +superscript_index+ is the superscript index for an IPA
+    # +rev_number+ is the number that is used to revise the superscript index
+    # after the common part of a us shorten ipa is joined with uk ipa, the 
+    # remainding part requires to be revised as it becomes longer or shorter.
+    # return the revised superscript_index or nil if the passed
+    # +superscript_index+ is nil.
+    def revise_index(superscript_index, rev_number)
+      return nil if superscript_index.nil?
+      ret = []
+      superscript_index.each_pair { |position, len|
+        ret += [position+rev_number, len]
+      }
+      return nil if ret.empty?
+      ret
+    end
+
     # Determine whether or not the range is included by the superscript index.
     # Return the pair of index array when it is included by that. Or return nil.
     def at_range(spindex, range) 

data/test/itest_client.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class ClientiTest < Test::Unit::TestCase
+  class ClientiTest < Minitest::Test
     def test_fetch
       c = Camdict::Client.new
       result = c.send :fetch, "pppppp"

data/test/itest_definition.rb

@@ -1,13 +1,14 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class DefinitioniTest < Test::Unit::TestCase
+  class DefinitioniTest < Minitest::Test
 
     def test_part_of_speech
       data = {'aluminium' => 'noun', 'aluminum' => 'noun', 
         'look at sth' => 'phrasal verb', 'plagiarist' => 'noun', 
-        'pass water' => 'idiom', 'ruby' => ['noun', 'adjective']}
+        'pass water' => 'idiom', 'ruby' => 'noun'}
+      # adjective for ruby exists in British dictionary
       data.each_pair { |word, exp_result|
         w = Camdict::Word.new(word)
         defa = w.definitions
@@ -31,33 +32,33 @@ module Camdict
       imaginary = {
         :word     => "imaginary",
         :uk_utf8  => %w(26a 2c8 6d e6 64 292 2e 26a 2e 6e 259 72 2e 69),
-        :expected => %w(26a 2c8 6d e6 64 292 2e 259 2e 6e 65 72 2e 69),
+        :us_utf8  => %w(26a 2c8 6d e6 64 292 2e 259 2e 6e 65 72 2e 69),
         :uk_inx   => [10,1],
-        :spiexp   => nil,
+        :us_inx   => nil,
         :which    => 0
       }
       plagiarism = {
         :word     => "plagiarism",
         :uk_utf8  => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 26a 2e 7a 259 6d),
-        :expected => %w(2c8 70 6c 65 26a 2e 64 292 25a 2e 26a 2e 7a 259 6d),
+        :us_utf8  => %w(2c8 70 6c 65 26a 2e 64 292 25a 2e 26a 2e 7a 259 6d),
         :uk_inx   => [8,1,14,1],
-        :spiexp   => [13,1],
+        :us_inx   => [13,1],
         :which    => 0
       }
       aluminum = {
         :word     => "aluminum",
         :uk_utf8  => %w(259 2c8 6c 75 2d0 2e 6d 26a 2e 6e 259 6d),
-        :expected => %w(259 2c8 6c 75 2d0 2e 6d 26a 2e 6e 259 6d),
+        :us_utf8  => %w(259 2c8 6c 75 2d0 2e 6d 26a 2e 6e 259 6d),
         :uk_inx   => nil,
-        :spiexp   => nil,
+        :us_inx   => nil,
         :which    => 0
       }
       sled = {
         :word     => "sled",
         :uk_utf8  => nil,
-        :expected => nil,
+        :us_utf8  => nil,
         :uk_inx   => nil,
-        :spiexp   => nil,
+        :us_inx   => nil,
         :which    => 1
       }
       data = [imaginary, plagiarism, aluminum, sled]
@@ -71,10 +72,10 @@ module Camdict
         us = us.unpack('U*').map { |n| n.to_s 16 } if us
         actk = defo.ipa.k
         acts = defo.ipa.s
-        assert_equal d[:uk_utf8], uk 
-        assert_equal d[:expected], us
-        assert_equal d[:uk_inx], actk
-        assert_equal d[:spiexp], acts
+        assert_equal d[:uk_utf8], uk, "#{d[:word]} uk ipa got a problem"
+        assert_equal d[:us_utf8], us, "#{d[:word]} us ipa got a problem"
+        assert_equal d[:uk_inx], actk, "#{d[:word]} uk superscript index issue"
+        assert_equal d[:us_inx], acts, "#{d[:word]} us superscript index issue"
       }
     end
 

data/test/itest_explanation.rb

@@ -1,16 +1,17 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class ExplanationiTest < Test::Unit::TestCase
+  class ExplanationiTest < Minitest::Test
     def test_explanations
       w = Camdict::Word.new('correct')
       defa = w.definitions
       def1 = defa.first #first is adjective
       e1 = def1.explanations.first
-      assert_equal "A2", e1.level
-      assert_equal "B2", defa.last.explanations.first.level
-      assert_equal "I've got 30 exam papers to correct.", 
+      #todo: level info is not in english-chinese-simplied dictionary
+      #assert_equal "A2", e1.level
+      #assert_equal "B2", defa.last.explanations.first.level
+      assert_equal "I've got thirty exam papers to correct.", 
         defa.last.explanations.first.examples.last.sentence
       w = Camdict::Word.new('correctly')
       defa = w.definitions
@@ -18,7 +19,7 @@ module Camdict
       e1 = def1.explanations
       assert_equal "Have I pronounced your name correctly?", 
         e1[2].examples[0].sentence
-      assert_equal "B1", e1[2].level
+      #assert_equal "B1", e1[2].level
     end
 
     def test_phrase_meaning

data/test/test_client.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
@@ -10,11 +10,11 @@ module Camdict
 </ul>
 EoHTM
 
-  class ClientTest < Test::Unit::TestCase
+  class ClientTest < MiniTest::Test
 
     def test_new
       c = Camdict::Client.new
-      assert c.instance_eval { @dictionary == "british" }
+      assert c.instance_eval { @dictionary == "english-chinese-simplified" }
       c = Camdict::Client.new("american-english")
       assert c.instance_eval { @dictionary == "american-english" }
     end
@@ -55,7 +55,7 @@ EoHTM
     end
 
     def test_di_head
-      # Nokogiri version 1.? and later required for this test case
+      # Nokogiri version 1.6.2 and later required for this test case
       # but previous versions should also work with camdict
       # you won't see this test case failure once 
       # https://github.com/sparklemotion/nokogiri/pull/1020 is released.

data/test/test_common.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class CommonTest < Test::Unit::TestCase
+  class CommonTest < Minitest::Test
     include Camdict::Common
 
     def test_flatten
@@ -39,9 +39,11 @@ module Camdict
         'the other end of sth']
       assert_equal expected, str.flatten
       strs = ["20/20 vision", "public enemy number one/no. 1"]
-      assert_nothing_raised do
-        strs.each { |s| s.flatten }
-      end
+      # todo: 
+      # "20/20 vision".flatten => "20/20 vision" no change expected
+      # public enemy number one/no. 1 =>
+      #   public enemy number one
+      #   public enemy no. 1
       str = "the more...the more/less"
       expected = ['the more...the more', 'the more...the less']
       assert_equal expected, str.flatten

data/test/test_definition.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
@@ -13,7 +13,7 @@ module Camdict
     '<span class="runon-info"><span class="posgram"><span class="pos">noun' +
     '</span></span></span></span>'
 
-  class DefinitionTest < Test::Unit::TestCase
+  class DefinitionTest < Minitest::Test
 
     def test_pos
       html = '<h2 class="di-title cdo-section-title-hw">favourite</h2>' +
@@ -141,6 +141,14 @@ module Camdict
         :uk_inx   => [10,1],
         :spiexp   => nil 
       }
+      plagiarism = {
+        :uk_utf8  => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 61 26a 7a),
+        :us_utf8  => %w(2d 64 292 259 72 2e 26a 2e 7a 259 6d),
+        :expected => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 26a 2e 7a 259 6d),
+        :us_inx   => [3,1,9,1],
+        :uk_inx   => [8,1],
+        :spiexp   => [8,1,14,1]
+      }
       # left hyphen
       plagiarize = {
         :uk_utf8  => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 61 26a 7a),
@@ -150,14 +158,6 @@ module Camdict
         :uk_inx   => [8,1],
         :spiexp   => nil 
       }
-      plagiarism = {
-        :uk_utf8  => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 61 26a 7a),
-        :us_utf8  => %w(2d 64 292 259 72 2e 26a 2e 7a 259 6d),
-        :expected => %w(2c8 70 6c 65 26a 2e 64 292 259 72 2e 26a 2e 7a 259 6d),
-        :us_inx   => [3,1,9,1],
-        :uk_inx   => [8,1],
-        :spiexp   => [8,1,14,1]
-      }
       painting = {
         :uk_utf8  => %w(2c8 70 65 26a 6e 2e 74 26a 14b),
         :us_utf8  => %w(2d 74 32c 26a 14b),

data/test/test_explanation.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class ExplanationTest < Test::Unit::TestCase
+  class ExplanationTest < Minitest::Test
 
     def test_get_level
       html = '<span class="def-info"><span class="epp-xref B1">B1</span>'

data/test/test_http_client.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'camdict'
 
 module Camdict
-  class HTTPClientTest < Test::Unit::TestCase
+  class HTTPClientTest < Minitest::Test
     
     def test_get_html
       require 'webrick'

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: camdict
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Pan Gaoyong
-- 潘高勇
+- "潘高勇"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 description: Get definitions, pronunciation and example sentences of a word or phrase
   from the online Cambridge dictionaries.
 email: pan.gaoyong@gmail.com
@@ -32,24 +32,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- license
-- Rakefile
 - README.md
+- Rakefile
 - lib/camdict.rb
-- lib/camdict/http_client.rb
+- lib/camdict/client.rb
+- lib/camdict/common.rb
 - lib/camdict/definition.rb
 - lib/camdict/explanation.rb
-- lib/camdict/common.rb
+- lib/camdict/http_client.rb
 - lib/camdict/word.rb
-- lib/camdict/client.rb
-- test/itest_explanation.rb
-- test/test_common.rb
+- license
 - test/itest_client.rb
 - test/itest_definition.rb
-- test/test_definition.rb
-- test/test_http_client.rb
+- test/itest_explanation.rb
 - test/test_client.rb
+- test/test_common.rb
+- test/test_definition.rb
 - test/test_explanation.rb
+- test/test_http_client.rb
 homepage: https://github.com/pan/camdict
 licenses:
 - MIT
@@ -60,18 +60,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: online Cambridge dictionary client
-test_files: []
+test_files:
+- test/itest_explanation.rb
+- test/test_common.rb
+- test/itest_client.rb
+- test/itest_definition.rb
+- test/test_definition.rb
+- test/test_http_client.rb
+- test/test_client.rb
+- test/test_explanation.rb