jpeg 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b512a8178edabb2a12690e9a276ad5606e0a80b
-  data.tar.gz: aaba7c6ba93a72a70523022f8ec9755520773172
+  metadata.gz: 93785b2c60448a6fa4e9bf5b69de642d1ba0099e
+  data.tar.gz: 31ae30b5e411487c1c3d4436a6496a9dc2cdbd8a
 SHA512:
-  metadata.gz: d161cfb5425cd64037ae7f264e374a97a1a232dfc9215cb36f65b26c29601e5e5e713c88813b9594c72db7dda9f934e33e81f0807c7da854d8fe604046e5cfc6
-  data.tar.gz: 25122f30d0b14743f57007162fc4c223e507f2f257120c3d36cc55d7ba4b4b65160e90bd5f215ae790281ab5843de58b7c9937ace6b46102052f3b9d033af697
+  metadata.gz: cc3ba62f9d815a63e620c86a95cc7ca12b0c1e2c4f8ab78bf505e38988b8ecf700a699fe47e6f39ac27a1bede8f9eff79d12ca3e4331dd7a9965bd54623e00b8
+  data.tar.gz: 4cb12a28680e11496716f216d0aa355ac269cf68e012078ede2895b7bfd1beb336b3edaf3dec42c4206a02b2c9b1fb7705a35bcc4ee524bed40bdbc6f586a824

data/.rspec

@@ -1 +1,3 @@
+--require spec_helper
 --color
+--format doc

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,6 +1,7 @@
+language: ruby
+sudo: false
+cache: bundle
 before_script:
  - rake compile
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
+  - 2.3.1

data/Guardfile

@@ -0,0 +1,25 @@
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end
+
+guard :rake, task: 'compile' do
+  watch(%r{ext/.*$})
+end
+
+guard :rubocop, cli: '--auto-correct' do
+  watch(/.+\.rb$/)
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end

data/README.md

@@ -32,6 +32,11 @@ jpeg.height # => 1080
 jpeg.color_info # => :rgb or :gray
 jpeg.rgb? # => true
 jpeg.gray? # => false
+
+
+dot = jpeg.at(1920, 500)   #=> <Jpeg::Color r=0x00 g=0xaa b=0xff>
+dot.rgb    #=> [0, 170, 255]
+dot.to_s   #=> '#00aaff'
 ```
 
 ## Contributing

data/Rakefile

@@ -1,12 +1,12 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 require 'rake/extensiontask'
 
-Rake::ExtensionTask.new("jpeg") do |ext|
-  ext.lib_dir = "lib/jpeg"
+Rake::ExtensionTask.new('jpeg') do |ext|
+  ext.lib_dir = 'lib/jpeg'
 end

data/ext/jpeg/extconf.rb

@@ -1,6 +1,4 @@
-require "mkmf"
+require 'mkmf'
 
 dir_config('jpeglib')
-if have_header('jpeglib.h') and have_library('jpeg')
-  create_makefile('jpeg/jpeg')
-end
+create_makefile('jpeg/jpeg') if have_header('jpeglib.h') && have_library('jpeg')

data/ext/jpeg/jpeg_image.c

@@ -74,7 +74,7 @@ static void jpeg_image_s_set_read_source(struct rb_jpeg_image *p_jpeg) {
 
     } else {
 
-#ifdef jpeg_mem_src
+#if JPEG_LIB_VERSION >= 80
         jpeg_mem_src(p_jpeg->read, (unsigned char *) p_jpeg->buffer, p_jpeg->buffer_len);
 #else
         if ((p_jpeg->fp = fmemopen(p_jpeg->buffer, p_jpeg->buffer_len, "rb")) == NULL) {

data/jpeg.gemspec

@@ -4,24 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jpeg/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "jpeg"
+  spec.name          = 'jpeg'
   spec.version       = Jpeg::VERSION
-  spec.authors       = ["masarakki"]
-  spec.email         = ["masaki@hisme.net"]
-  spec.extensions    = ["ext/jpeg/extconf.rb"]
-  spec.summary       = "libjpeg wrapper for ruby"
-  spec.description   = "libjpeg wrapper for ruby"
-  spec.homepage      = "http://github.com/masarakki/jpeg"
-  spec.license       = "MIT"
+  spec.authors       = ['masarakki']
+  spec.email         = ['masaki@hisme.net']
+  spec.extensions    = ['ext/jpeg/extconf.rb']
+  spec.summary       = 'libjpeg wrapper for ruby'
+  spec.description   = 'libjpeg wrapper for ruby'
+  spec.homepage      = 'http://github.com/masarakki/jpeg'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  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"
+  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'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'guard-rake'
+  spec.add_development_dependency 'guard-rubocop'
 end

data/lib/jpeg.rb

@@ -2,6 +2,7 @@ require 'tempfile'
 require 'jpeg/version'
 require 'jpeg/jpeg'
 require 'jpeg/image'
+require 'jpeg/color'
 
 module Jpeg
   def self.open_buffer(str)

data/lib/jpeg/color.rb

@@ -0,0 +1,16 @@
+module Jpeg
+  Color = Struct.new(:r, :g, :b) do
+    def rgb
+      [r, g, b]
+    end
+    alias_method :to_a, :rgb
+
+    def to_s
+      format '#%02x%02x%02x', *rgb
+    end
+
+    def inspect
+      format '<Jpeg::Color r=0x%02x g=0x%02x b=0x%02x>', *rgb
+    end
+  end
+end

data/lib/jpeg/image.rb

@@ -1,11 +1,24 @@
 module Jpeg
   class Image
+    def at(x, y)
+      raise 'invalid position' unless inside? x, y
+      dot = raw_data[y][x]
+      color? ? Color.new(*dot) : Color.new(dot, dot, dot)
+    end
+
     def rgb?
       color_info == :rgb
     end
+    alias color? rgb?
 
     def gray?
       color_info == :gray
     end
+
+    private
+
+    def inside?(x, y)
+      x < width && x >= 0 && y < height && y >= 0
+    end
   end
 end

data/lib/jpeg/version.rb

@@ -1,3 +1,3 @@
 module Jpeg
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'.freeze
 end

data/spec/jpeg/color_spec.rb

@@ -0,0 +1,9 @@
+describe Jpeg::Color do
+  let(:g) { 0x00 }
+  let(:rgb) { [0xcc, g, 0xff] }
+  subject { Jpeg::Color.new(*rgb) }
+
+  its(:g) { is_expected.to eq g }
+  its(:rgb) { is_expected.to eq rgb }
+  its(:to_s) { is_expected.to eq '#cc00ff' }
+end

data/spec/jpeg/image_spec.rb

@@ -0,0 +1,53 @@
+describe Jpeg::Image do
+  subject(:image) { Jpeg.open(sample_file_path('zoi.jpg')) }
+  its(:width) { is_expected.to eq 630 }
+  its(:height) { is_expected.to eq 427 }
+
+  describe '#inside?' do
+    subject { image.send(:inside?, *pos) }
+    context [0, 0] do
+      let(:pos) { [0, 0] }
+      it { is_expected.to eq true }
+    end
+
+    context [629, 426] do
+      let(:pos) { [629, 426] }
+      it { is_expected.to eq true }
+    end
+
+    [[630, 0], [-1, 0], [0, 427], [0, -1]].each do |pos|
+      context pos do
+        let(:pos) { pos }
+        it { is_expected.to eq false }
+      end
+    end
+  end
+
+  context 'color image' do
+    subject { image }
+    it { is_expected.to be_rgb }
+    it { is_expected.to be_color }
+    it { is_expected.not_to be_gray }
+
+    describe '#at' do
+      subject { image.at(450, 200) }
+      it { is_expected.to be_a Jpeg::Color }
+      its(:rgb) { is_expected.to eq [0x99, 0x86, 0xbe] }
+      context 'invalid position' do
+        it { expect { image.at(630, 0) }.to raise_error 'invalid position' }
+      end
+    end
+  end
+
+  context 'gray image' do
+    subject(:image) { Jpeg.open(sample_file_path('gray.jpg')) }
+    it { is_expected.to be_gray }
+    it { is_expected.not_to be_color }
+
+    describe '#at' do
+      subject { image.at(50, 60) }
+      it { is_expected.to be_a Jpeg::Color }
+      its(:to_a) { is_expected.to eq [37, 37, 37] }
+    end
+  end
+end

data/spec/jpeg_spec.rb

@@ -1,22 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+describe 'Jpeg' do
+  describe '.open' do
+    subject(:image) { Jpeg.open(sample_file_path(filename)) }
+    context 'valid jpeg' do
+      let(:filename) { 'sample.jpg' }
 
-def sample_file_path(file)
-  File.join(File.dirname(__FILE__), 'samples', file)
-end
+      it { is_expected.to be_a Jpeg::Image }
+      its(:size) { is_expected.to eq [112, 112] }
+      its(:width) { is_expected.to eq 112 }
+      its(:height) { is_expected.to eq 112 }
+      its(:color_info) { is_expected.to eq :rgb }
+      it { is_expected.to be_rgb }
+      it { is_expected.not_to be_gray }
 
-describe "Jpeg" do
-  subject { @jpeg }
-  describe :open do
-    context "valid jpeg" do
-      before { @jpeg = Jpeg.open(sample_file_path("sample.jpg")) }
-      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 }
-      it "should export the decoded data" do
+      it 'should export the decoded data' do
         decoded = subject.raw_data
         expect(decoded.count).to eq 112
         expect(decoded[0].count).to eq 112
@@ -26,16 +22,19 @@ describe "Jpeg" do
       end
     end
 
-    context "non-exists file" do
-      it { expect { Jpeg.open(sample_file_path("nonexists.jpg")) }.to raise_error(Jpeg::Error) }
+    context 'non-exists file' do
+      let(:filename) { 'nonexists.jpg' }
+      it { expect { subject }.to raise_error(Jpeg::Error) }
     end
 
-    context "not a correct jpeg file" do
-      it { expect { Jpeg.open(sample_file_path("sample.png")) }.to raise_error(Jpeg::Error) }
+    context 'not a correct jpeg file' do
+      let(:filename) { 'sample.png' }
+      it { expect { subject }.to raise_error(Jpeg::Error) }
     end
   end
   describe :from_string do
-    before { @jpeg = Jpeg.open_buffer(File.open(sample_file_path("sample.jpg")).read) }
-    it { expect(subject.size).to eq [112, 112] }
+    subject { Jpeg.open_buffer(File.read(sample_file_path(filename))) }
+    let(:filename) { 'sample.jpg' }
+    its(:size) { is_expected.to eq [112, 112] }
   end
 end

data/spec/leak_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
 require 'jpeg'
 
 puts Process.pid

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'jpeg'
 require 'pry'
+require 'rspec/its'
+
+def sample_file_path(file)
+  File.join(File.dirname(__FILE__), 'samples', file)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpeg
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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: guard
+  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: guard-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: guard-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: guard-rubocop
+  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
 email:
 - masaki@hisme.net
@@ -90,8 +160,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -104,12 +176,17 @@ files:
 - ext/jpeg/jpeg_image.h
 - jpeg.gemspec
 - lib/jpeg.rb
+- lib/jpeg/color.rb
 - lib/jpeg/image.rb
 - lib/jpeg/version.rb
+- spec/jpeg/color_spec.rb
+- spec/jpeg/image_spec.rb
 - spec/jpeg_spec.rb
 - spec/leak_test.rb
+- spec/samples/gray.jpg
 - spec/samples/sample.jpg
 - spec/samples/sample.png
+- spec/samples/zoi.jpg
 - spec/spec_helper.rb
 homepage: http://github.com/masarakki/jpeg
 licenses:
@@ -131,13 +208,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: libjpeg wrapper for ruby
 test_files:
+- spec/jpeg/color_spec.rb
+- spec/jpeg/image_spec.rb
 - spec/jpeg_spec.rb
 - spec/leak_test.rb
+- spec/samples/gray.jpg
 - spec/samples/sample.jpg
 - spec/samples/sample.png
+- spec/samples/zoi.jpg
 - spec/spec_helper.rb