morpher_inflecter 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDYyNGM0NzQyMTJjMWFkY2FkNGI5MWVhZDNlNWI2NjAyM2I0YWViMw==
-  data.tar.gz: !binary |-
-    NDliNTkyNzkyNjg1MjZmNzUxYWQzNWY4YmU2ZmEyMjVhNWU3NjA3YQ==
+SHA1:
+  metadata.gz: e7ff8832273fcc0b4df4c7d670b280144e172b01
+  data.tar.gz: 2b54567b82057bcc93748b5294f79950629bc4f6
 SHA512:
-  metadata.gz: !binary |-
-    ZmViMTczNTc0ZTAyZGRiZTViMDQ4MjhlOGRmN2I2MmI3YjcxMTZmMDhjYmNl
-    MTJjM2I4NjQyZWI5MGY0ZmJiMzY0YWMzMzkxMjkyN2RjZWRkYjhkYzk3NjYy
-    NmI3OTI2Mjg2MWJiYjU4NWVlMDIwYTMwMzFiYzRmNDczMDA1OGY=
-  data.tar.gz: !binary |-
-    NmQzYWE1ZTI3NzljNmYyOWRjY2RhYTc0YmVhYTY3MDAyNjNhZGUzZWFjNzg1
-    ZGMzMzBhMTMwNDdlYWQ1YTk3NzczOTUxNDY4OWU1NzMyMjI4ZjM1MjZhNGVh
-    M2EyNWQwMzNjODM4YzU3NTYxYTg1YmUzNjgwZGI1ODI4OGNiYzA=
+  metadata.gz: 251630f8c3b435f0911012533f0179e1560a5a361619d09812c7bb3515fb8dc66b0b8cd3e2513a62ad3c6bc46fa67bd2c1b11a5cb9c246d76f365bb85f44f934
+  data.tar.gz: f18e10cefbccdde0ebf9ccf219af3c42d6648d38b56dfaa463455d0a801141f280f721a2f40f9823900c25aab78ff90032da148c074055a422b65890edb90f28

data/lib/morpher_inflecter/version.rb

@@ -1,3 +1,3 @@
 module MorpherInflecter
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/morpher_inflecter.rb

@@ -3,23 +3,44 @@
 require "morpher_inflecter/version"
 require 'rubygems'
 require 'open-uri'
-require 'nokogiri'
+require 'json'
 
 module MorpherInflecter
+  URL = 'https://ws3.morpher.ru/russian/declension'.freeze
+
   # Падежи
   CASES = %w(И Р Д В Т П)
 
+  ERROR_CODES = {
+    "402" => ["1", "Превышен лимит на количество запросов в сутки. Перейдите на следующий тарифный план."],
+    "403" => ["3", "IP заблокирован."],
+    "495" => ["4", "Склонение числительных в declension не поддерживается. Используйте метод spell."],
+    "496" => ["5", "Не найдено русских слов."],
+    "400" => ["6", "Не указан обязательный параметр s."],
+    "402" => ["7", "Необходимо оплатить услугу."],
+    "498" => ["9", "Данный token не найден."],
+    "497" => ["10", "Неверный формат токена."],
+    "500" => ["11", "Ошибка сервера."],
+    "494" => ["12", "Указаны неправильные флаги."]
+  }
+
   # Класс для получения данных с веб-сервиса Морфера.
   class Inflection
-    def get(text, login = nil, password = nil)
-      url = 'http://morpher.ru/WebService.asmx/GetXml?'
-      options = { :s => text }
-      if login and password
-        options[:username] = login
-        options[:password] = password
+    def get(text, token = nil)
+      params = { s: text }
+      params[:token] = token if token
+
+      uri = URI(MorpherInflecter::URL)
+      uri.query = URI.encode_www_form(params)
+
+      JSON.parse( open(uri, 'Accept' => 'application/json').read )
+
+    rescue OpenURI::HTTPError => ex
+      error = { error: ex.message.strip }
+      if code = MorpherInflecter::ERROR_CODES[ex.message.strip]
+        error.merge!(code: code[0], message: code[1])
       end
-      url = url + URI.encode(options.map{|key, val| "#{key}=#{val}"}.join('&'))
-      Nokogiri.XML(open(url)) rescue nil
+      error
     end
   end
 
@@ -28,34 +49,33 @@ module MorpherInflecter
 
   # Возвращает хэш склонений в следуюшем формате
   # {:singular => [], :plural => []}
-  # Если слово не найдено в словаре или произошла ошибка, будет возвращен код ошибки {:error => XXX}
-  def self.inflections(word)
-    inflections = {}
+  # Если слово не найдено в словаре или произошла ошибка, будет возвращен код ошибки { error: "XXX", code: "Y", message: 'error message' }
+  def self.inflections(word, options = {})
 
     lookup = cache_lookup(word)
     return lookup if lookup
+    resp = Inflection.new.get(word, options[:token])
+    inflections = {}
 
-    doc = Inflection.new.get(word)
-
-    return nil if doc.nil?
-
-    unless doc.xpath('error/code').empty?
-      inflections[:error] = doc.xpath('error/code').text.to_i
+    if resp[:error]
+      inflections = resp
     else
-      singular = true unless doc.search('множественное').empty?
+      plural_only = resp['множественное'].nil?
+
+      inflections[:singular] = [] unless plural_only
+      inflections[:plural] = []
 
       CASES.each do |_case|
-        nodes = doc.search(_case)
-        if singular == true
-          s = _case == 'И' ? word : nodes.first.text.to_s
-          p = nodes.last.text.to_s
+        i = _case == 'И' ? word : resp[_case]
+
+        if plural_only
+          inflections[:plural] << i
         else
-          p = _case == 'И' ? word : nodes.last.text.to_s
+          inflections[:singular] << i
+          inflections[:plural] << resp['множественное'][_case]
         end
-
-        (inflections[:singular]||=[]) << s if singular
-        (inflections[:plural]||=[])  << p if p
       end
+
       cache_store(word, inflections)
     end
 

data/morpher_inflecter.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.license = 'MIT'
   gem.require_paths = ["lib"]
 
   gem.has_rdoc = true
   gem.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
 
-  gem.add_dependency "nokogiri"
   gem.add_development_dependency "rspec", '2.6'
   gem.add_development_dependency "rake"
 end

data/spec/morpher_inflecter_spec.rb

@@ -4,102 +4,102 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe MorpherInflecter do
   before(:all) do
-    @singular_noun_answer = <<EOS
-<?xml version="1.0" encoding="utf-8"?>
-<xml xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://morpher.ru/">
-  <Р>рубина</Р>
-  <Д>рубину</Д>
-  <В>рубин</В>
-  <Т>рубином</Т>
-  <П>рубине</П>
-  <множественное>
-    <И>рубины</И>
-    <Р>рубинов</Р>
-    <Д>рубинам</Д>
-    <В>рубины</В>
-    <Т>рубинами</Т>
-    <П>рубинах</П>
-  </множественное>
-</xml>
-EOS
-    @singular_noun_inflection = {:singular=>["рубин", "рубина", "рубину", "рубин", "рубином", "рубине"], :plural=>["рубины", "рубинов", "рубинам", "рубины", "рубинами", "рубинах"]}
-
-    @plural_noun_answer = <<EOS
-<?xml version="1.0" encoding="utf-8"?>
-<xml xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://morpher.ru/">
-  <Р>рубинов</Р>
-  <Д>рубинам</Д>
-  <В>рубины</В>
-  <Т>рубинами</Т>
-  <П>рубинах</П>
-</xml>
-EOS
-    @plural_noun_inflection = {:plural=>["рубины", "рубинов", "рубинам", "рубины", "рубинами", "рубинах"]}
-
-    @error_answer =<<EOS
-<error>
-  <code>5</code>
-  <message>Не найдено русских слов.</message>
-</error>
-EOS
-    @error_code = {:error => 5}
+
+    @singular_noun_answer = '{
+  "Р": "рубина",
+  "Д": "рубину",
+  "В": "рубин",
+  "Т": "рубином",
+  "П": "рубине",
+  "множественное": {
+    "И": "рубины",
+    "Р": "рубинов",
+    "Д": "рубинам",
+    "В": "рубины",
+    "Т": "рубинами",
+    "П": "рубинах"
+  }
+}'
+
+    @singular_noun_inflection = {
+      singular: ["рубин", "рубина", "рубину", "рубин", "рубином", "рубине"],
+      plural: ["рубины", "рубинов", "рубинам", "рубины", "рубинами", "рубинах"]
+    }
+
+    @plural_noun_answer = '{
+  "Р": "рубинов",
+  "Д": "рубинам",
+  "В": "рубины",
+  "Т": "рубинами",
+  "П": "рубинах"
+}
+'
+    @plural_noun_inflection = { plural: ["рубины", "рубинов", "рубинам", "рубины", "рубинами", "рубинах"] }
+
+    @error = { error: "496", code: "5", message: "Не найдено русских слов." }
+
+
   end
 
   before(:each) do
-    @inflection = mock(:inflection)
+    @inflection = MorpherInflecter::Inflection.new
     MorpherInflecter::clear_cache
   end
 
   it "should return an hash of inflections for singular noun" do
-    @inflection.stub!(:get).and_return(parsed_xml(@singular_noun_answer))
+    @inflection.stub_chain(:open, :read).and_return(@singular_noun_answer)
     MorpherInflecter::Inflection.should_receive(:new).and_return(@inflection)
     MorpherInflecter.inflections("рубин").should == @singular_noun_inflection
   end
 
   it "should return an hash of inflections for plural noun" do
-    @inflection.stub!(:get).and_return(parsed_xml(@plural_noun_answer))
+    @inflection.stub_chain(:open, :read).and_return(@plural_noun_answer)
     MorpherInflecter::Inflection.should_receive(:new).and_return(@inflection)
     MorpherInflecter.inflections("рубины").should == @plural_noun_inflection
   end
 
   it "should return error when webservice returns error" do
-    @inflection.stub!(:get).and_return(parsed_xml(@error_answer))
+    exception_io = mock('io')
+    exception_io.stub_chain(:status,:[],:message)
+    @inflection.stub(:open).and_raise(OpenURI::HTTPError.new('496',exception_io))
     MorpherInflecter::Inflection.should_receive(:new).and_return(@inflection)
-    MorpherInflecter.inflections("рубин1").should == {:error => 5}
+    MorpherInflecter.inflections("рубин1").should == @error
   end
 
   it "should return nil when webservice does not return xml or connection failed" do
-    @inflection.stub!(:get).and_return(nil)
+    exception_io = mock('io')
+    exception_io.stub_chain(:status,:[],:message)
+    @inflection.stub(:open).and_raise(OpenURI::HTTPError.new('502',exception_io))
+
     MorpherInflecter::Inflection.should_receive(:new).and_return(@inflection)
-    MorpherInflecter.inflections("рубин").should == nil
+    MorpherInflecter.inflections("рубин").should == {error: '502'}
   end
 
   context 'Cache' do
     it "should cache successful lookups" do
-      @inflection.stub!(:get).and_return(parsed_xml(@singular_noun_answer))
+      @inflection.stub!(:get).and_return(parsed_json(@singular_noun_answer))
       MorpherInflecter::Inflection.should_receive(:new).once.and_return(@inflection)
 
       2.times { MorpherInflecter.inflections("рубин") }
     end
 
-    it "should NOT cache unseccussful lookups" do
-      sample = nil
-      @inflection.stub!(:get).and_return(sample)
+    it "should NOT cache unsuccessful lookups" do
+      @inflection.stub!(:get).and_return({error: "496"})
       MorpherInflecter::Inflection.should_receive(:new).twice.and_return(@inflection)
 
       2.times { MorpherInflecter.inflections("рубин") }
     end
 
-    it "should NOT cache unseccussful lookups" do
-      sample = parsed_xml(@singular_noun_answer)
+    it "should NOT cache unsuccessful lookups" do
+      sample = parsed_json(@singular_noun_answer)
       @inflection.stub!(:get).and_return(sample)
-     MorpherInflecter::Inflection.should_receive(:new).once.and_return(@inflection)
+      MorpherInflecter::Inflection.should_receive(:new).once.and_return(@inflection)
 
       2.times { MorpherInflecter.inflections("рубин") }
     end
 
     it "should allow to clear cache" do
-      sample = parsed_xml(@singular_noun_answer)
+      sample = parsed_json(@singular_noun_answer)
       @inflection.stub!(:get).and_return(sample)
       MorpherInflecter::Inflection.should_receive(:new).twice.and_return(@inflection)
 

data/spec/spec_helper.rb

@@ -3,6 +3,6 @@ require 'rspec'
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'morpher_inflecter'
 
-def parsed_xml(text)
-  Nokogiri::XML.parse(text)
+def parsed_json(text)
+  JSON.parse(text)
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: morpher_inflecter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Dmitry Penkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Morpher.ru inflections for russian proper and common nouns. Code inspired
@@ -61,8 +47,8 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -75,7 +61,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/dmitryp/morpher_inflecter/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -83,17 +70,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: morpher_inflecter
-rubygems_version: 2.1.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Morpher.ru webservice client (Russian language inflection)
@@ -101,3 +88,4 @@ test_files:
 - spec/morpher_inflecter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true