blurhash 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5b0ff9856430593e1b492182c357638d27c26781befa870ec63d2b045f68e1d
-  data.tar.gz: 65838972c020362dc506f5008c9967a67aed4b937a3ea711a54d980dfb3abd9a
+  metadata.gz: 8b20f7dc194fc64dd01eb87018cf0b5d8ea946df2d8cef51b1b9af5a9a959a6e
+  data.tar.gz: 2f918982c095b65fe40d4b9c21d93375cd20ab7fe046369b494daea34966220d
 SHA512:
-  metadata.gz: c273dc1cdc119883defbe1551a8ab6a20bd4ae0aa9fa1959be8192e6a6cfbc42d9b1226e1a4202c3a8a7e16bd828442f45ed8a5d14a5690e00bf3da2d3213b60
-  data.tar.gz: 59f5d327864de4557c467965da90dad9a4302b24e77ff1f6268bc2a4bd6f4250cb55d15a0b4e6c1805278ef16beb025486fd0a077310ba434ff84511d37d2b31
+  metadata.gz: 75960b20bab150322ff70bdac7a971583feacb3462e11b60f6cf9214631bb2b41fb47f64397b0ffbf1e044a5743d4706b6a70aa0ec2464bb6b9afd391c0893bf
+  data.tar.gz: bc3218e7b8da39367702976b208505b603ef0cd765783ba00c4f9c2713cbe95f92204b87fb8cfee10449b49a7f06cb5e70b229ecdc5261b3bca0caf26a9b350f

data/.github/workflows/gempush.yml

@@ -1,6 +1,7 @@
 name: Ruby Gem
 
 on:
+  workflow_dispatch:
   push:
     tags:
       - v*
@@ -12,11 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@master
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1.137.0
       with:
-        ruby-version: 2.6.x
-
+        ruby-version: '3.0'
     - name: Publish to RubyGems
       run: |
         mkdir -p $HOME/.gem

data/Gemfile.lock

@@ -1,14 +1,12 @@
 PATH
   remote: .
   specs:
-    blurhash (0.1.5)
-      ffi (~> 1.14)
+    blurhash (0.1.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    ffi (1.14.2)
     rake (13.0.3)
     rake-compiler (1.1.1)
       rake
@@ -37,4 +35,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.2.7
+   2.3.23

data/Rakefile

@@ -8,8 +8,7 @@ require "rake/extensiontask"
 task :build => :compile
 
 Rake::ExtensionTask.new("blurhash") do |ext|
-  ext.name = "encode"
-  ext.lib_dir = "ext/blurhash"
+  ext.name = "blurhash_ext"
 end
 
 task :default => [:clobber, :compile, :spec]

data/blurhash.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.extensions    = ['ext/blurhash/extconf.rb']
 
-  spec.add_dependency 'ffi', '~> 1.14'
-
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rake-compiler'

data/ext/blurhash/encode.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <math.h>
+#include <ruby.h>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
@@ -135,3 +136,22 @@ static char *encode_int(int value, int length, char *destination) {
 	}
 	return destination;
 }
+
+VALUE rb_blur_hash_for_pixels(VALUE m, VALUE x_comp, VALUE y_comp, VALUE width, VALUE height, VALUE p)
+{
+    const char * buf = blurHashForPixels(NUM2INT(x_comp),
+            NUM2INT(y_comp),
+            NUM2INT(width),
+            NUM2INT(height),
+            (uint8_t *)StringValuePtr(p),
+            NUM2INT(width) * 3);
+
+    return rb_str_new2(buf);
+}
+
+void Init_blurhash_ext()
+{
+    VALUE mBlurhash = rb_define_module("Blurhash");
+    VALUE mUnstable = rb_define_module_under(mBlurhash, "Unstable");
+    rb_define_singleton_method(mUnstable, "blurHashForPixels", rb_blur_hash_for_pixels, 5);
+}

data/ext/blurhash/extconf.rb

@@ -2,7 +2,4 @@ require 'mkmf'
 
 $CFLAGS += ' -std=c99 -lm'
 
-# Don't link to libruby
-$LIBRUBYARG = nil
-
-create_makefile 'encode'
+create_makefile 'blurhash_ext'

data/lib/blurhash/version.rb

@@ -1,3 +1,3 @@
 module Blurhash
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/blurhash.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 require 'blurhash/version'
-require 'ffi'
+require 'blurhash_ext'
 
 module Blurhash
   def self.encode(width, height, pixels, x_comp: 4, y_comp: 3)
-    FFI::MemoryPointer.new(:u_int8_t, pixels.size) do |p|
-      p.write_array_of_uint8(pixels)
-      return Unstable.blurHashForPixels(x_comp, y_comp, width, height, p, width * 3)
-    end
+    p = pixels.pack("C#{pixels.size}")
+    return Unstable.blurHashForPixels(x_comp, y_comp, width, height, p)
   end
 
   def self.components(str)
@@ -21,12 +19,6 @@ module Blurhash
     [x_comp, y_comp]
   end
 
-  module Unstable
-    extend FFI::Library
-    ffi_lib File.join(File.expand_path(File.dirname(__FILE__)), '..', 'ext', 'blurhash', 'encode.' + RbConfig::CONFIG['DLEXT'])
-    attach_function :blurHashForPixels, %i(int int int int pointer size_t), :string
-  end
-
   module Base83
     DIGIT_CHARACTERS = %w(
       0 1 2 3 4 5 6 7 8 9

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: blurhash
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Eugen Rochko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Encode an image as a small string that can saved in the database and used