als_typograf 0.0.5 → 0.1.0

data/Rakefile

@@ -4,20 +4,19 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "als_typograf"
+    gem.name = 'als_typograf'
     gem.summary = %Q{ArtLebedevStudio.RemoteTypograf}
     gem.description = %Q{ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)}
-    gem.email = "rotuka@rotuka.com"
-    gem.homepage = "http://github.com/rotuka/als_typograf"
-    gem.authors = ["Alexander Semyonov"]
+    gem.email = 'rotuka@rotuka.com'
+    gem.homepage = 'http://github.com/rotuka/als_typograf'
+    gem.authors = ['Alexander Semyonov']
     gem.add_dependency 'activesupport', '>= 2.3.4'
-    gem.add_dependency 'httparty', '>= 0.4.5'
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_development_dependency "yard", ">= 0"
+    gem.add_development_dependency 'shoulda', '>= 0'
+    gem.add_development_dependency 'yard', '>= 0'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end
 
 require 'rake/testtask'
@@ -36,7 +35,7 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort 'RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov'
   end
 end
 
@@ -49,7 +48,7 @@ begin
   end
 rescue LoadError
   task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+    abort 'Reek is not available. In order to run reek, you must: sudo gem install reek'
   end
 end
 
@@ -61,7 +60,7 @@ begin
   end
 rescue LoadError
   task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+    abort 'Roodi is not available. In order to run roodi, you must: sudo gem install roodi'
   end
 end
 
@@ -70,7 +69,7 @@ begin
   YARD::Rake::YardocTask.new
 rescue LoadError
   task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+    abort 'YARD is not available. In order to run yardoc, you must: sudo gem install yard'
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/als_typograf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{als_typograf}
-  s.version = "0.0.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2009-11-26}
+  s.date = %q{2010-01-24}
   s.description = %q{ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)}
   s.email = %q{rotuka@rotuka.com}
   s.extra_rdoc_files = [
@@ -52,19 +52,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<httparty>, [">= 0.4.5"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<httparty>, [">= 0.4.5"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

data/lib/als_typograf.rb

@@ -1,6 +1,6 @@
 $KCODE = 'u'
 
-require 'activesupport'
+require 'active_support'
 require 'httparty'
 
 # ruby-implementation of ArtLebedevStudio.RemoteTypograf class (web-service client)
@@ -102,7 +102,7 @@ module AlsTypograf
   # @option custom_options [String] :max_nobr (3) How many symbols around dash to surround with +<nobr>+ tag
   # @option custom_options [String] :encoding ('UTF-8') Encoding of text
   def self.process(text, custom_options = {})
-    Request.new.process_text(text, custom_options.reverse_merge(options))
+    Request.process_text(text, custom_options.reverse_merge(options))
   end
 end
 

data/lib/als_typograf/request.rb

@@ -1,18 +1,20 @@
+require 'net/http'
+
 module AlsTypograf
   # The request class
-  class Request
-    include HTTParty
-    base_uri 'typograf.artlebedev.ru'
-    format :xml
-    headers('Content-Type' => 'text/xml',
-            'Host' => 'typograf.artlebedev.ru',
-            'SOAPAction' => '"http://typograf.artlebedev.ru/webservices/ProcessText"')
+  module Request
+    @@url = URI.parse('http://typograf.artlebedev.ru/webservices/typograf.asmx')
+    @@result_regexp = /<ProcessTextResult>\s*((.|\n)*?)\s*<\/ProcessTextResult>/m
 
     # Process text with remote web-service
     # @param [String] text text to process
     # @param [Hash] options options for web-service
-    def process_text(text, options = {})
-      soap_request = <<-END_SOAP
+    def self.process_text(text, options = {})
+      request = Net::HTTP::Post.new(@@url.path, {
+        'Content-Type' => 'text/xml',
+        'SOAPAction' => '"http://typograf.artlebedev.ru/webservices/ProcessText"'
+      })
+      request.body = <<-END_SOAP
 <?xml version="1.0" encoding="#{options[:encoding]}" ?>
 <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>
@@ -25,11 +27,24 @@ module AlsTypograf
   </ProcessText>
  </soap:Body>
 </soap:Envelope>
-      END_SOAP
-      response = self.class.post('/webservices/typograf.asmx', :body => soap_request)
-      response['soap:Envelope']['soap:Body']['ProcessTextResponse']['ProcessTextResult'].gsub(/&amp;/, '&').gsub(/&lt;/, '<').gsub(/&gt;/, '>').gsub(/\t$/, '')
+END_SOAP
+
+      response = Net::HTTP.new(@@url.host, @@url.port).start do |http|
+        http.request(request)
+      end
+
+      case response
+      when Net::HTTPSuccess
+        result = if @@result_regexp =~ response.body
+          $1.gsub(/&gt;/, '>').gsub(/&lt;/, '<').gsub(/&amp;/, '&').gsub(/(\t|\n)$/, '')
+        else
+          text
+        end
+      else
+        text
+      end
     rescue ::Exception => exception
-      return text
+      text
     end
   end
 end

data/test/helper.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 require 'shoulda'
 require 'redgreen' rescue nil
 require 'als_typograf'
@@ -11,8 +11,8 @@ require 'active_support/test_case'
 class ActiveSupport::TestCase
   def self.process_assertions(assertions)
     assertions.each do |from, to|
-      should "process '#{from}' to '#{to}'" do
-        assert_equal to, AlsTypograf.process(from)
+      should "process [#{from}] to [#{to}]" do
+        assert_equal(to, AlsTypograf.process(from))
       end
     end
   end
@@ -38,7 +38,7 @@ def load_schema
     end
 
   if db_adapter.nil?
-    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
+    raise 'No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3.'
   end
 
   ActiveRecord::Base.establish_connection(config[db_adapter])

data/test/unit/als_typograf_test.rb

@@ -5,14 +5,14 @@ class AlsTypografTest < ActiveSupport::TestCase
   context 'with default configuration' do
     setup { AlsTypograf.default_options! }
     process_assertions({
-      '- Это "Типограф"?' => "<p>— Это «Типограф»?</p>",
+      '- Это "Типограф"?' => "<p>— Это «Типограф»?<br />\n</p>",
     })
   end
 
   context 'no p' do
     setup { AlsTypograf.use_p = false }
     process_assertions({
-      '- Это "Типограф"?' => "— Это «Типограф»?",
+      '- Это "Типограф"?' => "— Это «Типограф»?<br />",
     })
   end
 

data/test/unit/article_test.rb

@@ -23,16 +23,16 @@ class ArticleTest < ActiveSupport::TestCase
   context 'with an Article' do
     setup do
       @article = Article.create(:title => '- Does it "Article"?',
-                                :content => 'Yes, this is an "Article"...')
+                                :content => 'Да, это - "Статья"...')
       AlsTypograf.default_options!
     end
 
     should 'typograf article’s content with default options' do
-      assert_equal '<p>Yes, this is an «Article»…</p>', @article.content
+      assert_equal "<p>Да, это — «Статья»...<br />\n</p>", @article.content
     end
 
     should 'typograf article’s title with custom options' do
-      assert_equal '— Does it «Article»?', @article.title
+      assert_equal "— Does it “Article”?", @article.title
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: als_typograf
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +03:00
+date: 2010-01-24 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,17 +23,7 @@ dependencies:
         version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement