string_master 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82692a09cefda620a2fc88697bcbc7382abfc33
-  data.tar.gz: 3541faa9f5b5c657d618722af5e8c646873d4857
+  metadata.gz: a6eb20322a22a9deea5805d592055c2665125861
+  data.tar.gz: 8155230d47972e417a0493f88f0af7a07bfc9d3f
 SHA512:
-  metadata.gz: 7fa14aa940a227d4aa6cb89895bf761a5ed89f0b6fd403ea8f7e48900bde7f60737ec0550969854ade40585eb5b34fda10efc8315546d6e03ca1d819c72bcf54
-  data.tar.gz: e563f83012a7ef46869f565dd17d8165f78e265ba6145ac042800396405bc7c5086c5c6ef0d52d69bdd10a49e1b7157b0679bb8dc7983840d123f67446197d87
+  metadata.gz: c040bc7898f29bfa65e9a16ec0dd92846e0b772de01a2ac06f12ad3a3c3991c260c32c2f5cadd4341509bca40737631f7ae79d76c70da0e06763300107588e03
+  data.tar.gz: 68222ac8ebc89779e6ed45d4f87eb34e79e359a1d1ce27201d2e4aeeefe387fbcf7385ccd28c24b4c7c4b8ae959ba6e9124cb9e0a9ed1ca940778f66e54bcb36

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/string_master/string_master.rb

@@ -51,8 +51,8 @@ class StringMaster
     wrap_with    = options[:wrap_with]    || ['','']
     html_options = options[:html_options] || ''
     @modified_string.gsub!(
-      /(\s|^|\A|\n|\t|\r)(http:\/\/.*?\.(jpg|jpeg|png|gif|JPG|JPEG|PNG|GIF))([,.])?(\s|$|\n|\Z|\t|\r)/,
-      "#{wrap_with[0]}<img src=\"\\2\" alt=\"\" #{html_options}/>\\5#{wrap_with[1]}"
+      /(\s|^|\A|\n|\t|\r)((http|https):\/\/.*?\.(jpg|jpeg|png|gif|JPG|JPEG|PNG|GIF))([,.])?(\s|$|\n|\Z|\t|\r)/,
+      "#{wrap_with[0]}<img src=\"\\2\" alt=\"\" #{html_options}/>\\6#{wrap_with[1]}"
     )
     self
   end
@@ -64,8 +64,8 @@ class StringMaster
     wrap_with = options[:wrap_with] || ['','']
     html_options = options[:html_options] || ''
     @modified_string.gsub!(
-      /(\s|^|\A|\n|\t|\r)(http:\/\/.*?)([,.])?(\s|$|\n|\Z|\t|\r|<)/,
-      '\1<a href="\2" ' + html_options + '>\2</a>\3\4'
+      /(\s|^|\A|\n|\t|\r)((http|https):\/\/.*?)([,.])?(\s|$|\n|\Z|\t|\r|<)/,
+      '\1<a href="\2" ' + html_options + '>\2</a>\4\5'
     )
     self
   end

data/spec/lib/string_master/string_master_spec.rb

@@ -14,12 +14,19 @@ describe StringMaster do
     parser.html_escape(:except => %w(b)).to_s.should == '&lt;i&gt;hello&lt;/i&gt; <b>world</b>'
     parser = StringMaster.new('<a href="http://google.com">hello</a> <b>world</b>')
     parser.html_escape(:except => %w(a)).to_s.should == '<a href="http://google.com">hello</a> &lt;b&gt;world&lt;/b&gt;'
+    parser = StringMaster.new('<a href="https://google.com">hello</a> <b>world</b>')
+    parser.html_escape(:except => %w(a)).to_s.should == '<a href="https://google.com">hello</a> &lt;b&gt;world&lt;/b&gt;'
   end
 
   it "makes images of urls that end with .jpg and other image extensions" do
     parser = StringMaster.new('Hello, this is my photo http://image.com/image.jpg, yeah baby')
     parser.urls_to_images(:wrap_with => ['<p>', '</p>'], :html_options => 'class="ico"').string.should == 
       'Hello, this is my photo<p><img src="http://image.com/image.jpg" alt="" class="ico"/> </p>yeah baby'
+
+    # use https
+    parser = StringMaster.new('Hello, this is my photo https://image.com/image.jpg, yeah baby')
+    parser.urls_to_images(:wrap_with => ['<p>', '</p>'], :html_options => 'class="ico"').string.should == 
+      'Hello, this is my photo<p><img src="https://image.com/image.jpg" alt="" class="ico"/> </p>yeah baby'
   end
 
   it "makes links of urls" do
@@ -36,6 +43,10 @@ describe StringMaster do
     # example 3
     parser = StringMaster.new('http://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png<br>')
     parser.urls_to_links.string.should == '<a href="http://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png" >http://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png</a><br>'
+
+    # example 4, with https
+    parser = StringMaster.new('https://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png<br>')
+    parser.urls_to_links.string.should == '<a href="https://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png" >https://gyazo.com/a4c16e7a6009f40f29248ad4fed41bd3.png</a><br>'
   end
 
   it "wraps code in <code> tags" do
@@ -113,6 +124,12 @@ WRAPPED_CODE
     end
     parser.string.should ==
       "<img src=\"http://images.com/image.jpg\" alt=\"\" /> <b>Hello <a href=\"http://url.com\" target=\"_blank\">http://url.com</a> </b>"
+
+    parser = StringMaster.new('https://images.com/image.jpg <b>Hello https://url.com </b>') do |p|
+      p.urls_to_images.urls_to_links(:html_options => 'target="_blank"')
+    end
+    parser.string.should ==
+      "<img src=\"https://images.com/image.jpg\" alt=\"\" /> <b>Hello <a href=\"https://url.com\" target=\"_blank\">https://url.com</a> </b>"
   end
 
   it "replaces newline characters with <br/> tags" do

data/string_master.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: string_master 0.3.10 ruby lib
+# stub: string_master 0.3.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "string_master"
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2015-08-13"
+  s.date = "2015-08-18"
   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 = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_master
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack