bisque 0.1.4 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTE1NzRhMjI3YjBkYWJlNjg1MWRlYmViNzZjMzk4YmE0YTA2NTEwYw==
+  data.tar.gz: !binary |-
+    NzkxMDEwZmIwZDQzNzU4ZTQ5MWZjMjlkODY4M2IwYjllN2U4OWMwMA==
+SHA512:
+  metadata.gz: !binary |-
+    ZmYxNjAzYjdkMDQ2ZGM0Y2M4ZjgyZDVhNjE5MTkxMWRmMmVkMzkxZTFhMzVh
+    YzUxOGYwYzgyNjA1MzVkZmNmNTAxMWExYmZkMWE0OTg1MzJkOTdlMWI3MDJh
+    YzQzMDdiZDRjZTExOTIzNDM5OGZlOGZkOGYyNjNjMWU4MjU3Mjg=
+  data.tar.gz: !binary |-
+    NjU5Njk2M2VkYWQ3NzgxMTE2N2QzOGU5NDQwNDRlY2E5YWZlZGFlY2Q2M2U3
+    ZTg4MTI4NDk1MzEyYjhjMThhY2U4M2JmYzNiOGEzYzI0MzhmMjUxMzMxMjA5
+    MjI3MWYyOGEzODk3MzA3ZDAwYmQ5Y2Q5ZDZhZGNjYTM0MzgxN2M=

data/Gemfile

@@ -10,7 +10,7 @@ gem 'pg'
 group :development do
   gem "rspec", "~> 2.8.0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.0"
+  gem "bundler", "~> 1.3.5"
   gem "jeweler", "~> 1.8.4"
   gem "simplecov", ">= 0"
   gem 'spork'

data/Gemfile.lock

@@ -16,23 +16,51 @@ GEM
     builder (3.0.0)
     coderay (1.0.7)
     diff-lcs (1.1.3)
-    git (1.2.5)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.8.1)
+      faraday (~> 0.8.1)
+      hashie (~> 1.2.0)
+      multi_json (~> 1.3)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (1.2.0)
+    highline (1.6.20)
+    httpauth (0.2.0)
     i18n (0.6.0)
-    jeweler (1.8.4)
+    jeweler (1.8.5)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (>= 0.8.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
+    json (1.8.1)
+    jwt (0.1.6)
+      multi_json (>= 1.0)
     method_source (0.8)
     multi_json (1.3.6)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     pg (0.14.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -55,7 +83,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  bundler (~> 1.1.0)
+  bundler (~> 1.3.5)
   jeweler (~> 1.8.4)
   pg
   pry

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/bisque.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: bisque 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bisque"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Holland"]
-  s.date = "2013-07-04"
+  s.date = "2013-12-30"
   s.description = "Bisque exists to ease the organizational pain of having to attach reporting and ad-hoc queries to ActiveRecord models in order to get any class-like behavior out of them by providing a new class and DSL for that express purpose."
   s.email = "jeremy@jeremypholland.com"
   s.extra_rdoc_files = [
@@ -19,7 +20,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -42,18 +42,18 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/awebneck/bisque"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.1.11"
   s.summary = "A simple gem for ease of use in generating reports with ActiveRecord"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<pg>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<spork>, [">= 0"])
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<spork>, [">= 0"])
@@ -74,7 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<spork>, [">= 0"])

data/lib/bisque/report.rb

@@ -15,6 +15,10 @@ module Bisque
         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
+      self.class.method_params.each do |param|
+        raise Bisque::MissingParameterException, "Missing method :#{param} for construction of #{self.class} - please define a method for this parameter." unless respond_to?(param)
+        @sql.gsub!(/(?<!:):##{param}/, sanitize_and_sqlize(send(param)))
+      end
       @results = ActiveRecord::Base.connection.execute @sql
       extract_datatypes
       construct_converted
@@ -125,6 +129,7 @@ module Bisque
         if qstr
           @qstr = qstr.strip
           @params = qstr.scan(/(?<!:):\w+/).map { |p| p.gsub(/:/,'').intern }
+          @method_params = qstr.scan(/(?<!:):#\w+/).map { |p| p.gsub(/:#/,'').intern }
         else
           raise Bisque::MissingQueryException, "Bisque Report #{self} missing query definition." if @qstr.nil?
           @qstr
@@ -153,6 +158,10 @@ module Bisque
       def params
         @params || []
       end
+
+      def method_params
+        @method_params || []
+      end
     end
   end
 end

data/spec/bisque/report_spec.rb

@@ -26,6 +26,19 @@ describe Bisque::Report do
       end
     end
 
+    describe "method_params" do
+      it "should return an empty array if no method parameters exist" do
+        FooReport.method_params.should be_a Array
+        FooReport.method_params.should be_empty
+      end
+
+      it "should return a list of the method parameters extracted from the query if present" do
+        CorkReport.method_params.should be_a Array
+        CorkReport.method_params.length.should == 1
+        CorkReport.method_params.should include :slam
+      end
+    end
+
     describe "defaults" do
       it "should return an empty hash if no defaults exist" do
         BarReport.defaults.should be_a Hash
@@ -97,10 +110,18 @@ describe Bisque::Report do
         lambda { BarReport.new }.should raise_error Bisque::MissingParameterException
       end
 
+      it "should raise a Bisque::MissingParameterException if the query designates method parameters but no corresponding methods" do
+        lambda { CorkReport.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 not raise a Bisque::MissingParameterException if the query designates method parameters with corresponding methods" do
+        lambda { CheeseReport.new }.should_not raise_error Bisque::MissingParameterException
+      end
+
       it "should accept a hash of parameters" do
         lambda { BarReport.new :corn => 'cheese' }.should_not raise_error
       end
@@ -179,7 +200,7 @@ describe Bisque::Report do
                             :created_on => Date.new(2012,2,1),
                             :boolish => true,
                             :binny => "\x00\x01\x02\x03"
-        p.sql.should == "SELECT * FROM frobnitzs WHERE name = 'test' AND description = 'testagain' AND score = 12 AND cost = 34.12 AND numberish = 123.35583 AND created_at = '2012-01-01 05:00:00.000000' AND timish = '2012-01-01 06:00:00.000000' AND summed_at = '2012-01-01 07:00:00.000000' AND created_on = '2012-02-01' AND boolish = 't' AND binny = ''"
+        p.sql.should == "SELECT * FROM frobnitzs WHERE name = 'test' AND description = 'testagain' AND score = 12 AND cost = 34.12 AND numberish = 123.35583 AND created_at = '2012-01-01 05:00:00.000000' AND timish = '2012-01-01 06:00:00.000000' AND summed_at = '2012-01-01 07:00:00.000000' AND created_on = '2012-02-01' AND boolish = 't' AND binny = '' AND chili = 'hahahah'"
       end
     end
 

data/spec/resources/models.rb

@@ -46,11 +46,27 @@ class FunReport < Bisque::Report
   end
 end
 
+class CorkReport < Bisque::Report
+  query "SELECT * FROM frobnitzs WHERE name = :#slam"
+end
+
+class CheeseReport < Bisque::Report
+  query "SELECT * FROM frobnitzs WHERE name = :#slam"
+
+  def slam
+    'whoopie'
+  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"
+  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 AND chili = :#chili"
+
+  def chili
+    'hahahah'
+  end
 end

data/spec/resources/schema.rb

@@ -11,5 +11,6 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :created_on, :date
     t.column :boolish, :boolean
     t.column :binny, :binary
+    t.column :chili, :string
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bisque
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,55 +55,52 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: !binary |-
+          My4xMg==
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: !binary |-
+          My4xMg==
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: !binary |-
+          MS44LjQ=
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: !binary |-
+          MS44LjQ=
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +108,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +115,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +122,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +129,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +136,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,7 +152,6 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -189,29 +173,25 @@ files:
 homepage: http://github.com/awebneck/bisque
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1348488274421313650
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple gem for ease of use in generating reports with ActiveRecord
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@bisque