renaming, adding decoder

.gitignore

@@ -1,12 +1,12 @@
 .*.swp
 *.tmproj
-ext/qrdecode/*.o
-ext/qrdecode/*.dll
-ext/qrdecode/Makefile
-ext/qrdecode/*.log
-ext/qrdecode/*.bundle
-ext/qrdecode/*.a
-ext/qrdecode/*.so
-ext/qrdecode/conftest.dSYM
+ext/qrtools/*.o
+ext/qrtools/*.dll
+ext/qrtools/Makefile
+ext/qrtools/*.log
+ext/qrtools/*.bundle
+ext/qrtools/*.a
+ext/qrtools/*.so
+ext/qrtools/conftest.dSYM
 tags
 .rake_tasks

Rakefile

@@ -6,26 +6,26 @@ require 'hoe'
 kind = Config::CONFIG['DLEXT']
 windows = RUBY_PLATFORM =~ /mswin/i ? true : false
 
-EXT = "ext/qrdecode/qrdecode.#{kind}"
+EXT = "ext/qrtools/qrtools.#{kind}"
 
-Hoe.new('qrdecode', '1.0.0') do |p|
+Hoe.new('qrtools', '1.0.0') do |p|
   p.developer('Aaron Patterson', 'aaronp@rubyforge.org')
   p.clean_globs = [
-    'ext/qrdecode/Makefile',
-    'ext/qrdecode/*.{o,so,bundle,a,log,dll}',
-    'ext/qrdecode/conftest.dSYM',
+    'ext/qrtools/Makefile',
+    'ext/qrtools/*.{o,so,bundle,a,log,dll}',
+    'ext/qrtools/conftest.dSYM',
   ]
-  p.spec_extras = { :extensions => ["ext/qrdecode/extconf.rb"] }
+  p.spec_extras = { :extensions => ["ext/qrtools/extconf.rb"] }
 end
 
-task 'ext/qrdecode/Makefile' do
-  Dir.chdir('ext/qrdecode') do
+task 'ext/qrtools/Makefile' do
+  Dir.chdir('ext/qrtools') do
     ruby "extconf.rb #{ENV['EXTOPTS']}"
   end
 end
 
-task EXT => 'ext/qrdecode/Makefile' do
-  Dir.chdir('ext/qrdecode') do
+task EXT => 'ext/qrtools/Makefile' do
+  Dir.chdir('ext/qrtools') do
     sh 'make'
   end
 end

ext/qrdecode/extconf.rb → ext/qrtools/extconf.rb

@@ -22,4 +22,4 @@
   abort "need #{lib}" unless have_library(lib)
 end
 have_library('stdc++')
-create_makefile('qrdecode')
+create_makefile('qrtools')

ext/qrtools/qrtools.c

@@ -0,0 +1,12 @@
+#include <qrtools.h>
+
+VALUE mQRTools;
+
+void Init_qrtools()
+{
+  VALUE qrtools = rb_define_module("QRTools");
+  mQRTools = qrtools;
+
+  init_qrtools_image();
+  init_qrtools_decoder();
+}

ext/qrtools/qrtools.h

@@ -0,0 +1,14 @@
+#ifndef QRTOOLS_QRTOOLS
+#define QRTOOLS_QRTOOLS
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ruby.h>
+#include <decodeqr.h>
+
+#include <qrtools_image.h>
+#include <qrtools_decoder.h>
+
+extern VALUE mQRTools;
+
+#endif

ext/qrtools/qrtools_decoder.c

@@ -0,0 +1,19 @@
+#include <qrtools_decoder.h>
+
+static VALUE allocate(VALUE klass)
+{
+  QrDecoderHandle decoder = qr_decoder_open();
+
+  return Data_Wrap_Struct(klass, NULL, qr_decoder_close, decoder);
+}
+
+VALUE cQRToolsDecoder;
+void init_qrtools_decoder()
+{
+  VALUE qrtools  = rb_define_module("QRTools");
+  VALUE klass    = rb_define_class_under(qrtools, "Decoder", rb_cObject);
+
+  cQRToolsDecoder = klass;
+
+  rb_define_alloc_func(klass, allocate);
+}

ext/qrtools/qrtools_decoder.h

@@ -0,0 +1,10 @@
+#ifndef QRTOOLS_DECODER
+#define QRTOOLS_DECODER
+
+#include <qrtools.h>
+
+extern VALUE cQRToolsDecoder;
+
+void init_qrtools_decoder();
+
+#endif

ext/qrtools/qrtools_image.c

@@ -0,0 +1,24 @@
+#include <qrtools_image.h>
+
+static void dealloc(IplImage * img)
+{
+  cvReleaseImage(&img);
+}
+
+static VALUE load(VALUE klass, VALUE path)
+{
+  IplImage *src = cvLoadImage(StringValuePtr(path), 1);
+  return Data_Wrap_Struct(klass, NULL, dealloc, src);
+}
+
+VALUE cQRToolsImage;
+
+void init_qrtools_image()
+{
+  VALUE qrtools  = rb_define_module("QRTools");
+  VALUE klass    = rb_define_class_under(qrtools, "Image", rb_cObject);
+
+  cQRToolsImage = klass;
+
+  rb_define_singleton_method(klass, "load", load, 1);
+}

ext/qrtools/qrtools_image.h

@@ -0,0 +1,10 @@
+#ifndef QRTOOLS_IMAGE
+#define QRTOOLS_IMAGE
+
+#include <qrtools.h>
+
+extern VALUE cQRToolsImage;
+
+void init_qrtools_image();
+
+#endif

lib/qrtools.rb

@@ -0,0 +1,5 @@
+require 'qrtools/qrtools' # native
+
+module QRTools
+  VERSION = '1.0.0'
+end

test/helper.rb

@@ -4,9 +4,9 @@
   $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), path)))
 end
 
-require 'qrdecode'
+require 'qrtools'
 
-class QRDecodeTestCase < Test::Unit::TestCase
+class QRToolsTestCase < Test::Unit::TestCase
   ASSETS = File.expand_path(File.join(File.dirname(__FILE__), 'assets'))
 
   unless RUBY_VERSION >= '1.9'

test/test_decoder.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+
+class DecoderTestCase < QRToolsTestCase
+  def test_new
+    assert decoder = QRTools::Decoder.new
+  end
+end
+

test/test_image.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
-class ImageTestCase < QRDecodeTestCase
+class ImageTestCase < QRToolsTestCase
   def test_load
-    assert img = QRDecode::Image.load(File.join(ASSETS, '01-1.jpg'))
+    assert img = QRTools::Image.load(File.join(ASSETS, '01-1.jpg'))
   end
 end