string_master 0.3.5 → 0.3.6

data/Gemfile

@@ -5,6 +5,5 @@ gem "actionpack"
 group :development do
   gem "bundler"
   gem "jeweler"
-  gem "rcov"
   gem "rspec"
 end

data/Gemfile.lock

@@ -1,22 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.4)
+      activemodel (= 3.2.4)
+      activesupport (= 3.2.4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.4)
+      activesupport (= 3.2.4)
       builder (~> 3.0.0)
+    activesupport (3.2.4)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
@@ -24,29 +23,31 @@ GEM
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+      rdoc
+    journey (1.0.3)
+    json (1.7.3)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sprockets (2.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -59,5 +60,4 @@ DEPENDENCIES
   actionpack
   bundler
   jeweler
-  rcov
   rspec

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/string_master/string_master.rb

@@ -101,19 +101,30 @@ class StringMaster
 
   # Finds lines of text that satisfy a 'regexp' and wraps them into an
   # opening and closing 'tag'. Best example of usage is #wrap_code.
-  def wrap_lines(tag, regexp)
-    code_open = false; result = ""
+  #
+  # Also receives an option :remove_newlines (default is false)
+  # which removes \n around the tag that wraps the lines of text. Useful if
+  # you're using this method with #newlines_to_br to avoid extra space that may or
+  # may not be in the user's input.
+  def wrap_lines(tag, regexp, options={remove_newlines: false})
+    code_tag = nil; result = ""
     @modified_string.each_line do |line|
       if line =~ regexp
-        result += "<#{tag}>" unless code_open
-        code_open = true
+        unless code_tag == :opened
+          result.chomp! if options[:remove_newlines]
+          result += "<#{tag}>" 
+          code_tag = :opened
+        end
         result += line.sub(regexp, '')
       else
-        if code_open
+        if code_tag == :opened
+          code_tag = :closed
           result.chomp!
-          result += "</#{tag}>\n" 
+          result += "</#{tag}>"
+        elsif code_tag == :closed
+          code_tag = nil
+          result.chomp! if options[:remove_newlines]
         end
-        code_open = false
         result += line
       end
     end
@@ -125,7 +136,7 @@ class StringMaster
   # It also transforms each occurence of 2 or more spaces into an &nbsp; entity,
   # which is available as a standalone method #preserve_whitespace 
   def wrap_code
-    wrap_lines("code", /\A\s{4}/) 
+    wrap_lines("code", /\A\s{4}/, remove_newlines: true) 
     preserve_whitespace_within("code") # already returns `self`
   end
 

data/spec/lib/string_master/string_master_spec.rb

@@ -44,12 +44,10 @@ I have a piece of code
 and here's what my code looks like.
 CODE
     StringMaster.new(code).wrap_code.to_s.should == <<WRAPPED_CODE
-I have a piece of code
-<code>def say_hello
+I have a piece of code<code>def say_hello
 &nbsp;&nbsp;puts "hello world"
 &nbsp;&nbsp;return true
-end</code>
-and here's what my code looks like.
+end</code>and here's what my code looks like.
 WRAPPED_CODE
   end
 

data/string_master.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "string_master"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Snitko"]
@@ -47,20 +47,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<actionpack>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<actionpack>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<actionpack>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: string_master
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -380418558032014970
+      hash: -1937837215791656684
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: