pixel_matcher 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a265a3a6340812f32f4f438182a263e5f51428b75fd11a2085700fb455c9a4e4
-  data.tar.gz: f842ba4e06f8731225956314fca77544615bd9b021a37e2bd2a6fbd81ea2a07c
+  metadata.gz: 6f74eb9515f4f4afbc889420fe889cea52a8f222eb07345a2a7d536744f81283
+  data.tar.gz: 735290ba76f513abe2da41bd814e2459e0ca049d02cda7cd1097080911cf5164
 SHA512:
-  metadata.gz: 749712981d31f8b49f99a43c086e3b77e0900a0f4a41de15ae5a2c8a676ab8e73216ee5c61778aa49cc454344a0d8dbd89ba164d3b0b748de194280fe696bf71
-  data.tar.gz: 2ce49467b2110c9bf0ab57bf6e543726f2c3f57b3eabfc8320e9c9fb90f5c9f7dc1a5891dae1160a36d50ce07de6514760bb049ee74f3d47b238d06f11d1d4b9
+  metadata.gz: 16cd3a165ee5f880436485ecd11c764476a116a78bcc6f35a78c065fa89166519433c40f8ee4dcddfbe4c345a7bc9ad827dec38289e0d57e76f09e3f4dd86b89
+  data.tar.gz: 138df0c70c5bd2bbfa42b805ee806c9a11474465598cd9589805038cbe469a5b54177b0b20f3d4a3d7efb73ab5944874aea002643729042e514fde2aa38b8215

data/Gemfile.lock

@@ -1,19 +1,32 @@
 PATH
   remote: .
   specs:
-    pixel_matcher (0.0.2)
+    pixel_matcher (0.0.3)
       rmagick (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
+    backport (1.1.2)
     coderay (1.1.2)
     diff-lcs (1.3)
+    jaro_winkler (1.5.4)
+    maruku (0.7.3)
     method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.1)
+    parser (2.7.0.1)
+      ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (10.5.0)
+    reverse_markdown (1.3.0)
+      nokogiri
     rmagick (4.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -28,6 +41,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    rubocop (0.78.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    solargraph (0.38.0)
+      backport (~> 1.1)
+      bundler (>= 1.17.2)
+      jaro_winkler (~> 1.5)
+      maruku (~> 0.7, >= 0.7.3)
+      nokogiri (~> 1.9, >= 1.9.1)
+      parser (~> 2.3)
+      reverse_markdown (~> 1.0, >= 1.0.5)
+      rubocop (~> 0.52)
+      thor (~> 0.19, >= 0.19.4)
+      tilt (~> 2.0)
+      yard (~> 0.9)
+    thor (0.20.3)
+    tilt (2.0.10)
+    unicode-display_width (1.6.0)
+    yard (0.9.22)
 
 PLATFORMS
   ruby
@@ -38,6 +75,7 @@ DEPENDENCIES
   pry (~> 0.12.2)
   rake (~> 10.0)
   rspec (~> 3.0)
+  solargraph
 
 BUNDLED WITH
    2.0.2

data/README.md

@@ -21,9 +21,21 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-require 'pixel_matcher
+require 'pixel_matcher'
 
-diff = PixelMatcher::DiffImage('img1.png', 'img2.png')
+# from rmagick image
+require 'rmagick'
+diff = PixelMatcher::DiffImage.new(Magick::Image.read('img1.png').first, Magick::Image.read('img2.png').first)
+diff.export_diff('diff.png')
+diff.export_gray_scale('gray_scale.png')
+
+# from file path
+diff = PixelMatcher::DiffImage.from_path('img1.png', 'img2.png')
+diff.export_diff('diff.png')
+diff.export_gray_scale('gray_scale.png')
+
+# from blob
+diff = PixelMatcher::DiffImage.from_blob(File.read('img1.png'), File.read('img2.png'))
 diff.export_diff('diff.png')
 diff.export_gray_scale('gray_scale.png')
 ```

data/lib/pixel_matcher/diff_image.rb

@@ -1,14 +1,26 @@
 require 'rmagick'
 
 module PixelMatcher
-  class DiffImage < Magick::Image
-    def initialize(path1, path2)
-      @img1 = Magick::Image.read(path1).first
-      @img2 = Magick::Image.read(path2).first
+  class DiffImage
+    def initialize(img1, img2)
+      @img1 = img1
+      @img2 = img2
       @gray_scale = @img1.clone.quantize(256, Magick::GRAYColorspace)
       @diff = Magick::Image.new(@img1.columns, @img1.rows)
     end
 
+    def self.from_path(path1, path2)
+      img1 = Magick::Image.read(path1).first
+      img2 = Magick::Image.read(path2).first
+      self.new(img1, img2)
+    end
+
+    def self.from_blob(bin1, bin2)
+      img1 = Magick::Image.from_blob(bin1).first
+      img2 = Magick::Image.from_blob(bin2).first
+      self.new(img1, img2)
+    end
+
     def export_diff(output_path)
       store_diff
       @diff.write(output_path)
@@ -26,7 +38,7 @@ module PixelMatcher
     def store_diff
       @img1.columns.times do |i|
         @img1.rows.times do |j|
-          @diff.store_pixels(i, j, 1, 1, [@img1.pixel_color(i, j)]) unless eq_pixel?(@img1, @img2, i, j)
+          @diff.store_pixels(i, j, 1, 1, [@img1.pixel_color(i, j)]) unless eq_pixel?(i, j)
         end
       end
     end
@@ -34,17 +46,13 @@ module PixelMatcher
     def store_gray_scale_diff
       @img1.columns.times do |i|
         @img1.rows.times do |j|
-          @gray_scale.store_pixels(i, j, 1, 1, [@img1.pixel_color(i, j)]) unless eq_pixel?(@img1, @img2, i, j)
+          @gray_scale.store_pixels(i, j, 1, 1, [@img1.pixel_color(i, j)]) unless eq_pixel?(i, j)
         end
       end
     end
-  end
-end
-
-def image_array(img)
-  img.export_pixels.each_slice(3).each_slice(img.columns).to_a
-end
 
-def eq_pixel?(img1, img2, i, j)
-  img1.pixel_color(i, j) == img2.pixel_color(i, j)
+    def eq_pixel?(i, j)
+      @img1.pixel_color(i, j) == @img2.pixel_color(i, j)
+    end
+  end
 end

data/lib/pixel_matcher/version.rb

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

data/pixel_matcher.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'pry', '~> 0.12.2'
+  spec.add_development_dependency "solargraph"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixel_matcher
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ksk001100
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  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: Library to compare images and generate difference image files
 email:
 - hm.pudding0715@gmail.com