ege_parser 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d97966c307a6afba2579d16a15671415ecbbd89
-  data.tar.gz: 84bab26b2f56247818f316d2a5e71cf619821219
+  metadata.gz: 8c3d88a6d1218841609cc949cdb780de9c477267
+  data.tar.gz: 39b923161b41d0be14e6857929010d628258658f
 SHA512:
-  metadata.gz: 0362644dc515fa306c2fafa13bcf52619911de8241fe03cd013723b8bf1483cbd49dab9f83ce85f57ff5be8761f37af2b91d34d06b28d68f3d46c3f8e0a51880
-  data.tar.gz: d4901b1d2589058326759e1d314eeaffe39bfa0b851f73bdd7fd10524918d11dbb8821634ae36571549a29fb66318641237f388195c0e92e18068715b33e4e15
+  metadata.gz: 1d373c802c80d53a47f4783673a18f9d8bac3b47da6938da2574920b9bbc3bcef57e1c8f930c8e8ece8ac26aa577cdbb9644599a2437c502f8d1e062a2085401
+  data.tar.gz: e8a8a1e3976bb4f12be6ca26fd5459bb10ceaf7a4d48f7ab749b9ba7f998464ab2835962b0dc1887eb7f2874c762a17ca1d09f2e6c1fd208b66f728a7827b071

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: qkUyVDDryC8fvCC3byZLX1SzMEE7AzxgO

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ruby-head

data/Gemfile

@@ -10,9 +10,9 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 2.0.1"
-  gem "simplecov", ">= 0"
-	gem "webmock"
+  gem "webmock"
 end
+gem 'coveralls', require: false
 
 gem 'nokogiri'
 gem 'mechanize'

data/Gemfile.lock

@@ -3,6 +3,12 @@ GEM
   specs:
     addressable (2.3.6)
     builder (3.2.2)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
@@ -72,6 +78,8 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -86,8 +94,11 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.4)
+    tins (1.3.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
@@ -101,11 +112,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0)
+  coveralls
   foreman
   jeweler (~> 2.0.1)
   mechanize
   nokogiri
   rdoc (~> 3.12)
   rspec (~> 2.8.0)
-  simplecov
   webmock

data/README.rdoc

@@ -1,7 +1,12 @@
-= ege_parser
+= ege_parser {<img src="https://coveralls.io/repos/manyrus/ege_gem/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/manyrus/ege_gem] {<img src="https://travis-ci.org/manyrus/ege_gem.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/manyrus/ege_gem]
 
-Description goes here.
+See {example}[https://github.com/manyrus/ege_gem/blob/master/examples/2.rb]
 
+== Installing
+Simply add to your Gemfile this code:
+  gem 'ege_parser'
+Or exec from console:
+  $ gem install ege_parser
 == Contributing to ege_parser
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/ege_parser.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ege_parser 1.0.0 ruby lib
+# stub: ege_parser 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ege_parser"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -19,8 +19,10 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".coveralls.yml",
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -48,6 +50,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<coveralls>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<mechanize>, [">= 0"])
       s.add_runtime_dependency(%q<foreman>, [">= 0"])
@@ -55,9 +58,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
+      s.add_dependency(%q<coveralls>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<mechanize>, [">= 0"])
       s.add_dependency(%q<foreman>, [">= 0"])
@@ -65,10 +68,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
+    s.add_dependency(%q<coveralls>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<mechanize>, [">= 0"])
     s.add_dependency(%q<foreman>, [">= 0"])
@@ -76,7 +79,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
   end
 end

data/examples/2.rb

@@ -1,4 +1,5 @@
-require_relative '../lib/ege_parser.rb'
+require 'ege_parser'
+
 pupil = EgeParser::Pupil.new
 
 pupil.name = 'Никитос'
@@ -8,4 +9,8 @@ pupil.passport = '453312'
 pupil.region = '45'
 
 ege_parser = EgeParser::Parser.new
-p ege_parser.get_subjects pupil
+begin
+  p ege_parser.get_subjects pupil #output as {'subject'=>'status', 'subject#2'=>'status2'}
+rescue EgeParser::AuthError #see all errors in error.rb
+  p 'Auth error('
+end

data/lib/ege_parser.rb

@@ -8,70 +8,70 @@ require_relative 'pupil.rb'
 
 module EgeParser
 
-	class Parser
-
-		attr_writer :auth_agent
-
-		def auth_agent
-			@auth_agent ||= Mechanize.new
-			@auth_agent.open_timeout=180
-			@auth_agent.read_timeout=180
-			@auth_agent
-		end
-
-		def get_subjects pupil
-			page = auth_agent.post('http://check.ege.edu.ru/ru/index.php', {
-					name:                   pupil.name,
-					surname:                pupil.surname,
-					patronymic:             pupil.patronymic,
-					doc_number:             pupil.passport,
-					region:                 pupil.region,
-					generate_captcha_val => ''
-			})
-
-			generate_subjects page
-		end
-
-		private
-
-		def generate_captcha_val
-			captcha_key = '-a-UHS2Wj8Cy8W4QB4cpZ8y_6XZNUWU'
-			page = auth_agent.post('http://check.ege.edu.ru/common/Qaptcha.jquery.php', {
-					action:'qaptcha',
-					qaptcha_key:captcha_key
-			})
-			raise EgeParser::CaptchaError if JSON.parse(page.body)['error']
-			captcha_key
-		end
-
-		def generate_subjects page
-			Hash[find_elements(2, page).zip find_elements(5, page)]
-		end
-
-		def find_elements row, page
-			result = []
-			page.search("//table[contains(@class, 'appil_resultat')]/tbody/tr/td[#{row}]").to_a.map{|el|
-				parsed = el_to_s(el)
-				result << parsed if parsed != nil|| parsed != ''
-			}
-
-			check_for_errors page
-
-			raise EgeParser::BadDataError if result.any?{|k| k.empty?} || result.empty?
-
-			result
-		end
-
-		def check_for_errors page
-			service_error = el_to_s(page.search('//h2'))
-			raise EgeParser::ServiceError.new(service_error) unless service_error.empty?
-
-			auth_error = el_to_s(page.search('//div[@id="show_div2"]/form'))
-			raise EgeParser::AuthError.new unless auth_error.empty?
-		end
-
-		def el_to_s el
-			el.to_s.gsub(/<\/?[^>]+>/, '').gsub(/\n|\t/,'').strip
-		end
-	end
+  class Parser
+
+    attr_writer :auth_agent
+
+    def auth_agent
+      @auth_agent ||= Mechanize.new
+      @auth_agent.open_timeout=180
+      @auth_agent.read_timeout=180
+      @auth_agent
+    end
+
+    def get_subjects pupil
+      page = auth_agent.post('http://check.ege.edu.ru/ru/index.php', {
+          name:                   pupil.name,
+          surname:                pupil.surname,
+          patronymic:             pupil.patronymic,
+          doc_number:             pupil.passport,
+          region:                 pupil.region,
+          generate_captcha_val => ''
+      })
+
+      generate_subjects page
+    end
+
+    private
+
+    def generate_captcha_val
+      captcha_key = '-a-UHS2Wj8Cy8W4QB4cpZ8y_6XZNUWU'
+      page = auth_agent.post('http://check.ege.edu.ru/common/Qaptcha.jquery.php', {
+          action:'qaptcha',
+          qaptcha_key:captcha_key
+      })
+      raise EgeParser::CaptchaError if JSON.parse(page.body)['error']
+      captcha_key
+    end
+
+    def generate_subjects page
+      Hash[find_elements(2, page).zip find_elements(5, page)]
+    end
+
+    def find_elements row, page
+      result = []
+      page.search("//table[contains(@class, 'appil_resultat')]/tbody/tr/td[#{row}]").to_a.map{|el|
+        parsed = el_to_s(el)
+        result << parsed if parsed != nil|| parsed != ''
+      }
+
+      check_for_errors page
+
+      raise EgeParser::BadDataError if result.any?{|k| k.empty?} || result.empty?
+
+      result
+    end
+
+    def check_for_errors page
+      service_error = el_to_s(page.search('//h2'))
+      raise EgeParser::ServiceError.new(service_error) unless service_error.empty?
+
+      auth_error = el_to_s(page.search('//div[@id="show_div2"]/form'))
+      raise EgeParser::AuthError.new unless auth_error.empty?
+    end
+
+    def el_to_s el
+      el.to_s.gsub(/<\/?[^>]+>/, '').gsub(/\n|\t/,'').strip
+    end
+  end
 end

data/lib/error.rb

@@ -1,7 +1,7 @@
 module EgeParser
-	class AuthError < StandardError; end
-	class ParserError < StandardError; end
-	class BadDataError < StandardError; end
-	class ServiceError < StandardError; end
-	class CaptchaError < StandardError; end
+  class AuthError < StandardError; end
+  class ParserError < StandardError; end
+  class BadDataError < StandardError; end
+  class ServiceError < StandardError; end
+  class CaptchaError < StandardError; end
 end

data/lib/pupil.rb

@@ -1,11 +1,11 @@
 module EgeParser
 
-	class Pupil
-		attr_accessor :name,
-		              :surname,
-		              :patronymic,
-		              :passport,
-		              :region
-	end
+  class Pupil
+    attr_accessor :name,
+                  :surname,
+                  :patronymic,
+                  :passport,
+                  :region
+  end
 
 end

data/spec/ege_parser_spec.rb

@@ -1,70 +1,71 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe EgeParser::Parser, :fast do
-	let(:pupil){
-		pupil = EgeParser::Pupil.new
-		pupil.name  = 'Сергей'
-		pupil.surname = 'Попов'
-		pupil.patronymic = 'Олегович'
-		pupil.passport = '741131'
-		pupil.region = '29'
+  let(:pupil){
+    pupil = EgeParser::Pupil.new
+    pupil.name  = 'Сер'
+    pupil.surname = 'ПоЛяков'
+    pupil.patronymic = 'Сергеевич'
+    pupil.passport = '342412'
+    pupil.region = '30'
 
-		pupil
-	}
+    pupil
+  }
 
-	def stub_captcha(is_error=false)
-		stub_request(:post, 'http://check.ege.edu.ru/common/Qaptcha.jquery.php').to_return(body:{error:is_error}.to_json)
-	end
+  def stub_captcha(is_error = false)
+    stub_request(:post, 'http://check.ege.edu.ru/common/Qaptcha.jquery.php').to_return(body:{error:is_error}.to_json)
+  end
 
-	def stub_result file_name
-		stub_request(:post, "http://check.ege.edu.ru/ru/index.php")
-								.to_return(
-										:status => 200,
-										:body => File.read(File.dirname(__FILE__) + "/templates/#{file_name}.html"),
-										:headers => {'Content-Type'=>'text/html'}
-								)
-	end
+  def stub_result file_name
+    stub_request(:post, "http://check.ege.edu.ru/ru/index.php")
+                .to_return(
+                    :status => 200,
+                    :body => File.read(File.dirname(__FILE__) + "/templates/#{file_name}.html"),
+                    :headers => {'Content-Type'=>'text/html'}
+                )
+  end
 
   describe '#get_subjects' do
-	  context 'when bad captcha' do
-			it 'throw EgeParser::CaptchaError' do
-				stub_captcha(is_error = true)
+    context 'when bad captcha' do
+      it 'throw EgeParser::CaptchaError' do
+        stub_captcha(true)
 
-				expect{subject.get_subjects pupil}.to raise_error(EgeParser::CaptchaError)
-			end
-	  end
+        expect{subject.get_subjects pupil}.to raise_error(EgeParser::CaptchaError)
+      end
+    end
 
-	  context 'when not authed' do
-		  it 'throw EgeParser::AuthError' do
-				stub_captcha
-				stub_result 'authed_error'
+    context 'when not authed' do
+      it 'throw EgeParser::AuthError' do
+        stub_captcha
+        stub_result 'authed_error'
 
-				expect{subject.get_subjects pupil}.to raise_error(EgeParser::AuthError)
-		  end
-	  end
+        expect{subject.get_subjects pupil}.to raise_error(EgeParser::AuthError)
+      end
+    end
 
-	  context 'when some subject is empty' do
-			it 'throw EgeParser::ParserError' do
-				stub_captcha
-				stub_result 'bad_data'
+    context 'when some subject is empty' do
+      it 'throw EgeParser::ParserError' do
+        stub_captcha
+        stub_result 'bad_data'
 
-				expect{p subject.get_subjects pupil}.to raise_error(EgeParser::BadDataError)
-			end
-	  end
+        expect{p subject.get_subjects pupil}.to raise_error(EgeParser::BadDataError)
+      end
+    end
 
-	  context 'all ok' do
-		  it 'parse all data and get result' do
-			  stub_captcha
-			  stub_result 'success'
+    context 'all ok' do
+      it 'parse all data and get result' do
+        stub_captcha
+        stub_result 'success'
 
-			  subject.get_subjects(pupil).should ==
-					  {'Русский язык' => 'Нет результата (обработка)',
-					   'Математика' => 'Экзамен не проходил',
-					   'Физика' => 'Экзамен не проходил',
-					   'Информатика и ИКТ' => 'Экзамен не проходил'}
-		  end
-	  end
-	end
+        subject.get_subjects(pupil).should ==
+            {'Русский язык' => 'Нет результата (обработка)',
+             'Математика' => 'Экзамен не проходил',
+             'Физика' => 'Экзамен не проходил',
+             'Информатика и ИКТ' => 'Экзамен не проходил'}
+      end
+    end
+  end
 end
 
 

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'simplecov'
 require 'webmock/rspec'
+require 'coveralls'
 
+Coveralls.wear!
 module SimpleCov::Configuration
   def clean_filters
     @filters = []
@@ -26,5 +28,5 @@ require 'ege_parser'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |c|
-	c.treat_symbols_as_metadata_keys_with_true_values = true
+  c.treat_symbols_as_metadata_keys_with_true_values = true
 end