jpeg 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38f85970789b149b8328172ba08dcd4ace974bf
-  data.tar.gz: a92cf8cd4a996d755cdd69c913f3ffcce965421e
+  metadata.gz: 17514bf49f64437e58f047e73f51f8aa910d419f
+  data.tar.gz: bad9d9450380e4d9f31c0ba2dbc3e1a6a434bbf9
 SHA512:
-  metadata.gz: 2e54c57d3c1bb861f3ac3788ec9e37720c995ac9ee33d710c09478574a3bf493c823d7ae1b9e8015889da2b7e8c716dc2bd1dab035d5c523eda65beb3eaf0394
-  data.tar.gz: 17fc49472ca3c05554c875bb67df6ae9e5ba7bbdc9342fe462aa1c7ab57b46bf1071a06af1e0193c1d52be8c6809cc31ffef20b5e5730c5ded8128e0884a5650
+  metadata.gz: e64f1099daaea7eee6c8b2e4ea3158550015a0117e5d804881a249c73ca207024b5ef094d9b72d46fec9fceff04b2dc982f02fb3444113907dc81ac2f86e944f
+  data.tar.gz: 241da4820a95b3feaa7820526c8ea62d5fa71c27efc302ac7aa669f07884f23196f8f61cc102d83b4f03529d648f4c5a7f1e08c210412c991deb5b6c7b4df902

data/ext/jpeg/jpeg.c

@@ -1,8 +1,12 @@
 #include "jpeg.h"
-#include "jpeg_jpeg.h"
+#include "jpeg_image.h"
 #include "jpeg_error.h"
 
-void Init_jpeg() {
-    Init_jpeg_jpeg();
+VALUE rb_mJpeg;
+
+void
+Init_jpeg(void) {
+    rb_mJpeg = rb_define_module("Jpeg");
+    Init_jpeg_image();
     Init_jpeg_error();
 }

data/ext/jpeg/jpeg.h

@@ -1,8 +1,6 @@
-#ifndef __JPEG_IMAGE_
-#define __JPEG_IMAGE_
+#ifndef RB_JPEG_H
+#define RB_JPEG_H 1
 
 #include "ruby.h"
 
-void Init_jpeg();
-
 #endif

data/ext/jpeg/jpeg_error.c

@@ -2,9 +2,9 @@
 #include "jpeg_error.h"
 #include "ruby.h"
 
-extern VALUE Jpeg;
-VALUE Jpeg_Error;
+extern VALUE rb_mJpeg;
+VALUE rb_eJpegError;
 
 void Init_jpeg_error() {
-    Jpeg_Error = rb_define_class_under(Jpeg, "Error", rb_eStandardError);
+    rb_eJpegError = rb_define_class_under(rb_mJpeg, "Error", rb_eStandardError);
 }

data/ext/jpeg/jpeg_error.h

@@ -1,5 +1,5 @@
-#ifndef __JPEG_ERROR_H__
-#define __JPEG_ERROR_H__
+#ifndef RB_JPEG_ERROR
+#define RB_JPEG_ERROR_H 1
 
 void Init_jpeg_error();
 

data/ext/jpeg/jpeg_image.c

@@ -0,0 +1,116 @@
+#include <stdio.h>
+#include <jpeglib.h>
+#include "jpeg_image.h"
+#include "jpeg_error.h"
+
+extern VALUE rb_mJpeg;
+VALUE rb_cJpegImage;
+
+static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE sef);
+static VALUE jpeg_image_alloc(VALUE klass);
+static void jpeg_image_mark(struct rb_jpeg_image *p);
+static void jpeg_image_free(struct rb_jpeg_image *p);
+static VALUE jpeg_image_width(VALUE self);
+static VALUE jpeg_image_height(VALUE self);
+static VALUE jpeg_image_size(VALUE self);
+static VALUE jpeg_image_color_info(VALUE self);
+
+extern VALUE rb_eJpegError;
+
+void Init_jpeg_image(void) {
+    rb_cJpegImage = rb_define_class_under(rb_mJpeg, "Image", rb_cObject);
+    rb_define_alloc_func(rb_cJpegImage, jpeg_image_alloc);
+    rb_define_singleton_method(rb_cJpegImage, "open", jpeg_image_s_open, -1);
+    rb_define_method(rb_cJpegImage, "width", jpeg_image_width, 0);
+    rb_define_method(rb_cJpegImage, "height", jpeg_image_height, 0);
+    rb_define_method(rb_cJpegImage, "size", jpeg_image_size, 0);
+    rb_define_method(rb_cJpegImage, "color_info", jpeg_image_color_info, 0);
+}
+
+void jpeg_image_exit(j_common_ptr jpeg) {
+    char buffer[JMSG_LENGTH_MAX];
+    jpeg->err->format_message(jpeg, buffer);
+    rb_raise(rb_eJpegError, buffer);
+}
+
+static VALUE jpeg_image_alloc(VALUE klass) {
+    struct rb_jpeg_image *jpeg = ALLOC(struct rb_jpeg_image);
+
+    jpeg->read = (void *)ALLOC(struct jpeg_decompress_struct);
+    jpeg->error = (void *)ALLOC(struct jpeg_error_mgr);
+    jpeg->read->err = jpeg_std_error(jpeg->error);
+    jpeg->error->error_exit = jpeg_image_exit;
+    jpeg_create_decompress(jpeg->read);
+
+    return Data_Wrap_Struct(klass, jpeg_image_mark, jpeg_image_free, jpeg);
+}
+
+static void jpeg_image_mark(struct rb_jpeg_image *p) {
+
+}
+
+static void jpeg_image_free(struct rb_jpeg_image *p) {
+    if (p->read) {
+        jpeg_destroy_decompress(p->read);
+        xfree(p->read);
+    }
+    if (p->error) {
+        xfree(p->error);
+    }
+    xfree(p);
+}
+
+static VALUE jpeg_image_s_open(int argc, VALUE *argv, VALUE self) {
+    VALUE path;
+    VALUE jpeg;
+    struct rb_jpeg_image *p_jpeg;
+    FILE *fp;
+    char *filename;
+    rb_scan_args(argc, argv, "1", &path);
+    Check_Type(path, T_STRING);
+
+    jpeg = rb_funcall(rb_cJpegImage, rb_intern("new"), 0);
+    Data_Get_Struct(jpeg, struct rb_jpeg_image, p_jpeg);
+    filename = StringValuePtr(path);
+
+    if ((fp = fopen(filename, "rb")) == NULL) {
+        rb_raise(rb_eJpegError, "Open file failed: %s", filename);
+    }
+    jpeg_stdio_src(p_jpeg->read, fp);
+
+    jpeg_read_header(p_jpeg->read, TRUE);
+    jpeg_start_decompress(p_jpeg->read);
+    fclose(fp);
+    return jpeg;
+}
+
+static VALUE jpeg_image_width(VALUE self) {
+    struct rb_jpeg_image *p_jpeg;
+    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
+    return rb_int_new(p_jpeg->read->output_width);
+}
+
+static VALUE jpeg_image_height(VALUE self) {
+    struct rb_jpeg_image *p_jpeg;
+    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
+    return rb_int_new(p_jpeg->read->output_height);
+}
+
+static VALUE jpeg_image_size(VALUE self) {
+    struct rb_jpeg_image *p_jpeg;
+    VALUE array;
+    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
+
+    array = rb_ary_new();
+    rb_ary_push(array, rb_int_new(p_jpeg->read->output_width));
+    rb_ary_push(array, rb_int_new(p_jpeg->read->output_height));
+
+    return array;
+}
+
+static VALUE jpeg_image_color_info(VALUE self) {
+    struct rb_jpeg_image *p_jpeg;
+
+    Data_Get_Struct(self, struct rb_jpeg_image, p_jpeg);
+    return ID2SYM(rb_intern( p_jpeg->read->out_color_components == 3 ? "rgb" : "gray" ));
+}

data/ext/jpeg/{jpeg_jpeg.h → jpeg_image.h}

@@ -1,14 +1,14 @@
-#ifndef __JPEG_JPEG_
-#define __JPEG_JPEG_
+#ifndef RB_JPEG_JPEG_H
+#define RB_JPEG_JPEG_H 1
 #include <jpeglib.h>
 #include "jpeg.h"
 #include "ruby.h"
 
-struct jpeg_jpeg {
+struct rb_jpeg_image {
     struct jpeg_decompress_struct *read;
     struct jpeg_error_mgr *error;
 };
 
-void Init_jpeg_jpeg();
+void Init_jpeg_image();
 
 #endif

data/jpeg.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake-compiler"
 end

data/lib/jpeg.rb

@@ -1,22 +1,20 @@
 require 'tempfile'
+require 'jpeg/version'
 require 'jpeg/jpeg'
+require 'jpeg/image'
 
-class Jpeg
+module Jpeg
   def self.open_buffer(str)
     tmp = Tempfile::new("ruby-jpeg")
     tmp.set_encoding Encoding::BINARY if tmp.respond_to?(:set_encoding)
     tmp.puts str
     tmp.rewind
-    jpeg = Jpeg.open(tmp.path)
+    jpeg = Jpeg::Image.open(tmp.path)
     tmp.close
     jpeg
   end
 
-  def rgb?
-    color_info == :rgb
-  end
-
-  def gray?
-    color_info == :gray
+  def self.open(file)
+    Jpeg::Image.open(file)
   end
 end

data/lib/jpeg/image.rb

@@ -0,0 +1,11 @@
+module Jpeg
+  class Image
+    def rgb?
+      color_info == :rgb
+    end
+
+    def gray?
+      color_info == :gray
+    end
+  end
+end

data/lib/jpeg/version.rb

@@ -1,3 +1,3 @@
-class Jpeg
-  VERSION = "0.4.0"
+module Jpeg
+  VERSION = "0.5.0"
 end

data/spec/jpeg_spec.rb

@@ -9,31 +9,25 @@ describe "Jpeg" do
   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 }
-      its(:color_info) { should == :rgb }
-      its(:rgb?) { should be_true }
-      its(:gray?) { should be_false }
+      it { expect(subject).to be_a Jpeg::Image }
+      it { expect(subject.size).to eq [112, 112] }
+      it { expect(subject.width).to eq 112 }
+      it { expect(subject.height).to eq 112 }
+      it { expect(subject.color_info).to eq :rgb }
+      it { expect(subject).to be_rgb }
+      it { expect(subject).not_to be_gray }
     end
+
     context "non-exists file" do
-      it {
-        lambda {
-          Jpeg.open(sample_file_path("nonexists.jpg"))
-        }.should raise_error
-      }
+      it { expect { Jpeg.open(sample_file_path("nonexists.jpg")) }.to raise_error(Jpeg::Error) }
     end
 
     context "not a correct jpeg file" do
-      it {
-        lambda {
-          Jpeg.open(sample_file_path("sample.png"))
-        }.should raise_error
-      }
+      it { expect { Jpeg.open(sample_file_path("sample.png")) }.to raise_error(Jpeg::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] }
+    it { expect(subject.size).to eq [112, 112] }
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,3 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'jpeg'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end
+require 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - masarakki
@@ -14,56 +14,70 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: libjpeg wrapper for ruby
@@ -74,10 +88,10 @@ extensions:
 - ext/jpeg/extconf.rb
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,10 +102,11 @@ files:
 - ext/jpeg/jpeg.h
 - ext/jpeg/jpeg_error.c
 - ext/jpeg/jpeg_error.h
-- ext/jpeg/jpeg_jpeg.c
-- ext/jpeg/jpeg_jpeg.h
+- ext/jpeg/jpeg_image.c
+- ext/jpeg/jpeg_image.h
 - jpeg.gemspec
 - lib/jpeg.rb
+- lib/jpeg/image.rb
 - lib/jpeg/version.rb
 - spec/jpeg_spec.rb
 - spec/samples/sample.jpg
@@ -107,12 +122,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/ext/jpeg/jpeg_jpeg.c

@@ -1,114 +0,0 @@
-#include <stdio.h>
-#include <jpeglib.h>
-#include "jpeg_jpeg.h"
-#include "jpeg_error.h"
-
-VALUE Jpeg;
-
-static VALUE jpeg_jpeg_s_open(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);
-static VALUE jpeg_jpeg_width(VALUE self);
-static VALUE jpeg_jpeg_height(VALUE self);
-static VALUE jpeg_jpeg_size(VALUE self);
-static VALUE jpeg_jpeg_color_info(VALUE self);
-
-extern VALUE Jpeg_Error;
-
-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_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);
-    rb_define_method(Jpeg, "color_info", jpeg_jpeg_color_info, 0);
-}
-
-void jpeg_jpeg_exit(j_common_ptr jpeg) {
-    char buffer[JMSG_LENGTH_MAX];
-    jpeg->err->format_message(jpeg, buffer);
-    rb_raise(Jpeg_Error, buffer);
-}
-
-static VALUE jpeg_jpeg_alloc(VALUE klass) {
-    struct jpeg_jpeg *jpeg = ALLOC(struct jpeg_jpeg);
-
-    jpeg->read = (void *)ALLOC(struct jpeg_decompress_struct);
-    jpeg->error = (void *)ALLOC(struct jpeg_error_mgr);
-    jpeg->read->err = jpeg_std_error(jpeg->error);
-    jpeg->error->error_exit = jpeg_jpeg_exit;
-    jpeg_create_decompress(jpeg->read);
-
-    return Data_Wrap_Struct(klass, jpeg_jpeg_mark, jpeg_jpeg_free, jpeg);
-}
-
-static void jpeg_jpeg_mark(struct jpeg_jpeg *p) {
-
-}
-
-static void jpeg_jpeg_free(struct jpeg_jpeg *p) {
-    if (p->read) {
-        jpeg_destroy_decompress(p->read);
-        xfree(p->read);
-    }
-    if (p->error) {
-        xfree(p->error);
-    }
-    xfree(p);
-}
-
-static VALUE jpeg_jpeg_s_open(int argc, VALUE *argv, VALUE self) {
-    VALUE path;
-    VALUE jpeg;
-    struct jpeg_jpeg *p_jpeg;
-    int errorp;
-    FILE *fp;
-    rb_scan_args(argc, argv, "1", &path);
-    Check_Type(path, T_STRING);
-
-    jpeg = rb_funcall(Jpeg, rb_intern("new"), 0);
-    Data_Get_Struct(jpeg, struct jpeg_jpeg, p_jpeg);
-
-    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);
-    fclose(fp);
-    return jpeg;
-}
-
-static VALUE jpeg_jpeg_width(VALUE self) {
-    struct jpeg_jpeg *p_jpeg;
-    Data_Get_Struct(self, struct jpeg_jpeg, p_jpeg);
-    return rb_int_new(p_jpeg->read->output_width);
-}
-
-static VALUE jpeg_jpeg_height(VALUE self) {
-    struct jpeg_jpeg *p_jpeg;
-    Data_Get_Struct(self, struct jpeg_jpeg, p_jpeg);
-    return rb_int_new(p_jpeg->read->output_height);
-}
-
-static VALUE jpeg_jpeg_size(VALUE self) {
-    struct jpeg_jpeg *p_jpeg;
-    VALUE array;
-    Data_Get_Struct(self, struct jpeg_jpeg, p_jpeg);
-
-    array = rb_ary_new();
-    rb_ary_push(array, rb_int_new(p_jpeg->read->output_width));
-    rb_ary_push(array, rb_int_new(p_jpeg->read->output_height));
-
-    return array;
-}
-
-static VALUE jpeg_jpeg_color_info(VALUE self) {
-    struct jpeg_jpeg *p_jpeg;
-
-    Data_Get_Struct(self, struct jpeg_jpeg, p_jpeg);
-    return ID2SYM(rb_intern( p_jpeg->read->out_color_components == 3 ? "rgb" : "gray" ));
-}