dry-web-roda 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 669cb29fe96550f45f14eb056d582129fcf2439c
-  data.tar.gz: 8859cf62ebd9af843df6525c8cace40ddbafc483
+  metadata.gz: dd98b628eb646092627a0322e5d9fec5d5df8922
+  data.tar.gz: e68b854855b73288d83dd46e337dea8352890d6f
 SHA512:
-  metadata.gz: '08935e3269b27767a3e86ae34e1ddeccb0c40a2111d1b51f3ef1ca59f8107b80decddfabc9ca5dbe7bbab79d3bc1e9dab06e84247aa7798250dd187a2fdf99aa'
-  data.tar.gz: 9b1b3264bfe6e8c4b208e55f9819faa040d091fb1a97c7b220b3b333e70e079e7567a7f5d1d514123e98eeea2c94512d61e964de4f60882941e961ab9cf862c2
+  metadata.gz: 49f813b5b909bc6b4d9f6772cc7a3a51560f2a440f60dfbbdbbe28ea4f653ccdc596453cc0fb51f2866c77467e923493e9a166103466d61527f38440ccf832d5
+  data.tar.gz: 8aee21a881953339e3e5552183ecf2b1ab2675d274dede6f8e0474def29e7fc98644f55af30b77d463c5032c4e19b15f37679fcbd12f14689d37ccd903aa0b64

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.3 - 2017-03-02
+
+### Changed
+
+- Use the newly-released rom/rom-sql instrumentation plugin to generate SQL logs, rather than a local monkey patch (timriley)
+
 # 0.6.2 - 2017-02-20
 
 ### Fixed

data/lib/dry/web/roda/skeletons/flat_project/Gemfile

@@ -13,8 +13,9 @@ gem "shotgun", ">= 0.9.2"
 
 # Database persistence
 gem "pg"
+gem "rom", ">= 3.1.0"
 gem "rom-repository"
-gem "rom-sql"
+gem "rom-sql", ">= 1.1.0"
 
 # Application dependencies
 gem "dry-matcher"

data/lib/dry/web/roda/skeletons/flat_project/system/boot/monitor.rb.tt

@@ -1,7 +1,6 @@
 <%= config[:camel_cased_app_name] %>::Container.finalize :monitor do |_container|
   init do
     require "dry/monitor"
-    require "rom/instrumentation"
   end
 
   start do

data/lib/dry/web/roda/skeletons/flat_project/system/boot/rom.rb.tt

@@ -15,6 +15,10 @@
         extensions: [:error_sql]
       )
 
+      rom_config.plugin(:sql, relations: :instrumentation) do |p|
+        p.notifications = notifications
+      end
+
       persistence.register("config", rom_config)
     end
 

data/lib/dry/web/roda/skeletons/umbrella_project/Gemfile

@@ -13,8 +13,9 @@ gem "shotgun", ">= 0.9.2"
 
 # Database persistence
 gem "pg"
+gem "rom", ">= 3.1.0"
 gem "rom-repository"
-gem "rom-sql"
+gem "rom-sql", ">= 1.1.0"
 
 # Application dependencies
 gem "dry-matcher"

data/lib/dry/web/roda/skeletons/umbrella_project/system/boot/monitor.rb.tt

@@ -1,7 +1,6 @@
 <%= config[:camel_cased_app_name] %>::Container.finalize :monitor do |_container|
   init do
     require "dry/monitor"
-    require "rom/instrumentation"
   end
 
   start do

data/lib/dry/web/roda/skeletons/umbrella_project/system/boot/rom.rb.tt

@@ -3,7 +3,7 @@
     init do
       require "sequel"
       require "rom"
-      
+
       use :monitor
 
       Sequel.database_timezone = :utc
@@ -15,6 +15,10 @@
         extensions: [:error_sql]
       )
 
+      rom_config.plugin(:sql, relations: :instrumentation) do |p|
+        p.notifications = notifications
+      end
+
       persistence.register("config", rom_config)
     end
 

data/lib/dry/web/roda/version.rb

@@ -1,7 +1,7 @@
 module Dry
   module Web
     module Roda
-      VERSION = "0.6.2".freeze
+      VERSION = "0.6.3".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-web-roda
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-web
@@ -238,7 +238,6 @@ files:
 - lib/dry/web/roda/skeletons/flat_project/lib/__underscored_app_name__/views/welcome.rb.tt
 - lib/dry/web/roda/skeletons/flat_project/lib/persistence/commands/.keep
 - lib/dry/web/roda/skeletons/flat_project/lib/persistence/relations/.keep
-- lib/dry/web/roda/skeletons/flat_project/lib/rom/instrumentation.rb.tt
 - lib/dry/web/roda/skeletons/flat_project/lib/types.rb
 - lib/dry/web/roda/skeletons/flat_project/log/.keep
 - lib/dry/web/roda/skeletons/flat_project/spec/app_helper.rb
@@ -291,7 +290,6 @@ files:
 - lib/dry/web/roda/skeletons/umbrella_project/lib/__underscored_app_name__/view_context.rb.tt
 - lib/dry/web/roda/skeletons/umbrella_project/lib/persistence/commands/.keep
 - lib/dry/web/roda/skeletons/umbrella_project/lib/persistence/relations/.keep
-- lib/dry/web/roda/skeletons/umbrella_project/lib/rom/instrumentation.rb.tt
 - lib/dry/web/roda/skeletons/umbrella_project/lib/types.rb
 - lib/dry/web/roda/skeletons/umbrella_project/log/.keep
 - lib/dry/web/roda/skeletons/umbrella_project/spec/app_helper.rb

data/lib/dry/web/roda/skeletons/flat_project/lib/rom/instrumentation.rb.tt

@@ -1,22 +0,0 @@
-require "rom-sql"
-
-module ROM
-  class Relation
-    # Monkey patch ROM::SQL to support query logs until an official API is available
-    module Instrumentation
-      def self.included(klass)
-        klass.option :notifications, reader: true, optional: false, default: proc {
-          <%= config[:camel_cased_app_name] %>::Container[:notifications]
-        }
-      end
-
-      def to_a
-        notifications.instrument(:sql, name: name.relation, query: dataset.sql) do
-          super
-        end
-      end
-    end
-
-    SQL::Relation.include(Instrumentation)
-  end
-end

data/lib/dry/web/roda/skeletons/umbrella_project/lib/rom/instrumentation.rb.tt

@@ -1,22 +0,0 @@
-require "rom-sql"
-
-module ROM
-  class Relation
-    # Monkey patch ROM::SQL to support query logs until an official API is available
-    module Instrumentation
-      def self.included(klass)
-        klass.option :notifications, reader: true, optional: false, default: proc {
-          <%= config[:camel_cased_app_name] %>::Container[:notifications]
-        }
-      end
-
-      def to_a
-        notifications.instrument(:sql, name: name.relation, query: dataset.sql) do
-          super
-        end
-      end
-    end
-
-    SQL::Relation.include(Instrumentation)
-  end
-end