google_speech 0.1.6 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDVkYmNiZGJiNGY2Y2Y2NmY2YjAwZThhNGMwMGY5MzM4MzE5MTAzMQ==
+    M2I5ODY4NzA3Mzg1OTcyZjJlYWJlNjc2ZjdhMDc4ZjcyYzcxOTkwYQ==
   data.tar.gz: !binary |-
-    YWIwYzg5YTM0YmYwNjcwMThjYWNlMTExZjQ1NWM1ODcwYmNjZjljYQ==
+    YTkyYWY0NTExNjRmZDZjY2VmYjdjYTZjMGZlZDJjY2QyMzEyOWRjMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzZlMzVkNzFkZTNmODc1ZTdhYTJlYTA0ZWExOGFiMDliNWJhYmRmZDhiY2Rj
-    ODgwODJkN2UyY2VmZmZjNTJiY2Y4YjFhYzAxY2ZkYmQ1ZmI1YjMyNWQ1MDNi
-    OWQ2ODVjNjQwYWQ5ODY3YTMxYTg4YjlhYjY2YmVlMDEwMmUwODM=
+    NDQ0NThhNzhkMjg3YjExNTk5ZmRkNmRjMDc1YTMwMjcxYTg0N2FlZWE5YjVi
+    OWNlN2U4ZWM1NWJmN2QyZTgwMTJiMDgzYmQwZTlmMDBhMmNlMDdlMmZiZTFj
+    NmE3OTc1MThjZmVkNzEyYmUxYTg1NTQ5OTgyN2UyMzI5Mzg4MTA=
   data.tar.gz: !binary |-
-    ZDIwMWY5OWNjNmE3ZDIxYmIxOWRlMjBlYWIwMDk3YTdkZjkwMDU3ZDA3MmU3
-    ZDQ2NWZkMDhkZTViZjRhYTBiMWFiMDYxZDk2ZWZkMWU1ZTAxZjg4ZTg0YjMy
-    MDhhZDk2YWRmOGEzOTdkOTI0YzRmMDFjMDYxZjZiZWIyYjJhNjg=
+    YjU5ODViY2QwNjJjZjVlMGQzNmI4ZDJmYmUxMmEyNTY1NDViYWU3MjdkZDlh
+    ZjM4M2NkZDk4NDNiZTZlOTc5YTBjMmY0OGYyOTU3Mzk3Y2VhOGRhMGYwNWY4
+    ODVjOTI0ZGE5OGRhM2Q4ODQ3ODU0NDhmMzI3ZDkwMTVlNjI4ZDI=

data/bin/google_speech

@@ -2,6 +2,8 @@
 
 require 'google_speech'
 
+GoogleSpeech.logger = Logger.new(STDOUT)
+
 if ARGV[0].nil? || !File.exist?(ARGV[0])
   STDERR.puts "usage: #{$0} input.wav"
   exit(1)

data/lib/google_speech.rb

@@ -1,8 +1,18 @@
 # -*- encoding: utf-8 -*-
 
 require 'rubygems'
+require 'logger'
 
 module GoogleSpeech
+
+  def self.logger
+    @_logger ||= Logger.new(STDOUT)
+  end
+
+  def self.logger=(l)
+    @_logger = l
+  end
+
 end
 
 require 'google_speech/version'

data/lib/google_speech/chunk.rb

@@ -29,7 +29,7 @@ module GoogleSpeech
     end
 
     def logger
-      GoogleSpeech::Utility.logger
+      GoogleSpeech.logger        
     end
 
   end

data/lib/google_speech/chunk_factory.rb

@@ -24,7 +24,7 @@ module GoogleSpeech
     end
 
     def logger
-      GoogleSpeech::Utility.logger
+      GoogleSpeech.logger
     end
 
   end

data/lib/google_speech/transcriber.rb

@@ -12,9 +12,9 @@ module GoogleSpeech
       :language         => 'en-US',
       :chunk_duration   => 5,
       :overlap          => 1,
-      :max_results      => 2,
+      :max_results      => 1,
       :request_pause    => 1,
-      :profanity_filter => false
+      :profanity_filter => true
     }
 
     def initialize(original_file, options=nil)
@@ -64,9 +64,6 @@ module GoogleSpeech
 
     def transcribe_data(data)
       params = {
-        :scheme   => 'https',
-        :host     => 'www.google.com',
-        :port     => 443,
         :path     => "/speech-api/v1/recognize",
         :query    => "xjerr=1&client=google_speech&lang=#{options[:language]}&maxresults=#{options[:max_results].to_i}&pfilter=#{pfilter}",
         :body     => data,
@@ -80,28 +77,37 @@ module GoogleSpeech
       retry_max = options[:retry_max] ? [options[:retry_max].to_i, 1].max : 3
       retry_count = 0
       result = nil
-      url = "#{params[:scheme]}://#{params[:host]}:#{params[:port]}#{params[:path]}"
+      url = "https://www.google.com:443#{params[:path]}"
       while(!result && retry_count < retry_max)
-        connection = Excon.new(url)
-        response = connection.request(params)
-        # puts "response: #{response.inspect}\n\n"
-        # puts "response.body: #{response.body}\n\n"
-        if response.status.to_s.start_with?('2')
-          if (response.body && response.body.size > 0)
-            result = response.body.split("\n").collect{|b| JSON.parse(b)}
-            # puts "results #{result.count}: #{result.inspect}\n\n"
+        retry_count += 1
+
+        begin
+          connection = Excon.new(url)
+          response = connection.request(params)
+          # puts "response: #{response.inspect}\n\n"
+          # puts "response.body: #{response.body}\n\n"
+          if response.status.to_s.start_with?('2')
+            result = []
+            if (response.body && response.body.size > 0)
+              result = response.body.split("\n").collect{|b| JSON.parse(b)} rescue []
+            end
+          else
+            logger.error "transcribe_data response unsuccessful, status: #{response.status}, response: #{response.inspect}"
+            sleep(1) 
           end
-        else
+        rescue StandardError => err
+          #need to do something to retry this - use new a13g func for this.
+          logger.error "transcribe_data retrycount(#{retry_count}): error: #{err.message}"
           sleep(1)
-          retry_count += 1
         end
+
       end
 
-      result
+      result || []
     end
 
     def logger
-      GoogleSpeech::Utility.logger
+      GoogleSpeech.logger
     end
 
   end

data/lib/google_speech/utility.rb

@@ -2,7 +2,6 @@
 
 require 'tempfile'
 require 'open3'
-require 'logger'
 
 module GoogleSpeech
 
@@ -83,11 +82,7 @@ module GoogleSpeech
       end
 
       def logger
-        @logger ||= Logger.new(STDOUT)
-      end
-
-      def logger=(l)
-        @logger = l
+        GoogleSpeech.logger        
       end
 
     end    

data/lib/google_speech/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module GoogleSpeech
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_speech
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon