db_mod 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5547dcc1f21c6ca964d25c097abb813e77713161
-  data.tar.gz: 2214d888e4d39fb545e65e2c8539fdeadc48b145
+  metadata.gz: 1fe4bb1c7e19c817bad5e788d2cd626ce909ba0d
+  data.tar.gz: 3bb72d90d2387e7f8e7373f41d390f779b0cc819
 SHA512:
-  metadata.gz: 6e5bd968a9b47e6d55972444b55bb7bf0434938711c71d0c6955b6d6d048c25a7bfb0e78bffec87bc70dbe3c58aec5766513530e63104c24a2a1089ba99a91c0
-  data.tar.gz: 28d48191ba234d83a0dc52dc5c9224923712834d8b8411e4e67d081bc36ab45f062f5476e7e0d17f2eb0222cb89065bdb5f657d84230c765bc2f1208ce26a0dc
+  metadata.gz: b9318f1de5b1fe4c8189c7bc1d03cb42533316175411bb33440824e0051dd33da5c4c64595658e95d001b8995fca4fa4e4c67d24570e229e48418d4cfd346f5e
+  data.tar.gz: fe369f08a3c480d4c5d3322c35b575ecccb5cbada2b7db33f5b05a3fd692ad5d17cbc9580fabf2356e936b7886d28d1cc7d322e605ad3f6f3f2b04ad5523fa1e

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+0.0.3 (2015-10-13)
+==================
+
+* Configurable method framework. Adds `def_prepared/statement.as(:csv)` - [@dslh](https://github.com/dslh)
+
+0.0.2 (2015-10-12)
+==================
+
+* Adds `def_statement` to compliment `def_prepared` - [@dslh](https://github.com/dslh).
+
+0.0.1 (2015-10-11)
+==================
+
+* Initial release - [@dslh](https://github.com/dslh).

data/README.md

@@ -183,3 +183,23 @@ Db::ComplicatedStuff.prepare_all_statements my_conn
 the SQL queries are saved in memory rather than being sent to the database
 at connection time. This is useful for queries that will only be run once
 or twice during a program's execution.
+
+#### Configuring defined statements
+
+`db_mod` contains a simple framework for extending these statement methods
+and prepared methods with additional argument and result processing. For
+now only `.as(:csv)` is supported, which will cause the method to format
+the SQL result set as a CSV string.
+
+```ruby
+module CsvReports
+  include DbMod
+
+  def_prepared(:foo, 'SELECT a, b FROM foo WHERE bar_id = $id').as(:csv)
+end
+
+include CsvReports
+db_connect db: 'testdb'
+
+foo(id: 1) # => "a,b\n1,2\n3,4\n..."
+```

data/lib/db_mod/as.rb

@@ -0,0 +1,38 @@
+require_relative 'as/csv'
+
+module DbMod
+  # Contains coercers and other functions that allow
+  # module instance methods returning an SQL result set
+  # to be extended with additional result coercion and
+  # formatting. The normal way to access this functionality
+  # is via {DbMod::Statements::ConfigurableMethod#as},
+  # which is available when defining a statement method
+  # or prepared method:
+  #
+  #  def_statement(:a, 'SELECT a, b, c FROM foo').as(:csv)
+  #  def_prepared(:b, 'SELECT d, e, f FROM bar').as(:csv)
+  module As
+    # List of available result coercion methods.
+    # Only keys defined here are allowed as arguments
+    # to {DbMod::Statements::ConfigurableMethod#as}.
+    COERCERS = {
+      csv: DbMod::As::Csv
+    }
+
+    # Extend a method so that the SQL result set it
+    # returns will be coerced to the given type.
+    # See {COERCERS} for a list of defined coercion
+    # methods.
+    #
+    # @param mod [Module] module where the method has been defined
+    # @param name [Symbol] method name
+    # @param type [Symbol] type to which result set should be coerced
+    def self.extend_method(mod, name, type)
+      unless COERCERS.key? type
+        fail ArgumentError, "#{type} not in #{COERCERS.keys.join ', '}"
+      end
+
+      Statements.extend_method(mod, name, COERCERS[type])
+    end
+  end
+end

data/lib/db_mod/as/csv.rb

@@ -0,0 +1,37 @@
+module DbMod
+  module As
+    # Coercer which converts an SQL result set
+    # into a string formatted as a CSV document.
+    # May be enabled for a prepared method or
+    # statement method using +.as(:csv)+:
+    #
+    #  def_statement(:a, 'SELECT a, b FROM foo').as(:csv)
+    #  def_prepared(:b, 'SELECT b, c FROM bar').as(:csv)
+    #
+    #  def do_stuff
+    #    a # => "a,b\r\n1,2\r\n3,4\r\n..."
+    #  end
+    module Csv
+      # Enables this module to be passed to {DbMod::Statements.extend_method}
+      # as the +wrapper+ function, in which case it will retrieve the results
+      # and format them as a CSV document using the column names from the
+      # result set.
+      #
+      # @param wrapped_method [Method] the method that has been wrapped
+      # @param args [*] arguments expected to be passed to the wrapped method
+      # @return [String] a CSV formatted document
+      def self.call(wrapped_method, *args)
+        results = wrapped_method.call(*args)
+
+        headers = nil
+        CSV.generate do |csv|
+          results.each do |row|
+            csv << (headers = row.keys) unless headers
+
+            csv << headers.map { |col| row[col] }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/db_mod/statements.rb

@@ -1,3 +1,4 @@
+require_relative 'statements/configurable_method'
 require_relative 'statements/statement'
 require_relative 'statements/prepared'
 
@@ -15,5 +16,42 @@ module DbMod
       DbMod::Statements::Prepared.setup(mod)
       DbMod::Statements::Statement.setup(mod)
     end
+
+    # Used by submodules to when defining a method as declared by
+    # +def_statement+ or +def_prepared+. Wraps the defined method
+    # so that it may be extended with additional argument and
+    # result processing.
+    #
+    # @param mod [Module] the module where the method has been declared
+    # @param name [Symbol] the name of the module that has been defined
+    # @param definition [Proc] method definition
+    # @return [DbMod::Statements::ConfigurableMethod] dsl object for
+    #   further extending the method
+    def self.configurable_method(mod, name, definition)
+      mod.instance_eval { define_method(name, definition) }
+
+      ConfigurableMethod.new(mod, name)
+    end
+
+    # Used by {ConfigurableMethod} (and associated code) to wrap a defined
+    # statement method or prepared method with additional parameter or result
+    # processing. A wrapper method definition should be provided, which will
+    # be called in place of the original method. It will be called with the
+    # original method proc as a first argument followed by the original
+    # method arguments (before +DbMod+ has made any attempt to validate them!).
+    # It is expected to yield to the original proc at some point, although it
+    # is allowed to do whatever it wants with the results before returning them.
+    #
+    # @param mod [Module] the module where the method has been defined
+    # @param name [Symbol] the method name
+    # @param wrapper [Proc] a function which will be used to wrap the
+    #   original method definition
+    def self.extend_method(mod, name, wrapper)
+      mod.instance_eval do
+        wrapped = instance_method(name)
+
+        define_method name, ->(*args) { wrapper.call wrapped.bind(self), *args }
+      end
+    end
   end
 end

data/lib/db_mod/statements/configurable_method.rb

@@ -0,0 +1,41 @@
+require 'db_mod/as'
+
+module DbMod
+  module Statements
+    # Encapsulates a method that has just been defined
+    # via the dsl exposed in {DbMod::Statements} so that
+    # it can be extended with additional processing such
+    # as result coercion.
+    #
+    # The pattern here is something similar to rack's middleware.
+    # Calling any of the extension methods below will replace
+    # the original method defined by +def_prepared+ or +def_statement+
+    # with a wrapper function that may perform processing on given
+    # arguments, pass them to the original function, then perform
+    # additional processing on the result.
+    class ConfigurableMethod
+      # Encapsulate a method that has been newly defined
+      # by a {DbMod} dsl function, for additional configuration.
+      #
+      # @param mod [Module] the {DbMod} enabled module
+      #   where the method was defined
+      # @param name [Symbol] the method name
+      def initialize(mod, name)
+        @mod = mod
+        @name = name
+      end
+
+      # Extend the method by converting results into a given
+      # format, using one of the coercion methods defined
+      # under {DbMod::As}.
+      #
+      # @param type [Symbol] for now, only :csv is accepted
+      # @return [self]
+      def as(type)
+        DbMod::As.extend_method(@mod, @name, type)
+
+        self
+      end
+    end
+  end
+end

data/lib/db_mod/statements/prepared.rb

@@ -145,9 +145,8 @@ module DbMod
       # @param name [Symbol] name of the method to be defined
       #   and the prepared query to be called.
       def self.define_no_args_prepared_method(mod, name)
-        mod.instance_eval do
-          define_method name, ->() { conn.exec_prepared(name.to_s) }
-        end
+        method = ->() { conn.exec_prepared(name.to_s) }
+        Statements.configurable_method mod, name, method
       end
 
       # Define a method with the given name that accepts the
@@ -165,7 +164,7 @@ module DbMod
           conn.exec_prepared(name.to_s, args)
         end
 
-        mod.instance_eval { define_method(name, method) }
+        Statements.configurable_method mod, name, method
       end
 
       # Define a method with the given name that accepts a fixed
@@ -186,7 +185,7 @@ module DbMod
           conn.exec_prepared(name.to_s, args)
         end
 
-        mod.instance_eval { define_method(name, method) }
+        Statements.configurable_method(mod, name, method)
       end
 
       # Adds +prepared_statements+ to a module. This list of named

data/lib/db_mod/statements/statement.rb

@@ -83,9 +83,7 @@ module DbMod
       # @param name [Symbol] name of the method to be defined
       # @param sql [String] parameterless SQL statement to execute
       def self.define_no_args_statement_method(mod, name, sql)
-        mod.instance_eval do
-          define_method name, ->() { query(sql) }
-        end
+        Statements.configurable_method mod, name, ->() { query(sql) }
       end
 
       # Define a method with the given name, that accepts the
@@ -101,7 +99,7 @@ module DbMod
           conn.exec_params(sql, args)
         end
 
-        mod.instance_eval { define_method(name, method) }
+        Statements.configurable_method mod, name, method
       end
 
       # Define a method with the given name that accepts a fixed number
@@ -119,7 +117,7 @@ module DbMod
           conn.exec_params(sql, args)
         end
 
-        mod.instance_eval { define_method(name, method) }
+        Statements.configurable_method mod, name, method
       end
     end
   end

data/lib/db_mod/version.rb

@@ -1,5 +1,5 @@
 # Version information
 module DbMod
   # The current version of db_mod.
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/db_mod/as/csv_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'csv'
+
+describe DbMod::As::Csv do
+  subject do
+    Module.new do
+      include DbMod
+
+      def_statement(:statement, 'SELECT a, b FROM foo').as(:csv)
+      def_prepared(:prepared, 'SELECT c, d FROM bar').as(:csv)
+    end
+  end
+
+  before do
+    @conn = instance_double 'PGconn'
+    allow(@conn).to receive(:prepare)
+    allow(PGconn).to receive(:connect).and_return @conn
+  end
+
+  {
+    statement: :query,
+    prepared: :exec_prepared
+  }.each do |method_type, exec_type|
+    context "#{method_type} methods" do
+      it 'coerces results to csv' do
+        expect(@conn).to receive(exec_type).and_return([
+          { 'a' => '1', 'b' => '2' },
+          { 'a' => '3', 'b' => '4' }
+        ])
+
+        csv = subject.create(db: 'testdb').send(method_type)
+        expect(csv).to eq("a,b\n1,2\n3,4\n")
+      end
+    end
+  end
+end

data/spec/db_mod/as_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+# See submodules for more
+describe DbMod::As do
+  it 'disallows unknown coercions' do
+    expect do
+      Module.new do
+        include DbMod
+
+        def_statement(:foo, 'SELECT 1').as(:lolwut)
+      end
+    end.to raise_exception ArgumentError
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_mod
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Doug Hammond
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -105,6 +105,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -113,6 +114,8 @@ files:
 - Rakefile
 - db_mod.gemspec
 - lib/db_mod.rb
+- lib/db_mod/as.rb
+- lib/db_mod/as/csv.rb
 - lib/db_mod/create.rb
 - lib/db_mod/exceptions.rb
 - lib/db_mod/exceptions/already_in_transaction.rb
@@ -120,11 +123,14 @@ files:
 - lib/db_mod/exceptions/connection_not_set.rb
 - lib/db_mod/exceptions/duplicate_statement_name.rb
 - lib/db_mod/statements.rb
+- lib/db_mod/statements/configurable_method.rb
 - lib/db_mod/statements/parameters.rb
 - lib/db_mod/statements/prepared.rb
 - lib/db_mod/statements/statement.rb
 - lib/db_mod/transaction.rb
 - lib/db_mod/version.rb
+- spec/db_mod/as/csv_spec.rb
+- spec/db_mod/as_spec.rb
 - spec/db_mod/create_spec.rb
 - spec/db_mod/statements/prepared_spec.rb
 - spec/db_mod/statements/statement_spec.rb
@@ -156,6 +162,8 @@ signing_key:
 specification_version: 4
 summary: Declarative, modular database library framework.
 test_files:
+- spec/db_mod/as/csv_spec.rb
+- spec/db_mod/as_spec.rb
 - spec/db_mod/create_spec.rb
 - spec/db_mod/statements/prepared_spec.rb
 - spec/db_mod/statements/statement_spec.rb