enjoy_cms_goto 0.3.7 → 0.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac37e01d38bd2f30b7a1386733bac3989a21ad05
-  data.tar.gz: 960fd4f624f441a30aec6a2c8a3b60579c4aa6a2
+  metadata.gz: e44d5d1040026ba29bc6070702d9f7ca05fffe8b
+  data.tar.gz: bc002af3019a8c6f5490d587877e06830516e22f
 SHA512:
-  metadata.gz: 2f718d039cdd527dcc7f1844182720aae509313c640f37ef33254bea3aa254b4ef21c2df3a5b21b7eb7e73ad5e48a7700e828c93b0012e001f670a54ded14c09
-  data.tar.gz: 3582d133bdb0f82f9f5ae338881338e51cd8b6a34fdb49592aff673dc402347553ad52d7d725f6b2b7215deb3afb43be9138b4d807e500491dbb59191e710c4a
+  metadata.gz: f4b36e4fda1839ccc6f8d9e541cb40f1da45d46baf1a903114703fa00a74e439716380f6df371bd1755c434afdc19b5db8e63c0bff47a55fdd8fcdfc07f64306
+  data.tar.gz: 2bc15d2253430224d927468da1025dc079847b3d34933c68b9b8d3afbd76817077d963ba7c2931789e5c6cbbfbe162b29dd96563d98f500df564133ea1d9eca7

data/.ruby-gemset

@@ -0,0 +1 @@
+enjoy_cms_goto

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/config/initializers/enjoy_goto.rb

@@ -0,0 +1,22 @@
+Enjoy.configure do |config|
+  config.ability_manager_config ||= []
+  config.ability_manager_config << {
+    method: :can,
+    model: Enjoy::Goto::Transfer,
+    actions: [:read]
+  }
+
+  config.ability_admin_config ||= []
+  config.ability_admin_config << {
+    method: :can,
+    model: Enjoy::Goto::Transfer,
+    actions: :manage
+  }
+end
+
+Enjoy.rails_admin_configure do |config|
+  if defined?(RailsAdminComments)
+    config.action_visible_for :comments, 'Enjoy::Goto::Transfer'
+    config.action_visible_for :model_comments, 'Enjoy::Goto::Transfer'
+  end
+end

data/config/locales/enjoy.goto.ru.yml

@@ -1,5 +1,7 @@
 ru:
-  mongoid:
+  enjoy:
+    goto: 'Переходы с сайта'
+  mongoid: &mongoid
     models:
       enjoy/goto/transfer: "Переходы с сайта"
     attributes:
@@ -10,3 +12,6 @@ ru:
         referer: Страница, с которой перешли
         source_ip: IP пользователя
         creator: Пользователь
+
+  activerecord:
+    <<: *mongoid

data/enjoy_cms_goto.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'enjoy_cms', "~> 0.3.7"
+  spec.add_dependency 'enjoy_cms', "~> 0.4.0.beta3"
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'addressable'
 end

data/lib/enjoy/goto/admin/transfer.rb

@@ -3,6 +3,11 @@ module Enjoy::Goto
     module Transfer
       def self.config(fields = {})
         Proc.new {
+          if defined?(Enjoy::Feedback)
+            navigation_label I18n.t('enjoy.feedback')
+          else
+            navigation_label I18n.t('enjoy.goto')
+          end
 
           field :creator do
             filterable true

data/lib/enjoy/goto/configuration.rb

@@ -13,7 +13,26 @@ module Enjoy
 
     class Configuration
 
+      attr_accessor :css_selector
+      attr_accessor :href_regex
+      attr_accessor :excluded_hosts
+
+      attr_accessor :add_nofollow
+      attr_accessor :add_noindex
+      attr_accessor :add_noreferrer
+      attr_accessor :add_noopener
+      attr_accessor :del_attrs
+
       def initialize
+        @css_selector = "a[href]"
+        @href_regex = /^(https?:)?\/\//i
+        @excluded_hosts = []
+
+        @add_nofollow = true
+        @add_noindex = true
+        @add_noreferrer = true
+        @add_noopener = true
+        @del_attrs = true
       end
     end
   end

data/lib/enjoy/goto/controllers/transfers.rb

@@ -4,10 +4,10 @@ module Enjoy::Goto
       extend ActiveSupport::Concern
 
       def index
-        url = Addressable::URI.parse(params[:url]) rescue nil
+        url = Addressable::URI.heuristic_parse(params[:url]) rescue nil
         referer = (request.referer ? Addressable::URI.parse(request.referer) : nil) rescue nil
 
-        @transfer = Transfer.new
+        @transfer = transfer_class.new
         @transfer.recieved_url = params[:url]
         @transfer.url = url.to_s
         @transfer.host = url.host.to_s if url
@@ -18,6 +18,10 @@ module Enjoy::Goto
         redirect_to @transfer.url, code: 303
       end
 
+      def transfer_class
+        Enjoy::Goto::Transfer
+      end
+
     end
   end
 end

data/lib/enjoy/goto/middleware.rb

@@ -5,9 +5,20 @@ require 'rack'
 module Enjoy::Goto
   class Middleware
 
+    ATTRS = {
+      disabled:       'data-enjoy-goto-disabled',
+      add_nofollow:   'data-enjoy-goto-add-nofollow',
+      add_noindex:    'data-enjoy-goto-add-noindex',
+      add_noreferrer: 'data-enjoy-goto-add-noreferrer',
+      add_noopener:   'data-enjoy-goto-add-noopener',
+      del_attrs:      'data-enjoy-goto-del-attrs'
+    }
+
+    REL_ATTRS = ATTRS
+    REL_ATTRS.delete(:disabled)
+
     def initialize(app, options = {})
       @app = app
-      @excluded_hosts = options.delete(:excluded_hosts) || []
       self
     end
 
@@ -16,15 +27,22 @@ module Enjoy::Goto
 
       if headers['Content-Type'].to_s.include?('text/html')
         begin
-          doc = Nokogiri::HTML.parse(body.body)
-          doc.css("a[href]").each do |a|
+          doc = Nokogiri::HTML.fragment(body.body)
+          doc.css(Enjoy::Goto.config[:css_selector]).each do |a|
+            if (!a[ATTRS[:disabled]].blank? and !["0", "false", "no"].include?(a[ATTRS[:disabled]]))
+              del_attrs(a)
+              next
+            end
+
             _href = a['href']
-            if _href =~ /^(https?:)?\/\//i
+            if _href =~ Enjoy::Goto.config[:href_regex]
               begin
                 _host = Addressable::URI.parse(_href).host
-                unless @excluded_hosts.include?(_host)
+                unless Enjoy::Goto.config[:excluded_hosts].include?(_host)
                   a['href'] = Rails.application.routes.url_helpers.enjoy_goto_path(url: _href)
                   a['target'] = '_blank' if a['target'].blank?
+                  set_rel_attribute(a)
+                  del_attrs(a)
                 end
               rescue
               end
@@ -37,5 +55,47 @@ module Enjoy::Goto
 
       [status, headers, body]
     end
+
+    private
+    def check_attr(a, attr_name)
+      Enjoy::Goto.config[attr_name] or (!a[ATTRS[attr_name]].blank? and !["0", "false", "no"].include?(a[ATTRS[attr_name]]))
+    end
+
+    def add_attr(a, attr_name)
+      rel = a['rel'].blank? ? [] : a.rel.split(" ")
+      rel << attr_name unless rel.include?(attr_name)
+      a
+    end
+
+    def add_nofollow(a)
+      add_attr('nofollow') if check_attr(a, :add_nofollow)
+    end
+
+    def add_noindex(a)
+      add_attr('noindex') if check_attr(a, :add_noindex)
+    end
+
+    def add_noreferrer(a)
+      add_attr('noreferrer') if check_attr(a, :add_noreferrer)
+    end
+
+    def add_noopener(a)
+      add_attr('noopener') if check_attr(a, :add_noopener)
+    end
+
+    def del_attrs(a)
+      if check_attr(ATTRS[del_attrs])
+        ATTRS.values.each do |attr|
+          a.remove_attribute(attr)
+        end
+      end
+    end
+
+    def set_rel_attribute(a)
+      REL_ATTRS.keys.each do |meth|
+        self.send(meth, a)
+      end
+    end
+
   end
 end

data/lib/enjoy/goto/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Goto
-    VERSION = "0.3.7"
+    VERSION = "0.4.0.beta3"
   end
 end

data/lib/enjoy_cms_goto.rb

@@ -2,7 +2,7 @@ require "enjoy/goto/version"
 
 require "enjoy/goto/routes"
 
-require 'enjoy_cms'
+# require 'enjoy_cms'
 
 require 'mongoid'
 require 'mongoid_userstamp'
@@ -15,7 +15,7 @@ module Enjoy
   module Goto
     class << self
       def orm
-        :mongoid
+        :mongoid #Enjoy.orm
       end
       def mongoid?
         Enjoy::Goto.orm == :mongoid

data/lib/generators/{config → enjoy/goto/config}/install_generator.rb

@@ -1,11 +1,11 @@
 require 'rails/generators'
 
-module Enjoy::Goto::Config
-  class InstallGenerator < Rails::Generators::Base
+module Enjoy::Goto
+  class ConfigGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
     desc 'Enjoy::Goto Config generator'
-    def install
+    def config
       template 'enjoy_goto.erb', "config/initializers/enjoy_goto.rb"
     end
 

data/lib/generators/enjoy/goto/config/templates/enjoy_goto.erb

@@ -0,0 +1,12 @@
+Enjoy::Goto.configure do |config|
+  ##### defaults #####
+  # config.css_selector = "a[href]"
+  # config.href_regex = /^(https?:)?\/\//i
+  # config.excluded_hosts = []
+
+  # config.add_nofollow = true
+  # config.add_noindex = true
+  # config.add_noreferrer = true
+  # config.add_noopener = true
+  # config.del_attrs = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_goto
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0.beta3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0.beta3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -99,7 +101,7 @@ files:
 - app/models/enjoy/goto/transfer.rb
 - bin/console
 - bin/setup
-- config/initializers/rails_admin.rb
+- config/initializers/enjoy_goto.rb
 - config/locales/enjoy.goto.ru.yml
 - enjoy_cms_goto.gemspec
 - lib/enjoy/goto/admin.rb
@@ -113,8 +115,8 @@ files:
 - lib/enjoy/goto/routes.rb
 - lib/enjoy/goto/version.rb
 - lib/enjoy_cms_goto.rb
-- lib/generators/config/install_generator.rb
-- lib/generators/config/templates/enjoy_goto.erb
+- lib/generators/enjoy/goto/config/install_generator.rb
+- lib/generators/enjoy/goto/config/templates/enjoy_goto.erb
 - release.sh
 homepage: https://github.com/enjoycreative/enjoy_cms_goto
 licenses:
@@ -131,12 +133,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: URL redirect dispatcher with EnjoyCMS support.

data/config/initializers/rails_admin.rb

@@ -1,8 +0,0 @@
-if defined?(RailsAdmin)
-  RailsAdmin.config do |config|
-    config.excluded_models ||= []
-    config.excluded_models << [
-    ]
-    config.excluded_models.flatten!
-  end
-end

data/lib/generators/config/templates/enjoy_goto.erb

@@ -1,3 +0,0 @@
-Enjoy::Goto.configure do |config|
-  ##### defaults #####
-end