yandex_mystem 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c1c4fcbbbafd601e0457db5366a8d82639955d
-  data.tar.gz: 3da18f1e83a23747a51786fcda68b5ccd109dfb2
+  metadata.gz: 42ebc26d8af331ec4a606c2f7ed69a5a40239f7c
+  data.tar.gz: 4bb5b88a71900b0a1e52c15721aa3c9da910c81a
 SHA512:
-  metadata.gz: fdca784ffa0621fc345ffa080e00131c43db0ac86f14012082271ed378a1cfa32ff1145acfecb77ef2d336e8f6a8ed4e976375b81ed3fbedbfd94aaf7213ba97
-  data.tar.gz: 6fa8de5e45b069137e46165d6da1cd7d0209b297e85de996a30340d1171cf8d85eb1194787f0fa40bae12fbb4ccd92ecef0601462cfdc3e2e6664dbf9ff8f234
+  metadata.gz: b03f45bf62644835dc08b2900a96fd803d6988bc7a6ea628db32fca727b366c51c962b732996b4a7d6ad7345b4d160dad2668d856e17d206a56fa57409655682
+  data.tar.gz: e4e5b7739af721a1c5a4d9d9333f8899d875142b4922d81987557de14762c222727d7d1cd2ad5f73adc828a1165679e15e688dae09eb023212bb286c35cd5733

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.idea/
+.idea/
+.DS_Store

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.4

data/README.md

@@ -17,6 +17,8 @@ Mystem is a software that provided by the Yandex only for non-commercial project
 
     gem install yandex_mystem
 
+Current version is **3.0.1**
+
 ## License
 
 First of all, read license on http://api.yandex.ru/mystem/
@@ -31,8 +33,7 @@ This gem contains executables for there platforms:
 * Linux 3.5 32-bit
 * Linux 3.1 64-bit
 * Freebsd 9.0 64-bit
-
-Note: Mystem 3.0 not support Mac OS X, sorry.
+* Mac OS X
 
 ## Usage
 

data/lib/yandex_mystem.rb

@@ -3,7 +3,7 @@
 require 'open3'
 require 'yandex_mystem/version'
 require 'pathname'
-require 'json'
+require 'oj'
 
 module YandexMystem
   class Base    
@@ -36,13 +36,17 @@ module YandexMystem
         when /64.+linux$/
           'linux-64'
         when /darwin/
-          raise 'Mystem 3.0 does not support Max OS X.'
+          'osx'
         when /freebsd/
           'bsd'
         else
           raise 'Unknown OS'
         end
     end
+
+    def self.as_json(data)
+      Oj.load("[#{data.split("\n").join(',')}]", symbol_keys: true)
+    end
   end
 
   class Simple < Base
@@ -50,7 +54,14 @@ module YandexMystem
 
 
     def self.parse(data)
-      Hash[ JSON.parse('[' + data.split("\n").join(",") + ']', :symbolize_names => true).inject([]){|s, h| s + [[ h[:text], h[:analysis].map{|a| a[:lex]} ]]}  ]
+      Hash[
+        as_json(data).map do |h|
+          [
+            h[:text],
+            h[:analysis].map { |a| a[:lex] }
+          ]
+        end
+      ]
     end
   end
 
@@ -58,7 +69,7 @@ module YandexMystem
     ARGUMENTS = '-e utf-8 -ig -n --weight --format json --eng-gr'        
 
     def self.parse(data)
-      JSON.parse('[' + data.split("\n").join(",") + ']', :symbolize_names => true)
+      as_json(data)
     end    
   end
 end

data/lib/yandex_mystem/version.rb

@@ -1,3 +1,3 @@
 module YandexMystem
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'yandex_mystem'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 end

data/spec/yandex_mystem_spec.rb

@@ -3,36 +3,39 @@ require 'spec_helper'
 
 describe YandexMystem do
   context YandexMystem::Simple do
-    it "should stem words" do
+    it 'should stem words' do
       data = YandexMystem::Simple.stem("мальчики мальчиков девочки девочек компьютеров компьютере сов пошли elements")
-      data['мальчики'].should eq %w(мальчик)
-      data['мальчиков'].should eq %w(мальчик мальчиков мальчиковый)
-      data['девочки'].should eq %w(девочка)
-      data['девочек'].should eq %w(девочка)
-      data['сов'].should eq %w(сова)
-      data['пошли'].should eq %w(пойти посылать)
-      data['elements'].should eq []
+
+      expect(data['мальчики']).to eq %w(мальчик)
+      expect(data['мальчиков']).to eq %w(мальчик мальчиков мальчиковый)
+      expect(data['девочки']).to eq %w(девочка)
+      expect(data['девочек']).to eq %w(девочка)
+      expect(data['сов']).to eq %w(сова)
+      expect(data['пошли']).to eq %w(пойти посылать)
+      expect(data['elements']).to eq []
     end
     
-    it "should stem words in few lines" do
-      data = YandexMystem::Simple.stem(%[
-                                       
-                                       
-                                       мальчики 
-                                       мальчиков 
-                                      девочки девочек компьютеров компьютере сов пошли 
-                                      elements
-                                      
-                                      
-                                      
-                                      ])
-      data['мальчики'].should eq %w(мальчик)
-      data['мальчиков'].should eq %w(мальчик мальчиков мальчиковый)
-      data['девочки'].should eq %w(девочка)
-      data['девочек'].should eq %w(девочка)
-      data['сов'].should eq %w(сова)
-      data['пошли'].should eq %w(пойти посылать)
-      data['elements'].should eq []
+    it 'should stem words in few lines' do
+      data = YandexMystem::Simple.stem('
+        мальчики
+        мальчиков
+        девочки
+        девочек
+        компьютеров
+        компьютере
+        сов
+        пошли
+        elements
+      ')
+
+      expect(data['мальчики']).to eq %w(мальчик)
+      expect(data['мальчиков']).to eq %w(мальчик мальчиков мальчиковый)
+      expect(data['девочки']).to eq %w(девочка)
+      expect(data['девочек']).to eq %w(девочка)
+      expect(data['компьютере']).to eq %w(компьютер)
+      expect(data['сов']).to eq %w(сова)
+      expect(data['пошли']).to eq %w(пойти посылать)
+      expect(data['elements']).to eq []
     end
   end
 
@@ -40,28 +43,28 @@ describe YandexMystem do
     it 'latin words' do
       response = YandexMystem::Raw.stem('Elements')
 
-      response.size.should eq 1
-      response[0][:analysis].should eq []      
-      response[0][:text].should eq 'Elements'      
+      expect(response.size).to eq 1
+      expect(response[0][:analysis]).to eq []
+      expect(response[0][:text]).to eq 'Elements'
     end
 
     it 'multiple definitions' do
       response = YandexMystem::Raw.stem('девочка мальчиков пошла к комьютерам искать, в прочем, как и всегда')
 
-      response.size.should eq 11
+      expect(response.size).to eq 11
+
+      analysis = response.find { |h| h[:text] == 'девочка' }[:analysis].first
 
-      response.find_all{|h| h[:text] == 'девочка'}.first[:analysis].first[:lex].should eq 'девочка'
-      response.find_all{|h| h[:text] == 'девочка'}.first[:analysis].first[:wt].should eq 1
-      response.find_all{|h| h[:text] == 'девочка'}.first[:analysis].first[:gr].should eq 'S,f,anim=nom,sg'      
+      expect(analysis[:lex]).to eq 'девочка'
+      expect(analysis[:wt]).to eq 1
+      expect(analysis[:gr]).to eq 'S,f,anim=nom,sg'
 
-      response.find_all{|h| h[:text] == 'мальчиков'}.first[:analysis].size.should eq 3
+      expect(response.find { |h| h[:text] == 'мальчиков'}[:analysis].size).to eq 3
     end
 
     it 'get geo name' do
       response = YandexMystem::Raw.stem('Москва')
-      response.find_all{|h| h[:text] == 'Москва'}.first[:analysis].first[:gr].should include 'geo'
+      expect(response.find { |h| h[:text] == 'Москва' }[:analysis].first[:gr]).to include 'geo'
     end
-
-
   end
 end

data/yandex_mystem.gemspec

@@ -9,13 +9,14 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Yandex Mystem makes morphological analysis of a russian text}
   gem.homepage      = ''
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'yandex_mystem'
   gem.require_paths = %w(lib)
   gem.version       = YandexMystem::VERSION
 
-  gem.add_development_dependency 'rspec', '~> 2.8'
+  gem.add_dependency 'oj', '~> 2.11'
+  gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'rake', '~> 10.1'
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: yandex_mystem
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Dmitry Polushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 description: Mystem is a software that provided by the Yandex only for non-commercial
@@ -47,19 +61,21 @@ executables:
 - mystem-bsd
 - mystem-linux-32
 - mystem-linux-64
+- mystem-osx
 - mystem-win.exe
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/mystem-bsd
 - bin/mystem-linux-32
 - bin/mystem-linux-64
+- bin/mystem-osx
 - bin/mystem-win.exe
 - lib/yandex_mystem.rb
 - lib/yandex_mystem/version.rb
@@ -75,12 +91,12 @@ 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: []