rspec-have_readonly_query_matcher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f405bdfe7b9168719524dcc3ec3031243c63110ec8aba5f0d1df7537917a172
-  data.tar.gz: a1e2d3d3f877c2e61d83ccdf0cf4ebce23433630e0df7a76a8176dd9d4a53063
+  metadata.gz: 3ace760e2644dcec97474133aadfd9f9db092b8b64b756c8953ff950fa07a55b
+  data.tar.gz: aa3c82291706ad5b0ef067dbd452cd874f4ac974bdb2c0082a9fee27ec1ff1e2
 SHA512:
-  metadata.gz: 9ea6e41e03b52525af0a5c69992586a026e917d8810fe0939e83cb0c3bac241b417ba6c2d342eeede8b35a8a603c59a0f64a137bd21cc31e3d44b21b7ddcb131
-  data.tar.gz: ad337d7044a0b86514c1f5e97731b751931db88e7914acd5d13167b505d9afc207456b332b3a8602dfc723a21e99f5e0b765400b9dfc95e711edc3a1892f17d2
+  metadata.gz: 3606401a93d0a719f93f81610e038569cb00bfe2c205993b1edc29b6be21fbf64c78b031768be0065334f9cbdf8c5e777379d01dba9579f504e36746f43c3695
+  data.tar.gz: d86f74e80344a4a7526f24b1e566a0d9dca9874276c43406fb38231adc569f7feacd4a95b876f92ff9a0862e57b0e092430b1210583f2be52da8d50910e33bc6

data/README.md

@@ -26,10 +26,6 @@ spec/spec_helper.rb:
 ```ruby
 require 'rspec/have_readonly_query_matcher'
 
-RSpec::HaveReadonlyQueryMatcher.configure do |config|
-  config.adapter = ActiveRecord::ConnectionAdapters::Mysql2Adapter
-end
-
 RSpec.configuration.include RSpec::HaveReadonlyQueryMatcher
 ```
 

data/lib/rspec/have_readonly_query_matcher.rb

@@ -1,7 +1,8 @@
+require "active_support/notifications"
+require "active_record"
+
 require "rspec/have_readonly_query_matcher/version"
-require "rspec/have_readonly_query_matcher/config"
 require "rspec/have_readonly_query_matcher/have_readonly_query"
-require "rspec/have_readonly_query_matcher/readonlyable"
 
 module RSpec
   module HaveReadonlyQueryMatcher
@@ -11,22 +12,5 @@ module RSpec
     alias_method :have_only_read_query, :have_readonly_query
 
     module_function
-
-    def configure
-      @config = Config.new
-      yield @config
-    end
-
-    def enable!
-      @enabled = true
-    end
-
-    def disable!
-      @enabled = false
-    end
-
-    def enable?
-      @enabled || false
-    end
   end
 end

data/lib/rspec/have_readonly_query_matcher/have_readonly_query.rb

@@ -2,15 +2,20 @@ module RSpec
   module HaveReadonlyQueryMatcher
     class HaveReadonlyQuery
       def matches?(given_proc)
-        begin
-          RSpec::HaveReadonlyQueryMatcher.enable!
+        read_queries = []
+        callback = lambda { |name, start, finish, id, payload|
+          if payload[:sql] =~ /^(SELECT|SET|SHOW|DESCRIBE)\b/
+            read_queries << true
+          else
+            read_queries << false
+          end
+        }
+
+        ActiveSupport::Notifications.subscribed callback, 'sql.active_record' do
           given_proc.call
-        rescue RSpec::HaveReadonlyQueryMatcher::Readonlyable::NotReadonlyError => e
-          return false
-        ensure
-          RSpec::HaveReadonlyQueryMatcher.disable!
         end
-        true
+
+        read_queries.all?
       end
 
       def description

data/lib/rspec/have_readonly_query_matcher/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module HaveReadonlyQueryMatcher
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/rspec-have_readonly_query_matcher.gemspec

@@ -21,6 +21,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rspec-have_readonly_query_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takatoshi Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,9 +97,7 @@ files:
 - bin/console
 - bin/setup
 - lib/rspec/have_readonly_query_matcher.rb
-- lib/rspec/have_readonly_query_matcher/config.rb
 - lib/rspec/have_readonly_query_matcher/have_readonly_query.rb
-- lib/rspec/have_readonly_query_matcher/readonlyable.rb
 - lib/rspec/have_readonly_query_matcher/version.rb
 - rspec-have_readonly_query_matcher.gemspec
 homepage: https://github.com/takatoshiono/rspec-have_readonly_query_matcher

data/lib/rspec/have_readonly_query_matcher/config.rb

@@ -1,27 +0,0 @@
-module RSpec
-  module HaveReadonlyQueryMatcher
-    class Config
-      attr_reader :adapter
-
-      def adapter=(adapter)
-        @adapter = adapter
-        prepend_readonlyable
-      end
-
-      private
-
-      def prepend_readonlyable
-        adapter_class.prepend(RSpec::HaveReadonlyQueryMatcher::Readonlyable)
-      end
-
-      def adapter_class
-        case @adapter
-        when Class
-          @adapter
-        else
-          raise RSpec::HaveReadonlyQueryMatcher::Error, "Unexpected adapter: #{@adapter}"
-        end
-      end
-    end
-  end
-end  

data/lib/rspec/have_readonly_query_matcher/readonlyable.rb

@@ -1,19 +0,0 @@
-module RSpec
-  module HaveReadonlyQueryMatcher
-    module Readonlyable
-      class NotReadonlyError < StandardError; end
-
-      def execute(sql, name = nil)
-        if RSpec::HaveReadonlyQueryMatcher.enable?
-            if sql =~ /^(SELECT|SET|SHOW|DESCRIBE)\b/
-              super sql, name
-            else
-              raise NotReadonlyError.new("#{name}: #{sql}")
-            end
-        else
-            super sql, name
-        end
-      end
-    end
-  end
-end