bisque 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bisque.gemspec

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

data/lib/bisque/report.rb

@@ -9,7 +9,7 @@ module Bisque
       @sql = self.class.query.dup
       self.class.params.each do |param|
         value = @params[param]
-        raise Bisque::MissingParameterException, "Missing parameter :#{param} for construction of #{self.class} - please provide a value for this parameter to the constructor or define a default." if value.nil?
+        raise Bisque::MissingParameterException, "Missing parameter :#{param} for construction of #{self.class} - please provide a value for this parameter to the constructor or define a default." if value.nil? && !self.class.optional.include?(param.intern)
         @sql.gsub!(/(?<!:):#{param}/, sanitize_and_sqlize(value))
       end
       @results = ActiveRecord::Base.connection.execute @sql
@@ -109,6 +109,15 @@ module Bisque
         end
       end
 
+      def optional(*keys)
+        if keys
+          @optionals ||= []
+          @optionals = (@optionals + keys).uniq
+        else
+          @optionals || []
+        end
+      end
+
       def query(qstr=nil)
         if qstr
           @qstr = qstr.strip

data/spec/bisque/report_spec.rb

@@ -97,6 +97,10 @@ describe Bisque::Report do
         lambda { BarReport.new }.should raise_error Bisque::MissingParameterException
       end
 
+      it "should not raise a Bisque::MissingParameterException if the query designates parameters but no defaults, it is constructed with no arguments, and the designated parameters are designated as optional" do
+        lambda { CornReport.new }.should_not raise_error
+      end
+
       it "should accept a hash of parameters" do
         lambda { BarReport.new :corn => 'cheese' }.should_not raise_error
       end

data/spec/resources/models.rb

@@ -41,6 +41,11 @@ class FunReport < Bisque::Report
   end
 end
 
+class CornReport < Bisque::Report
+  query "SELECT * FROM frobnitzs WHERE name = :corn"
+  optional :corn
+end
+
 class ParamReport < Bisque::Report
   query "SELECT * FROM frobnitzs WHERE name = :name AND description = :description AND score = :score AND cost = :cost AND numberish = :numberish AND created_at = :created_at AND timish = :timish AND summed_at = :summed_at AND created_on = :created_on AND boolish = :boolish AND binny = :binny"
 end

metadata

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