bullet 5.1.0 → 5.4.0

data/lib/bullet/active_record5.rb

@@ -20,9 +20,9 @@ module Bullet
       require 'active_record'
       ::ActiveRecord::Base.class_eval do
         class <<self
-          alias_method :origin_find, :find
-          def find(*args)
-            result = origin_find(*args)
+          alias_method :origin_find_by_sql, :find_by_sql
+          def find_by_sql(sql, binds = [], preparable: nil)
+            result = origin_find_by_sql(sql, binds, preparable: nil)
             if Bullet.start?
               if result.is_a? Array
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
@@ -40,38 +40,30 @@ module Bullet
       ::ActiveRecord::Base.prepend(SaveWithBulletSupport)
 
       ::ActiveRecord::Relation.class_eval do
-        alias_method :origin_to_a, :to_a
+        alias_method :origin_records, :records
         # if select a collection of objects, then these objects have possible to cause N+1 query.
         # if select only one object, then the only one object has impossible to cause N+1 query.
-        def to_a
-          records = origin_to_a
+        def records
+          result = origin_records
           if Bullet.start?
-            if records.first.class.name !~ /^HABTM_/
-              if records.size > 1
-                Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
-                Bullet::Detector::CounterCache.add_possible_objects(records)
-              elsif records.size == 1
-                Bullet::Detector::NPlusOneQuery.add_impossible_object(records.first)
-                Bullet::Detector::CounterCache.add_impossible_object(records.first)
+            if result.first.class.name !~ /^HABTM_/
+              if result.size > 1
+                Bullet::Detector::NPlusOneQuery.add_possible_objects(result)
+                Bullet::Detector::CounterCache.add_possible_objects(result)
+              elsif result.size == 1
+                Bullet::Detector::NPlusOneQuery.add_impossible_object(result.first)
+                Bullet::Detector::CounterCache.add_impossible_object(result.first)
               end
             end
           end
-          records
-        end
-      end
-
-      ::ActiveRecord::Associations::Association.class_eval do
-        alias_method :origin_initialize, :initialize
-        def initialize(owner, reflection)
-          origin_initialize(owner, reflection)
-          reflection.set_owner owner
+          result
         end
       end
 
       ::ActiveRecord::Associations::Preloader.class_eval do
-        alias_method :origin_preloaders_on, :preloaders_on
+        alias_method :origin_preloaders_for_one, :preloaders_for_one
 
-        def preloaders_on(association, records, scope)
+        def preloaders_for_one(association, records, scope)
           if Bullet.start?
             records.compact!
             if records.first.class.name !~ /^HABTM_/
@@ -81,7 +73,7 @@ module Bullet
               Bullet::Detector::UnusedEagerLoading.add_eager_loadings(records, association)
             end
           end
-          origin_preloaders_on(association, records, scope)
+          origin_preloaders_for_one(association, records, scope)
         end
       end
 
@@ -104,6 +96,7 @@ module Bullet
 
       ::ActiveRecord::Associations::JoinDependency.class_eval do
         alias_method :origin_instantiate, :instantiate
+        alias_method :origin_construct, :construct
         alias_method :origin_construct_model, :construct_model
 
         def instantiate(result_set, aliases)
@@ -119,6 +112,27 @@ module Bullet
           records
         end
 
+        def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+          if Bullet.start?
+            unless ar_parent.nil?
+              parent.children.each do |node|
+                key = aliases.column_alias(node, node.primary_key)
+                id = row[key]
+                if id.nil?
+                  associations = node.reflection.name
+                  Bullet::Detector::Association.add_object_associations(ar_parent, associations)
+                  Bullet::Detector::NPlusOneQuery.call_association(ar_parent, associations)
+                  @bullet_eager_loadings[ar_parent.class] ||= {}
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] ||= Set.new
+                  @bullet_eager_loadings[ar_parent.class][ar_parent] << associations
+                end
+              end
+            end
+          end
+
+          origin_construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+        end
+
         # call join associations
         def construct_model(record, node, row, model_cache, id, aliases)
           result = origin_construct_model(record, node, row, model_cache, id, aliases)
@@ -143,7 +157,14 @@ module Bullet
           records = origin_load_target
 
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name) unless @inversed
+            if self.is_a? ::ActiveRecord::Associations::ThroughAssociation
+              Bullet::Detector::NPlusOneQuery.call_association(owner, through_reflection.name)
+              association = self.owner.association self.through_reflection.name
+              Array(association.target).each do |through_record|
+                Bullet::Detector::NPlusOneQuery.call_association(through_record, source_reflection.name)
+              end
+            end
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name) unless @inversed
             if records.first.class.name !~ /^HABTM_/
               if records.size > 1
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(records)
@@ -159,8 +180,8 @@ module Bullet
 
         alias_method :origin_empty?, :empty?
         def empty?
-          if Bullet.start? && !@reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           origin_empty?
         end
@@ -168,7 +189,7 @@ module Bullet
         alias_method :origin_include?, :include?
         def include?(object)
           if Bullet.start?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           origin_include?(object)
         end
@@ -180,9 +201,9 @@ module Bullet
         def reader(force_reload = false)
           result = origin_reader(force_reload)
           if Bullet.start?
-            if @owner.class.name !~ /^HABTM_/ && !@inversed
-              Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
-              if Bullet::Detector::NPlusOneQuery.impossible?(@owner)
+            if owner.class.name !~ /^HABTM_/ && !@inversed
+              Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
+              if Bullet::Detector::NPlusOneQuery.impossible?(owner)
                 Bullet::Detector::NPlusOneQuery.add_impossible_object(result) if result
               else
                 Bullet::Detector::NPlusOneQuery.add_possible_objects(result) if result
@@ -196,28 +217,20 @@ module Bullet
       ::ActiveRecord::Associations::HasManyAssociation.class_eval do
         alias_method :origin_many_empty?, :empty?
         def empty?
-          Thread.current[:bullet_collection_empty] = true
           result = origin_many_empty?
-          Thread.current[:bullet_collection_empty] = nil
-          if Bullet.start? && !@reflection.has_cached_counter?
-            Bullet::Detector::NPlusOneQuery.call_association(@owner, @reflection.name)
+          if Bullet.start? && !reflection.has_cached_counter?
+            Bullet::Detector::NPlusOneQuery.call_association(owner, reflection.name)
           end
           result
         end
-      end
-
-      ::ActiveRecord::Reflection::AbstractReflection.class_eval do
-        def set_owner(owner)
-          @owner = owner
-        end
 
-        alias_method :origin_has_cached_counter?, :has_cached_counter?
-        def has_cached_counter?
-          result = origin_has_cached_counter?
-          if Bullet.start? && !result && !Thread.current[:bullet_collection_empty]
-            Bullet::Detector::CounterCache.add_counter_cache(@owner, @name)
+        alias_method :origin_count_records, :count_records
+        def count_records
+          result = reflection.has_cached_counter?
+          if Bullet.start? && !result && !self.is_a?(::ActiveRecord::Associations::ThroughAssociation)
+            Bullet::Detector::CounterCache.add_counter_cache(owner, reflection.name)
           end
-          result
+          origin_count_records
         end
       end
     end

data/lib/bullet/dependency.rb

@@ -26,6 +26,8 @@ module Bullet
                                      'active_record42'
                                    elsif active_record50?
                                      'active_record5'
+                                   elsif active_record51?
+                                     'active_record5'
                                    end
                                  end
     end
@@ -84,8 +86,12 @@ module Bullet
       active_record5? && ::ActiveRecord::VERSION::MINOR == 0
     end
 
+    def active_record51?
+      active_record5? && ::ActiveRecord::VERSION::MINOR == 1
+    end
+
     def mongoid2x?
-      mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-8]/
+      mongoid? && ::Mongoid::VERSION =~ /\A2\.[4-9]/
     end
 
     def mongoid3x?

data/lib/bullet/detector/n_plus_one_query.rb

@@ -2,6 +2,7 @@ module Bullet
   module Detector
     class NPlusOneQuery < Association
       extend Dependency
+      extend StackTraceFilter
 
       class <<self
         # executed when object.assocations is called.
@@ -87,21 +88,6 @@ module Bullet
               Bullet.notification_collector.add(notice)
             end
           end
-
-          def caller_in_project
-            app_root = rails? ? Rails.root.to_s : Dir.pwd
-            vendor_root = app_root + "/vendor"
-            caller.select do |c|
-              c.include?(app_root) && !c.include?(vendor_root) ||
-              Bullet.stacktrace_includes.any? { |include| c.include?(include) }
-            end
-          end
-
-          def excluded_stacktrace_path?
-            Bullet.stacktrace_excludes.any? do |excluded_path|
-              caller_in_project.any? { |c| c.include?(excluded_path) }
-            end
-          end
       end
     end
   end

data/lib/bullet/detector/unused_eager_loading.rb

@@ -1,6 +1,9 @@
 module Bullet
   module Detector
     class UnusedEagerLoading < Association
+      extend Dependency
+      extend StackTraceFilter
+
       class <<self
         # check if there are unused preload associations.
         #   get related_objects from eager_loadings associated with object and associations
@@ -15,7 +18,7 @@ module Bullet
             next if object_association_diff.empty?
 
             Bullet.debug("detect unused preload", "object: #{bullet_key}, associations: #{object_association_diff}")
-            create_notification bullet_key.bullet_class_name, object_association_diff
+            create_notification(caller_in_project, bullet_key.bullet_class_name, object_association_diff)
           end
         end
 
@@ -53,11 +56,11 @@ module Bullet
         end
 
         private
-          def create_notification(klazz, associations)
+          def create_notification(callers, klazz, associations)
             notify_associations = Array(associations) - Bullet.get_whitelist_associations(:unused_eager_loading, klazz)
 
             if notify_associations.present?
-              notice = Bullet::Notification::UnusedEagerLoading.new(klazz, notify_associations)
+              notice = Bullet::Notification::UnusedEagerLoading.new(callers, klazz, notify_associations)
               Bullet.notification_collector.add(notice)
             end
           end

data/lib/bullet/notification/unused_eager_loading.rb

@@ -1,6 +1,18 @@
 module Bullet
   module Notification
     class UnusedEagerLoading < Base
+      def initialize(callers, base_class, associations, path = nil)
+        super(base_class, associations, path)
+
+        @callers = callers
+      end
+
+      def notification_data
+        super.merge(
+          :backtrace => @callers
+        )
+      end
+
       def body
         "#{klazz_associations_str}\n  Remove from your finder: #{associations_str}"
       end

data/lib/bullet/rack.rb

@@ -80,8 +80,8 @@ module Bullet
 data-is-bullet-footer ondblclick="this.parentNode.removeChild(this);" style="position: fixed; bottom: 0pt; left: 0pt; cursor: pointer; border-style: solid; border-color: rgb(153, 153, 153);
  -moz-border-top-colors: none; -moz-border-right-colors: none; -moz-border-bottom-colors: none;
  -moz-border-left-colors: none; -moz-border-image: none; border-width: 2pt 2pt 0px 0px;
- padding: 5px; border-radius: 0pt 10pt 0pt 0px; background: none repeat scroll 0% 0% rgba(200, 200, 200, 0.8);
- color: rgb(119, 119, 119); font-size: 18px; font-family: 'Arial', sans-serif; z-index:9999;"
+ padding: 3px 5px; border-radius: 0pt 10pt 0pt 0px; background: none repeat scroll 0% 0% rgba(200, 200, 200, 0.8);
+ color: rgb(119, 119, 119); font-size: 16px; font-family: 'Arial', sans-serif; z-index:9999;"
 EOF
     end
   end

data/lib/bullet/stack_trace_filter.rb

@@ -0,0 +1,34 @@
+module Bullet
+  module StackTraceFilter
+    VENDOR_PATH = "/vendor"
+
+    def caller_in_project
+      app_root = rails? ? Rails.root.to_s : Dir.pwd
+      vendor_root = app_root + VENDOR_PATH
+      caller.select do |caller_path|
+        caller_path.include?(app_root) && !caller_path.include?(vendor_root) ||
+          Bullet.stacktrace_includes.any? do |include_pattern|
+          case include_pattern
+          when String
+            caller_path.include?(include_pattern)
+          when Regexp
+            caller_path =~ include_pattern
+          end
+        end
+      end
+    end
+
+    def excluded_stacktrace_path?
+      Bullet.stacktrace_excludes.any? do |exclude_pattern|
+        caller_in_project.any? do |caller_path|
+          case exclude_pattern
+          when String
+            caller_path.include?(exclude_pattern)
+          when Regexp
+            caller_path =~ exclude_pattern
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bullet/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Bullet
-  VERSION = "5.1.0"
+  VERSION = "5.4.0"
 end

data/lib/bullet.rb

@@ -4,6 +4,7 @@ require 'uniform_notifier'
 require 'bullet/ext/object'
 require 'bullet/ext/string'
 require 'bullet/dependency'
+require 'bullet/stack_trace_filter'
 
 module Bullet
   extend Dependency
@@ -166,8 +167,9 @@ module Bullet
     end
 
     def perform_out_of_channel_notifications(env = {})
+      request_uri = env['REQUEST_URI'] || build_request_uri(env)
       for_each_active_notifier_with_notification do |notification|
-        notification.url = env['REQUEST_URI']
+        notification.url = request_uri
         notification.notify_out_of_channel
       end
     end
@@ -190,17 +192,22 @@ module Bullet
     end
 
     def profile
+      return_value = nil
       if Bullet.enable?
         begin
           Bullet.start_request
 
-          yield
+          return_value = yield
 
           Bullet.perform_out_of_channel_notifications if Bullet.notification?
         ensure
           Bullet.end_request
         end
+      else
+        return_value = yield
       end
+
+      return_value
     end
 
     private
@@ -212,5 +219,13 @@ module Bullet
           end
         end
       end
+
+      def build_request_uri(env)
+        if env['QUERY_STRING'].present?
+          "#{env['PATH_INFO']}?#{env['QUERY_STRING']}"
+        else
+          env['PATH_INFO']
+        end
+      end
   end
 end

data/spec/bullet/detector/n_plus_one_query_spec.rb

@@ -87,7 +87,7 @@ module Bullet
         end
 
         context "stacktrace_excludes" do
-          before { Bullet.stacktrace_excludes = [ 'def' ] }
+          before { Bullet.stacktrace_excludes = [ /def/ ] }
           after { Bullet.stacktrace_excludes = nil }
 
           it "should not create notification when stacktrace contains paths that are in the exclude list" do
@@ -114,17 +114,17 @@ module Bullet
         end
 
         context "stacktrace_includes" do
-          before { Bullet.stacktrace_includes = [ 'def' ] }
+          before { Bullet.stacktrace_includes = [ 'def', /xyz/ ] }
           after { Bullet.stacktrace_includes = nil }
 
           it "should include paths that are in the stacktrace_include list" do
             in_project = File.join(Dir.pwd, 'abc', 'abc.rb')
-            included_gem = '/def/def.rb'
+            included_gems = ['/def/def.rb', 'xyz/xyz.rb']
             excluded_gem = '/ghi/ghi.rb'
 
-            expect(NPlusOneQuery).to receive(:caller).and_return([in_project, included_gem, excluded_gem])
+            expect(NPlusOneQuery).to receive(:caller).and_return([in_project, *included_gems, excluded_gem])
             expect(NPlusOneQuery).to receive(:conditions_met?).with(@post, :association).and_return(true)
-            expect(NPlusOneQuery).to receive(:create_notification).with([in_project, included_gem], "Post", :association)
+            expect(NPlusOneQuery).to receive(:create_notification).with([in_project, *included_gems], "Post", :association)
             NPlusOneQuery.call_association(@post, :association)
           end
         end

data/spec/bullet/detector/unused_eager_loading_spec.rb

@@ -39,9 +39,11 @@ module Bullet
       end
 
       context ".check_unused_preload_associations" do
+        let(:paths) { ["/dir1", "/dir1/subdir"] }
         it "should create notification if object_association_diff is not empty" do
           UnusedEagerLoading.add_object_associations(@post, :association)
-          expect(UnusedEagerLoading).to receive(:create_notification).with("Post", [:association])
+          allow(UnusedEagerLoading).to receive(:caller_in_project).and_return(paths)
+          expect(UnusedEagerLoading).to receive(:create_notification).with(paths, "Post", [:association])
           UnusedEagerLoading.check_unused_preload_associations
         end
 

data/spec/bullet/notification/unused_eager_loading_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Bullet
   module Notification
     describe UnusedEagerLoading do
-      subject { UnusedEagerLoading.new(Post, [:comments, :votes], "path") }
+      subject { UnusedEagerLoading.new([""], Post, [:comments, :votes], "path") }
 
       it { expect(subject.body).to eq("  Post => [:comments, :votes]\n  Remove from your finder: :includes => [:comments, :votes]") }
       it { expect(subject.title).to eq("Unused Eager Loading in path") }

data/spec/bullet/rack_spec.rb

@@ -60,7 +60,7 @@ module Bullet
         it "should return original response body" do
           expected_response = Support::ResponseDouble.new "Actual body"
           app.response = expected_response
-          _, _, response = middleware.call([])
+          _, _, response = middleware.call({})
           expect(response).to eq(expected_response)
         end
 
@@ -68,7 +68,7 @@ module Bullet
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
           expect(Bullet).to receive(:perform_out_of_channel_notifications)
-          status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
+          status, headers, response = middleware.call({"Content-Type" => "text/html"})
           expect(headers["Content-Length"]).to eq("56")
           expect(response).to eq(["<html><head></head><body><bullet></bullet></body></html>"])
         end
@@ -79,7 +79,7 @@ module Bullet
           app.response = response
           expect(Bullet).to receive(:notification?).and_return(true)
           expect(Bullet).to receive(:gather_inline_notifications).and_return("<bullet></bullet>")
-          status, headers, response = middleware.call([200, {"Content-Type" => "text/html"}])
+          status, headers, response = middleware.call({"Content-Type" => "text/html"})
           expect(headers["Content-Length"]).to eq("58")
         end
       end
@@ -89,7 +89,7 @@ module Bullet
 
         it "should not call Bullet.start_request" do
           expect(Bullet).not_to receive(:start_request)
-          middleware.call([])
+          middleware.call({})
         end
       end
     end

data/spec/bullet_spec.rb

@@ -94,4 +94,47 @@ describe Bullet, focused: true do
       end
     end
   end
+
+  describe '#perform_out_of_channel_notifications' do
+    let(:notification) { double }
+
+    before do
+      allow(Bullet).to receive(:for_each_active_notifier_with_notification).and_yield(notification)
+      allow(notification).to receive(:notify_out_of_channel)
+    end
+
+    context 'when called with no args' do
+      it 'should notification.url is nil' do
+        expect(notification).to receive(:url=).with(nil)
+        Bullet.perform_out_of_channel_notifications
+      end
+    end
+
+    context 'when called with Rack environment hash' do
+      let(:env) {
+        {
+          'PATH_INFO' => '/path',
+          'QUERY_STRING' => 'foo=bar',
+        }
+      }
+
+      context "when env['REQUEST_URI'] is nil" do
+        before { env['REQUEST_URI'] = nil }
+
+        it 'should notification.url is built' do
+          expect(notification).to receive(:url=).with('/path?foo=bar')
+          Bullet.perform_out_of_channel_notifications(env)
+        end
+      end
+
+      context "when env['REQUEST_URI'] is present" do
+        before { env['REQUEST_URI'] = 'http://example.com/path' }
+
+        it "should notification.url is env['REQUEST_URI']" do
+          expect(notification).to receive(:url=).with(env['REQUEST_URI'])
+          Bullet.perform_out_of_channel_notifications(env)
+        end
+      end
+    end
+  end
 end

data/spec/integration/active_record3/association_spec.rb

@@ -13,6 +13,16 @@ if !mongoid? && active_record3?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
 
+      it "should detect non preload post => comments for find_by_sql" do
+        Post.find_by_sql("SELECT * FROM posts").each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
       it "should detect preload with post => comments" do
         Post.includes(:comments).each do |post|
           post.comments.map(&:name)
@@ -214,7 +224,7 @@ if !mongoid? && active_record3?
     context "post => comment" do
       it "should detect unused preload with post => comments" do
         Post.includes(:comments).each do |post|
-          post.comments.first.name
+          post.comments.first.name if post.comments.first
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -453,6 +463,16 @@ if !mongoid? && active_record3?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload student => teachers with empty?" do
+        Student.all.each do |student|
+          student.teachers.empty?
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Student, :teachers)
+      end
     end
   end
 

data/spec/integration/active_record4/association_spec.rb

@@ -13,6 +13,16 @@ if !mongoid? && active_record4?
         expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
       end
 
+      it "should detect non preload post => comments for find_by_sql" do
+        Post.find_by_sql("SELECT * FROM posts").each do |post|
+          post.comments.map(&:name)
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Post, :comments)
+      end
+
       it "should detect preload with post => comments" do
         Post.includes(:comments).each do |post|
           post.comments.map(&:name)
@@ -214,7 +224,7 @@ if !mongoid? && active_record4?
     context "post => comment" do
       it "should detect unused preload with post => comments" do
         Post.includes(:comments).each do |post|
-          post.comments.first.name
+          post.comments.first.name if post.comments.first
         end
         Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
         expect(Bullet::Detector::Association).not_to be_unused_preload_associations_for(Post, :comments)
@@ -465,6 +475,16 @@ if !mongoid? && active_record4?
 
         expect(Bullet::Detector::Association).to be_completely_preloading_associations
       end
+
+      it "should detect non preload student => teachers with empty?" do
+        Student.all.each do |student|
+          student.teachers.empty?
+        end
+        Bullet::Detector::UnusedEagerLoading.check_unused_preload_associations
+        expect(Bullet::Detector::Association).not_to be_has_unused_preload_associations
+
+        expect(Bullet::Detector::Association).to be_detecting_unpreloaded_association_for(Student, :teachers)
+      end
     end
   end