jpeg 0.0.2 → 0.1.0

data/README.rdoc

@@ -1,10 +1,10 @@
 = jpeg
- A libjpeg wrapper for ruby
+A libjpeg wrapper for ruby
 == Install
  gem install jpeg
 
 or
- echo 'gem "jpeg"' > Gemfile
+ echo 'gem "jpeg"' >> Gemfile
  bundle install
 
 == Usage

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/ext/jpeg_jpeg.c

@@ -5,7 +5,6 @@
 VALUE Jpeg;
 
 static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE sef);
-static VALUE jpeg_jpeg_s_open_buffer(int argc, VALUE *argv, VALUE sef);
 static VALUE jpeg_jpeg_alloc(VALUE klass);
 static void jpeg_jpeg_mark(struct jpeg_jpeg *p);
 static void jpeg_jpeg_free(struct jpeg_jpeg *p);
@@ -17,7 +16,6 @@ void Init_jpeg_jpeg() {
     Jpeg = rb_define_class("Jpeg", rb_cObject);
     rb_define_alloc_func(Jpeg, jpeg_jpeg_alloc);
     rb_define_singleton_method(Jpeg, "open", jpeg_jpeg_s_open, -1);
-    rb_define_singleton_method(Jpeg, "open_buffer", jpeg_jpeg_s_open_buffer, -1);
     rb_define_method(Jpeg, "width", jpeg_jpeg_width, 0);
     rb_define_method(Jpeg, "height", jpeg_jpeg_height, 0);
     rb_define_method(Jpeg, "size", jpeg_jpeg_size, 0);
@@ -39,11 +37,14 @@ static void jpeg_jpeg_mark(struct jpeg_jpeg *p) {
 }
 
 static void jpeg_jpeg_free(struct jpeg_jpeg *p) {
-    //    if (p->read) {
-    //    jpeg_destroy_compress(p->read);
-    //    free(p->read);
-    //}
-    //xfree(p);
+    if (p->read) {
+        jpeg_destroy_compress(p->read);
+        free(p->read);
+    }
+    if (p->error) {
+        free(p->error);
+    }
+    xfree(p);
 }
 
 static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE self) {
@@ -58,7 +59,9 @@ static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE self) {
     jpeg = rb_funcall(Jpeg, rb_intern("new"), 0);
     Data_Get_Struct(jpeg, struct jpeg_jpeg, p_jpeg);
 
-    fp = fopen(RSTRING_PTR(path), "rb");
+    if ((fp = fopen(RSTRING_PTR(path), "rb")) == NULL) {
+        rb_raise(rb_eRuntimeError, "Open file failed");
+    }
     jpeg_stdio_src(p_jpeg->read, fp);
     jpeg_read_header(p_jpeg->read, TRUE);
     jpeg_start_decompress(p_jpeg->read);
@@ -66,30 +69,6 @@ static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE self) {
     return jpeg;
 }
 
-static VALUE jpeg_jpeg_s_open_buffer(int argc, VALUE *argv, VALUE self) {
-    VALUE buffer;
-    VALUE jpeg;
-    struct jpeg_jpeg *p_jpeg;
-    void *data = NULL;
-    int len = 0;
-    int errorp;
-    int buffer_is_temporary = 0;
-
-    rb_scan_args(argc, argv, "1", &buffer);
-
-    if (TYPE(buffer) == T_STRING) {
-        data = RSTRING_PTR(buffer);
-        len = RSTRING_LEN(buffer);
-    } else {
-        rb_raise(rb_eTypeError, "wrong argument type %s (expected String)", rb_class2name(CLASS_OF(buffer)));
-    }
-
-    jpeg = rb_funcall(Jpeg, rb_intern("new"), 0);
-    Data_Get_Struct(jpeg, struct jpeg_jpeg, p_jpeg);
-
-    return jpeg;
-}
-
 static VALUE jpeg_jpeg_width(VALUE self) {
     struct jpeg_jpeg *p_jpeg;
     Data_Get_Struct(self, struct jpeg_jpeg, p_jpeg);

data/jpeg.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "jpeg"
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["masarakki"]
+  s.date = "2012-03-29"
+  s.description = "libjpeg wrapper for ruby"
+  s.email = "masaki@hisme.net"
+  s.extensions = ["ext/extconf.rb"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "ext/extconf.rb",
+    "ext/jpeg.c",
+    "ext/jpeg.h",
+    "ext/jpeg_jpeg.c",
+    "ext/jpeg_jpeg.h",
+    "jpeg.gemspec",
+    "lib/jpeg.rb",
+    "spec/jpeg_spec.rb",
+    "spec/samples/sample.jpg",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/masarakki/jpeg"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.21"
+  s.summary = "libjpeg wrapper for ruby"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/lib/jpeg.rb

@@ -0,0 +1,10 @@
+require 'tempfile'
+require 'jpeg.so'
+class Jpeg
+  def self.open_buffer(str)
+    tmp = Tempfile::new("ruby-jpeg")
+    jpeg = Jpeg.open(tmp.path)
+    tmp.close
+    jpeg
+  end
+end

data/spec/jpeg_spec.rb

@@ -1,7 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+def sample_file_path(file)
+  File.join(File.dirname(__FILE__), 'samples', file)
+end
+
 describe "Jpeg" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  subject { @jpeg }
+  describe :open do
+    context "valid jpeg" do
+      before { @jpeg = Jpeg.open(sample_file_path("sample.jpg")) }
+      its(:size) { should == [112, 112] }
+      its(:width) { should == 112 }
+      its(:height) { should == 112 }
+    end
+    context "non-exists file" do
+      it {
+        lambda {
+          Jpeg.open(sample_file_path("nonexists.jpg"))
+        }.should raise_error
+      }
+    end
+
+    context "not a correct jpeg file" do
+      it {
+        lambda {
+          Jpeg.open(sample_file_path("sample.png"))
+        }.should raise_error
+      }
+    end
+  end
+  describe :from_string do
+    before { @jpeg = Jpeg.open_buffer(File.open(sample_file_path("sample.jpg")).read) }
+    its(:size) { should == [112, 112] }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -97,7 +97,10 @@ files:
 - ext/jpeg.h
 - ext/jpeg_jpeg.c
 - ext/jpeg_jpeg.h
+- jpeg.gemspec
+- lib/jpeg.rb
 - spec/jpeg_spec.rb
+- spec/samples/sample.jpg
 - spec/spec_helper.rb
 homepage: http://github.com/masarakki/jpeg
 licenses:
@@ -114,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1223134826035652440
+      hash: -2749025185700545883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: