art_typograph 0.1.0 → 0.1.1

data/Readme.markdown

@@ -1,4 +1,4 @@
-Клиент для [веб-сервиса «Типографа»](http://www.artlebedev.ru/tools/typograf/webservice/), код частично позаимствован из [als_typograf](https://github.com/alsemyonov/als_typograf).
+Клиент для [веб-сервиса «Типографа»](http://www.artlebedev.ru/tools/typograf/webservice/) студии Лебедева, код частично позаимствован из [als_typograf](https://github.com/alsemyonov/als_typograf) и [art_typograf](https://github.com/stereobooster/art_typograf).
 
 ```ruby
 ArtTypograph.process('- Это "Типограф"?')
@@ -15,8 +15,7 @@ ArtTypograph.process('- Это "Типограф"?', :use_p => false)
   :entity_type => :no, # :html, :xml, :no, :mixed
   :use_br      => false,
   :use_p       => true,
-  :max_nobr    => 3,
-  :encoding    => 'UTF-8'
+  :max_nobr    => 3
 }
 ```
 

data/lib/art_typograph/request.rb

@@ -14,8 +14,7 @@ module ArtTypograph
       :entity_type => :no,
       :use_br => false,
       :use_p => true,
-      :max_nobr => 3,
-      :encoding => 'UTF-8'
+      :max_nobr => 3
     }
 
     def initialize(options = {})
@@ -30,7 +29,7 @@ module ArtTypograph
         'SOAPAction' => '"http://typograf.artlebedev.ru/webservices/ProcessText"'
       })
       request.body = <<-END_SOAP
-<?xml version="1.0" encoding="#{options[:encoding]}" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
 <soap:Body>
  <ProcessText xmlns="http://typograf.artlebedev.ru/webservices/">
@@ -51,7 +50,7 @@ END_SOAP
       case response
       when Net::HTTPSuccess
         result = if /<ProcessTextResult>\s*((.|\n)*?)\s*<\/ProcessTextResult>/m =~ response.body
-          $1.gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&').gsub(/(\t|\n)$/, '')
+          $1.gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&').gsub(/(\t|\n)$/, '').force_encoding("UTF-8").chomp
         else
           text
         end

data/lib/art_typograph/version.rb

@@ -1,3 +1,3 @@
 module ArtTypograph
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/request_spec.rb

@@ -17,7 +17,7 @@ describe ArtTypograph::Request do
       subject { req.new(options) }
 
       it 'merges default options' do
-        subject.options.should include(:use_br, :use_p, :entity_type, :encoding, :max_nobr)
+        subject.options.should include(:use_br, :use_p, :entity_type, :max_nobr)
       end
 
       it 'processes options' do

metadata

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