td-logger 0.3.14 → 0.3.15

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2012-11-14 version 0.3.15
+
+* Removing InstanceMethods as it is deprecated in Rails 3.2 and
+  yields warning. issue #3
+* Add ActiveSupport::TimeWithZone#to_msgpack. issue #4
+
 
 == 2012-07-26 version 0.3.14
 

data/VERSION

@@ -1 +1 @@
-0.3.14
+0.3.15

data/lib/td/logger/agent/rails/controller.rb

@@ -7,24 +7,15 @@ module Agent::Rails
       ::ActionController::Base.send(:include, self)
     end
 
-    if defined?(ActiveSupport::Concern)
-      extend ActiveSupport::Concern
-    else
-      # Rails 2
-      def self.included(mod)
-        im = InstanceMethods
-        cm = ClassMethods
-        mod.class_eval do
-          include im
-          extend cm
-        end
+    def self.included(mod)
+      cm = ClassMethods
+      mod.class_eval do
+        extend cm
       end
     end
 
-    module InstanceMethods
-      def event
-        TreasureData::Logger.event
-      end
+    def event
+      TreasureData::Logger.event
     end
 
     module ClassMethods

data/lib/td/logger/agent/rails/model.rb

@@ -14,23 +14,13 @@ module Agent::Rails
       ::ActiveRecord::Base.send(:include, self)
     end
 
-    if defined?(ActiveSupport::Concern)
-      extend ActiveSupport::Concern
-    else
-      # Rails 2
-      def self.included(mod)
-        im = InstanceMethods
-        cm = ClassMethods
-        mod.class_eval do
-          include im
-          extend cm
-        end
+    def self.included(mod)
+      cm = ClassMethods
+      mod.class_eval do
+        extend cm
       end
     end
 
-    module InstanceMethods
-    end
-
     module ClassMethods
       def td_enable_model_tracer(tag, options={})
         only = nil

data/lib/td/logger/agent/rails.rb

@@ -47,6 +47,14 @@ module Agent::Rails
     TreasureData::Logger::Agent::Rails.init(::Rails.configuration)
   end
 
+  # implement ActiveSupport::TimeWithZone#to_msgpack
+  unless ActiveSupport::TimeWithZone.method_defined?(:to_msgpack)
+    class ActiveSupport::TimeWithZone
+      def to_msgpack(out='')
+        strftime("%Y-%m-%d %H:%M:%S %z").to_msgpack(out)
+      end
+    end
+  end
 end
 end
 end

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.14'
+VERSION = '0.3.15'
 
 end
 end

data/spec/rails_config_spec.rb

@@ -36,6 +36,11 @@ class ActionController
   end
 end
 
+class ActiveSupport
+  class TimeWithZone
+  end
+end
+
 require 'td/logger/agent/rails'
 
 describe TreasureData::Logger::Agent::Rails::Config do
@@ -114,3 +119,8 @@ EOF
   end
 end
 
+describe ActiveSupport::TimeWithZone do
+  it 'has to_msgpack' do
+    ActiveSupport::TimeWithZone.method_defined?(:to_msgpack).should be_true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -147,4 +147,3 @@ test_files:
 - spec/rails_config_spec.rb
 - spec/spec_helper.rb
 - spec/td_logger_spec.rb
-has_rdoc: