irie 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f409d1f391aa9e53304a97e6f6357ffc40d5ea9
-  data.tar.gz: 81f44151ad5ce58128580295a60ee5b9a1f97a34
+  metadata.gz: 7c6c9a801e9a8f04df53747c167d6d3728a01036
+  data.tar.gz: ba8c401ad9d9f93307174aa57b266962a6d5fd86
 SHA512:
-  metadata.gz: a258a07df2bcbfb081c50e47920830ed50f1e7492212e70d73d5b98dc25a12600baac8166b8ccb31d78af57731c8fb2a118a3cfc067b76257356731dc8deefc1
-  data.tar.gz: c141fdc765c8371416c9668ae9c834ece91ad8b98d30cd4d70ebe58156b6ae9cc36f7cac68fbfb00772e910a005a3b788e6cffb58ea0edb724343d320a13a4c8
+  metadata.gz: 60706798105e74ef9ece7cee97190088034cf9fb2da66f6db0fb18ad29baa2d95b12a86a8d4444d2aa58729fa97616808220fa5ec8d4fbc64238f23bd3729cfa
+  data.tar.gz: acfafe39ace9dad293ce8b7572420217213b1fc7da0351df1013f5f88c06ab423f3c37e2e6b1b994cc51e207d8525d8995231790c307b68632532f34a5691cf5

data/README.md

@@ -581,6 +581,12 @@ However, that might not catch all the initialization debug logging that could oc
 config.log_level = :debug
 ```
 
+If you are really having trouble tracking down a problem and can live with the significant impact of increasing the number and result size of queries and are ok with a lot more data being logged, you can turn on more verbose debug logging via:
+
+```ruby
+::Irie.debug = ::Irie.verbose = true
+```
+
 ### restful_json
 
 The project was originally named [restful_json][restful_json]. Old commit tags corresponding to restful_json versions may be found in [legacy][legacy].

data/lib/irie/class_methods.rb

@@ -45,7 +45,7 @@ module Irie
       ordered_extension_syms.each do |arg_sym|
         if module_class_name = self.available_extensions[arg_sym]
           begin
-            logger.debug("Irie::ClassMethods.extensions! #{self} including #{module_class_name}") if ::Irie.debug?
+            ::Irie.logger.debug("[Irie] Irie::ClassMethods.extensions! #{self} including #{module_class_name}") if ::Irie.debug?
             include module_class_name.constantize
           rescue NameError => e
             raise ::Irie::ConfigurationError.new "Failed to constantize '#{module_class_name}' with extension key #{arg_sym.inspect} in self.available_extensions. Error: \n#{e.message}\n#{e.backtrace.join("\n")}"

data/lib/irie/config.rb

@@ -6,8 +6,10 @@ module Irie
     :available_extensions,
     :can_filter_by_default_using,
     :debug,
+    :verbose,
     :function_param_names,
     :id_is_primary_key_param,
+    :logger,
     :number_of_records_in_a_page,
     :predicate_prefix,
     :extension_include_order
@@ -17,6 +19,10 @@ module Irie
     CONTROLLER_OPTIONS.each{|name|attr_accessor name; define_method("#{name}?") { !!public_send(name) } }
     def configure(&blk); class_eval(&blk); end
 
+    def logger
+      @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+    end
+
     # Adds to extension_include_order and extension_include_order, e.g.
     #   ::Irie.register_extension :boolean_params, '::Focal::Irie::BooleanParams'
     # Is equivalent to:
@@ -120,7 +126,7 @@ end
   # You shouldn't have to worry about configuring this typically.
   self.available_extensions = {}
 
-  # If true, will logger.debug in instance methods to help with execution tracing at
+  # If true, will ::Irie.logger.debug in instance methods to help with execution tracing at
   # runtime.
   self.debug = false
 end

data/lib/irie/extensions/autorender_count.rb

@@ -8,8 +8,10 @@ module Irie
       protected
       
       def autorender_count(options={}, &block)
-        logger.debug("Irie::Extensions::AutorenderCount.autorender_count") if ::Irie.debug?
-        render request.format.symbol => { count: @count }, status: 200, layout: false
+        ::Irie.logger.debug("[Irie] Irie::Extensions::AutorenderCount.autorender_count: count: #{@count}") if ::Irie.debug?
+        result = render(request.format.symbol => { count: @count }, status: 200, layout: false)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::AutorenderCount.autorender_count: result: #{result.inspect}") if ::Irie.verbose?
+        result
       end
       
     end

data/lib/irie/extensions/conversion/nil_params.rb

@@ -12,13 +12,15 @@ module Irie
 
         # Converts request param value(s) 'NULL', 'null', and 'nil' to nil.
         def convert_param(param_name, param_value_or_values)
-          logger.debug("Irie::Extensions::Conversion::NilParams.convert_param(#{param_name.inspect}, #{param_value_or_values.inspect})") if ::Irie.debug?
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Conversion::NilParams.convert_param(#{param_name.inspect}, #{param_value_or_values.inspect})") if ::Irie.debug?
           param_value_or_values = super if defined?(super)
           if param_value_or_values.is_a? Array
-            param_value_or_values.map{|v| v && NILS.include?(v) ? nil : v }
+            result = param_value_or_values.map{|v| v && NILS.include?(v) ? nil : v }
           else
-            param_value_or_values && NILS.include?(param_value_or_values) ? nil : param_value_or_values
+            result = param_value_or_values && NILS.include?(param_value_or_values) ? nil : param_value_or_values
           end
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Conversion::NilParams.convert_param: result: #{result.inspect}") if ::Irie.verbose?
+          result
         end
       
       end

data/lib/irie/extensions/count.rb

@@ -10,10 +10,15 @@ module Irie
       end
       
       def index(options={}, &block)
-        logger.debug("Irie::Extensions::Count.index") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Count.index") if ::Irie.debug?
         return super(options, &block) unless aliased_param_present?(:count)
         @count = collection.count
-        return respond_to?(:autorender_count, true) ? autorender_count(options, &block) : super(options, &block)
+
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Count.index: count: #{@count}") if ::Irie.debug?
+
+        result = respond_to?(:autorender_count, true) ? autorender_count(options, &block) : super(options, &block)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Count.index: result: #{result.inspect}") if ::Irie.verbose?
+        result
       end
 
     end

data/lib/irie/extensions/index_query.rb

@@ -30,16 +30,19 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::IndexQuery.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::IndexQuery.collection") if ::Irie.debug?
         object = super
+        ::Irie.logger.debug("[Irie] Irie::Extensions::IndexQuery.collection starting after super with object=#{object.inspect}") if ::Irie.verbose?
         if self.custom_index_query
           # convert to relation if model class because proc expects a relation
           object = object.all unless object.is_a?(ActiveRecord::Relation)
           a = object.to_s
+          ::Irie.logger.debug("[Irie] Irie::Extensions::IndexQuery.collection before custom_index_query with object=#{object.inspect}") if ::Irie.verbose?
           object = self.custom_index_query.call(object)
+          ::Irie.logger.debug("[Irie] Irie::Extensions::IndexQuery.collection after custom_index_query with object=#{object.inspect}") if ::Irie.verbose?
         end
 
-        logger.debug("Irie::Extensions::IndexQuery.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::IndexQuery.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/limit.rb

@@ -12,11 +12,15 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::Limit.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Limit.collection") if ::Irie.debug?
         object = super
-        aliased_params(:limit).each {|param_value| object = object.limit(param_value)}
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Limit.collection: starting after super with object=#{object.inspect}") if ::Irie.verbose?
+        limit_params = aliased_params(:limit)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Limit.collection: limit_params=#{limit_params.inspect}") if ::Irie.debug?
+        limit_params.each {|param_value| object = object.limit(param_value.to_i)}
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Limit.collection: after limits with object=#{object.inspect}") if ::Irie.verbose?
 
-        logger.debug("Irie::Extensions::Limit.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Limit.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/offset.rb

@@ -12,11 +12,15 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::Offset.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Offset.collection") if ::Irie.debug?
         object = super
-        aliased_params(:offset).each {|param_value| object = object.offset(param_value)}
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Offset.collection starting after super with object=#{object.inspect}") if ::Irie.verbose?
+        offset_params = aliased_params(:offset)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Offset.collection: offset_params=#{offset_params.inspect}") if ::Irie.debug?
+        offset_params.each {|param_value| object = object.offset(param_value.to_i)}
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Offset.collection: after offsets object=#{object.inspect}") if ::Irie.verbose?
 
-        logger.debug("Irie::Extensions::Offset.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Offset.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/order.rb

@@ -85,8 +85,9 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::Order.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection") if ::Irie.debug?
         object = super
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection starting after super with object=#{object.inspect}") if ::Irie.verbose?
 
         already_ordered_by = []
         aliased_params(:order).collect{|p| p.split(',')}.flatten.collect(&:strip).each do |split_param_name|
@@ -112,6 +113,7 @@ module Irie
           # if there is one.
           if self.can_be_ordered_by.include?(split_param_name) && !already_ordered_by.include?(attr_sym)
             join_to_apply = join_for_param(split_param_name)
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: can_be_ordered_by: calling joins(#{join_to_apply.inspect})") if ::Irie.verbose?
             object = object.joins(join_to_apply) if join_to_apply
             arel_table_column = get_arel_table(split_param_name)[attr_sym]
             raise ::Irie::ConfigurationError.new "can_order_by/define_params config problem: could not find arel table/column for param name #{split_param_name.inspect} and/or attr_sym #{attr_sym.inspect}" unless arel_table_column
@@ -119,7 +121,10 @@ module Irie
             sql_fragment = "#{arel_table_column.relation.name}.#{arel_table_column.name}#{direction == :desc ? ' DESC' : ''}"
             # Important note! the behavior of multiple `order`'s' got reversed between Rails 4.0.0 and 4.0.1:
             # http://weblog.rubyonrails.org/2013/11/1/Rails-4-0-1-has-been-released/
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: aliased_params: calling order(#{sql_fragment.inspect})") if ::Irie.debug?
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: aliased_params: before order object=#{object.inspect}") if ::Irie.verbose?
             object = object.order(sql_fragment)
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: aliased_params: after order object=#{object.inspect}") if ::Irie.verbose?
             already_ordered_by << attr_sym
           end
 
@@ -136,13 +141,16 @@ module Irie
             arel_table_column = get_arel_table(split_param_name)[attr_sym]
             raise ::Irie::ConfigurationError.new "default_order_by/define_params config problem: could not find arel table/column for param name #{split_param_name.inspect} and/or attr_sym #{attr_sym.inspect}" unless arel_table_column
             #TODO: is there a better way? not sure how else to order on joined table columns- no example
-            sql_fragment = "#{arel_table_column.relation.name}.#{arel_table_column.name}#{direction == :desc ? ' DESC' : ''}"            
+            sql_fragment = "#{arel_table_column.relation.name}.#{arel_table_column.name}#{direction == :desc ? ' DESC' : ''}"
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: default_ordered_by: calling order(#{sql_fragment.inspect})") if ::Irie.debug?
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: default_ordered_by: before order object=#{object.inspect}") if ::Irie.verbose?
             object = object.order(sql_fragment)
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: default_ordered_by: after order object=#{object.inspect}") if ::Irie.verbose?
             already_ordered_by << attr_sym
           end
         end
 
-        logger.debug("Irie::Extensions::Order.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Order.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/paging.rb

@@ -14,7 +14,7 @@ module Irie
       end
 
       def index(options={}, &block)
-        logger.debug("Irie::Extensions::Count.index") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.index") if ::Irie.debug?
         return super(options, &block) unless aliased_param_present?(:page_count)
         @page_count = (collection.count.to_f / self.number_of_records_in_a_page.to_f).ceil
         return respond_to?(:autorender_page_count, true) ? autorender_page_count(options, &block) : super(options, &block)
@@ -23,17 +23,25 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::Paging.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.collection") if ::Irie.debug?
         object = super
         page_param_value = aliased_param(:page)
         unless page_param_value.nil?
           page = page_param_value.to_i
           page = 1 if page < 1
-          object = object.offset((self.number_of_records_in_a_page * (page - 1)).to_s)
-          object = object.limit(self.number_of_records_in_a_page.to_s)
+          ::Irie.logger.debug
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.collection: aliased_params: before offset and limit with object=#{object.inspect}") if ::Irie.verbose?
+          object = object.offset(self.number_of_records_in_a_page.to_i * (page - 1))
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.collection: aliased_params: after offset/before limit with object=#{object.inspect}") if ::Irie.verbose?
+          object = object.limit(self.number_of_records_in_a_page.to_i)
+          begin
+            ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.collection: aliased_params: after offset and limit with object=#{object.inspect}") if ::Irie.verbose?
+          rescue => e
+            binding.pry
+          end
         end
 
-        logger.debug("Irie::Extensions::Paging.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::Paging.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/paging/autorender_page_count.rb

@@ -9,8 +9,10 @@ module Irie
         protected
 
         def autorender_page_count(options={}, &block)
-          logger.debug("Irie::Extensions::Paging::AutorenderPageCount.autorender_page_count") if ::Irie.debug?
-          render request.format.symbol => { page_count: @page_count }, status: 200, layout: false
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Paging::AutorenderPageCount.autorender_page_count: page_count: #{@page_count.inspect}") if ::Irie.debug?
+          result = render(request.format.symbol => { page_count: @page_count }, status: 200, layout: false)
+          ::Irie.logger.debug("[Irie] Irie::Extensions::Paging::AutorenderPageCount.autorender_page_count: result: #{result.inspect}") if ::Irie.verbose?
+          result
         end
         
       end

data/lib/irie/extensions/param_filters.rb

@@ -92,11 +92,15 @@ module Irie
         end
       end
 
+      IRIE_ARY_PREDICATES = [:not_eq_any, :not_eq_all, :eq_any, :eq_all, :in_any, :in_all, :not_in_any, :not_in_all, :matches_any, :matches_all, :does_not_match_all,
+        :gteq_any, :gteq_all, :gt_any, :gt_all, :lt_any, :lt_all, :lteq_any, :lteq_all]
+
       protected
 
       def collection
-        logger.debug("Irie::Extensions::ParamFilters.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection") if ::Irie.debug?
         object = super
+        ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection starting after super with object=#{object.inspect}") if ::Irie.verbose?
         already_filtered_by_split_param_names = []
         self.composite_param_to_param_name_and_arel_predicate.each do |composite_param, param_name_and_arel_predicate, split|
           if params.key?(composite_param)
@@ -106,10 +110,16 @@ module Irie
             # support for named_params/:through renaming of param name
             attr_sym = attr_sym_for_param(split_param_name)
             join_to_apply = join_for_param(split_param_name)
-            object = object.joins(join_to_apply) if join_to_apply
+            if join_to_apply
+              ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: composite_param_to_param_name_and_arel_predicate: object.joins(#{join_to_apply.inspect})") if ::Irie.debug?
+              object = object.joins(join_to_apply)
+            end
+            # note: we call it column but it is Arel::Attributes::Attribute
             arel_table_column = get_arel_table(split_param_name)[attr_sym]
             raise ::Irie::ConfigurationError.new "can_filter_by/define_params config problem: could not find arel table/column for param name #{split_param_name.inspect} and/or attr_sym #{attr_sym.inspect}" unless arel_table_column
+            ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: composite_param_to_param_name_and_arel_predicate: before adding where col=#{arel_table_column.inspect} pred=#{predicate_sym.inspect} equal_to_or_in=#{converted_param_values.inspect} with object=#{object.inspect}") if ::Irie.verbose?
             object = object.where(arel_table_column.send(predicate_sym, converted_param_values))
+            ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: composite_param_to_param_name_and_arel_predicate: after adding where col=#{arel_table_column.inspect} pred=#{predicate_sym.inspect} equal_to_or_in=#{converted_param_values.inspect} with object=#{object.inspect}") if ::Irie.verbose?
             already_filtered_by_split_param_names << split_param_name
           end
         end
@@ -118,16 +128,23 @@ module Irie
           unless already_filtered_by_split_param_names.include?(split_param_name) || predicates_to_default_values.blank?
             attr_sym = attr_sym_for_param(split_param_name)
             join_to_apply = join_for_param(split_param_name)
-            object = object.joins(join_to_apply) if join_to_apply
+            if join_to_apply
+              ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: default_filtered_by: object.joins(#{join_to_apply.inspect})") if ::Irie.debug?
+              object = object.joins(join_to_apply)
+            end
+            # note: we call it column but it is Arel::Attributes::Attribute
             arel_table_column = get_arel_table(split_param_name)[attr_sym]
             raise ::Irie::ConfigurationError.new "default_filter_by/define_params config problem: could not find arel table/column for param name #{split_param_name.inspect} and/or attr_sym #{attr_sym.inspect}" unless arel_table_column
             predicates_to_default_values.each do |predicate_sym, one_or_more_default_values|
-              object = object.where(arel_table_column.send(predicate_sym, Array.wrap(one_or_more_default_values)))
+              one_or_more_default_values = Array.wrap(one_or_more_default_values) if IRIE_ARY_PREDICATES.include?(predicate_sym)
+              ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: default_filtered_by: before adding where col=#{arel_table_column.inspect} pred=#{predicate_sym.inspect} equal_to_or_in=#{one_or_more_default_values.inspect} with object=#{object.inspect}") if ::Irie.verbose?
+              object = object.where(arel_table_column.send(predicate_sym, one_or_more_default_values))
+              ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: default_filtered_by: after adding where col=#{arel_table_column.inspect} pred=#{predicate_sym.inspect} equal_to_or_in=#{one_or_more_default_values.inspect} with object=#{object.inspect}") if ::Irie.verbose?
             end
           end
         end
 
-        logger.debug("Irie::Extensions::ParamFilters.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::ParamFilters.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
         
         set_collection_ivar object
       end

data/lib/irie/extensions/params_to_joins.rb

@@ -93,13 +93,15 @@ module Irie
         end
 
         (find_arel_table = ->(last_resource_class, val) do
+          ::Irie.logger.debug("[Irie] Irie::Extensions::ParamsToJoins.get_arel_table: calling anonymous function with #{last_resource_class.inspect}, #{val.inspect}") if ::Irie.debug?
           case val
           when String, Symbol
             find_assoc_resource_class.call(last_resource_class, val).arel_table
           when Hash
             find_arel_table.call(find_assoc_resource_class.call(last_resource_class, val.keys.first), val.values.first)
           else
-            raise ::Irie::ConfigurationError.new "get_arel_table failed because unhandled #{val} in joins in through"
+            ::Irie.logger.debug("[Irie] Irie::Extensions::ParamsToJoins.get_arel_table: unhandled val in anonymous function: #{val.inspect}") if ::Irie.debug?
+            raise ::Irie::ConfigurationError.new "get_arel_table failed because unhandled(#{last_resource_class.inspect}, #{val.inspect}) in joins in through"
           end
         end)[resource_class, opts[:joins]]
       end

data/lib/irie/extensions/query_filter.rb

@@ -36,8 +36,9 @@ module Irie
       protected
 
       def collection
-        logger.debug("Irie::Extensions::QueryFilter.collection") if ::Irie.debug?
+        ::Irie.logger.debug("[Irie] Irie::Extensions::QueryFilter.collection") if ::Irie.debug?
         object = super
+        ::Irie.logger.debug("[Irie] Irie::Extensions::QueryFilter.collection starting after super with object=#{object.inspect}") if ::Irie.verbose?
         # convert to relation if model class because proc expects a relation
         object = object.all unless object.is_a?(ActiveRecord::Relation)
 
@@ -45,11 +46,14 @@ module Irie
         self.param_to_query.each do |param_name, param_query|
           param_value = params[param_name]
           unless param_value.nil?
-            object = param_query.call(object, convert_param(param_name.to_s, param_value))
+            converted_param = convert_param(param_name.to_s, param_value)
+            ::Irie.logger.debug("[Irie] Irie::Extensions::QueryFilter.collection: param_to_query: before query call with object=#{object.inspect} and converted_param=#{converted_param.inspect}") if ::Irie.verbose?
+            object = param_query.call(object, converted_param)
+            ::Irie.logger.debug("[Irie] Irie::Extensions::QueryFilter.collection: param_to_query: after query call with object=#{object.inspect}") if ::Irie.verbose?
           end
         end
 
-        logger.debug("Irie::Extensions::QueryFilter.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::QueryFilter.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
         set_collection_ivar object
       end

data/lib/irie/extensions/query_includes.rb

@@ -62,12 +62,16 @@ module Irie
         
         this_includes = self.action_to_query_includes[params[:action].to_sym] || self.all_action_query_includes
         if this_includes && this_includes.size > 0
+          ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.collection: calling .includes(*#{this_includes.inspect})") if ::Irie.debug?
           object = object.includes(*this_includes)
         else
+          ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.collection: not calling .includes") if ::Irie.debug?
           object
         end
 
-        logger.debug("Irie::Extensions::QueryIncludes.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+        ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.collection: relation.to_sql so far: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+
+        ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.collection: object = #{object.inspect}") if ::Irie.verbose?
 
         set_collection_ivar object
       end
@@ -75,19 +79,22 @@ module Irie
       def resource
         cached = get_resource_ivar
         if cached
-          logger.debug("Irie::Extensions::QueryIncludes.resource returning cached resource") if ::Irie.debug?
+          ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.resource: returning cached resource") if ::Irie.debug?
           return cached
         end
         logger.debug("Irie::Extensions::QueryIncludes.resource") if ::Irie.debug?
+
         this_includes = self.action_to_query_includes[params[:action].to_sym] || self.all_action_query_includes
         if this_includes && this_includes.size > 0
           # can return the model class, so won't call bang (includes!) method
           object = end_of_association_chain.includes(*this_includes)
 
-          logger.debug("Irie::Extensions::QueryIncludes.resource: end_of_association_chain.to_sql: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
+          ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.resource: end_of_association_chain.to_sql: #{object.to_sql}") if ::Irie.debug? && object.respond_to?(:to_sql)
 
           set_resource_ivar object.send(method_for_find, params[:id])
         else
+          ::Irie.logger.debug("[Irie] Irie::Extensions::QueryIncludes.resource") if ::Irie.debug?
+
           super
         end
       end

data/lib/irie/extensions/smart_layout.rb

@@ -10,8 +10,12 @@ module Irie
       end
       
       def index(options={}, &block)
-        logger.debug("Irie::Extensions::NoLayout.index") if ::Irie.debug?
-        options.merge!({layout: false}) unless request.format.html?
+        if request.format.html?
+          ::Irie.logger.debug("[Irie] Irie::Extensions::SmartLayout.index: not merging layout:false into options because not html") if ::Irie.debug?
+        else
+          ::Irie.logger.debug("[Irie] Irie::Extensions::SmartLayout.index: merging layout:false into options because format.html? is truthy") if ::Irie.debug?
+          options.merge!({layout: false}) unless request.format.html?
+        end
         super(options, &block)
       end
 

data/lib/irie/param_aliases.rb

@@ -9,7 +9,7 @@ module Irie
     # values for all matching defined request params. Does *not* convert param
     # value with convert_param(...).
     def aliased_params(function_sym)
-      logger.debug("Irie::ParamAliases.aliased_params(#{function_sym.inspect})") if ::Irie.debug?
+      ::Irie.logger.debug("[Irie] Irie::ParamAliases.aliased_params(#{function_sym.inspect})") if ::Irie.debug?
       if self.function_param_names.key?(function_sym)
         self.function_param_names[function_sym].select {|v| params.key?(v)}.collect {|param_name| params[param_name]}
       else
@@ -18,7 +18,7 @@ module Irie
     end
 
     def aliased_param_present?(function_sym)
-      logger.debug("Irie::ParamAliases.aliased_param_key?(#{function_sym.inspect})") if ::Irie.debug?
+      ::Irie.logger.debug("[Irie] Irie::ParamAliases.aliased_param_key?(#{function_sym.inspect})") if ::Irie.debug?
       if self.function_param_names.key?(function_sym)
         self.function_param_names[function_sym].select {|v| params.key?(v)}.any? {|param_name| params.key?(param_name)}
       else
@@ -28,7 +28,7 @@ module Irie
 
     # Same as aliased_params(function_sym).first.
     def aliased_param(function_sym)
-      logger.debug("Irie::ParamAliases.aliased_param(#{function_sym.inspect})") if ::Irie.debug?
+      ::Irie.logger.debug("[Irie] Irie::ParamAliases.aliased_param(#{function_sym.inspect})") if ::Irie.debug?
       aliased_params(function_sym).first
     end
 

data/lib/irie/version.rb

@@ -1,3 +1,3 @@
 module Irie
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: irie
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Gary S. Weaver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inherited_resources
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Extend Inherited Resources.