pihsi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 476ee4a5c97cca36a91e30b9ab3b4e5b821ad63f
-  data.tar.gz: 40195a7c1873796cb245e6511b76842cfa4c279e
+  metadata.gz: 5a9fe7a19443c847fddb1f9c00738cdb53e44e65
+  data.tar.gz: 64b2b6f1f7f2266c287cdfe9f7d0eaf5841140e3
 SHA512:
-  metadata.gz: 4a9e8409bf6bc3d6a68a6a78029413f3f3f3836734b3c94ff05db046c3b17f06861a37bf460c73a6c7e0ac1c2b31244843b038ef788fd108455c72263a8a5393
-  data.tar.gz: f66b6ac970d69479f38d4b945a56e7af5d4d40b232974bd7660e7098723febacbb1c5b189d522269120691a5211bf8fdd9e3eaaef33aaa155822f26117208b8c
+  metadata.gz: 8656fa29997992a8e4b65ff2b6fe14b5237ee2ee0f040cbdea66482590270c054ab7f7935ff78799a9eea109c18705a2b0bc4fe7a9111e2de7d9179ed95c8b0f
+  data.tar.gz: 4a49ce9f911275b8642af3aa6cd74f19c14594527c20f62aa3371c5ebb2711f99410967e1143b2a646beb004a6517e00cfed63eb2ecdfe0e466f111570e9d0f9

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.1.2
+  - 2.0.0
+  - 1.9.3
+  - rbx-2.2.7
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install libpocketsphinx-dev libsphinxbase-dev

data/README.md

@@ -1,5 +1,7 @@
 # Pihsi
 
+[![Build Status](https://travis-ci.org/siegfried/pihsi.svg?branch=master)](https://travis-ci.org/siegfried/pihsi)
+
 Pihsi is a Ruby Speech Recognition toolkit based on [PocketSphinx](http://cmusphinx.sourceforge.net).
 
 ## Installation
@@ -34,7 +36,7 @@ recognizer.recognize string_buffer
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/pihsi/fork )
+1. Fork it ( https://github.com/siegfried/pihsi/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -12,3 +12,5 @@ RSpec::Core::RakeTask.new do |t|
 end
 
 task :spec => :compile
+
+task default: %w[spec]

data/ext/pocket_sphinx/extconf.rb

@@ -1,9 +1,11 @@
 require 'mkmf'
 
-unless find_header 'pocketsphinx_export.h', '/usr/local/include/pocketsphinx'
+unless find_header 'pocketsphinx_export.h', '/usr/local/include/pocketsphinx', '/usr/include/pocketsphinx'
   abort 'cannot find pocketsphinx, please install it.'
 end
-find_header 'cmd_ln.h', '/usr/local/include/sphinxbase'
+unless find_header 'cmd_ln.h', '/usr/local/include/sphinxbase', '/usr/include/sphinxbase'
+  abort 'cannot find sphinxbase, please install it.'
+end
 find_library 'pocketsphinx', 'ps_init'
 find_library 'sphinxbase', 'cmd_ln_init'
 

data/ext/pocket_sphinx/pocket_sphinx.c

@@ -1,33 +1,57 @@
 #include <ruby.h>
 #include <pocketsphinx.h>
 
-VALUE recognize(VALUE self, VALUE string_buffer) {
+VALUE recognize(VALUE self, VALUE data) {
 	char const *hyp, *uttid;
 	int rv;
 	int32 score;
 	ps_decoder_t *ps;
 	cmd_ln_t *config;
 
+	int data_length = RARRAY_LEN(data);
+	int16 *c_data = malloc(sizeof(int16) * data_length);
+
 	char *hmm = RSTRING_PTR(rb_funcall(self, rb_intern("hmm"), 0));
 	char *lm = RSTRING_PTR(rb_funcall(self, rb_intern("lm"), 0));
 	char *dict = RSTRING_PTR(rb_funcall(self, rb_intern("dict"), 0));
+
+	int i;
+	for(i = 0; i < data_length; i++) {
+		c_data[i] = NUM2SHORT(rb_ary_entry(data, i));
+	}
+
 	config = cmd_ln_init(NULL, ps_args(), TRUE, "-hmm", hmm, "-lm", lm, "-dict", dict, "-logfn", "/dev/null", NULL);
-	if (config == NULL)
+
+	if (config == NULL) {
+		free(c_data);
 		rb_raise(rb_eStandardError, "configuration might be wrong");
+	}
 
 	ps = ps_init(config);
 	rv = ps_start_utt(ps, "goforward");
-	if (rv < 0)
+
+	if (rv < 0) {
+		free(c_data);
 		rb_raise(rb_eStandardError, "cannot start utterance");
+	}
 
-	rv = ps_process_raw(ps, (const int16 *) RSTRING_PTR(string_buffer), RSTRING_LEN(string_buffer) / 2, FALSE, FALSE);
+	rv = ps_process_raw(ps, c_data, data_length, FALSE, FALSE);
 	rv = ps_end_utt(ps);
-	if (rv < 0)
+
+	if (rv < 0) {
+		free(c_data);
 		rb_raise(rb_eStandardError, "cannot end utterance");
+	}
+
 	hyp = ps_get_hyp(ps, &score, &uttid);
-	if (hyp == NULL)
-		rb_raise(rb_eStandardError, "no hypothesis string");
-	return rb_str_new2(hyp);
+
+	free(c_data);
+
+	if (hyp == NULL) {
+		return Qnil;
+	} else {
+		return rb_str_new2(hyp);
+	}
 }
 
 void Init_pocket_sphinx() {

data/lib/pihsi/version.rb

@@ -1,3 +1,3 @@
 module Pihsi
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/pihsi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions    = %w[ext/pocket_sphinx/extconf.rb]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3"
   spec.add_development_dependency "factory_girl", "~> 4.0"

data/spec/speech_recognizer_spec.rb

@@ -1,11 +1,11 @@
 RSpec.describe Pihsi::SpeechRecognizer do
   let(:instance) { build :speech_recognizer }
 
-  describe '#recognize(string_buffer)' do
-    subject { instance.recognize(string_buffer) }
+  describe '#recognize(data)' do
+    subject { instance.recognize(data) }
 
-    context 'when string_buffer is the content of goforward.raw' do
-      let(:string_buffer) { File.read 'spec/fixtures/goforward.raw' }
+    context 'when data is the content of goforward.raw' do
+      let(:data) { File.read('spec/fixtures/goforward.raw').unpack('s*') }
 
       it { should eq "go forward ten meters" }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pihsi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Zhi-Qiang Lei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md