semian 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d993b21e41c60680d8229a6dc5cdd7b738f63a2c
-  data.tar.gz: f7d661b33ad871138625904ab945787814c692fd
+  metadata.gz: 37818bb2b8352953c8a3977a29381a812dd6a5aa
+  data.tar.gz: c1cf6be9179e4d21a41d2ff3bc831af8bca7b71f
 SHA512:
-  metadata.gz: 68ee4e3fed2cbe0cae47ca21ab08c2896bcfa73ef053b5e99e56e0d62b0b97cd514c232ab0c7cf9b25a530eeb5d3e90d1f65fb870fb80eaa461c7fadb7415b11
-  data.tar.gz: bf5a184b767a1e2db9417119ced349d0f528efb54e2ed763eeffcccac4d5986368befd4bd5f9f674be0366d395af95f8d933d59b7b9dd6091d7288a26be9086d
+  metadata.gz: af8ced42836152bebc2f8bebc5a8046c8a69c2cc0bf2c5ce22d286a394d621f140f191df1339a0b90dfe426b7c38e4c3e05f25ced591c008450eb2d3f82a418b
+  data.tar.gz: 309107cb264ad1665103fbcd001134a91491618f6be66d463e2f024892021a80a3f9b7c4f02f97d37e96aca9f31fab6a5a4a7edb402233995c14fb07e4547b15

data/lib/semian/redis.rb

@@ -16,11 +16,17 @@ class Redis
   ResourceBusyError = Class.new(SemianError)
   CircuitOpenError = Class.new(SemianError)
 
-  # This memoized alias is necessary because during a `pipelined` block
-  # the client is replaced by an instance of `Redis::Pipeline` and there is
-  # no way to access the original client.
-  def semian_resource
-    @semian_resource ||= @client.semian_resource
+  attr_reader :semian_resource
+
+  alias_method :_original_initialize, :initialize
+
+  def initialize(*args, &block)
+    _original_initialize(*args, &block)
+
+    # This alias is necessary because during a `pipelined` block
+    # the client is replaced by an instance of `Redis::Pipeline` and there is
+    # no way to access the original client.
+    @semian_resource = client.semian_resource
   end
 
   def semian_identifier

data/lib/semian/version.rb

@@ -1,3 +1,3 @@
 module Semian
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/test/fixtures/binary.sql

@@ -0,0 +1 @@
+INSERT IGNORE INTO `theme_template_bodies` (`cityhash`, `body`, `created_at`) VALUES ('716374049952273167', '�
�{\"current\":{\"bg_color\":\"#ff0000\"},\"presets\":{\"sandbox>,\0\07

, grey_bg\":6M\0\06

!blueJ!\0
lff
!redJ \0$ff0000\"}}}', '2015-11-06 19:08:03.498432')

data/test/mysql2_test.rb

@@ -181,12 +181,9 @@ class TestMysql2 < MiniTest::Unit::TestCase
   end
 
   def test_query_whitelisted_returns_false_for_binary_sql
+    binary_query = File.read(File.expand_path('../fixtures/binary.sql', __FILE__))
     client = connect_to_mysql!
-
-    q = "INSERT IGNORE INTO `theme_template_bodies` (`cityhash`, `body`, `created_at`) VALUES ('716374049952273167', \
-'\xB1\x01\xD0{\\\"current\\\":{\\\"bg_color\\\":\\\"#ff0000\\\"},\\\"presets\\\":{\\\"sandbox>,\\0\\07\x05\x01\x01, \
-grey_bg\\\":6M\\0\\06\x05\x01\x01!\fblueJ!\\0\x01l\x04ff\x01!\bredJ \\0$ff0000\\\"}}}', '2015-11-06 19:08:03.498432')"
-    refute client.send(:query_whitelisted?, q)
+    refute client.send(:query_whitelisted?, binary_query)
   end
 
   def test_semian_allows_rollback_to_safepoint

data/test/redis_test.rb

@@ -19,9 +19,9 @@ class TestRedis < MiniTest::Unit::TestCase
   end
 
   def test_semian_identifier
-    assert_equal :redis_foo, Redis.new(semian: {name: 'foo'}).client.semian_identifier
-    assert_equal :'redis_127.0.0.1:6379/0', Redis.new.client.semian_identifier
-    assert_equal :'redis_example.com:42/0', Redis.new(host: 'example.com', port: 42).client.semian_identifier
+    assert_equal :redis_foo, new_redis(semian: {name: 'foo'}).client.semian_identifier
+    assert_equal :'redis_127.0.0.1:16379/1', new_redis(semian: {name: nil}).client.semian_identifier
+    assert_equal :'redis_example.com:42/1', new_redis(host: 'example.com', port: 42, semian: {name: nil}).client.semian_identifier
   end
 
   def test_client_alias
@@ -35,6 +35,13 @@ class TestRedis < MiniTest::Unit::TestCase
     assert_instance_of Semian::UnprotectedResource, resource
   end
 
+  def test_semian_resource_in_pipeline
+    redis = connect_to_redis!
+    redis.pipelined do
+      assert_instance_of Semian::ProtectedResource, redis.semian_resource
+    end
+  end
+
   def test_connection_errors_open_the_circuit
     client = connect_to_redis!
 
@@ -210,15 +217,20 @@ class TestRedis < MiniTest::Unit::TestCase
 
   private
 
-  def connect_to_redis!(semian_options = {})
-    redis = Redis.new(
+  def new_redis(options = {})
+    semian_options = SEMIAN_OPTIONS.merge(options.delete(:semian) || {})
+    Redis.new({
       host: '127.0.0.1',
       port: 16_379,
       reconnect_attempts: 0,
       db: 1,
       timeout: 0.5,
-      semian: SEMIAN_OPTIONS.merge(semian_options),
-    )
+      semian: semian_options,
+    }.merge(options))
+  end
+
+  def connect_to_redis!(semian_options = {})
+    redis = new_redis(semian: semian_options)
     redis.client.connect
     redis
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Scott Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -161,6 +161,7 @@ files:
 - scripts/install_toxiproxy.sh
 - semian.gemspec
 - test/circuit_breaker_test.rb
+- test/fixtures/binary.sql
 - test/helpers/background_helper.rb
 - test/instrumentation_test.rb
 - test/mysql2_test.rb