hyrax 3.0.0.pre.rc1 → 3.0.0.pre.rc2

data/app/controllers/hyrax/citations_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class CitationsController < ApplicationController
     include WorksControllerBehavior
@@ -24,8 +25,8 @@ module Hyrax
 
     private
 
-      def show_presenter
-        WorkShowPresenter
-      end
+    def show_presenter
+      WorkShowPresenter
+    end
   end
 end

data/app/controllers/hyrax/collections_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class CollectionsController < ApplicationController
     include CollectionsControllerBehavior
@@ -16,18 +17,18 @@ module Hyrax
 
     private
 
-      def form
-        @form ||= form_class.new(@collection, current_ability, repository)
-      end
+    def form
+      @form ||= form_class.new(@collection, current_ability, repository)
+    end
 
-      def decide_layout
-        layout = case action_name
-                 when 'show'
-                   '1_column'
-                 else
-                   'dashboard'
-                 end
-        File.join(theme, layout)
-      end
+    def decide_layout
+      layout = case action_name
+               when 'show'
+                 '1_column'
+               else
+                 'dashboard'
+               end
+      File.join(theme, layout)
+    end
   end
 end

data/app/controllers/hyrax/contact_form_controller.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
 module Hyrax
   class ContactFormController < ApplicationController
     before_action :build_contact_form
     layout 'homepage'
 
+    class_attribute :model_class
+    self.model_class = Hyrax::ContactForm
+
     def new; end
 
     def create
@@ -11,10 +15,10 @@ module Hyrax
         ContactMailer.contact(@contact_form).deliver_now
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
-        @contact_form = ContactForm.new
+        @contact_form = model_class.new
       else
-        flash.now[:error] = 'Sorry, this message was not sent successfully. '
-        flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(", ")
+        flash.now[:error] = 'Sorry, this message was not sent successfully. ' +
+                            @contact_form.errors.full_messages.map(&:to_s).join(", ")
       end
       render :new
     rescue RuntimeError => exception
@@ -34,13 +38,13 @@ module Hyrax
 
     private
 
-      def build_contact_form
-        @contact_form = Hyrax::ContactForm.new(contact_form_params)
-      end
+    def build_contact_form
+      @contact_form = model_class.new(contact_form_params)
+    end
 
-      def contact_form_params
-        return {} unless params.key?(:contact_form)
-        params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
-      end
+    def contact_form_params
+      return {} unless params.key?(:contact_form)
+      params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
+    end
   end
 end

data/app/controllers/hyrax/content_blocks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   class ContentBlocksController < ApplicationController
     load_and_authorize_resource
@@ -22,18 +23,18 @@ module Hyrax
 
     private
 
-      def permitted_params
-        params.require(:content_block).permit(:marketing,
-                                              :announcement,
-                                              :researcher)
-      end
+    def permitted_params
+      params.require(:content_block).permit(:marketing,
+                                            :announcement,
+                                            :researcher)
+    end
 
-      # When a request comes to the controller, it will be for one and
-      # only one of the content blocks. Params always looks like:
-      #   {'about_page' => 'Here is an awesome about page!'}
-      # So reach into permitted params and pull out the first value.
-      def update_value_from_params
-        permitted_params.values.first
-      end
+    # When a request comes to the controller, it will be for one and
+    # only one of the content blocks. Params always looks like:
+    #   {'about_page' => 'Here is an awesome about page!'}
+    # So reach into permitted params and pull out the first value.
+    def update_value_from_params
+      permitted_params.values.first
+    end
   end
 end

data/app/controllers/hyrax/dashboard/collection_members_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Dashboard
     ## Shows a list of all collections to the admins
@@ -40,35 +41,35 @@ module Hyrax
 
       private
 
-        def validate
-          return t('hyrax.dashboard.my.action.members_no_access') if batch_ids.blank?
-          return t('hyrax.dashboard.my.action.collection_deny_add_members') unless current_ability.can?(:deposit, collection)
-          return t('hyrax.dashboard.my.action.add_to_collection_only') unless member_action == "add" # should never happen
-        end
+      def validate
+        return t('hyrax.dashboard.my.action.members_no_access') if batch_ids.blank?
+        return t('hyrax.dashboard.my.action.collection_deny_add_members') unless current_ability.can?(:deposit, collection)
+        return t('hyrax.dashboard.my.action.add_to_collection_only') unless member_action == "add" # should never happen
+      end
 
-        def success_return_path
-          dashboard_collection_path(collection_id)
-        end
+      def success_return_path
+        dashboard_collection_path(collection_id)
+      end
 
-        def err_return_path
-          dashboard_collections_path
-        end
+      def err_return_path
+        dashboard_collections_path
+      end
 
-        def collection_id
-          params[:id]
-        end
+      def collection_id
+        params[:id]
+      end
 
-        def collection
-          @collection ||= Collection.find(collection_id)
-        end
+      def collection
+        @collection ||= ::Collection.find(collection_id)
+      end
 
-        def batch_ids
-          params[:batch_document_ids]
-        end
+      def batch_ids
+        params[:batch_document_ids]
+      end
 
-        def member_action
-          params[:collection][:members]
-        end
+      def member_action
+        params[:collection][:members]
+      end
     end
   end
 end

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Hyrax
   module Dashboard
     ## Shows a list of all collections to the admins
@@ -197,278 +198,278 @@ module Hyrax
 
       private
 
-        def default_collection_type
-          Hyrax::CollectionType.find_or_create_default_collection_type
-        end
+      def default_collection_type
+        Hyrax::CollectionType.find_or_create_default_collection_type
+      end
 
-        def link_parent_collection(parent_id)
-          parent = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: parent_id, use_valkyrie: false)
-          Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: @collection)
-        end
+      def link_parent_collection(parent_id)
+        parent = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: parent_id, use_valkyrie: false)
+        Hyrax::Collections::NestedCollectionPersistenceService.persist_nested_collection_for(parent: parent, child: @collection)
+      end
 
-        def uploaded_files(uploaded_file_ids)
-          return [] if uploaded_file_ids.empty?
-          UploadedFile.find(uploaded_file_ids)
-        end
+      def uploaded_files(uploaded_file_ids)
+        return [] if uploaded_file_ids.empty?
+        UploadedFile.find(uploaded_file_ids)
+      end
 
-        def update_referer
-          return edit_dashboard_collection_path(@collection) + (params[:referer_anchor] || '') if params[:stay_on_edit]
-          dashboard_collection_path(@collection)
-        end
+      def update_referer
+        return edit_dashboard_collection_path(@collection) + (params[:referer_anchor] || '') if params[:stay_on_edit]
+        dashboard_collection_path(@collection)
+      end
 
-        def process_banner_input
-          return update_existing_banner if params["banner_unchanged"] == "true"
-          remove_banner
-          uploaded_file_ids = params["banner_files"]
-          add_new_banner(uploaded_file_ids) if uploaded_file_ids
-        end
+      def process_banner_input
+        return update_existing_banner if params["banner_unchanged"] == "true"
+        remove_banner
+        uploaded_file_ids = params["banner_files"]
+        add_new_banner(uploaded_file_ids) if uploaded_file_ids
+      end
 
-        def update_existing_banner
-          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-          banner_info.first.save(banner_info.first.local_path, false)
-        end
+      def update_existing_banner
+        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+        banner_info.first.save(banner_info.first.local_path, false)
+      end
 
-        def add_new_banner(uploaded_file_ids)
-          f = uploaded_files(uploaded_file_ids).first
-          banner_info = CollectionBrandingInfo.new(
-            collection_id: @collection.id,
-            filename: File.split(f.file_url).last,
-            role: "banner",
-            alt_txt: "",
-            target_url: ""
-          )
-          banner_info.save f.file_url
-        end
+      def add_new_banner(uploaded_file_ids)
+        f = uploaded_files(uploaded_file_ids).first
+        banner_info = CollectionBrandingInfo.new(
+          collection_id: @collection.id,
+          filename: File.split(f.file_url).last,
+          role: "banner",
+          alt_txt: "",
+          target_url: ""
+        )
+        banner_info.save f.file_url
+      end
 
-        def remove_banner
-          banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
-          banner_info&.delete_all
-        end
+      def remove_banner
+        banner_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "banner")
+        banner_info&.delete_all
+      end
 
-        def update_logo_info(uploaded_file_id, alttext, linkurl)
-          logo_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo").where(local_path: uploaded_file_id.to_s)
-          logo_info.first.alt_text = alttext
-          logo_info.first.target_url = linkurl
-          logo_info.first.local_path = uploaded_file_id
-          logo_info.first.save(uploaded_file_id, false)
-        end
+      def update_logo_info(uploaded_file_id, alttext, linkurl)
+        logo_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo").where(local_path: uploaded_file_id.to_s)
+        logo_info.first.alt_text = alttext
+        logo_info.first.target_url = linkurl
+        logo_info.first.local_path = uploaded_file_id
+        logo_info.first.save(uploaded_file_id, false)
+      end
 
-        def create_logo_info(uploaded_file_id, alttext, linkurl)
-          file = uploaded_files(uploaded_file_id)
-          logo_info = CollectionBrandingInfo.new(
-            collection_id: @collection.id,
-            filename: File.split(file.file_url).last,
-            role: "logo",
-            alt_txt: alttext,
-            target_url: linkurl
-          )
-          logo_info.save file.file_url
-          logo_info
-        end
+      def create_logo_info(uploaded_file_id, alttext, linkurl)
+        file = uploaded_files(uploaded_file_id)
+        logo_info = CollectionBrandingInfo.new(
+          collection_id: @collection.id,
+          filename: File.split(file.file_url).last,
+          role: "logo",
+          alt_txt: alttext,
+          target_url: linkurl
+        )
+        logo_info.save file.file_url
+        logo_info
+      end
 
-        def remove_redundant_files(public_files)
-          # remove any public ones that were not included in the selection.
-          logos_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo")
-          logos_info.each do |logo_info|
-            logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
-            logo_info.destroy unless public_files.include? logo_info.local_path
-          end
+      def remove_redundant_files(public_files)
+        # remove any public ones that were not included in the selection.
+        logos_info = CollectionBrandingInfo.where(collection_id: @collection.id.to_s).where(role: "logo")
+        logos_info.each do |logo_info|
+          logo_info.delete(logo_info.local_path) unless public_files.include? logo_info.local_path
+          logo_info.destroy unless public_files.include? logo_info.local_path
         end
+      end
 
-        def process_logo_records(uploaded_file_ids)
-          public_files = []
-          uploaded_file_ids.each_with_index do |ufi, i|
-            if ufi.include?('public')
-              update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
-              public_files << ufi
-            else # brand new one, insert in the database
-              logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
-              public_files << logo_info.local_path
-            end
+      def process_logo_records(uploaded_file_ids)
+        public_files = []
+        uploaded_file_ids.each_with_index do |ufi, i|
+          if ufi.include?('public')
+            update_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+            public_files << ufi
+          else # brand new one, insert in the database
+            logo_info = create_logo_info(ufi, params["alttext"][i], verify_linkurl(params["linkurl"][i]))
+            public_files << logo_info.local_path
           end
-          public_files
         end
+        public_files
+      end
 
-        def process_logo_input
-          uploaded_file_ids = params["logo_files"]
-          public_files = []
-
-          if uploaded_file_ids.nil?
-            remove_redundant_files public_files
-            return
-          end
+      def process_logo_input
+        uploaded_file_ids = params["logo_files"]
+        public_files = []
 
-          public_files = process_logo_records uploaded_file_ids
+        if uploaded_file_ids.nil?
           remove_redundant_files public_files
+          return
         end
 
-        # run a solr query to get the collections the user has access to edit
-        # @return [Array] a list of the user's collections
-        def find_collections_for_form
-          Hyrax::CollectionsService.new(self).search_results(:edit)
-        end
+        public_files = process_logo_records uploaded_file_ids
+        remove_redundant_files public_files
+      end
 
-        def remove_select_something_first_flash
-          flash.delete(:notice) if flash.notice == 'Select something first'
-        end
+      # run a solr query to get the collections the user has access to edit
+      # @return [Array] a list of the user's collections
+      def find_collections_for_form
+        Hyrax::CollectionsService.new(self).search_results(:edit)
+      end
 
-        def presenter
-          @presenter ||= begin
-            # Query Solr for the collection.
-            # run the solr query to find the collection members
-            response = repository.search(single_item_search_builder.query)
-            curation_concern = response.documents.first
-            raise CanCan::AccessDenied unless curation_concern
-            presenter_class.new(curation_concern, current_ability)
-          end
-        end
+      def remove_select_something_first_flash
+        flash.delete(:notice) if flash.notice == 'Select something first'
+      end
 
-        # Instantiates the search builder that builds a query for a single item
-        # this is useful in the show view.
-        def single_item_search_builder
-          single_item_search_builder_class.new(self).with(params.except(:q, :page))
+      def presenter
+        @presenter ||= begin
+          # Query Solr for the collection.
+          # run the solr query to find the collection members
+          response = repository.search(single_item_search_builder.query)
+          curation_concern = response.documents.first
+          raise CanCan::AccessDenied unless curation_concern
+          presenter_class.new(curation_concern, current_ability)
         end
+      end
 
-        def collection_params
-          @participants = extract_old_style_permission_attributes(params[:collection])
-          form_class.model_attributes(params[:collection])
-        end
+      # Instantiates the search builder that builds a query for a single item
+      # this is useful in the show view.
+      def single_item_search_builder
+        single_item_search_builder_class.new(self).with(params.except(:q, :page))
+      end
 
-        def extract_old_style_permission_attributes(attributes)
-          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-          permissions = attributes.delete("permissions_attributes")
-          return [] unless permissions
-          Deprecation.warn(self, "Passing in permissions_attributes parameter with a new collection is deprecated and support will be removed from Hyrax 3.0. " \
-                                 "Use Hyrax::PermissionTemplate instead to grant Manage, Deposit, or View access.")
-          participants = []
-          permissions.each do |p|
-            access = access(p)
-            participants << { agent_type: agent_type(p), agent_id: p["name"], access: access } if access
-          end
-          participants
-        end
+      def collection_params
+        @participants = extract_old_style_permission_attributes(params[:collection])
+        form_class.model_attributes(params[:collection])
+      end
 
-        def agent_type(permission)
-          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-          return 'group' if permission["type"] == 'group'
-          'user'
-        end
+      def extract_old_style_permission_attributes(attributes)
+        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+        permissions = attributes.delete("permissions_attributes")
+        return [] unless permissions
+        Deprecation.warn(self, "Passing in permissions_attributes parameter with a new collection is deprecated and support will be removed from Hyrax 3.0. " \
+                               "Use Hyrax::PermissionTemplate instead to grant Manage, Deposit, or View access.")
+        participants = []
+        permissions.each do |p|
+          access = access(p)
+          participants << { agent_type: agent_type(p), agent_id: p["name"], access: access } if access
+        end
+        participants
+      end
 
-        def access(permission)
-          # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
-          return Hyrax::PermissionTemplateAccess::MANAGE if permission["access"] == 'edit'
-          return Hyrax::PermissionTemplateAccess::VIEW if permission["access"] == 'read'
-        end
+      def agent_type(permission)
+        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+        return 'group' if permission["type"] == 'group'
+        'user'
+      end
 
-        def process_member_changes
-          case params[:collection][:members]
-          when 'add' then add_members_to_collection
-          when 'remove' then remove_members_from_collection
-          when 'move' then move_members_between_collections
-          end
-        end
+      def access(permission)
+        # TODO: REMOVE in 3.0 - part of deprecation of permission attributes
+        return Hyrax::PermissionTemplateAccess::MANAGE if permission["access"] == 'edit'
+        return Hyrax::PermissionTemplateAccess::VIEW if permission["access"] == 'read'
+      end
 
-        def add_members_to_collection(collection = nil)
-          collection ||= @collection
-          collection.add_member_objects batch
+      def process_member_changes
+        case params[:collection][:members]
+        when 'add' then add_members_to_collection
+        when 'remove' then remove_members_from_collection
+        when 'move' then move_members_between_collections
         end
+      end
 
-        def remove_members_from_collection
-          batch.each do |pid|
-            work = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: pid, use_valkyrie: false)
-            work.member_of_collections.delete @collection
-            work.save!
-          end
-        end
+      def add_members_to_collection(collection = nil)
+        collection ||= @collection
+        collection.add_member_objects batch
+      end
 
-        def move_members_between_collections
-          destination_collection = ::Collection.find(params[:destination_collection_id])
-          remove_members_from_collection
-          add_members_to_collection(destination_collection)
-          if destination_collection.save
-            flash[:notice] = "Successfully moved #{batch.count} files to #{destination_collection.title} Collection."
-          else
-            flash[:error] = "An error occured. Files were not moved to #{destination_collection.title} Collection."
-          end
+      def remove_members_from_collection
+        batch.each do |pid|
+          work = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: pid, use_valkyrie: false)
+          work.member_of_collections.delete @collection
+          work.save!
         end
+      end
 
-        # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
-        # our local paths. Thus we are unable to just override `self.local_prefixes`
-        def _prefixes
-          @_prefixes ||= super + ['catalog', 'hyrax/base']
+      def move_members_between_collections
+        destination_collection = ::Collection.find(params[:destination_collection_id])
+        remove_members_from_collection
+        add_members_to_collection(destination_collection)
+        if destination_collection.save
+          flash[:notice] = "Successfully moved #{batch.count} files to #{destination_collection.title} Collection."
+        else
+          flash[:error] = "An error occured. Files were not moved to #{destination_collection.title} Collection."
         end
+      end
 
-        def ensure_admin!
-          # Even though the user can view this collection, they may not be able to view
-          # it on the admin page.
-          authorize! :read, :admin_dashboard
-        end
+      # Include 'catalog' and 'hyrax/base' in the search path for views, while prefering
+      # our local paths. Thus we are unable to just override `self.local_prefixes`
+      def _prefixes
+        @_prefixes ||= super + ['catalog', 'hyrax/base']
+      end
 
-        def search_action_url(*args)
-          hyrax.dashboard_collections_url(*args)
-        end
+      def ensure_admin!
+        # Even though the user can view this collection, they may not be able to view
+        # it on the admin page.
+        authorize! :read, :admin_dashboard
+      end
 
-        def form
-          @form ||= form_class.new(@collection, current_ability, repository)
-        end
+      def search_action_url(*args)
+        hyrax.dashboard_collections_url(*args)
+      end
 
-        def set_default_permissions
-          additional_grants = @participants # Grants converted from older versions (< Hyrax 2.1.0) where share was edit or read access instead of managers, depositors, and viewers
-          Collections::PermissionsCreateService.create_default(collection: @collection, creating_user: current_user, grants: additional_grants)
-        end
+      def form
+        @form ||= form_class.new(@collection, current_ability, repository)
+      end
 
-        def query_collection_members
-          member_works
-          member_subcollections if collection.collection_type.nestable?
-          parent_collections if collection.collection_type.nestable? && action_name == 'show'
-        end
+      def set_default_permissions
+        additional_grants = @participants # Grants converted from older versions (< Hyrax 2.1.0) where share was edit or read access instead of managers, depositors, and viewers
+        Collections::PermissionsCreateService.create_default(collection: @collection, creating_user: current_user, grants: additional_grants)
+      end
 
-        # Instantiate the membership query service
-        def collection_member_service
-          @collection_member_service ||= membership_service_class.new(scope: self, collection: collection, params: params_for_query)
-        end
+      def query_collection_members
+        member_works
+        member_subcollections if collection.collection_type.nestable?
+        parent_collections if collection.collection_type.nestable? && action_name == 'show'
+      end
 
-        def member_works
-          @response = collection_member_service.available_member_works
-          @member_docs = @response.documents
-          @members_count = @response.total
-        end
+      # Instantiate the membership query service
+      def collection_member_service
+        @collection_member_service ||= membership_service_class.new(scope: self, collection: collection, params: params_for_query)
+      end
 
-        def member_subcollections
-          results = collection_member_service.available_member_subcollections
-          @subcollection_solr_response = results
-          @subcollection_docs = results.documents
-          @subcollection_count = @presenter.nil? ? 0 : @subcollection_count = @presenter.subcollection_count = results.total
-        end
+      def member_works
+        @response = collection_member_service.available_member_works
+        @member_docs = @response.documents
+        @members_count = @response.total
+      end
 
-        def parent_collections
-          page = params[:parent_collection_page].to_i
-          query = Hyrax::Collections::NestedCollectionQueryService
-          collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
-        end
+      def member_subcollections
+        results = collection_member_service.available_member_subcollections
+        @subcollection_solr_response = results
+        @subcollection_docs = results.documents
+        @subcollection_count = @presenter.nil? ? 0 : @subcollection_count = @presenter.subcollection_count = results.total
+      end
 
-        def collection_object
-          action_name == 'show' ? Collection.find(collection.id) : collection
-        end
+      def parent_collections
+        page = params[:parent_collection_page].to_i
+        query = Hyrax::Collections::NestedCollectionQueryService
+        collection.parent_collections = query.parent_collections(child: collection_object, scope: self, page: page)
+      end
 
-        # You can override this method if you need to provide additional
-        # inputs to the search builder. For example:
-        #   search_field: 'all_fields'
-        # @return <Hash> the inputs required for the collection member search builder
-        def params_for_query
-          params.merge(q: params[:cq])
-        end
+      def collection_object
+        action_name == 'show' ? ::Collection.find(collection.id) : collection
+      end
 
-        # Only accept HTTP|HTTPS urls;
-        # @return <String> the url
-        def verify_linkurl(linkurl)
-          url = Loofah.scrub_fragment(linkurl, :prune).to_s
-          url if valid_url?(url)
-        end
+      # You can override this method if you need to provide additional
+      # inputs to the search builder. For example:
+      #   search_field: 'all_fields'
+      # @return <Hash> the inputs required for the collection member search builder
+      def params_for_query
+        params.merge(q: params[:cq])
+      end
 
-        def valid_url?(url)
-          (url =~ URI.regexp(['http', 'https']))
-        end
+      # Only accept HTTP|HTTPS urls;
+      # @return <String> the url
+      def verify_linkurl(linkurl)
+        url = Loofah.scrub_fragment(linkurl, :prune).to_s
+        url if valid_url?(url)
+      end
+
+      def valid_url?(url)
+        (url =~ URI.regexp(['http', 'https']))
+      end
     end
   end
 end