hancock_cms_goto 1.0.1.3 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9771d8e1b490bf827afc4e10ab3e970cd6ed66da
-  data.tar.gz: f947668e1a9d7afdde70f4046e3a20261bff84bc
+  metadata.gz: 932b515ab4747afce58b9df9d20db449b4ae7c06
+  data.tar.gz: ab16fc9166fb4dd6442d00747ccea30292fc4c88
 SHA512:
-  metadata.gz: dc4e4f86484628d774e4e105167a22411e7a027852dd85cf4488065ae6645a1ea71a90dee736d4d27f9bb7a9ad108604f4c7f4cdd60c86afba8dddd305496ccf
-  data.tar.gz: 4a77dae4bd934d11d0e7ec3c456180f9d990f02c7186bbc87a516f95f1846e0f98baaee5f0ef1ff67df6f677d0af67400f1cddbb7950fcacf0e6400ab542740b
+  metadata.gz: e6577e2407fae1ed2bb2275be10d41250264a84fa861229150b0a605920351fae0a45cfc7d038b24afd601bfb30f87fb6cc3a814de60b767963f3e4c66db7c2c
+  data.tar.gz: d5bd15db08c6203d61309cf090c83ce8383a08a8ed385f884a5064598402cbc2a746c475c38fb1b8ad21deed5fd376aa9c5b437a84cec1c84f37464cf6443f85

data/app/models/concerns/hancock/goto/decorators/transfer.rb

@@ -24,8 +24,15 @@ module Hancock::Goto::Decorators
       # end
 
       ############# rails_admin ##############
+      # def self.rails_admin_name_synonyms
+      #   "".freeze
+      # end
+      # def self.rails_admin_navigation_icon
+      #   ''.freeze
+      # end
+      #
       # def self.rails_admin_add_fields
-      #   [] #super
+      #   [].freeze #super
       # end
       #
       # def self.rails_admin_add_config(config)

data/app/views/hancock/goto/transfers/index.html.slim

@@ -0,0 +1,8 @@
+= hidden_field_tag nil, @target_url, id: 'redir'
+javascript:
+  window.opener=null;
+  window.location.replace(document.getElementById('redir').value);
+noscript
+  meta content="0;URL='#{@target_url}'" http-equiv="refresh"
+  = form_tag @target_url, method: "GET", authenticity_token: false, enforce_utf8: false do
+    = submit_tag "Continue"

data/hancock_cms_goto.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'hancock_cms', [">=1.0.1", "<=2.1"]
-  # spec.add_dependency 'hancock_cms', ["~> 1.0", "~> 2.1"]
+  spec.add_dependency 'hancock_cms', [">=1.0.2", "<2.1.x"]
+  # spec.add_dependency 'hancock_cms', ["~> 1.0.2", "~> 2.0"]
 
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'addressable'

data/lib/generators/hancock/goto/config/templates/hancock_goto.erb

@@ -13,4 +13,6 @@ Hancock::Goto.configure do |config|
   # config.model_settings_support = !!defined?(RailsAdminModelSettings)
   # config.user_abilities_support = !!defined?(RailsAdminUserAbilities)
   # config.ra_comments_support = !!defined?(RailsAdminComments)
+
+  # config.method = :render_view # or :redirect_from_controller
 end

data/lib/generators/hancock/goto/models/templates/transfer.erb

@@ -16,27 +16,34 @@ class <%= camelcased_class_name %> < Hancock::Goto::Transfer
   # end
 
   ############ rails_admin ##############
+  def self.rails_admin_name_synonyms
+    "".freeze
+  end
+  def self.rails_admin_navigation_icon
+    ''.freeze
+  end
+
   def self.rails_admin_add_fields
-    [] #super
+    [].freeze #super
   end
 
   def self.rails_admin_add_config(config)
     #super(config)
   end
 
-  def admin_can_user_defined_actions
+  def self.admin_can_user_defined_actions
     [].freeze
   end
-  def admin_cannot_user_defined_actions
+  def self.admin_cannot_user_defined_actions
     [].freeze
   end
-  def manager_can_user_defined_actions
+  def self.manager_can_user_defined_actions
     [].freeze
   end
-  def manager_cannot_user_defined_actions
+  def self.manager_cannot_user_defined_actions
     [].freeze
   end
-  def rails_admin_user_defined_visible_actions
+  def self.rails_admin_user_defined_visible_actions
     [].freeze
   end
 

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

@@ -1,12 +1,18 @@
 module Hancock::Goto
   module Admin
     module Transfer
-      def self.config(fields = {})
+      def self.config(nav_label = nil, fields = {})
+        if nav_label.is_a?(Hash)
+          nav_label, fields = nav_label[:nav_label], nav_label
+        elsif nav_label.is_a?(Array)
+          nav_label, fields = nil, nav_label
+        end
+
         Proc.new {
           if defined?(Hancock::Feedback)
-            navigation_label I18n.t('hancock.feedback')
+            navigation_label nav_label || I18n.t('hancock.feedback')
           else
-            navigation_label I18n.t('hancock.goto')
+            navigation_label nav_label || I18n.t('hancock.goto')
           end
 
           field :creator do
@@ -17,7 +23,7 @@ module Hancock::Goto
                 creator = bindings[:object].creator
                 model_name = creator.class.to_param.gsub("::", "~").underscore
                 _url = route.rails_admin.show_path(model_name: model_name, id: creator._id)
-                route.link_to(creator.name_for_hancock_cms, _url, class: "creator_link")
+                route.link_to(creator, _url, class: "creator_link")
               end
             end
           end
@@ -58,12 +64,22 @@ module Hancock::Goto
           end
           field :session_id do
             searchable true
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and render_object.current_user.admin?
+            end
           end
           field :session_data_unpack do
             searchable true
             read_only true
+            visible do
+              render_object = (bindings[:controller] || bindings[:view])
+              render_object and render_object.current_user.admin?
+            end
           end
 
+          Hancock::RailsAdminGroupPatch::hancock_cms_group(self, fields)
+
           if block_given?
             yield self
           end

data/lib/hancock/goto/configuration.rb

@@ -14,6 +14,7 @@ module Hancock
 
       attr_accessor :css_selector
       attr_accessor :href_regex
+      attr_accessor :href_attr_regex
       attr_accessor :excluded_hosts
 
       attr_accessor :add_nofollow
@@ -26,20 +27,25 @@ module Hancock
       attr_accessor :user_abilities_support
       attr_accessor :ra_comments_support
 
+      attr_accessor :method
+
       def initialize
         @css_selector = "a[href]"
         @href_regex = /^(https?:)?\/\//i
+        @href_attr_regex = /\shref=[\'\"](https?:)?\/\//i
         @excluded_hosts = []
 
         @add_nofollow = true
         @add_noindex = true
-        @add_noreferrer = true
+        @add_noreferrer = false
         @add_noopener = true
         @del_attrs = true
 
         @model_settings_support = !!defined?(RailsAdminModelSettings)
         @user_abilities_support = !!defined?(RailsAdminUserAbilities)
         @ra_comments_support = !!defined?(RailsAdminComments)
+
+        @method = :render_view
       end
 
       def default_html_options

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

@@ -4,21 +4,41 @@ module Hancock::Goto
       extend ActiveSupport::Concern
 
       def index
-        url = Addressable::URI.heuristic_parse(params[:url]) rescue nil
-        referer = (request.referer ? Addressable::URI.parse(request.referer) : nil) rescue nil
+        begin
+          @url = Addressable::URI.heuristic_parse(params[:url])
+          @target_url = @url.to_s
+        rescue
+          redirect_to root_path
+          return false
+        end
+
+        Thread.new(params.clone, session.clone, request.clone, transfer_class, @url) do |_params, _session, _request, transfer_class, url|
+          begin
+            referer = (_request.referer ? Addressable::URI.parse(_request.referer) : nil) rescue nil
 
-        @transfer = transfer_class.new
-        @transfer.recieved_url = params[:url]
-        @transfer.url = url.to_s
-        @transfer.host = url.host.to_s if url
-        @transfer.referer = referer.to_s
-        @transfer.source_ip = request.env['HTTP_X_FORWARDED_FOR'] || request.remote_ip
-        if Hancock::Goto.mongoid?
-          @transfer.set_session(session)
+            @transfer = transfer_class.new
+            @transfer.recieved_url = _params[:url]
+            @transfer.url = url.to_s
+            @transfer.host = url.host.to_s if url
+            @transfer.referer = referer.to_s
+            @transfer.source_ip = _request.env['HTTP_X_FORWARDED_FOR'] || _request.remote_ip
+            if Hancock::Goto.mongoid?
+              @transfer.set_session(_session)
+            end
+            @transfer.save
+          rescue Exception => ex
+            puts ex.inspect
+          end
         end
-        @transfer.save
 
-        redirect_to @transfer.url, code: 303
+        case Hancock::Goto.config.method.to_sym
+        when :render_view
+          render layout: false
+        when :redirect_from_controller
+          redirect_to @url, code: 303
+        else
+          redirect_to @url, code: 303
+        end
       end
 
       def transfer_class

data/lib/hancock/goto/middleware.rb

@@ -32,32 +32,33 @@ module Hancock::Goto
       if should_process?(status, headers, env)
         begin
           content = extract_content(response)
-          doc = ::Nokogiri::HTML(content)
-          array = doc.css(Hancock::Goto.config.css_selector)
+          if Hancock::Goto.config.href_attr_regex and content =~ Hancock::Goto.config.href_attr_regex
+            doc = ::Nokogiri::HTML(content)
 
-          doc.css(Hancock::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 =~ Hancock::Goto.config.href_regex
-              begin
-                _host = Addressable::URI.parse(_href).host
-                unless Hancock::Goto.config.excluded_hosts.include?(_host)
-                  a['href'] = Rails.application.routes.url_helpers.hancock_goto_path(url: _href)
-                  a['target'] = '_blank' if a['target'].blank?
-                  set_rel_attribute(a)
-                  del_attrs(a)
+            doc.css(Hancock::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 =~ Hancock::Goto.config.href_regex
+                begin
+                  _host = Addressable::URI.parse(_href).host
+                  unless Hancock::Goto.config.excluded_hosts.include?(_host)
+                    a['href'] = Rails.application.routes.url_helpers.hancock_goto_path(url: _href)
+                    a['target'] = '_blank' if a['target'].blank?
+                    set_rel_attribute(a)
+                    del_attrs(a)
+                  end
+                rescue
                 end
-              rescue
               end
             end
-          end
 
-          content = doc.to_html
-          headers['content-length'] = bytesize(content).to_s
-          response = [content]
+            content = doc.to_html
+            headers['content-length'] = bytesize(content).to_s
+            response = [content]
+          end
         rescue Exception => ex
           # puts ex.message
           # puts ex.backtrace

data/lib/hancock/goto/models/mongoid/transfer.rb

@@ -16,21 +16,37 @@ module Hancock::Goto
             belongs_to :session, class_name: "MongoidStore::Session"
           else
             belongs_to :session, class_name: "MongoidStore::Session", optional: true
+
+            if relations.has_key?("updater") and defined?(::Mongoid::History)
+              belongs_to :updater, class_name: ::Mongoid::History.modifier_class_name, optional: true, validate: false
+              _validators.delete(:updater)
+              _validate_callbacks.each do |callback|
+                if callback.raw_filter.respond_to?(:attributes) and callback.raw_filter.attributes.include?(:updater)
+                  _validate_callbacks.delete(callback)
+                end
+              end
+            end
           end
           field :session_data, type: BSON::Binary
-        end
 
-        def session_data_extract
-          session_data.data if session_data
-        end
+          def session_data_extract
+            session_data.data if session_data
+          end
 
-        def session_data_unpack
-          Marshal.load(session_data_extract) if session_data
+          def session_data_unpack
+            Marshal.load(session_data_extract) if session_data
+          end
+
+          def set_session(_session)
+            self.session_id = _session.id
+            self.session_data = ::BSON::Binary.new(Marshal.dump(_session.to_hash))
+          end
         end
 
-        def set_session(_session)
-          self.session_id = _session.id
-          self.session_data = BSON::Binary.new(Marshal.dump(_session.to_hash))
+        class_methods do
+          def track_history?
+            false
+          end
         end
 
       end

data/lib/hancock/goto/models/transfer.rb

@@ -6,32 +6,43 @@ module Hancock::Goto
 
       include Hancock::Goto.orm_specific('Transfer')
 
-      include ManualSlug
-
       included do
+      end
+
+      class_methods do
+
+        def rails_admin_name_synonyms
+          "".freeze
+        end
+        def rails_admin_navigation_icon
+          ''.freeze
+        end
 
-        def self.manager_can_default_actions
-          [:show, :read].freeze
+        # def manager_can_default_actions
+        #   # [:show, :read].freeze
+        #   super - [:new, :create, :delete, :destroy]
+        # end
+        def admin_cannot_actions
+          [:new, :create].freeze
         end
-        def manager_cannot_actions
-          [:new, :create, :edit, :update].freeze
+        def manager_cannot_add_actions
+          [:new, :create, :delete, :destroy, :edit, :update].freeze
         end
 
-        def self.manager_can_add_actions
+        def manager_can_add_actions
           ret = []
           ret << :model_settings if Hancock::Goto.config.model_settings_support
-          ret << :model_accesses if Hancock::Goto.config.user_abilities_support
+          # ret << :model_accesses if Hancock::Goto.config.user_abilities_support
           ret += [:comments, :model_comments] if Hancock::Goto.config.ra_comments_support
           ret.freeze
         end
-        def self.rails_admin_add_visible_actions
+        def rails_admin_add_visible_actions
           ret = []
           ret << :model_settings if Hancock::Goto.config.model_settings_support
           ret << :model_accesses if Hancock::Goto.config.user_abilities_support
           ret += [:comments, :model_comments] if Hancock::Goto.config.ra_comments_support
           ret.freeze
         end
-
       end
 
     end

data/lib/hancock/goto/routes.rb

@@ -1,11 +1,18 @@
 module ActionDispatch::Routing
   class Mapper
 
-    def hancock_cms_goto_routes
+    def hancock_cms_goto_routes(no_params = true)
+      if no_params.is_a?(Hash)
+        no_params = no_params[:no_params] || true
+      end
 
       scope module: 'hancock' do
         scope module: 'goto' do
-          get '/goto/*url' => 'transfers#index', as: :hancock_goto, format: false
+          if no_params
+            get 'goto/*url' => 'transfers#index', as: :hancock_goto, format: false
+          else
+            get 'goto' => 'transfers#index', as: :hancock_goto, format: false
+          end
         end
       end
 

data/lib/hancock/goto/version.rb

@@ -1,5 +1,5 @@
 module Hancock
   module Goto
-    VERSION = "1.0.1.3".freeze
+    VERSION = "1.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hancock_cms_goto
 version: !ruby/object:Gem::Version
-  version: 1.0.1.3
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<="
+        version: 1.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.x
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,7 @@ files:
 - app/helpers/hancock/goto/goto_helper.rb
 - app/models/concerns/hancock/goto/decorators/transfer.rb
 - app/models/hancock/goto/transfer.rb
+- app/views/hancock/goto/transfers/index.html.slim
 - bin/console
 - bin/setup
 - config/locales/hancock.goto.ru.yml