typograf 0.0.1 → 0.0.2

data/README.md

@@ -68,6 +68,10 @@ You can pass second argument - hash of options.
 }
 ```
 
+## TODO
+ - support ruby 1.8 (`encode` missing)
+ - implement missing specs
+
 ## Contributing
 
 1. Fork it

data/lib/typograf/client.rb

@@ -52,28 +52,28 @@ module Typograf
     def form_xml(options)
       o = options
       xml = <<-XML_TEMPLATE
-      <?xml version="1.0" encoding="windows-1251" ?>
-      <preferences>
-        <tags delete="#{o[:tags_delete]}">#{o[:tags]}</tags>
-        <paragraph insert="#{o[:paragraph][:insert]}">
-          <start><![CDATA[#{o[:paragraph][:start]}]]></start>
-          <end><![CDATA[#{o[:paragraph][:end]}]]></end>
-        </paragraph>
-        <newline insert="#{o[:newline][:insert]}"><![CDATA[#{o[:newline][:tag]}]]></newline>
-        <cmsNewLine valid="#{o[:cms_new_line]}" />
-        <dos-text delete="#{o[:dos_text]}" />
-        <nowraped insert="#{o[:nowraped][:insert]}" nonbsp="#{o[:nowraped][:nobsp]}" length="#{o[:nowraped][:length]}">
-          <start><![CDATA[#{o[:nowraped][:start]}]]></start>
-          <end><![CDATA[#{o[:nowraped][:end]}]]></end>
-        </nowraped>
-        <hanging-punct insert="#{o[:hanging_punct]}" />
-        <hanging-line delete="#{o[:hanging_line]}" />
-        <minus-sign><![CDATA[#{o[:minus_sign]}]]></minus-sign>
-        <hyphen insert="#{o[:hyphen][:insert]}" length="#{o[:hyphen][:length]}" />
-        <acronym insert="#{o[:acronym]}"></acronym>
-        <symbols type="#{o[:symbols]}" />
-        <link target="#{o[:link][:target]}" class="#{o[:link][:class]}" />
-      </preferences>
+<?xml version="1.0" encoding="windows-1251" ?>
+<preferences>
+  <tags delete="#{o[:tags_delete]}">#{o[:tags]}</tags>
+  <paragraph insert="#{o[:paragraph][:insert]}">
+    <start><![CDATA[#{o[:paragraph][:start]}]]></start>
+    <end><![CDATA[#{o[:paragraph][:end]}]]></end>
+  </paragraph>
+  <newline insert="#{o[:newline][:insert]}"><![CDATA[#{o[:newline][:tag]}]]></newline>
+  <cmsNewLine valid="#{o[:cms_new_line]}" />
+  <dos-text delete="#{o[:dos_text]}" />
+  <nowraped insert="#{o[:nowraped][:insert]}" nonbsp="#{o[:nowraped][:nobsp]}" length="#{o[:nowraped][:length]}">
+    <start><![CDATA[#{o[:nowraped][:start]}]]></start>
+    <end><![CDATA[#{o[:nowraped][:end]}]]></end>
+  </nowraped>
+  <hanging-punct insert="#{o[:hanging_punct]}" />
+  <hanging-line delete="#{o[:hanging_line]}" />
+  <minus-sign><![CDATA[#{o[:minus_sign]}]]></minus-sign>
+  <hyphen insert="#{o[:hyphen][:insert]}" length="#{o[:hyphen][:length]}" />
+  <acronym insert="#{o[:acronym]}"></acronym>
+  <symbols type="#{o[:symbols]}" />
+  <link target="#{o[:link][:target]}" class="#{o[:link][:class]}" />
+</preferences>
       XML_TEMPLATE
       xml.gsub(/^\s|\s$/, '')
     end
@@ -122,7 +122,7 @@ module Typograf
         raise NetworkError, "#{response.code}: #{response.message}"
       end
 
-      body = response.body.dup.force_encoding("cp1251")
+      body = response.body.force_encoding("cp1251").encode("utf-8")
 
       # error = "\xCE\xF8\xE8\xE1\xEA\xE0: \xE2\xFB \xE7\xE0\xE1\xFB\xEB\xE8 \xEF\xE5\xF0\xE5\xE4\xE0\xF2\xFC \xF2\xE5\xEA\xF1\xF2"
       # error.force_encoding("ASCII-8BIT") if error.respond_to?(:force_encoding)
@@ -130,7 +130,7 @@ module Typograf
         raise NetworkError, "Ошибка: вы забыли передать текст"
       end
 
-      body.encode("utf-8").chomp
+      body.chomp
     end
   end
 end

data/lib/typograf/version.rb

@@ -1,3 +1,3 @@
 module Typograf
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/typograf_spec.rb

@@ -7,6 +7,10 @@ describe Typograf do
     Typograf.process("- Это \"Типограф\"?\n— Нет, это «Типограф»!").should eq "<p>&mdash;&nbsp;Это &laquo;Типограф&raquo;?<br />\n&mdash;&nbsp;Нет, это &laquo;Типограф&raquo;!</p>"
   end
 
+  it ".process support options" do
+    Typograf.process("- Это \"Типограф\"?\n— Нет, это «Типограф»!", :paragraph => {:insert => 0}).should eq "&mdash;&nbsp;Это &laquo;Типограф&raquo;?<br />\n&mdash;&nbsp;Нет, это &laquo;Типограф&raquo;!"
+  end
+
   it "should raise 404 error" do
     lambda {Typograf.process("Тест", :url => 'http://www.typograf.ru/404')}.should raise_error Typograf::NetworkError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typograf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019651219
+      hash: 77060353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019651219
+      hash: 77060353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24