linkhum 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDZmOTk1OTg3ZjU2MzYxMTc2ZTA1ZDM1YjM4NmI2NWJlYzdkMWUyYQ==
+    MjZjODJiMGM1N2Q2ZjdlOTkyN2IyMThkNGQ4MDI3NjgyMzJhYzExZA==
   data.tar.gz: !binary |-
-    MmFjMWJlOTk3YjM5MGEyOTkzNWE2Y2E5NzYwZTFmM2U1Yjc5MjQwNw==
+    M2MwNTM2MGVmZjk5ZmZiMzMyOGU4YWFkN2Q2NDUyY2M0ODJlZWUzOA==
 SHA512:
   metadata.gz: !binary |-
-    ZGE1YTI2MzFmY2E3OGY4OTJkNTg2Mjk5YzI3ZTFjZDAzNmFkNmI0MTMyMzVh
-    MTJjMjgzZGU0MjYxMjZiNWRkYTZmYjYzOGVhY2U1ZmU0NWU4MzI3ZjQ5YzIx
-    MjI1MTU4ZTM4NTAyMjc1N2Y3MzU2NGE2NGQzZGFhNjdlOTZkYjI=
+    OTY5ZGIzNzdkZjgzYWJkODcyYjJlZjYzMzM4NGRiNGViYjNhMjUxNTdmMTM0
+    NDNhMTY2NzE4NzNlMDY4ZWQ2NTA4OTE4ZmU0YzIyZGY1ZWY4Y2Y0NjZkNWFj
+    YTdkZGY1N2U3NmMzMTA0NjU2ZTlkYWRlYTgyZTcwNWI0NGU2NzA=
   data.tar.gz: !binary |-
-    NzcwZjRmNDcwYTc4OTVjNTY4OTY2NTQ5OTg3NWIwZjZhOGU5MWFkOTExNGVm
-    MThkNDAzYmFlMjRkYTkwNWNiMWE0MTk3NWY1NzBmM2U4NGQ5NjY0ODA2MmFi
-    NGRjMGFkNzM0ZjY2NjU3NzRhZDNkMjEwNzYyMWI5YmZkYWJiYjY=
+    YWMwMDdhMzZjNzcxMDMyMTlhN2E0MmRkMGY1NDBmMzA0N2UwYWRjMjZjNGU5
+    MjljNGNmZTkxOTIxMDJlMjlkN2ZjZmY1MDhkODI0MjhmZTIyZjRmMWE0MzRm
+    N2NkMTM1OWQxYzQ1YTY1ZGFiYTlhODY3OWNhOTIwNzdhNGI5NDQ=

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.0.2 (2015-07-16)
+
+* Now supporting several `special` blocks in same class.

data/README.md

@@ -123,19 +123,19 @@ MyLinks.urlify("Hey, @jude!")
 # => "Hey, <a href='http://oursite/users/jude'>@jude</a>!"
 
 # nil or false means no replacements:
-class MyLinks < LinkHum
+class MyLinksConditional < LinkHum
   special /@(\S+)\b/ do |username|
     "http://oursite/users/#{username}" if User.where(name: username).exists?
   end
 end
 
-MyLinks.urlify("So, our @dude and @unknownguy walk into a bar...")
+MyLinksConditional.urlify("So, our @dude and @unknownguy walk into a bar...")
 # => "So, our <a href='http://oursite/users/dude'>@dude</a> and @unknownguy walk into a bar..."
 ```
 
 Some `special` gotchas:
-* for now, only one `special` per class is supported (an attempt to define
-  additional one will show warningn);
+* in version 0.0.2, you can define any number of `special`s, but it's
+  totally up to you to have non-conflicting, clearly distinguished patterns;
 * it passes to the block values by the same logic as `String#scan` does:
 
 ```ruby

data/lib/linkhum.rb

@@ -10,13 +10,12 @@ class LinkHum
       new(text).urlify(options.merge(link_processor: block))
     end
 
-    def special(pattern = nil, &block)
-      return @special unless pattern
-
-      @special and
-        puts("Warning: redefining #{self}.special from #{caller.first}")
+    def specials
+      @specials ||= []
+    end
 
-      @special = [pattern, block]
+    def special(pattern = nil, &block)
+      specials << [pattern, block]
     end
   end
 
@@ -52,18 +51,26 @@ class LinkHum
   def process_text(str)
     str = CGI.escapeHTML(str)
     
-    pattern, block = self.class.special
-
-    if pattern
-      str.gsub(pattern){|s|
-        if (u = block.call(*arguments(pattern, s)))
-          "<a href='#{screen_feet(u)}'>#{s}</a>"
-        else
-          s
-        end
-      }
-    else
+    if self.class.specials.empty?
       str
+    else
+      replace_specials(str)
+    end
+  end
+
+  def replace_specials(str)
+    patterns = self.class.specials.map(&:first)
+    blocks = self.class.specials.map(&:last)
+    
+    str.gsub(Regexp.union(patterns)) do |s|
+      pattern = patterns.detect{|p| s[p] == s}
+      idx = patterns.index(pattern)
+      
+      if idx && (u = blocks[idx].call(*arguments(pattern, s)))
+        "<a href='#{screen_feet(u)}'>#{s}</a>"
+      else
+        s
+      end
     end
   end
 

data/linkhum.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'linkhum'
-  s.version  = '0.0.1'
+  s.version  = '0.0.2'
   s.authors  = ['Alexey Makhotkin', 'Victor Shepelev']
   s.email    = 'zverok.offline@gmail.com'
   s.homepage = 'https://github.com/zverok/linkhum'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkhum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexey Makhotkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .dokaz
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - lib/linkhum.rb