qipowl 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: c27c57511c9dffe2f1d4c5f36f5f689f811b4081
-  data.tar.gz: 5df7de841f328a65f71311772fd7ca815617f118
+  metadata.gz: b1285e55189abe3129f00711fb21fbc905440796
+  data.tar.gz: 2b46cc8dbd9b675f5293a8ebd3242aee06a2e06b
 !binary "U0hBNTEy":
-  metadata.gz: 989c41bdb4f38b793b55dbbd7c3164d9cb8b29735c0ddbd71ec3486c670587bc6937a04fdad7068c2fd9f5489c64812fda9ae98ad6fabadbec2dac97ad9e6594
-  data.tar.gz: 3ae8a24d7788cabc4dcdf647dae1e686adfca7e699f710c5013546914efa719fb5e5dd39cf89b900193e242292af0b891e035b2e7fac77547f669f1be17bcf57
+  metadata.gz: 84bca4876f808702f0c4d8ae4a28ea46a9319fb7319c855c231d3b27ffadebaafecc85f8c94821d9373e6c8d087a526355900ba0d61a1668ad82e8cfd57ed605
+  data.tar.gz: 045c623b7344d3c84e47beb8240742fb04cabb329007e7f9a14814fec415efe0289381eaa505d7150e144780caf8b518386356f73a38dff112f34d30407256f8

data/Gemfile

@@ -4,13 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'aquarium', '~> 0.6', :git => 'git://github.com/deanwampler/Aquarium.git'
-gem "crochets", :git => 'git://github.com/mudasobwa/crochets.git'
-
-#gem "diff-lcs", :git => 'git://github.com/halostatue/diff-lcs.git'
-
-#gem "rspec-core", :git => 'git://github.com/rspec/rspec-core.git'
-#gem "rspec-expectations", :path => '../rspec-expectations'
-#gem "rspec-mocks", :git => 'git://github.com/rspec/rspec-mocks.git'
-# gem "rspec", :git => 'git://github.com/rspec/rspec.git'
 
 gem 'rake', :group => :test

data/lib/qipowl/bowlers/html.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'net/http'
+require 'typogrowth'
 
 require_relative '../core/bowler'
 
@@ -197,6 +198,13 @@ module Qipowl
       alias_method :▷, :▶
 
     protected
+      # @see {Qipowl::Bowlers::Bowler#defreeze}
+      # 
+      # @param [String] str to be defreezed
+      def defreeze str
+        (super str)
+      end
+
       # Computes the level of the `:linewide` element by counting
       # preceeding non-breakable spaces. For instance, nested lists
       # are produced by appending `"\u{00A0}"` to the line item
@@ -216,6 +224,14 @@ module Qipowl
         callee.to_s.gsub(/^#{String::NBSP}*/, '').to_sym if callee
       end
 
+      # Produces html paragraph tag (`<p>`) with no class.
+      # @see Qipowl::Bowler#orphan
+      # @param str the words, to be put in paragraph tag.
+      # @return [String] tagged words.
+      def orphan str
+        "#{tagify(:p, {}, str.to_s.strip)}"
+      end
+
       # @see Qipowl::Bowler#harvest
       # 
       # Additionally it checks if there was a `:linewide` item, requiring
@@ -259,13 +275,6 @@ module Qipowl
         send method, args, block
       end
 
-      # Produces html paragraph tag (`<p>`) with class `owl`.
-      # @see Qipowl::Bowler#orphan
-      # @param str the words, to be put in paragraph tag.
-      # @return [String] tagged words.
-      def orphan str
-        "#{tagify(:p, {}, str.to_s.strip)}"
-      end
       # Constructs opening html tag for the input given.
       # 
       # To construct `abbr` tag with `title` _Title_ and class _default_:
@@ -365,23 +374,6 @@ end
     
 
     
-    # @see {Qipowl::Bowler#defreeze}
-    # 
-    # Additionally it checks if tag is a `:block` tag and 
-    # substitutes all the carriage returns (`$/`) with special symbol
-    # {String::CARRIAGE_RETURN} to prevent format damage.
-    # 
-    # @param [String] str to be defreezed
-    def defreeze str
-      str = super str
-      @mapping[:block].each { |tag, htmltag|
-        str.gsub!(/(#{tag})(.*?)$(.*?)(#{tag}|\Z)/m) { |m|
-          "#{$1}('#{$2}', '#{$3}')\n\n"
-        }
-      }
-      str
-    end
-
     # @see {Qipowl::Bowler#serveup}
     #
     # Additionally it beatifies the output HTML

data/lib/qipowl/core/ruler.rb

@@ -20,8 +20,6 @@ module Qipowl
     extend self
 
     @@bowlers = {} # FIXME REDIS!!!!
-    @@yamls = {}
-
     
     def get_bowler id: nil, type: nil
       @@bowlers[id] || new_bowler(type, true)
@@ -50,13 +48,11 @@ module Qipowl
       
   private
     def get_yaml yaml
-      return @@yamls[yaml] if @@yamls[yaml]
-      
       clazz = Qipowl::Mappers.const_get("#{yaml.capitalize}BowlerMapper")
       raise NameError.new("Invalid mapper type: #{clazz}") \
         unless clazz.is_a?(Class) && clazz < Qipowl::Mappers::BowlerMapper
         
-      @@yamls[yaml] = clazz.new
+      clazz.new
     end
         
     # FIXME Make contants PER-EIGENCLASS

data/lib/qipowl/version.rb

@@ -1,3 +1,3 @@
 module Qipowl
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/qipowl.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'psych'
   s.add_dependency 'unicode'
-  s.add_dependency 'typogrowth'
-  s.add_dependency 'aquarium'
+  s.add_dependency 'typogrowth', '~> 0.9.0', '>= 0.9.1'
+  s.add_dependency 'aquarium', '~> 0.6'
   s.add_dependency 'crochets'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qipowl
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Alexei Matyushkin
@@ -112,30 +112,36 @@ dependencies:
   name: typogrowth
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: aquarium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: crochets
   requirement: !ruby/object:Gem::Requirement