bisque 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/bisque.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "bisque"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]

data/lib/bisque/report.rb

@@ -6,6 +6,9 @@ module Bisque
 
     def initialize(params={})
       @params = self.class.defaults.merge params
+      @params.each do |k,v|
+        @params[k] = v.call if v.is_a?(Proc)
+      end
       @sql = self.class.query.dup
       self.class.params.each do |param|
         value = @params[param]
@@ -95,9 +98,9 @@ module Bisque
       end
 
     class << self
-      def default(key, val)
+      def default(key, val=nil, &block)
         @defaults ||= {}
-        @defaults[key] = val
+        @defaults[key] = val || block
       end
 
       def defaults(hash=nil)

data/spec/bisque/report_spec.rb

@@ -159,6 +159,11 @@ describe Bisque::Report do
         b = BazReport.new :corn => 'powder'
         b.params.should == {:corn => 'powder'}
       end
+
+      it "should return the hash of defaults achieved by calling the proc if the default value is a proc" do
+        b = PorkReport.new
+        b.params.should == {:slip => 'pasta'}
+      end
     end
 
     describe "sql" do

data/spec/resources/models.rb

@@ -31,6 +31,11 @@ class QuuxReport < Bisque::Report
   default :slip, 'paper'
 end
 
+class PorkReport < Bisque::Report
+  query "SELECT * FROM frobnitzs WHERE name = :slip"
+  default :slip do 'pasta' end
+end
+
 class FunReport < Bisque::Report
   query "SELECT * FROM frobnitzs WHERE name = :corn"
   default :slip, 'paper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bisque
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2336335870480925139
+      hash: 1348488274421313650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: