Actually fix the issue, rather than pretending to

middleman-core/features/step_definitions/queryable_steps.rb

@@ -7,7 +7,7 @@ When /^I chain a where clause onto that query$/ do
 end
 
 Then /^the original query should remain unchanged$/ do
-  @query.should_not eql @new_query
+  @query.opts({}).should_not eql @new_query.opts({})
 end
 
 Then /^should initialize with an attribute and an operator$/ do

middleman-core/lib/middleman-core/sitemap/queryable.rb

@@ -80,31 +80,27 @@ module Middleman
             selector = Selector.new(:attribute => attribute, :operator => 'equal')
             selector_hash.update({ selector => value })
           end
-          @where.merge! selector_hash
+          Query.new @model, opts(:where => @where.merge(selector_hash))
-          Query.new @model, opts
         end
 
-        def opts
+        def opts new_opts
-          { :where => @where,
+          { :where => {}.merge(@where),
             :order_by => @order_by,
             :offset => @offset,
             :limit => @limit
-          }
+          }.merge(new_opts)
         end
 
         def order_by(field)
-          @order_by = field.is_a?(Symbol) ? {field => :asc} : field
+          Query.new @model, opts(:order_by => field.is_a?(Symbol) ? {field => :asc} : field)
-          Query.new @model, opts
         end
 
         def offset(number)
-          @offset = number
+          Query.new @model, opts(:offset => number)
-          Query.new @model, opts
         end
 
         def limit(number)
-          @limit = number
+          Query.new @model, opts(:limit => number)
-          Query.new @model, opts
         end
 
         def first