linkificator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd55f7b84fe5b8cc95452c4233f849cc56fb4b06
-  data.tar.gz: c4761b2b55ed9cc0f54a36f49a976db5f6b7e776
+  metadata.gz: 8d701023fd8a8105a73009361fcbd4bb3c37c913
+  data.tar.gz: 883dcb257b7e2d4a6817eb6de9589b552bd833d9
 SHA512:
-  metadata.gz: 2e47037d7c5caa01dfb5bb96176e54d7fc98149435beb72055127ce4c5a20650a872665ad7d2dd77f1d6a9b7ce7487b86af4b9dff68a29486db5801de2591f73
-  data.tar.gz: 10db3e4381d5dddadce0387d8a4ec2c60d2d507d58945b080073e660cfdfa807531e58b4a933413350a3963063eae70ba153bef391cbf93131ae3599461a42af
+  metadata.gz: 0138f1086f91eeef3c8b22cb056e268f5f9da9edd2a05a2574d84cc95ceed3665be7befdfd6579ecbe2d67d4b1ae51dd79b48eb6a600abbb2e9302f678020518
+  data.tar.gz: bf36ebce95a639dede5edab96a1110416cc79b94e82fa247a417396ca32931185ccf4f9f8009c6448a67675354a35500aeeda564b61f98d511b48fb52ac6487e

data/README.md

@@ -95,7 +95,7 @@ seo_link_to('text', 'http://other.com')   # => <a href="http://other.com">text</
 
 ## Contributing
 
-1. Fork itр
+1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/linkificator.rb

@@ -4,8 +4,8 @@ require 'linkificator/conditions_storage/condition'
 
 module Linkificator
 
-  def for_conditions(conditions)
-    ConditionsStorage.new(conditions)
+  def self.for_conditions(conditions, options={})
+    ConditionsStorage.new(conditions, options)
   end
 
 end

data/lib/linkificator/conditions_storage.rb

@@ -2,10 +2,11 @@ require 'base64'
 
 class Linkificator::ConditionsStorage
 
-  attr_reader :conditions
+  attr_reader :conditions, :options
 
-  def initialize(conditions)
-    @conditions = conditions.map { |hash| Condition.new(hash) }
+  def initialize(conditions, options={})
+    @conditions = conditions.map { |hash| Condition.new(hash.merge(options)) }
+    @options    = options
   end
 
   def condition_for(options={})
@@ -14,17 +15,18 @@ class Linkificator::ConditionsStorage
     end
   end
 
-  def link_to(*params, &block)
-    context = extract_context(params)
-    condition = condition_for(context) || Condition.new
-    condition.link_to(*params, &block)
+  def link_to(name = nil, options = nil, html_options = nil, &block)
+    context = extract_context(name, options, html_options, &block)
+    condition = condition_for(context) || Condition.new(self.options)
+    condition.link_to(name, options, html_options, &block)
   end
 
 private
 
-  def extract_context(params)
+  def extract_context(name = nil, options = nil, html_options = nil, &block)
+    html_options, options = options, name if block_given?
     context = {}
-    context[:target] = params[1] if params[1].is_a?(String)
-    context.merge!((params[2] || {}).delete(:context) || {})
+    context[:target] = options if options.is_a?(String)
+    context.merge!((html_options || {}).delete(:context) || {})
   end
 end

data/lib/linkificator/conditions_storage/condition.rb

@@ -1,8 +1,8 @@
 class Linkificator::ConditionsStorage::Condition
-  attr_reader :conditions
+  attr_reader :options
 
-  def initialize(conditions={})
-    @conditions = conditions
+  def initialize(options={})
+    @options = options
   end
 
   def match?(options)
@@ -14,21 +14,27 @@ class Linkificator::ConditionsStorage::Condition
     ].all?
   end
 
-  def link_to(*params, &block)
-    updated_params = params.clone
+  def link_to(name = nil, options = nil, html_options = nil, &block)
+    html_options, options, name = options, name, block if block_given?
+    options ||= {}
 
-    view_context = view_context((updated_params[2] || {}).delete(:view_context))
+    view_context = view_context((html_options || {}).delete(:view_context))
 
     if processing[:data_href]
-      url               = view_context.url_for(*updated_params[1])
-      updated_params[2] = (updated_params[2] || {}).merge('href' => '#', 'data-href' => Base64.strict_encode64(url))
+      url          = view_context.url_for(*options)
+      html_options = (html_options || {}).merge('href' => '#', 'data-href' => Base64.strict_encode64(url))
     end
 
     if processing[:rel_nofollow]
-      updated_params[2] = (updated_params[2] || {}).merge(rel: 'nofollow')
+      html_options = (html_options || {}).merge(rel: 'nofollow')
     end
 
-    link = view_context.link_to(*updated_params, &block)
+
+    link = if block_given?
+             call_link_method(view_context, options, html_options, &block)
+           else
+             call_link_method(view_context, name, options, html_options)
+           end
 
     if processing[:wrap_noindex]
       view_context.content_tag(:noindex) { link }
@@ -45,7 +51,7 @@ class Linkificator::ConditionsStorage::Condition
     include ActionView::Context
   end
 
-  def view_context(view_context)
+  def view_context(view_context=nil)
     view_context || (@view_context ||= ViewContext.new)
   end
 
@@ -63,10 +69,20 @@ class Linkificator::ConditionsStorage::Condition
   end
 
   def context
-    @context ||= conditions[:context] || {}
+    @context ||= options[:context] || {}
   end
 
   def processing
-    @processing ||= conditions[:processing] || {}
+    @processing ||= options[:processing] || {}
+  end
+
+  def call_link_method(view_context, *params, &block)
+    @link_method = if options[:link_via] && view_context(view_context).respond_to?(options[:link_via])
+                       options[:link_via]
+                     else
+                       :link_to
+                     end
+
+    view_context(view_context).send(*([@link_method] + params), &block)
   end
 end

data/lib/linkificator/version.rb

@@ -1,3 +1,3 @@
 module Linkificator
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/conditions_storage/condition_spec.rb

@@ -129,5 +129,29 @@ describe Linkificator::ConditionsStorage::Condition do
       end
     end
 
+    context 'with block' do
+      let(:condition) {
+        Linkificator::ConditionsStorage::Condition.new(
+            processing: {rel_nofollow: true}
+        )
+      }
+      it do
+        expect(condition.link_to('http://example.com'){ 'text' }).to eq('<a href="http://example.com" rel="nofollow">text</a>')
+      end
+    end
+
+    context 'use custom link_to methods' do
+      let(:condition) {
+        Linkificator::ConditionsStorage::Condition.new(
+            processing: {rel_nofollow: true},
+            link_via: :custom_link_to
+        )
+      }
+      it do
+        expect_any_instance_of(Linkificator::ConditionsStorage::Condition::ViewContext).to receive(:custom_link_to)
+        expect(condition.link_to('text', 'http://example.com')).to eq(nil)
+      end
+    end
+
   end
 end

data/spec/conditions_storage_spec.rb

@@ -19,7 +19,7 @@ describe Linkificator::ConditionsStorage do
 
   context '#link_to' do
     it 'dont match anything' do
-      expect(storage.link_to('text', 'http://example.com/c')).to   eq('<a href="http://example.com/c">text</a>')
+      expect(storage.link_to('text', 'http://example.com/c')).to eq('<a href="http://example.com/c">text</a>')
     end
     it 'match by target' do
       expect(storage.link_to('text', 'http://example.com/a/b')).to eq('<noindex><a href="http://example.com/a/b">text</a></noindex>')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linkificator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - dizer