diarize-ruby 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862081b1f139a2d177181be622086de18018aabd
-  data.tar.gz: 9f10cbcc0741b6ad845b2d5df000420e71aa4807
+  metadata.gz: cf974c96cf25699a635fe8adceff3839eb519dfd
+  data.tar.gz: dd4b2a3ee90d2893640110dc7b46a86086f9da56
 SHA512:
-  metadata.gz: 6543825ebf8a9909e3d49bfa81afd8f7146b426fd5bbf54fa1c3bc5561433625f384678c077bd63ecaa90baedd783aec2c2e3a1a09c372ee6d92827f36f7b6bc
-  data.tar.gz: 52f7db8c0bb30e16a13f61de11bc55ad43c26f7e3d2670a68889cd798c149d621dfa5e2e0260dacb89fe96a6e100e983b3e7a4893bcc84579fa3cd6f1a7bb643
+  metadata.gz: 9c12516dc25bd04468c4d771b29c848305807bf8a4fe3e7de2a6a64c3c45ca73aaf98cc067e2bf92890682eb5b353698c6fb1a9c1b46c677da7d83be4b119cbd
+  data.tar.gz: 06e93c8f82a8b3ffeb9f9fc3a7b01ee06368ef91edf55747f349af80cad91839cc5385760c8024e66ea47d447956d20b4abb072f898d4e0ab9e0979ba92b9a09

data/lib/diarize/segment.rb

@@ -51,9 +51,11 @@ module Diarize
         s['speaker'] = speaker.as_json if speaker
       }
     end
+    alias_method :_as_json, :as_json
 
     def to_json
       as_json.to_json
     end
+    alias_method :_to_json, :to_json
   end
 end

data/lib/diarize/speaker.rb

@@ -171,10 +171,12 @@ module Diarize
         'supervector_hash' => supervector.hash.to_s
       }
     end
+    alias_method :_as_json, :as_json
 
     def to_json
       as_json.to_json
     end
+    alias_method :_to_json, :to_json
 
     protected
 

data/lib/diarize/version.rb

@@ -1,3 +1,3 @@
 module Diarize
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/test/segment_test.rb

@@ -35,13 +35,17 @@ class SegmentTest < Test::Unit::TestCase
     assert_equal segment.uri, URI('http://example.com#t=2,7')
   end
 
-  def test_as_json
+  def test_as_json_and_to_json
     segment    = Diarize::Segment.new(OpenStruct.new({:base_uri => 'http://example.com'}), 2, 5, 'm', nil, 's1')
     model_file = File.join(File.dirname(__FILE__), 'data', 'speaker1.gmm')
     speaker    = Diarize::Speaker.new(URI.parse(""), "F", model_file)
     speaker.mean_log_likelihood = 0.9
-    segment.expects(:speaker).returns(speaker).twice
+    segment.expects(:speaker).returns(speaker).at_least(3)
     as_json = segment.as_json
+    assert_equal as_json, segment._as_json
+    assert_equal as_json, JSON.parse(segment.to_json)
+    assert_equal as_json, JSON.parse(segment._to_json)
+
     assert_equal true, as_json.has_key?('start')
     assert_equal true, as_json.has_key?('duration')
     assert_equal true, as_json.has_key?('gender')

data/test/speaker_test.rb

@@ -139,21 +139,14 @@ class SpeakerTest < Test::Unit::TestCase
     assert_equal true, to_rdf.include?("https://www.example.com/model/1")
   end
 
-  def test_as_json
+  def test_as_json_and_to_json
     speaker = Diarize::Speaker.new(URI.parse(""), "F", @model_file)
     speaker.mean_log_likelihood = 0.9
     as_json = speaker.as_json
-    assert_equal true, as_json.has_key?('gender')
-    assert_equal true, as_json.has_key?('model')
-    assert_equal true, as_json.has_key?('mean_log_likelihood')
-    assert_equal true, as_json.has_key?('supervector_hash')
-  end
+    assert_equal as_json, speaker._as_json
+    assert_equal as_json, JSON.parse(speaker.to_json)
+    assert_equal as_json, JSON.parse(speaker._to_json)
 
-  def test_to_json
-    speaker    = Diarize::Speaker.new(URI.parse(""), "F", @model_file)
-    speaker.mean_log_likelihood = 0.9
-    to_json    = speaker.to_json
-    as_json    = JSON.parse(to_json)
     assert_equal true, as_json.has_key?('gender')
     assert_equal true, as_json.has_key?('model')
     assert_equal true, as_json.has_key?('mean_log_likelihood')

data/test/version_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class VersionTest < Test::Unit::TestCase
 
   def test_current_version
-    assert_equal "0.3.11", Diarize::VERSION
+    assert_equal "0.3.12", Diarize::VERSION
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diarize-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Yves Raimond