tengine_event 1.2.1 → 1.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGIxMzc0N2I5ZGNjNGMwMmU3ZGM3NjdmNzNkOGFmYTVmZGE1N2E5Ng==
+    MTI1YmNlYjNlZWQ4YTJjNTY4M2JlZTRiNzE3MzFkZjNkZmRmYjI5ZQ==
   data.tar.gz: !binary |-
-    ODZjNTY2NDQ1OWUwZmI2ZDVhNGQ3MjBkZGQ5OGE5MWI0NjExZjc5ZQ==
+    NmJkNmI0MWE4MTVlYjM1YjVjNmI3YzZhMGI1NGI0YzJkMmZjYzViNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzZkN2QyNzY0NWQ1YjZmZmZjZDFhYmQ2NzBjN2NkNGQzMWUyYWE5NjEyOGVj
-    NDU4YmE4YTgwNGI1Zjc5OGViYTk0MTJkNTU0MzI4NzEyMDhjZGUyZDAyNDU5
-    NmJmMGM5Y2NkOTEzMTMxOGYyOTk4MzUyODI0ZTBhNWFkZmY0YjI=
+    ZWM1MjczMTgzNmJlZmI4ZDRiNzdiZjc1NWQwYjVhMDNhMGJhNzdhMzAxZWU5
+    NTBhMTA4NGZkZTBjMjI5MmNiN2Q5YWFjN2NkZDY5MGYwNTEyY2QzY2I3NTBl
+    NmQzZmQ1OWExY2M3MzI0N2Y3YjMzODU4YjI3YzUzYjczNmRlMmQ=
   data.tar.gz: !binary |-
-    ZDZiMWZkN2NhMmZjMjRhZTJjNTFiMDBjYjkwNjhkZmFmNDcwOGEzZmUxMWIz
-    NDZlMDZjNTlhOWRhNjU2YjJiNjVmMTIzNWUwZTAyNmFjNjY0NTRiZmJhYmNi
-    YjA4NGY3NGUzMDE5Njc5ZDQwZDA3N2VhOTlkMWJlMWY4NmU4ZmQ=
+    MDdiMzVhM2JhMzg3Y2Q1ZWFiODU3YmU4ODA3YWNkZjg1MzZkNjFkMGU2NDc1
+    MDA0NWU4ODk3ZGFhYmUxNGRiOWJiZjc4ODhhMTI5MjUwYWU3ZmNjOThlNTA5
+    Y2QxNGMxNGRjYWEwZTExMzVhOGZmNmYzZWY0NTdlNDQwZDJhMzY=

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    tengine_event (1.2.1)
+    tengine_event (1.2.2)
       activesupport (>= 3.0.0)
       amqp (~> 0.9.10)
-      tengine_support (~> 1.2.1)
+      tengine_support (~> 1.2.2)
       uuid (~> 2.3.4)
 
 GEM
@@ -64,7 +64,7 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.4)
     systemu (2.5.2)
-    tengine_support (1.2.1)
+    tengine_support (1.2.2)
       activesupport (>= 3.0.0, < 4.0.0)
     uuid (2.3.7)
       macaddr (~> 1.0)

data/lib/tengine/event.rb

@@ -119,14 +119,16 @@ class Tengine::Event
   # イベントの発生日時。
   attr_accessor :occurred_at
   def occurred_at=(v)
-    case v
-    when nil then @occurred_at = nil
-    when Time then @occurred_at = v.utc
-    when String then
-      @occurred_at = v.respond_to?(:to_time) ? v.to_time : Time.respond_to?(:parse) ? Time.parse(v) : v
-    else
-      raise ArgumentError, "occurred_at must be a Time but was #{v.inspect}" unless v.is_a?(Time)
-    end
+    @occurred_at =
+      case v
+      when nil then nil
+      when Time then v.utc
+      when Numeric then Time.at(v).utc
+      when String then
+        v.respond_to?(:to_time) ? v.to_time : Time.respond_to?(:parse) ? Time.parse(v) : v
+      else
+        raise ArgumentError, "occurred_at must be a Time but was #{v.inspect}" unless v.is_a?(Time)
+      end
   end
 
   # from level to level_key

data/spec/tengine/event_spec.rb

@@ -322,17 +322,21 @@ describe "Tengine::Event" do
 
 
   describe :parse do
+    let(:valid_attrs) do
+      {
+        :event_type_name => :foo,
+        :key => "hoge",
+        'source_name' => "server1",
+        :occurred_at => Time.utc(2011,8,11,12,0),
+        :level_key => 'error',
+        'sender_name' => "server2",
+        :properties => {:bar => "ABC", :baz => 999}
+      }
+    end
+
     context "can parse valid json object" do
       subject do
-        source = Tengine::Event.new(
-          :event_type_name => :foo,
-          :key => "hoge",
-          'source_name' => "server1",
-          :occurred_at => Time.utc(2011,8,11,12,0),
-          :level_key => 'error',
-          'sender_name' => "server2",
-          :properties => {:bar => "ABC", :baz => 999}
-          )
+        source = Tengine::Event.new(valid_attrs)
         Tengine::Event.parse(source.to_json)
       end
       its(:key){ should == "hoge" }
@@ -345,6 +349,22 @@ describe "Tengine::Event" do
       its(:properties){ should == {'bar' => "ABC", 'baz' => 999}}
     end
 
+    context "can accept Integer UNIX time" do
+      subject do
+        source = Tengine::Event.new(valid_attrs.dup.update(:occurred_at => Time.utc(2011,8,11,12,0).to_i))
+        Tengine::Event.parse(source.to_json)
+      end
+      its(:occurred_at){ should == Time.utc(2011,8,11,12,0) }
+    end
+
+    context "can accept Float UNIX time" do
+      subject do
+        source = Tengine::Event.new(valid_attrs.dup.update(:occurred_at => Time.utc(2011,8,11,12,0).to_f))
+        Tengine::Event.parse(source.to_json)
+      end
+      its(:occurred_at){ should == Time.utc(2011,8,11,12,0) }
+    end
+
     context "can parse valid json array" do
       before do
         source1 = Tengine::Event.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_event
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - taigou
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement