char_size 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6828b103b20f4146b1d1dab950c3406ead00ce81
-  data.tar.gz: bb140e077caeb3f704a9fa1b599c08891a971c54
+  metadata.gz: f5ed68db56f43eea742583e0beea346b72c197d6
+  data.tar.gz: 39050055ae78300950b648c6c1b3cd41a8bef30e
 SHA512:
-  metadata.gz: 36fc67ddacafe8ee708b52dded407224dd5c9126e8ef3608b66ae6022f85ee9a50eedafcefab021c82baaa44a01ab3398d5b4ff3144720f0a722aff561c650f4
-  data.tar.gz: eeb92cc7a3322cb1363aba9a5416d1ba1227e509691874042de5ced26a79a973774506bd7c47fb3fd48ea3fd409bcde6148af6d4a463347ad7e8821bc6d71071
+  metadata.gz: a2c2ab26b53ab4e848021c35da15996702c8302839ec2b84c16701927f503a75163e6bad390837122278f16d34dae818a45783d2c4c1d6ef389203cc7fd5a8ea
+  data.tar.gz: 5788bebedae4a24b984da72d8fb7d21b5a82ff514a0276cdf88c859fda4c5e9cc4c17b45a33829beb985e0d10c816aa4d846ed71481c1dcfcfa630ead178a639

data/ext/char_size/char_size.c

@@ -1,10 +1,5 @@
-#include <char_size.h>
-
-static rb_encoding* find_encoding(VALUE encoding_or_name) {
-  rb_encoding* encoding = rb_find_encoding(encoding_or_name);
-  if (encoding == NULL) rb_raise(rb_eArgError, "unknown encoding name - %"PRIsVALUE, encoding_or_name);
-  return encoding;
-}
+#include <ruby.h>
+#include <ruby/encoding.h>
 
 /*
  * Gets the minimum character size (in bytes) for an encoding.
@@ -14,8 +9,9 @@ static rb_encoding* find_encoding(VALUE encoding_or_name) {
  *   CharSize.min("UTF-8")         # => 1
  *   CharSize.min(Encoding::UTF_8) # => 1
  */
-static VALUE min(VALUE class, VALUE encoding_or_name) {
-  return INT2NUM(ONIGENC_MBC_MINLEN(find_encoding(encoding_or_name)));
+static VALUE min(VALUE class, VALUE encoding_or_name)
+{
+    return INT2NUM(ONIGENC_MBC_MINLEN(rb_to_encoding(encoding_or_name)));
 }
 
 /*
@@ -26,12 +22,14 @@ static VALUE min(VALUE class, VALUE encoding_or_name) {
  *   CharSize.max("UTF-8")         # => 6
  *   CharSize.max(Encoding::UTF_8) # => 6
  */
-static VALUE max(VALUE class, VALUE encoding_or_name) {
-  return INT2NUM(ONIGENC_MBC_MAXLEN(find_encoding(encoding_or_name)));
+static VALUE max(VALUE class, VALUE encoding_or_name)
+{
+    return INT2NUM(ONIGENC_MBC_MAXLEN(rb_to_encoding(encoding_or_name)));
 }
 
-void Init_char_size() {
-  VALUE CharSize = rb_define_module("CharSize");
-  rb_define_singleton_method(CharSize, "min", min, 1);
-  rb_define_singleton_method(CharSize, "max", max, 1);
+void Init_char_size()
+{
+    VALUE CharSize = rb_define_module("CharSize");
+    rb_define_singleton_method(CharSize, "min", min, 1);
+    rb_define_singleton_method(CharSize, "max", max, 1);
 }

data/lib/char_size/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CharSize
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: char_size
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Haines
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,6 @@ files:
 - bin/setup
 - char_size.gemspec
 - ext/char_size/char_size.c
-- ext/char_size/char_size.h
 - ext/char_size/extconf.rb
 - lib/char_size.rb
 - lib/char_size/rake/char_size.rb.erb

data/ext/char_size/char_size.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <ruby.h>
-#include <ruby/encoding.h>
-
-#include <char_size.h>