cassie-queries 0.0.1.a2 → 0.0.1.a3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292e17b52cc92a211e404495ca0835bd2a3bb368
-  data.tar.gz: edede8b8ef33b3625cba57ce64699ee11556ad86
+  metadata.gz: cb242e7d39178042db018afd756662c8fad3c97f
+  data.tar.gz: 635694c6fa09a3c33a4344a510a168f30f7395ff
 SHA512:
-  metadata.gz: 813f15ce1672f5f0a7cfb3adced562b0ee94a2f3a4e523a048e5b6973d22d38562068059a1cbc53fc0353c24fd20a1685b9246b19a9e9c03a24cd01327e98f28
-  data.tar.gz: b063aba0e91ef6bdb58bf68f732ec1bb5a490ffe37c63ac5b4c22f60e664c11fdf2a85ea787bc451fb3cf30d2d347e33a35f65929fa4b486932cf09821b8b3d7
+  metadata.gz: 2dcaa13edba2a7d1df4a6775efdf75671fc7782e2e8f3358748e2356acd17200098d6eeda84cb2d2b8774a4e15727d2220ea7b4397859a611713b16bc5a3af53
+  data.tar.gz: 6ee8cb5798723ecb6ca88133e07cdd7088bb6ea3558635db69b615e11644ba1c97a7a03b5d8e6f93422d198936d0d70d68d511f2ec1f2afda84ff12f29c5de4d

data/lib/cassie/queries/{log_subscription → logging}/cql_execution_event.rb

@@ -1,4 +1,4 @@
-module Cassie::Queries::LogSubscription
+module Cassie::Queries::Logging
   class CqlExecutionEvent < ActiveSupport::Notifications::Event
 
     def duration # in milliseconds

data/lib/cassie/queries/logging/logger.rb

@@ -0,0 +1,27 @@
+module Cassie::Queries
+  module Logging
+
+    def self.logger
+      @logger ||= init_logger
+    end
+
+    def self.logger=(new_logger)
+      @logger = new_logger || Logger.new('/dev/null')
+    end
+
+    def self.init_logger(target = STDOUT)
+      previous_logger = @logger
+
+      @logger = Logger.new(target)
+      @logger.level = Logger::INFO
+      @logger.formatter = log_formatter
+
+      previous_logger.close if previous_logger
+      @logger
+    end
+
+    def self.log_formatter
+      ActiveSupport::Logger::SimpleFormatter.new
+    end
+  end
+end

data/lib/cassie/queries/{log_subscription.rb → logging/subscription.rb}

@@ -1,7 +1,7 @@
-require_relative 'log_subscription/cql_execution_event'
+require_relative 'cql_execution_event'
 
-module Cassie::Queries
-  module LogSubscription
+module Cassie::Queries::Logging
+  module Subscription
     extend ::ActiveSupport::Concern
 
     included do
@@ -12,20 +12,11 @@ module Cassie::Queries
         # finish  # => Time, when the instrumented block ended execution
         # id      # => String, unique ID for this notification
         # payload # => Hash, the payload
+        #             [:exception] => if raised during event
         unless args.last[:exception]
           logger.debug(CqlExecutionEvent.new(*args).message)
         end
       end
     end
-
-    module ClassMethods
-      def logger
-        @logger ||= begin
-          l = Logger.new(STDOUT)
-          l.formatter = ActiveSupport::Logger::SimpleFormatter.new
-          l
-        end
-      end
-    end
   end
 end

data/lib/cassie/queries/logging.rb

@@ -0,0 +1,22 @@
+require_relative 'logging/logger'
+require_relative 'logging/subscription'
+
+module Cassie::Queries
+  module Logging
+    extend ::ActiveSupport::Concern
+
+    included do
+      include Subscription
+    end
+
+    module ClassMethods
+      def logger
+        Cassie::Queries::Logging.logger
+      end
+    end
+
+    def logger
+      self.class.logger
+    end
+  end
+end

data/lib/cassie/queries/prepared_statement.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/filters'
-
 module Cassie::Queries
   module PreparedStatement
     extend ::ActiveSupport::Concern

data/lib/cassie/query.rb

@@ -1,16 +1,16 @@
 module Cassie
-  # think about ActiveSupport autoloading
+  require 'cassandra'
   require_relative 'queries/session'
   require_relative 'queries/statement'
   require_relative 'queries/prepared_statement'
   require_relative 'queries/instrumentation'
-  require_relative 'queries/log_subscription'
+  require_relative 'queries/logging'
 
   class Query
     include Queries::Session
     include Queries::Statement
     include Queries::PreparedStatement
     include Queries::Instrumentation
-    include Queries::LogSubscription
+    include Queries::Logging
   end
 end

data/lib/cassie-queries.rb

@@ -1,6 +1,16 @@
+# Active Support used for
+#  * include convenience via ActiveSupport::Concern
+#  * string extensions
+#  * notification pub/sub
+#  * log formatting
+#
+# We require/autoload extensions only as needed,
+# this base require has almost no overhead
+#
+# http://guides.rubyonrails.org/active_support_core_extensions.html
 require 'active_support'
 
-# cassie directory instead of cassie_queries
+# Use cassie directory instead of cassie-queries
 # to allow sharing of cassie module with other libraries
 # but maintain folder/file/module/class naming conventions
 require_relative 'cassie/query'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie-queries
 version: !ruby/object:Gem::Version
-  version: 0.0.1.a2
+  version: 0.0.1.a3
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
@@ -74,8 +74,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cassie/queries/instrumentation.rb
-- lib/cassie/queries/log_subscription/cql_execution_event.rb
-- lib/cassie/queries/log_subscription.rb
+- lib/cassie/queries/logging/cql_execution_event.rb
+- lib/cassie/queries/logging/logger.rb
+- lib/cassie/queries/logging/subscription.rb
+- lib/cassie/queries/logging.rb
 - lib/cassie/queries/prepared_statement.rb
 - lib/cassie/queries/session.rb
 - lib/cassie/queries/statement.rb