mysql2_query_filter 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c513f2df9750b6025486434600dbae552d94beee
-  data.tar.gz: 0be4a4270f245156dd2c6459b77ff6d2c77daaf2
+  metadata.gz: 0d022676c32d776a551477f215d2cf8497bf1f0c
+  data.tar.gz: 34358b98e6940db5055810320e4d2d477f22bf63
 SHA512:
-  metadata.gz: 205205f2f6caae4c965283c5ab85285f5b9d7887012786db1c1f91f095da5bc82b3029d676d87449e739271a8d293237e7b66cffeeac19db2bc069359a45e8c4
-  data.tar.gz: 3501a15686fd83490f91073f40461dc1301e9e1c60c10d85914b858856d395a8f06a96aa52efc0e9c923d437d070495d867b77c7b7525c08e10744ac03a54254
+  metadata.gz: 1b5a352c96146904d8dfe339957bd2cdbbc1bc07b6b81c829631074d48d56767a351175549d4936a8a9620fce0fc86008c07ec276f7f119f7b35d2a6d087d717
+  data.tar.gz: 66584176d34607f657f8d88268f8d6a3d78f994f4244538a70e068d6210c32793624303aea7fae03ce6b9cbd1885b740cb7a96daf604fbd71fef9eec138fbfd5

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.5
+  - 2.2.1
+script:
+  - bundle install
+  - bundle exec rake

data/README.md

@@ -2,6 +2,9 @@
 
 Filtering framework for [Mysql2](https://github.com/brianmario/mysql2).
 
+[![Gem Version](https://badge.fury.io/rb/mysql2_query_filter.svg)](http://badge.fury.io/rb/mysql2_query_filter)
+[![Build Status](https://travis-ci.org/winebarrel/mysql2_query_filter.svg?branch=master)](https://travis-ci.org/winebarrel/mysql2_query_filter)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,7 +26,7 @@ Or install it yourself as:
 ```ruby
 require 'mysql2_query_filter'
 
-class MyFilter < Mysql2QueryFilter::Plugin::Filter
+class MyFilter < Mysql2QueryFilter::Base
   def filter(sql, query_options)
     p sql
     p query_options

data/Rakefile

@@ -1,2 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/lib/mysql2_query_filter.rb

@@ -2,9 +2,9 @@ require 'mysql2'
 
 require 'mysql2_query_filter/version'
 
+require 'mysql2_query_filter/base'
 require 'mysql2_query_filter/mysql2_client_ext'
 require 'mysql2_query_filter/plugin'
-require 'mysql2_query_filter/plugin/filter'
 require 'mysql2_query_filter/query_filter'
 
 Mysql2::Client.class_eval do
@@ -30,4 +30,12 @@ module Mysql2QueryFilter
   def self.disable!
     @@enabled = false
   end
+
+  def self.disable!
+    @@enabled = false
+  end
+
+  def self.clear!
+    @@query_filter.clear!
+  end
 end

data/lib/mysql2_query_filter/{plugin/filter.rb → base.rb}

@@ -1,4 +1,4 @@
-class Mysql2QueryFilter::Plugin::Filter
+class Mysql2QueryFilter::Base
   def initialize(options)
     @options = options.dup
   end

data/lib/mysql2_query_filter/query_filter.rb

@@ -9,7 +9,7 @@ class Mysql2QueryFilter::QueryFilter
   end
 
   def add(filter_class, options = {})
-    unless filter_class < Mysql2QueryFilter::Plugin::Filter
+    unless filter_class < Mysql2QueryFilter::Base
       raise "Invalid plug-in has been appended: #{filter_class}"
     end
 
@@ -21,4 +21,8 @@ class Mysql2QueryFilter::QueryFilter
       fltr.filter(sql, query_options)
     end
   end
+
+  def clear!
+    @filters.clear
+  end
 end

data/lib/mysql2_query_filter/version.rb

@@ -1,3 +1,3 @@
 module Mysql2QueryFilter
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/mysql2_query_filter.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
 end

data/spec/mysql2_query_filter/plugin/test_plugin.rb

@@ -0,0 +1,9 @@
+module Mysql2QueryFilter::Plugin
+  class Test < Mysql2QueryFilter::Base
+    Mysql2QueryFilter::Plugin.register(:test_plugin, self)
+
+    def filter(sql, query_options)
+      sql << ' through plugin'
+    end
+  end
+end

data/spec/mysql2_query_filter_spec.rb

@@ -0,0 +1,42 @@
+describe Mysql2QueryFilter do
+  let(:client) { Mysql2::Client.new }
+
+  context 'when using filters' do
+    let(:filter1) do
+      Class.new(Mysql2QueryFilter::Base) do
+        def filter(sql, query_options); sql << ' through filter1'; end
+      end
+    end
+
+    let(:filter2) do
+      Class.new(Mysql2QueryFilter::Base) do
+        def filter(sql, query_options); sql << ' through filter2'; end
+      end
+    end
+
+    before do
+      Mysql2QueryFilter.configure do |filter|
+        filter.add filter1
+        filter.add filter2
+      end
+    end
+
+    it do
+      expect(client).to receive(:query_without_filter).with('select 1 through filter1 through filter2')
+      client.query('select 1')
+    end
+  end
+
+  context 'when using a plug-in' do
+    before do
+      Mysql2QueryFilter.configure do |filter|
+        filter.plugin :test_plugin
+      end
+    end
+
+    it do
+      expect(client).to receive(:query_without_filter).with('select 1 through plugin')
+      client.query('select 1')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'mysql2_query_filter'
+
+RSpec.configure do |config|
+  config.before(:all) do
+    Mysql2QueryFilter.enable!
+  end
+
+  config.before(:each) do
+    Mysql2QueryFilter.clear!
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql2_query_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Filtering framework for Mysql2.
 email:
 - sgwr_dts@yahoo.co.jp
@@ -60,18 +74,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/mysql2_query_filter.rb
+- lib/mysql2_query_filter/base.rb
 - lib/mysql2_query_filter/mysql2_client_ext.rb
 - lib/mysql2_query_filter/plugin.rb
-- lib/mysql2_query_filter/plugin/filter.rb
-- lib/mysql2_query_filter/plugins.rb
 - lib/mysql2_query_filter/query_filter.rb
 - lib/mysql2_query_filter/version.rb
 - mysql2_query_filter.gemspec
+- spec/mysql2_query_filter/plugin/test_plugin.rb
+- spec/mysql2_query_filter_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/winebarrel/mysql2_query_filter
 licenses:
 - MIT
@@ -96,4 +114,7 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Filtering framework for Mysql2.
-test_files: []
+test_files:
+- spec/mysql2_query_filter/plugin/test_plugin.rb
+- spec/mysql2_query_filter_spec.rb
+- spec/spec_helper.rb

data/lib/mysql2_query_filter/plugins.rb

@@ -1,27 +0,0 @@
-class Mysql2QueryFilter::Plugins
-  @@plugins = {}
-
-  def self.register(name, klass)
-    name = name.to_s
-
-    if @@plugins.has_key?(name)
-      raise "Plugin has already been registered: #{name}"
-    end
-
-    @@plugins[name] = klass
-  end
-
-  def self.[](name)
-    name = name.to_s
-
-    require "mysql2_query_filter/plugin/#{name}"
-
-    plugin = @@plugins[name]
-
-    unless plugin
-      raise "Plugin is not found: #{name}"
-    end
-
-    plugin
-  end
-end