Pass options from scopes block to each individual scope

lib/trestle/resource/builder.rb

@@ -78,7 +78,7 @@ def count(&block)
 
       def scopes(options={}, &block)
         admin.scopes.options.merge!(options)
-        admin.scopes.append(&block) if block_given?
+        admin.scopes.append(options, &block) if block_given?
       end
 
       def scope(name, scope=nil, options={}, &block)

lib/trestle/scopes/block.rb

@@ -1,16 +1,16 @@
 module Trestle
   class Scopes
     class Block
-      attr_reader :block
+      attr_reader :block, :options
 
-      def initialize(&block)
-        @block = block
+      def initialize(options={}, &block)
+        @options, @block = options, block
       end
 
       # Evaluates the scope block within the given admin context
       # and returns an array of the scopes that were defined.
       def scopes(context)
-        context = Evaluator.new(context)
+        context = Evaluator.new(context, options)
         context.instance_exec(context, &block)
         context.scopes
       end
@@ -20,8 +20,8 @@ class Evaluator
 
         attr_reader :scopes
 
-        def initialize(context=nil)
-          @context = context
+        def initialize(context=nil, defaults={})
+          @context, @defaults = context, defaults
           @scopes = []
         end
 
@@ -31,7 +31,7 @@ def scope(name, scope=nil, options={}, &block)
             scope = nil
           end
 
-          scopes << Scope.new(@context, name, options, &(scope || block))
+          scopes << Scope.new(@context, name, @defaults.merge(options), &(scope || block))
         end
       end
     end

lib/trestle/scopes/definition.rb

@@ -8,8 +8,8 @@ def initialize
         @options = {}
       end
 
-      def append(&block)
-        @blocks << Block.new(&block)
+      def append(options={}, &block)
+        @blocks << Block.new(options, &block)
       end
 
       # Evaluates each of the scope blocks within the given admin context

spec/trestle/scopes/block_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Trestle::Scopes::Block do
+  let(:admin) { double }
+  let(:options) { {} }
+
+  subject(:block) do
+    Trestle::Scopes::Block.new(options) do
+      scope :first
+      scope :second, count: false
+    end
+  end
+
+  describe "#scopes" do
+    it "returns scopes that have been defined within the block" do
+      scope1, scope2 = block.scopes(admin)
+
+      expect(scope1.name).to eq(:first)
+      expect(scope1.options).to eq({})
+
+      expect(scope2.name).to eq(:second)
+      expect(scope2.options).to eq({ count: false })
+    end
+  end
+
+  context "with options" do
+    let(:options) { { count: false } }
+
+    it "applies the block options to each scope" do
+      scope1, scope2 = block.scopes(admin)
+
+      expect(scope1.options).to eq({ count: false })
+      expect(scope2.options).to eq({ count: false })
+    end
+  end
+end