qipowl 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 11832e5a92068dd4a814b706480c20aae99c3a30
-  data.tar.gz: 01dc0566c1f58d83664dff49c923dc68d5b58eeb
+  metadata.gz: c656b2aa5f88eb634e30f0ae4c9f8a1dae18237d
+  data.tar.gz: 26b1185aedc158f4fcb660b807bf5691fea97570
 !binary "U0hBNTEy":
-  metadata.gz: f4ee26556053853856c043979387e2fedd29901d0b199902bbff5bbd9ce0b37bfe5f5c3e819d77643655c811d8b2df42c2318ae4f7b4f536aea7e8452c39cefd
-  data.tar.gz: eeac33cd357ad9c0c5ebf3785c4ecb4a98289ac5498c3291b1c19029ed3ab431d7a7befdd03741e1a32a12a3b594f291943c8cc76a75d61c97939e090864904a
+  metadata.gz: 78be05dbfaf7720127cb2da7db32c4b204f8f7146d69fc3749f330e0e95ec2ce5fa3d99451fc38aa38b3e041c3a41e10f3c99ea37238c4bc5c5180943bfcf4e6
+  data.tar.gz: 50e3187848e51d7aca086f5410ed23cf0f472bd40844e2b83101cf67c574c6267c483e53e31db4ac3ae6d37a82616cf3b6005cc9a13f9bdacd20d22e6534a89c

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in typogrowl.gemspec
 gemspec
 
-gem 'htmlbeautifier', :git => 'https://github.com/threedaymonk/htmlbeautifier'
 gem 'aquarium', '~> 0.6', :git => 'git://github.com/deanwampler/Aquarium.git'
 gem "crochets", :git => 'git://github.com/mudasobwa/crochets.git'
 

data/bin/bowler

@@ -12,7 +12,7 @@ OptionParser.new do |opts|
 
   # Bowl result?
   opts.on("-a", "--action ACTION", [:bowl, :ruby, :cmd, :yaml, :html],
-          "Action to apply on input (bowl, ruby, cmd, yaml, html); default: html") do |action|
+          "Action to apply on input (bowl, html); default: html") do |action|
     options[:action] = action || :bowl
   end
 
@@ -31,14 +31,6 @@ file_or_string = File.read(file_or_string) if File.exist?(file_or_string)
 case options[:action]
 when :bowl
   puts file_or_string.bowl
-when :ruby
-  puts Qipowl::Mapping.new(nil, file_or_string).to_ruby
-when :html
-  puts Qipowl::Html.parse file_or_string
-when :cmd
-  puts Qipowl::Cmd.execute file_or_string
-when :yaml
-  puts Qipowl::Yaml.parse file_or_string
 else
   puts Qipowl::Html.parse file_or_string
 end  

data/config/bowlers/html.yaml

@@ -74,18 +74,20 @@
       :tag      : :p
       :class    : :lead
     :☆             :
-      :tag      : :p
-      :class    : :text_muted
-    :★             : :em
+      :tag      : :span
+      :class    : :'text-warning'
+    :★             :
+      :tag      : :span
+      :class    : :'label label-info'
     :☛             :
       :tag      : :p
-      :class    : :text_success
+      :class    : :'text-success'
     :☞             :
       :tag      : :p
-      :class    : :text_info
+      :class    : :'text-info'
     :☣             :
       :tag      : :p
-      :class    : :text_warning
+      :class    : :'text-warning'
     :☢             :
       :tag      : :p
       :class    : :text_danger

data/config/bowlers/ispru.yaml

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+:entities      :
+  :regular     :
+    '.'        : :dot
+    ','        : :comma
+    ':'        : :colon
+    ';'        : :semicolon
+    '¡'        : :exclm_start
+    '!'        : :exclm_end
+    '¿'        : :quest_start
+    '?'        : :quest_end
+
+:custom        :
+  '([.,:;?!])(?=\s|\Z)' : ' \1 '
+  '(?<=\s|\A)([¿¡])' : ' \1 '

data/extras/demo/main.rb

@@ -4,31 +4,32 @@ require 'cgi'
 require 'json'
 require 'sinatra'
 
-require_relative '../qipowl'
+require_relative '../../lib/qipowl'
 
 use Rack::Session::Pool, :expire_after => 2592000
 
 before do
-  session[:typo] ||= Qipowl.tg_md__html
+  session[:typo] ||= Qipowl::Ruler.new_bowler "html"
+  session[:mapping] ||= session[:typo].class::ENTITIES.rmerge({:custom => session[:typo].class::CUSTOM_TAGS}).to_json
 end
 
 get '/html/mapping' do
   content_type :json
-  session[:typo].mapping.hash.to_json
+  session[:mapping]
 end
 
 delete '/html/mapping/:key' do |key|
   content_type :json
-  session[:typo].mapping.remove_spice(key.to_sym).to_json
+  session[:typo].remove_entity(key.to_sym).to_json
 end
 
 put '/html/mapping/:section/:key/:value/?:enclosure?' do |section, key, value, enclosure|
   content_type :json
-  session[:typo].mapping.add_spice(section.to_sym, key.to_sym, value.to_sym, enclosure ? enclosure.to_sym : nil).to_json
+  session[:typo].add_entity(section.to_sym, key.to_sym, value.to_sym, enclosure ? enclosure.to_sym : nil).to_json
 end
 
 get '/html/parse' do
   str = CGI::parse(request.query_string)['text'].first
   content_type :html
-  session[:typo].parse_and_roll str
+  session[:typo].execute str
 end

data/extras/demo/public/html.html

@@ -6,7 +6,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Typogrowl for HTML</title>
+        <title>Qipowl for HTML</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">
 
@@ -17,7 +17,7 @@
                 padding-bottom: 20px;
             }
             table.mapping {
-                font: 9px monospace;
+                font: 10px monospace;
             }
             table.mapping thead {
                 font-size: 12px;
@@ -87,13 +87,12 @@
                     '    <input class="form-control" id="mapping-new-enclosure" name="enclosure" placeholder="Enclosure">' + 
                     '  </div>' + 
                     '  <div class="form-group">' + 
-                    '    <select class="form-control" id="mapping-new-section" name="section">' + 
-                    '      <option>' + 'flush' + '</option>' + 
+                    '    <select class="form-control" id="mapping-new-section" name="section">' +
                     '      <option>' + 'block' + '</option>' + 
+                    '      <option>' + 'alone' + '</option>' + 
                     '      <option>' + 'magnet' + '</option>' + 
-                    '      <option>' + 'inplace' + '</option>' + 
-                    '      <option>' + 'linewide' + '</option>' + 
-                    '      <option>' + 'custom' + '</option>' + 
+                    '      <option>' + 'grip' + '</option>' + 
+                    '      <option>' + 'regular' + '</option>' + 
                     '    </select>' + 
                     '  </div>' + 
                     '  <div class="form-group">' + 
@@ -153,11 +152,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">Typogrowl Demo</a>
+          <a class="navbar-brand" href="index.html">Qipowl Demo</a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a href="http://github.com/mudasobwa/typogrowl">Source</a></li>
+            <li><a href="http://github.com/mudasobwa/qipowl">Source</a></li>
             <li class="active"><a href="#">HTML</a></li>
             <!--li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
@@ -197,9 +196,10 @@
           <textarea style="margin-bottom:0.2em;" type="text" rows="21" id="text" name="text" class="form-control">
 §1 Welcome!
 
-Typogrowl ≈helps≈ you to ≡format rich≡ using plain text. This para is, for instance, the leading one in terms of bootstrap ( `class='lead'`).
+¶ Qipowl ≈helps≈ you to ≡format rich≡ using plain text. This para is, for instance,
+has “leading para” bootstrap class ( `class='lead'`).
 
-¶ This is a text with typogrowl markup. 
+This is a plain para with slight ≡qipowl≡ markup. 
 
 • unbulleted lists:
  • nice
@@ -208,8 +208,8 @@ Typogrowl ≈helps≈ you to ≡format rich≡ using plain text. This para is, f
 
 ★ Feel free to test:
 ▷ bulleted lists — with “•” symbol
-▷ data lists — with “▶”
-▷ blockquotes — with “〉” and nesteds
+▷ data lists — with “▶”
+▷ blockquotes — with “〉” and nesteds
 ▷ links — with “ ¹” and other human readables
 
 §3 Even bootstrap classes are available:
@@ -221,9 +221,16 @@ Typogrowl ≈helps≈ you to ≡format rich≡ using plain text. This para is, f
 • “☣” for “warning” text
 • “☢” for “danger” text
 
-✎ 
+✍ 
 Comments are visible in HTML source only
-✎
+✍
+
+Λ ruby
+# Source code snippet
+void main() {
+  exit("Hello, World!");
+}
+Λ
 
 Hope you’ll enjoy!
           </textarea>

data/extras/demo/public/index.html

@@ -6,7 +6,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title>Typogrowl Demo</title>
+        <title>Qipowl Demo</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">
 
@@ -34,11 +34,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="index.html">Typogrowl Demo</a>
+          <a class="navbar-brand" href="index.html">Qipowl Demo</a>
         </div>
         <nav class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a href="http://github.com/mudasobwa/typogrowl">Source</a></li>
+            <li><a href="http://github.com/mudasobwa/qipowl">Source</a></li>
             <li><a href="html.html">HTML</a></li>
             <!--li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
@@ -69,12 +69,12 @@
     <!-- Main jumbotron for a primary marketing message or call to action -->
     <div class="jumbotron">
       <div class="container">
-        <h1>Typogrowl rules</h1>
-        <p><em>Typogrowl</em> is the next generation markup environment. It’s not the
+        <h1>Qipowl rules</h1>
+        <p><em>Qipowl</em> is the next generation markup environment. It’s not the
             markup language only, since it provides the very efficient and straightforward
             library to produce custom markups. It′s not the markup library either,
             since it comes with ready-to-use markdown-like markup and 2HTML converter.</p>
-        <p><a class="btn btn-primary btn-lg" href="https://github.com/mudasobwa/typogrowl#usage">Learn more &raquo;</a></p>
+        <p><a class="btn btn-primary btn-lg" href="https://github.com/mudasobwa/qipowl#usage">Learn more &raquo;</a></p>
       </div>
     </div>
 

data/features/html.feature

@@ -23,6 +23,15 @@ Feature: All the possibilities of HTML parser
         | "here λ≡code bold≡λ goes"     | "<p>here <code><strong>code bold</strong></code> goes</p>" |
         | "Hello, ≈World≈!"              | "<p>Hello, <em>World</em>!</p>" |
 
+  Scenario Outline: Inplace tags nested
+    Given we use "html" bowler
+    When the input string is <input>
+    And the execute method is called on bowler
+    Then the result should NOT equal to <output>
+
+    Examples:
+        | input                            | output                             |
+        | "here ≡nested ≡bold≡ tags≡ go" | "<p>here <strong>nested <strong>bold</strong> tags</strong> goes</p>" |
 
   Scenario Outline: Alone tags
     Given we use "html" bowler
@@ -42,7 +51,7 @@ Feature: All the possibilities of HTML parser
     Then the result should equal to
     """
     
-    <pre class='ruby'>@mapping[:block] = ≡bold≡ </pre>
+    <pre class='ruby'>@mapping[:block] = ≡bold≡</pre>
     """
 
   Scenario: Block tag ✍
@@ -189,7 +198,6 @@ Feature: All the possibilities of HTML parser
     Then the result should equal to
     """
     
-    
     <p>Nice?</p>
     """
 

data/features/ispru.feature

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+Feature: Text must be properly translated with Ispru
+
+  Scenario Outline: Russian language
+    Given we use "ispru" bowler
+    When the input string is <input>
+    And the execute method is called on bowler
+    Then the result should equal to <output>
+
+    Examples:
+        | input                          | output                                  |
+        | "Он сказал: 'Поехали!'."       | "Он сказал: «Поехали!»."                |
+        | "Ссылка: http://wikipedia.org не покорежена." | "Ссылка: http://wikipedia.org не покорежена." |
+        | "Mamá lavados marco."          | "Мама моет раму." |

data/features/monkey.feature

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+Feature: String improvements
+
+  Scenario: I18n of up-/down-case and capitalize
+    Given input string is "мама"
+    When I call upcase on it
+    Then the result should equal to "МАМА"

data/features/step_definitions/bowler_steps.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Given(/^we use "(.*?)" bowler$/) do |f|
 #  @f = "config/bowlers/#{f}.yaml"
   @bowler = Qipowl::Ruler.new_bowler f

data/features/step_definitions/html_steps.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Then(/^the result should equal to "(.*?)"$/) do |result|
   expect(@result.carriage).to eq(result)
 end
@@ -9,3 +11,7 @@ end
 Then(/^the result should match "(.*?)"$/) do |result|
   expect(@result).to match(result)
 end
+
+Then(/^the result should NOT equal to "(.*?)"$/) do |result|
+  expect(@result.carriage).not_to eq(result)
+end

data/features/step_definitions/ispru_steps.rb

@@ -0,0 +1,2 @@
+# encoding: utf-8
+

data/features/step_definitions/monkey_steps.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+Given(/^input string is "(.*?)"$/) do |s|
+  @input = s
+end
+
+When(/^I call upcase on it$/) do
+  @result = @input.upcase
+end

data/lib/qipowl/bowlers/html.rb

@@ -1,12 +1,16 @@
 # encoding: utf-8
 
 require 'net/http'
-require 'htmlbeautifier'
 
 require_relative '../core/bowler'
-require_relative '../bowlers/htmldoc'
 
 module Qipowl
+  module Mappers
+    class HtmlBowlerMapper < BowlerMapper
+      
+    end
+  end
+
   # Module placeholder for dynamically created bowlers
   module Bowlers
     class Html < Bowler
@@ -18,8 +22,7 @@ module Qipowl
       # @param [Array] args the words, gained since last call to {#harvest}
       # @return [Array] the array of words with trimmed `grip` tag
       def ∀_grip *args
-        text = [*args].join(SEPARATOR)
-        mine, rest = text.split("#{__callee__}∎", 2)
+        mine, rest = [*args].join(SEPARATOR).split("#{__callee__}∎", 2)
         [tagify(∃_grip_tag(__callee__), {:class => ∃_grip(__callee__)[:class]}, mine), rest]
       end
 
@@ -35,12 +38,14 @@ module Qipowl
       # @param [String] param the text to be places on the same string as
       # opening tag
       # @return [Nil] nil
-      def ∀_block param, args
+      def ∀_block *args
+        param, *args = args.flatten
+        param = param.to_s
         harvest __callee__, 
                 tagify(
                   ∃_block_tag(__callee__), 
                   {:class => (param.strip.empty? ? ∃_block(__callee__)[:class] : param.strip)}, 
-                  args.hsub(String::HTML_ENTITIES)
+                  args.join(SEPARATOR).hsub(String::HTML_ENTITIES)
                 )
       end
   

data/lib/qipowl/bowlers/i_sp_ru.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+# КТО ЧТО_ДЕЛАЕТ КОМУ   ЧТО
+#  ☺       ⚙         ♿      ☕
+
+# КАКОЙ   КАК   КАКОЙ  КАКОЙ
+#  ☼        ☂        ☼       ☼
+
+# ПОКА НЕ ОПРЕДЕЛЕНА ЧАСТЬ РЕЧИ (найти термин для)
+#                 ∈
+
+# МАРКЕРЫ ДЛЯ ПАДЕЖЕЙ, ВРЕМЕН, [ДЕЕ]ПРИЧАСТИЙ ИТД.
+# например: глагол_наст.вр_деепричастие — «сетуя»
+
+require 'typogrowth'
+
+require_relative '../core/bowler'
+
+module Qipowl
+  module Mappers
+    class IspruBowlerMapper < BowlerMapper
+      
+    end
+  end
+
+  module Bowlers
+    class Ispru < Bowler
+
+      attr_reader :dict
+
+      LANG_FROM = 'es' # FIXME UGLY
+      LANG_TO   = 'ru' # FIXME UGLY
+      
+##############################################################################
+###              Default handlers for all the types of markup              ###
+##############################################################################
+
+      # `:regular` default handler
+      # @param [Array] args the words, gained since last call to {#harvest}
+      def ∀_regular *args
+        ["#{__callee__}", [*args].flatten]
+      end
+
+      # Drum-roll!! The main handler for words
+      def ∀_word method, *args, &block
+        [(@dict[method.to_s.unbowl] || method).bowl, args]
+      end
+
+=begin
+      def ． *args
+      end
+      def ， *args
+      end
+      def ； *args
+      end
+      def ！ *args
+      end
+      def ？ *args
+      end
+      def ！ *args
+        [__callee__, args]
+      end
+      def ： *args
+        [__callee__, args]
+      end
+=end
+    protected
+      def defreeze str
+        @dict = {'Mamá' => 'Мама', 'lavados' => 'моет', 'marco' => 'раму'}
+        (super str) # .typo(LANG_FROM)
+      end
+
+      # @see {Qipowl::Bowler#serveup}
+      #
+      # Additionally it beatifies the output HTML
+      # 
+      # @param [String] str to be roasted
+      def serveup str
+        (super str).typo(LANG_TO).strip
+      end
+
+    private
+      # Hence we cannot simply declare the DSL for it, we need to handle 
+      # calls to all the _methods_, starting with those symbols.
+      # 
+      # @param [Symbol] method as specified by caller (`method_missing`.)
+      # @param [Array] args as specified by caller (`method_missing`.)
+      # @param [Proc] block as specified by caller (`method_missing`.)
+      # 
+      # @return [Array] the array of words
+      def special_handler method, *args, &block
+        ∀_word method, args, block
+      end
+    end
+  end
+end

data/lib/qipowl/core/bowler.rb

@@ -46,7 +46,7 @@ module Qipowl::Bowlers
     # Everything is a DSL, remember?
     #
     # @return true
-    def respond_to?(method)
+    def respond_to? method, incl_priv = false
       true
     end
 
@@ -68,7 +68,7 @@ module Qipowl::Bowlers
         if self.private_methods.include?(:special_handler)
       [method, args].flatten
     end
-        
+
     # Adds new +entity+ in the section specified.
     # E. g., call to
     #
@@ -125,7 +125,7 @@ module Qipowl::Bowlers
     %w(block alone magnet grip regular).each { |section|
       define_method "∀_#{section}".to_sym, ->(*args) {
         raise "Default method for #{section} (“#{self.class.name.gsub(/_\d+\Z/, '')}#∀_#{section}”) MUST be defined"
-      }
+      } unless Bowler.instance_methods(true).include?("∀_#{section}".to_sym)
     }
 
     def defreeze str
@@ -133,14 +133,14 @@ module Qipowl::Bowlers
     end
 
     def roast str
-      (split str).reverse.map { |dish|
+      (split str).map { |dish|
         @yielded = []
         rest = begin
-          eval(dish.strip.carriage)
+          eval(dish.bowl.carriage)
         rescue Exception => e
           msg = e.message.dup
           logger.error '='*78
-          logger.error "Could not roast dish [#{msg.force_encoding(Encoding::UTF_8)}].\nWill return as is… Dish follows:"
+          logger.error "Could not roast dish [#{msg.force_encoding(Encoding::UTF_8)}].\nWill return as is… Dish follows:\n\n"
           logger.error '-'*78
           logger.error dish
           logger.error '='*78
@@ -148,7 +148,7 @@ module Qipowl::Bowlers
         end
         harvest(nil, orphan([*rest].join(SEPARATOR))) # FIXME Check if this is correct in all the cases
         @yielded.pop(@yielded.size).reverse.join(SEPARATOR)
-      }.reverse.join($/).uncarriage.un␚ify.unspacefy.unbowl
+      }.join($/).uncarriage.un␚ify.unspacefy.unbowl
     end
   
     def serveup str
@@ -204,12 +204,13 @@ module Qipowl::Bowlers
   private
     # Prepares blocks in the input for the execution
     def block str
+      return str unless self.class.const_defined?(:BLOCK_TAGS)
       result = str.dup
       self.class::BLOCK_TAGS.each { |tag, value|
-        result.gsub!(/(#{tag})\s*(\S*\s*|$)(.*?)(#{tag}|\Z)/m) {
+        result.gsub!(/(#{tag})\s*(\S*\s?|$)(.*?)(#{tag}|\Z)/m) {
           %Q{
 
-#{$1}('#{$2.strip}', '#{$3.carriage}')
+#{$1} #{$2.strip.bowl} #{$3.bowl.carriage}
 
 }
         }
@@ -219,17 +220,19 @@ module Qipowl::Bowlers
 
     # Prepares customs in the input for the execution
     def custom str
-      result = str.unbowl.dup
+      return str unless self.class.const_defined?(:CUSTOM_TAGS)
+      result = str.dup
       self.class::CUSTOM_TAGS.each { |tag, value|
-        result.gsub!(/#{tag}/, value)
+        result.gsub!(/#{tag}/m, value)
       }
-      result.bowl
+      result
     end
 
     # Prepares grips in the input for the execution
     # FIX<E There is a problem: we append a trailing space, need to remove it later!!
     def grip str
-      result = str.dup
+      return str unless self.class.const_defined?(:GRIP_TAGS)
+      result = str.bowl
       self.class::GRIP_TAGS.each { |tag, value|
         result.gsub!(/(?:#{tag})(.*?)(?:#{tag})/m) {
           next if (args = $1).vacant?
@@ -237,12 +240,13 @@ module Qipowl::Bowlers
           "⌦ #{tag} #{args}#{tag}∎⌫"
         }
       }
-      result
+      result.unbowl
     end
     
     def split str
-      (block str.bowl).split(/\R{2,}/).map { |para|
-        para =~ /\A(#{self.class::BLOCK_TAGS.keys.join('|')})\(/ ?
+      (block str).split(/\R{2,}/).map { |para|
+        self.class.const_defined?(:BLOCK_TAGS) &&
+              (para =~ /\A(#{self.class::BLOCK_TAGS.keys.join('|')})\s+/) ?
           para : (grip custom para)
       }
     end

data/lib/qipowl/core/mapper.rb

@@ -37,7 +37,7 @@ module Qipowl::Mappers
       @hash.rmerge!(input.to_hash)
       incs.each { |inc|
         merge! inc
-      } rescue NoMethodError
+      } rescue NoMethodError # FIXME WTF rescueing here?
     end
   private
   # FIXME Make file search more flexible!!!
@@ -49,6 +49,8 @@ module Qipowl::Mappers
   end
   
   class BowlerMapper < Mapper
+    include TypoLogging
+    
     def initialize input = nil
       input = self.class.name.split('::').last.downcase.gsub(/bowlermapper\Z/, '') if input.nil?
       super input
@@ -57,7 +59,7 @@ module Qipowl::Mappers
     @entities_dirty = true
 
     def entities
-      return @entities unless @entities_dirty
+      return @entities unless @entities_dirty && @hash[:entities]
       @entities = {}
       @hash[:entities].each { |key, value| # :block. :alone etc
         @entities[key] ||= {}
@@ -78,10 +80,6 @@ module Qipowl::Mappers
       @entities
     end
   end
-  
-  class HtmlBowlerMapper < BowlerMapper
-    
-  end
 end
   
 if __FILE__ == $0

data/lib/qipowl/core/monkeypatches.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require_relative '../utils/unicode_strings'
 require_relative '../utils/hash_recursive_merge'
 
 module Qipowl
@@ -114,11 +115,11 @@ module Qipowl
       self.gsub!(/\R/, " #{CARRIAGE_RETURN} ")
     end
     def uncarriage
-      self.gsub(/ #{CARRIAGE_RETURN} /, %Q(
+      self.gsub(/\s?#{CARRIAGE_RETURN}\s?/, %Q(
 ))
     end
     def uncarriage!
-      self.gsub!(/ #{CARRIAGE_RETURN} /, %Q(
+      self.gsub!(/\s?#{CARRIAGE_RETURN}\s?/, %Q(
 ))
     end
 

data/lib/qipowl/core/ruler.rb

@@ -57,9 +57,12 @@ module Qipowl
         
       @@yamls[yaml] = clazz.new
     end
+        
+    # FIXME Make contants PER-EIGENCLASS
     def teach_class clazz, mapper
       clazz.const_set("CUSTOM_TAGS", mapper.to_hash[:custom])
       clazz.const_set("ENCLOSURES_TAGS", mapper.to_hash[:enclosures])
+      clazz.const_set("ENTITIES", mapper.entities)
       clazz.const_set("TAGS", {})
       clazz.class_eval %Q{
         def ∃_enclosures entity
@@ -73,9 +76,10 @@ module Qipowl
         end
       }
       %w(block alone magnet grip regular).each { |section|
+        next unless mapper.entities && mapper.entities[section.to_sym]
         clazz.const_set("#{section.upcase}_TAGS", mapper.entities[section.to_sym])
         clazz.class_eval %Q{
-          #{clazz}::TAGS.rmerge! #{clazz}::#{section.upcase}_TAGS
+          self::TAGS.rmerge! self::#{section.upcase}_TAGS
           def ∃_#{section} entity
             self.class::#{section.upcase}_TAGS.each { |k, v|
               next unless k == entity
@@ -93,7 +97,7 @@ module Qipowl
           tag = Hash === value && value[:marker] ? value[:marker] : "∀_#{section}"
           clazz.class_eval %Q{
             alias_method :#{key}, :#{tag}
-          } unless clazz.instance_methods.include?(key)
+          } unless clazz.instance_methods.include?(key.to_sym)
         }
       }
       clazz.class_eval %Q{

data/lib/qipowl/utils/unicode_strings.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+if 'мама'.upcase != 'МАМА'
+  require 'unicode'
+  class ::String
+     def downcase
+       Unicode::downcase(self)
+     end
+     def downcase!
+       self.replace downcase
+     end
+     def upcase
+       Unicode::upcase(self)
+     end
+     def upcase!
+       self.replace upcase
+     end
+     def capitalize
+       Unicode::capitalize(self)
+     end
+     def capitalize!
+       self.replace capitalize
+     end
+  end
+end
+

data/lib/qipowl/version.rb

@@ -1,3 +1,3 @@
 module Qipowl
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/qipowl.rb

@@ -4,7 +4,9 @@ require_relative "qipowl/version"
 require_relative "qipowl/core/mapper"
 require_relative "qipowl/core/ruler"
 require_relative "qipowl/core/bowler"
+
 require_relative "qipowl/bowlers/html"
+require_relative "qipowl/bowlers/i_sp_ru"
 #require_relative "qipowl/bowlers/cmd"
 #require_relative "qipowl/bowlers/yaml"
 
@@ -33,18 +35,16 @@ module Qipowl
     instance_eval(&block)
   end
 
-  def self.tg__html
-    Html.new
-  end
-  
-  def self.tg_md__html
-    result = tg__html
-    result.merge_rules "#{File.dirname(__FILE__)}/tagmaps/markdown2html.yaml"
-    result
-  end
 end
 
 Qipowl::config do
   params :bowlers_dir
   bowlers_dir File.expand_path(File.join(__dir__, '..', 'config', 'bowlers'))
+end
+
+class Qipowl::Html
+  attr_reader :bowler
+  def self.parse s
+    (@bowler ||= Qipowl::Ruler.new_bowler "html").execute s
+  end
 end

data/qipowl.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard-cucumber'
 
   s.add_dependency 'psych'
-  s.add_dependency 'nokogiri'
-  s.add_dependency 'htmlbeautifier'
+  s.add_dependency 'unicode'
+  s.add_dependency 'typogrowth'
   s.add_dependency 'aquarium'
   s.add_dependency 'crochets'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qipowl
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Alexei Matyushkin
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: unicode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: htmlbeautifier
+  name: typogrowth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -172,6 +172,7 @@ files:
 - config/bowlers/cmd.yaml
 - config/bowlers/html.yaml
 - config/bowlers/html_supplemental.yaml
+- config/bowlers/ispru.yaml
 - config/bowlers/markdown2html.yaml
 - extras/demo/main.rb
 - extras/demo/public/apple-touch-icon-114x114-precomposed.png
@@ -201,8 +202,12 @@ files:
 - extras/support/typo
 - features/bowler.feature
 - features/html.feature
+- features/ispru.feature
+- features/monkey.feature
 - features/step_definitions/bowler_steps.rb
 - features/step_definitions/html_steps.rb
+- features/step_definitions/ispru_steps.rb
+- features/step_definitions/monkey_steps.rb
 - features/support/env.rb
 - images/owl-old.png
 - images/owl-old.xcf
@@ -211,7 +216,7 @@ files:
 - lib/qipowl.rb
 - lib/qipowl/bowlers/cmd.rb
 - lib/qipowl/bowlers/html.rb
-- lib/qipowl/bowlers/htmldoc.rb
+- lib/qipowl/bowlers/i_sp_ru.rb
 - lib/qipowl/bowlers/yaml.rb
 - lib/qipowl/core/bowler.rb
 - lib/qipowl/core/mapper.rb
@@ -219,6 +224,7 @@ files:
 - lib/qipowl/core/ruler.rb
 - lib/qipowl/utils/hash_recursive_merge.rb
 - lib/qipowl/utils/logging.rb
+- lib/qipowl/utils/unicode_strings.rb
 - lib/qipowl/version.rb
 - qipowl.gemspec
 - qipowl.komodoproject

data/lib/qipowl/bowlers/htmldoc.rb

@@ -1,268 +0,0 @@
-# encoding: utf-8
-
-require 'nokogiri'
-require 'fileutils'
-require 'yaml'
-require_relative '../core/monkeypatches.rb'
-require_relative '../utils/hash_recursive_merge.rb'
-
-module Qipowl
-
-  class HtmlDoc < Nokogiri::XML::SAX::Document
-    attr_reader :qp, :tags
-    def initialize mapping
-      @mapping = mapping
-      @inside = nil
-      @collector = {}
-      @tags = {:inplace => {}, :linewide => {}}
-      @qp = ''
-      @level = 0
-    end
-
-    def start_element name, attributes = []
-      current_attrs = Hash[attributes]
-      
-      @qp +=  case name.to_sym
-              when :p, :div
-                if current_attrs['class']
-                  @collector[name.to_sym] = "✿_#{name.to_sym}_#{current_attrs['class'].gsub(/\s+/, '_')}".to_sym
-                  @tags[:linewide][@collector[name.to_sym]] = "#{name.to_sym}†#{current_attrs['class'].gsub(/\s+/, '†')}".to_sym
-                  "\n\n#{@collector[name.to_sym]} "
-                else
-                  "\n\n"
-                end
-              when :ul, :ol, :table, :dl
-                @inside = name.to_sym
-                "\n"
-              when :pre then "\n\nΛ\n"
-              when :tr then " ┇ "
-              when :td then " ┆ "
-              when :a
-                @inside = :a
-                @collector[:href] = current_attrs['href']
-                @collector[:name] = current_attrs['name']
-                ''
-              when :li then (@inside == :ol) ? "◦ " : "• "
-              when :b, :strong then "≡"
-              when :i, :em, :nobr then "≈"
-              when :strike, :del, :s then "─"
-              when :small then "↓"
-              when :u then "▁"
-              when :code, :tt then "λ"
-              when :dfn, :abbr, :cite
-                @inside = name.to_sym
-                @collector[:title] = current_attrs['title']
-              when :hr then "\n\n——\n\n"
-              when :br then " ⏎\n"
-              when :center then "\n— "
-              when :dt then "▷ "
-              when :dd then " — "
-              when :h1 then "§1 "
-              when :h2 then "§2 "
-              when :h3 then "§3 "
-              when :h4 then "§4 "
-              when :h5 then "§5 "
-              when :h6 then "§6 "
-              when :blockquote then "\n\n〉 "
-              when :figure
-                @inside = :figure
-                "\n\n"
-              when :figcaption then " "
-              when :img then fix_href(current_attrs['src'])
-              when :span, :sup
-                if current_attrs['class'].nil?
-                  ''
-                else
-                  @collector[name.to_sym] = "✿_span_#{current_attrs['class'].gsub(/\s+/, '_')}".to_sym
-                  @tags[:inplace][@collector[name.to_sym]] = "span†#{current_attrs['class'].gsub(/\s+/, '†')}".to_sym
-                  " #{@collector[name.to_sym]}"
-                end
-              when :embed, :iframe then "\n\n#{current_attrs['src']}\n\n"
-              when :html, :body, :object, :param, :thead, :tbody, :font, :'lj-embed', :'lj-cut'
-                ''
-              else
-                raise "=== Unhandled: #{name} with attrs: [#{current_attrs}]"
-                ''
-              end
-    end
-
-    def characters str
-      case @inside 
-      when :a, :dfn, :abbr
-        @collector[:text] = str
-      else
-        @qp += str
-      end
-    end
-
-    def end_element name
-      @qp +=  case name.to_sym
-              when :p, :div
-                @collector.delete(name.to_sym)
-                "\n\n"
-              when :a
-                @inside = nil
-                (href= @collector.delete(:href)) ?
-                  " #{(@collector.delete(:text) || '').gsub(/\s+/, "\u{00A0}")}¹#{fix_href href} " :
-                  "☇ #{@collector.delete(:name)} #{@collector.delete(:text)}"
-              when :dfn, :abbr, :cite
-                @inside = nil
-                result = " #{@collector.delete(:text).gsub(/\s+/, "\u{00A0}")}†#{@collector.delete(:title)}† " rescue ''
-                result
-              when :ul, :ol, :table, :dl
-                @inside = nil
-                "\n"
-              when :li then "\n"
-              when :pre then "\nΛ\n\n"
-              when :b, :strong then "≡"
-              when :i, :em, :nobr then "≈"
-              when :u then "▁"
-              when :dd then "\n"
-              when :strike, :del, :s then "─"
-              when :small then "↓"
-              when :code, :tt then "λ"
-              when :span, :sup
-                "#{@collector.delete(name.to_sym)} "
-              when :h1, :h2, :h3, :h4, :h5, :h6 then "\n\n"
-              when :blockquote then "\n\n"
-              when :figure
-                @inside = nil
-                "\n\n"
-              else
-                ''
-              end
-    end
-    
-  private
-    def fix_href href, site = 'http://mudasobwa.ru/'
-      href.start_with?('http') ? href : href.gsub(/\A\/+/, '').prepend(site)
-    end
-  end
-
-end
-
-if __FILE__ == $0
-  
-def prepare str
-  str.gsub(/&[nm]dash;/, '—')            # dashes
-     .gsub(/&nbsp;/, ' ')            # dashes
-     .gsub(/\s+--\s+/, ' — ')            # dashes
-     .gsub(/^\s*/, '')            # leading spaces
-     .gsub(/<img src="\/i\/>/, '')
-     .gsub(/&trade;/, '™')               # other entities
-     .gsub(/&copy;/, '©')               # other entities
-     .gsub(/(1st@1stone.ru|am@secondiary.ru)/, 'am@mudasobwa.ru')
-     .gsub(/http:\/\/(www\.)?(secondiary|1stone|matiouchkine.net)\.ru/, 'http://mudasobwa.ru')  # obsolete site name
-     .gsub(/\[(http[^\]]*)\]/, '\1')     # obsolete markdown pics
-     .gsub(/<span>\s*<\/span>/, 'λ\1λ')     # obsolete markdown pics
-     .gsub(/<lj (?:comm|user)="(.*?)">/, '✎ \1')     # obsolete markdown pics
-     .gsub(/<([^<>]*?@[^<>]*?)>/, '\1')     # obsolete markdown pics
-     .gsub(/<imgsrc=/, '<img src=')     # obsolete markdown pics
-     .gsub(/<ahref=/, '<a href=')     # obsolete markdown pics
-     .gsub(/<\/p>\s*<p>\s*—/, " ⏎\n—")  # direct speech
-     .gsub(/<br(?:\s*\/?\s*)>\s*<br(?:\s*\/?\s*)>/, "\n\n")  # old-fashioned carriage     
-     .gsub(/<[!]--[^<>]*?-->/, '')            # comments
-#     .gsub(/([\.,:;!?])(?=\S)/, '\1 ')            # fix punctuation
-end
-
-def postpare str
-  str.gsub(/\R{2,}/, "\n\n")
-     .gsub(/\A(\s|⏎)*/, '')
-     .gsub(/(\s|⏎)*\Z/, '')
-end
-
-tags = {
-  :magnet => {:✎ => :lj, :☇ => :a},
-  :inplace => {:▁ => :u, :─ => :del},
-  :linewide => {:☛ => :twit},
-  :block => {:✁ => :cut}
-}
-file = "#{File.dirname(__FILE__)}/../../../data/internals/posts.csv"
-file_errors = "#{File.dirname(__FILE__)}/../../../data/internals/errors.txt"
-FileUtils.rm file_errors if File.exist? file_errors
-
-FileUtils.mkdir("#{File.dirname(__FILE__)}/../../../data/site")                
-# %w{txt pic ref twt}.each {|d| FileUtils.mkdir("#{File.dirname(__FILE__)}/../../../data/site/#{d}")}
-
-puts "Reading #{file} …"
-File.readlines(file).each { |l|
-  data = l.split('☢')
-  puts "Processing record #{data[0]}"
-  begin
-    html_doc = Qipowl::HtmlDoc.new nil
-    parser = Nokogiri::HTML::SAX::Parser.new(html_doc)
-    parser.parse(prepare data[2])
-    tags.rmerge! html_doc.tags
-    body = postpare(html_doc.qp)
-    
-    body = body.strip if body
-    
-    id    = data[0]
-    title = data[1].gsub(/'/, "’")
-    date  = data[3]
-    img   = data[4]
-
-    if img && !img.empty? && !img.start_with?('http://')
-      img = "http://mudasobwa.ru/i/#{img.gsub(/\A\/+/, '')}"
-    end
-    
-    q_doc = Qipowl::HtmlDoc.new nil
-    q_parser = Nokogiri::HTML::SAX::Parser.new(q_doc)
-    q_parser.parse(prepare data[5])
-    tags.rmerge! q_doc.tags
-    quote = postpare(q_doc.qp)
-
-    q_url = data[6]
-    type  = data[7].to_i  # 1 => text, 2 => image, 3 => quote, 4 => twit
-    stype = case type
-            when 1 then :txt
-            when 2 then :pic
-            when 3 then :ref
-            when 4 then :twt
-            else :txt
-            end
-  
-    owl_text = %Q(---
-title: '#{title}'
-id: #{id}
-date: '#{date}'
-categories: [#{stype}]
----
-
-)
-#    owl_text << (type == 4 ? "☛ " : "§1 ")
-#    owl_text << title
-#    owl_text << "\n\n"
-
-    owl_text << case type
-                when 2
-                  "#{img} #{body.gsub(/\R/, ' ⏎ ')}"
-                when 3
-                  q_ref = q_url[/http:\/\/(.*?)\/|\Z/, 1].split('.').last(2).join('.') rescue nil
-                  "\n〉 #{quote.strip}\n‒ #{q_ref ? q_ref : q_url}, #{q_url}\n\n#{body}"
-                else body
-                end
-
-    fname = "#{date.split.first}-#{title.to_filename}.owl"
-    fname = (1..100).each {|i|
-      break "#{date.split.first}-#{title.to_filename}-#{i}.owl" \
-        unless File.exist?("#{File.dirname(__FILE__)}/../../../data/site/#{date.split.first}-#{title.to_filename}-#{i}.owl")
-    } if File.exist?("#{File.dirname(__FILE__)}/../../../data/site/#{fname}")
-    File.open("#{File.dirname(__FILE__)}/../../../data/site/#{fname}", 'a') { |f| f.write(owl_text) }
-
-  rescue Exception => e
-    puts '—'*40
-    puts 'Error occured'
-    puts prepare(data[2])
-    puts '—'*40
-    puts prepare(data[5])
-    puts '—'*40
-    raise e
-  end
-}
-
-File.open("#{File.dirname(__FILE__)}/../../../data/site/rules.yaml", 'a') { |f|
-  f.write(tags.to_yaml)
-}
-
-end