string_master 0.2.1 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.1

data/lib/string_master/string_master.rb

@@ -68,41 +68,6 @@ class StringMaster
     self
   end
 
-  # Highlights code using 'uv' library.
-  # Make sure you have ultraviolet gem installed.
-  def highlight_code(options={})
-    begin
-      require 'uv'
-    rescue LoadError
-      raise LoadError, "Gem 'ultraviolet' is required to highlight code. Please install the gem. Note that it fails to build native extensions with ruby 1.9.x so it's only possible to use it with ruby 1.8.x\n\n "
-    end
-
-    wrap_with = options[:wrap_with] || ['','']
-    text = @modified_string
-
-    languages_syntax_list = File.readlines(
-      File.expand_path(File.dirname(__FILE__) + '/../config/languages_syntax_list')
-    ).map { |l| l.chomp }
-
-    text.gsub!(/<code(\s*?lang=["']?(.*?)["']?)?>(.*?)<\/code>/) do
-      if languages_syntax_list.include?($2)
-        lang = $2
-      else
-        lang = 'ruby'
-      end
-      unless $3.blank?
-        result = Uv.parse($3.gsub('<br/>', "\n").gsub('&lt;', '<').gsub('&gt;', '>').gsub('&quot;', '"'), 'xhtml', lang, false, 'active4d')
-        "#{wrap_with[0].gsub('$lang', lang)}#{result}#{wrap_with[1]}"
-      end
-    end
-
-    # TODO: split string longer than 80 characters
-
-    @modified_string = text
-    self
-
-  end
-
   # Breaks words that are longer than 'length'
   def break_long_words(length=75, &block)
     @modified_string.gsub!(/<a [^>]+>|<img [^>]+>|([^\s^\n^\^^\A^\t^\r<]{#{length},}?)|<\/a>/) do |s|
@@ -134,6 +99,34 @@ class StringMaster
     self
   end
 
+  # 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 = ""
+    @modified_string.each_line do |line|
+      if line =~ /\A\s{4}/
+        result += "<#{tag}>" unless code_open
+        code_open = true
+        result += line.sub(regexp, '')
+      else
+        result.chomp!
+        result += "</#{tag}>\n" if code_open
+        code_open = false
+        result += line
+      end
+    end
+    @modified_string = result
+  end
+
+  # Finds all lines that start with 4 spaces and wraps them into <code> tags.
+  def wrap_code
+    wrap_lines("code", /\A\s{4}/)
+  end
+
+  def wrap_inline_code(opening_tag="<span class=\"inlineCode\">", closing_tag="</span>")
+    @modified_string.gsub!(/`(.+?)`/, opening_tag + '\1' + closing_tag)
+  end
+
   def to_s
     modified_string.html_safe
   end

data/spec/lib/string_master/string_master_spec.rb

@@ -34,15 +34,25 @@ describe StringMaster do
     parser.urls_to_links.string.should == '<a href="http://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png" >http://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png</a><br>'
   end
 
-  it "highlights code" do
-    begin
-      require 'uv'
-      parser = StringMaster.new('<code>print "hello, world!"</code>')
-      parser.highlight_code.string.should == '<pre class="active4d">print <span class="String"><span class="String">&quot;</span>hello, world!<span class="String">&quot;</span></span>' + "\n</pre>"
-    rescue LoadError
-      pending "This test is skipped because 'ultraviolet' gem is not installed. If you wish to highlight code in a string, install this gem manually. Note that it fails to build native extensions with ruby 1.9.x so it's only possible to use it with ruby 1.8.x"
-    end
+  it "wraps code in <code> tags" do
+    code = <<CODE
+I have a piece of code
+    puts "hello world"
+    exit
+and here's what my code looks like.
+CODE
+    StringMaster.new(code).wrap_code.should == <<WRAPPED_CODE
+I have a piece of code
+<code>puts "hello world"
+exit</code>
+and here's what my code looks like.
+WRAPPED_CODE
+  end
 
+  it "wraps inline code into <span class=\"inlineCode\"></span> tags" do
+    code = "I have a variable called `a` and it has a `nil` value"
+    parser = StringMaster.new(code)
+    parser.wrap_inline_code.should == "I have a variable called <span class=\"inlineCode\">a</span> and it has a <span class=\"inlineCode\">nil</span> value"
   end
 
   it "breaks long words" do

data/string_master.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{string_master}
-  s.version = "0.2.1"
+  s.name = "string_master"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Snitko"]
-  s.date = %q{2011-11-24}
-  s.description = %q{Because every time I create a new webapp, I think about how I should process user-generated content. Should convert urls to links and images? Should I allow certain tags? Should I convert all new lines to *br* tags? Well, now all that is as simple as calling a single method.}
-  s.email = %q{roman.snitko@gmail.com}
+  s.date = "2012-05-30"
+  s.description = "Because every time I create a new webapp, I think about how I should process user-generated content. Should convert urls to links and images? Should I allow certain tags? Should I convert all new lines to *br* tags? Well, now all that is as simple as calling a single method."
+  s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "string_master.gemspec"
   ]
-  s.homepage = %q{http://github.com/snitko/string_master}
+  s.homepage = "http://github.com/snitko/string_master"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Most common string manipulations for a webapp}
+  s.rubygems_version = "1.8.21"
+  s.summary = "Most common string manipulations for a webapp"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: string_master
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 +04:00
-default_executable: 
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &23351540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23351540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23350300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23350300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23305120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23305120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23303060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23303060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23301300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23301300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Because every time I create a new webapp, I think about how I should
   process user-generated content. Should convert urls to links and images? Should
   I allow certain tags? Should I convert all new lines to *br* tags? Well, now all
@@ -94,7 +118,6 @@ files:
 - spec/lib/string_master/string_master_spec.rb
 - spec/spec_helper.rb
 - string_master.gemspec
-has_rdoc: true
 homepage: http://github.com/snitko/string_master
 licenses:
 - MIT
@@ -110,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1809944806549981373
+      hash: -1214522452410579616
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Most common string manipulations for a webapp