octoshark 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a3eb977595f681e0fffb0fe11387a0bfd14a5f
-  data.tar.gz: 2eb1ddcefcd71470ab1f6f0271b854b3294b9874
+  metadata.gz: d633a471d22eac63cd9221ccc6d05446f0dd374f
+  data.tar.gz: 17bbd7dd09f26461f283520e1a7dd2eec5224817
 SHA512:
-  metadata.gz: f317a576062bdee24ca65433969742ec7d86890af9f936d6fa6241bd69e5e4486dfa06e2de5bcac6f2c639c4946c9b25fd144db7afdfc29478cee5ff4b0db991
-  data.tar.gz: d27b2fdafc8a99bd78ac69e80152e509710908ebc5116451128c732ef793f79d5ad852dc4c47df3dfc757d21ec710996b4f4ff97f000d9f3df34230845e4763b
+  metadata.gz: 5e44c905b0c564be6446d7e9adde9d69cf6013da491da760194eeafc86c50b43322b1de1b036d1d1f18b6ba4a88f17a7740b399540f2f67d21a024f3152cf36f
+  data.tar.gz: ee16b4532fd1efc1709c3a401ae084de11e3bf62c53a657f5fab86bfa1fed022d2263c4a17d7d62b623362d1e432df5be2abdc3a8adcd64a43f381788a19937c

data/README.md

@@ -1,6 +1,6 @@
-![Travis status](https://travis-ci.org/dalibor/octoshark.png)
+![Octoshark logo](https://dl.dropboxusercontent.com/u/3230730/github/octoshark.png)
 
-# Octoshark
+![Travis status](https://travis-ci.org/dalibor/octoshark.png)
 
 Octoshark is a simple ActiveRecord connection switcher. It provides a general purpose connection switching mechanism that can be used in sharding and master-slave multi-database environments. It's up to you to specify how ActiveRecord models will use the Octoshark connections, see below for example scenarios.
 
@@ -155,6 +155,10 @@ def clean_database_with
 end
 ```
 
+## Logo
+
+Thanks to [@saschamt](https://github.com/saschamt) for Octoshark logo design. :)
+
 ## Contributing
 
 1. Fork it ( http://github.com/dalibor/octoshark/fork )

data/lib/octoshark/active_record_extensions.rb

@@ -17,17 +17,23 @@ module Octoshark
   end
 
   module ActiveRecordAbstractAdapter
+    extend ActiveSupport::Concern
+
     attr_accessor :connection_name
 
-    def log(sql, name = "SQL", *other_args)
+    included do
+      alias_method_chain :log, :octoshark
+    end
+
+    def log_with_octoshark(sql, name = "SQL", *other_args, &block)
       if connection_name
         name = "[Octoshark: #{connection_name}] #{name}"
       end
 
-      super(sql, name, *other_args)
+      log_without_octoshark(sql, name, *other_args, &block)
     end
   end
 end
 
 ActiveRecord::Base.send(:include, Octoshark::ActiveRecordBase)
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, Octoshark::ActiveRecordAbstractAdapter)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Octoshark::ActiveRecordAbstractAdapter)

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord