sanscript 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de011752bbfc87c08592300330dc0aca37a6b9da
-  data.tar.gz: 051e4aa36d4fb35a763f04299b4a278d416ff7cd
+  metadata.gz: 4abcaa011331a5fcdcb8e27184883850c6815b1e
+  data.tar.gz: 213abc61320426da678cabe812b59902c2d8833b
 SHA512:
-  metadata.gz: 31cc5709e9eb6ed76a1a43ec365e3ae645e1ca9a8e467c9087b4c2f8bdcb8cb2db4045eb6c5de8f216de97619c137a028ac3d27dd973ba8a37b20a6df173b065
-  data.tar.gz: 1bab14d866ae4995d5c5b09e489348ff9931ed403fd34949afe9e54bf9275f0ed84e1cfb15f3603d844a01f6cb040ab3efc9a8625652e0602596139e6cd54025
+  metadata.gz: ef7b9677ab085c54cbd0511a15d212b85776c43190bb82ca9a51000a83dbfecd257fbed6a347a31bd585407b32fddb2941c7c92bc06f8ebec7d1ac32f169933d
+  data.tar.gz: f158c34ec94e52d29b66caf5e6914f2c94db14d6e0523b791b1c0a739c4c53fcbb60d8f649f9b8c1d1a5d7c1b706546c3bab7ca7947613df64067cf108cd42d6

data/.travis.yml

@@ -1,14 +1,14 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.3.3
   - 2.2
-  - 2.4.0-preview2
+  - 2.4.0-preview3
 matrix:
   allow_failures:
-  - rvm: 2.4.0-preview2
+  - rvm: 2.4.0-preview3
 
-before_install: gem install bundler -v 1.13.1
+before_install: gem install bundler -v 1.13.6
 script: bundle exec rake spec SPEC_OPTS="--format p"
 addons:
   code_climate:

data/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "rusty_sanscript"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Tim Bellefleur <nomoon@phoebus.ca>"]
 publish = false
 
 [dependencies]
-lazy_static = "^0.2.1"
-ruby-sys = "^0.2.13"
-regex = "^0.1.77"
+lazy_static = "^0.2.2"
+ruby-sys = "^0.2.17"
+regex = "^0.1.80"
 
 [lib]
 crate-type = ["cdylib"]

data/lib/sanscript.rb

@@ -10,11 +10,9 @@ require "sanscript/benchmark"
 
 # Sanscript.rb detection/transliteration module for Sanskrit.
 module Sanscript
-  # Whether Rust extension is available.
-  RUST_AVAILABLE = load_rust!
-
   # Load rust if available.
-  rust_enable!
+  RUST_AVAILABLE = rust_load!
+  rust_enable! if RUST_AVAILABLE
 
   module_function
 

data/lib/sanscript/rust.rb

@@ -4,14 +4,14 @@ module Sanscript
 
   # Attempts to load Rust native extension.
   # @return [bool] whether the extension loaded.
-  def load_rust!
+  def rust_load!
     return RUST_AVAILABLE if defined?(RUST_AVAILABLE)
     require "thermite/fiddle"
     Thermite::Fiddle.load_module("init_rusty_sanscript",
                                  cargo_project_path: GEM_ROOT,
                                  ruby_project_path: GEM_ROOT)
     #:nocov:#
-    defined?(Sanscript::Detect::Rust) ? true : false
+    defined?(Sanscript::Rust) ? true : false
   rescue Fiddle::DLError
     false
     #:nocov:#
@@ -19,34 +19,26 @@ module Sanscript
 
   # @return [bool] the enabled status of the Rust extension
   def rust_enabled?
-    @rust_enabled
+    @rust_enabled ||= false
   end
 
   # Turns on Rust extension, if available.
   # @return [bool] the enabled status of the Rust extension
   def rust_enable!
-    if RUST_AVAILABLE
-      # :nocov:
-      Detect.module_eval do
-        class << self
-          alias_method :detect_scheme, :rust_detect_scheme
-        end
-      end
-      @rust_enabled = true
-    else
-      @rust_enabled = false
-      # :nocov:
+    return false unless RUST_AVAILABLE
+    # :nocov:
+    Detect.singleton_class.class_eval do
+      alias_method :detect_scheme, :rust_detect_scheme
     end
-    @rust_enabled
+    @rust_enabled = true
+    # :nocov:
   end
 
   # Turns off Rust native extension.
   # @return [bool] the enabled status of the Rust extension
   def rust_disable!
-    Detect.module_eval do
-      class << self
-        alias_method :detect_scheme, :ruby_detect_scheme
-      end
+    Detect.singleton_class.class_eval do
+      alias_method :detect_scheme, :ruby_detect_scheme
     end
     @rust_enabled = false
   end

data/lib/sanscript/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Sanscript
   # The version number
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 
   GEM_ROOT = Pathname.new(File.realpath(File.join(__dir__, "..", "..")))
   private_constant :GEM_ROOT

data/src/detect/ruby.rs

@@ -36,8 +36,9 @@ fn rbstr_detect_scheme(_rself: Value, s: Value) -> Value {
 pub extern fn init_rusty_sanscript() {
   let m_sanscript = rb::define_module("Sanscript");
   let m_detect = rb::define_module_under(&m_sanscript, "Detect");
-  let m_rust = rb::define_module_under(&m_detect, "Rust");
-  rb::define_method(&m_rust, "rust_detect_scheme",
+  let m_rust = rb::define_module_under(&m_sanscript, "Rust");
+  let m_rust_detect = rb::define_module_under(&m_rust, "Detect");
+  rb::define_method(&m_rust_detect, "rust_detect_scheme",
     rbstr_detect_scheme as CallbackPtr, 1);
-  rb::extend_object(&m_detect, &m_rust);
+  rb::extend_object(&m_detect, &m_rust_detect);
 }

data/src/rb.rs

@@ -1,7 +1,6 @@
 use std::ffi::{CStr, CString};
 
 use ruby_sys::{class, string, symbol, util};
-use ruby_sys::types::c_char;
 use ruby_sys::value::RubySpecialConsts::Nil;
 
 pub use ruby_sys::types::{CallbackPtr, Value};
@@ -11,12 +10,10 @@ pub const RB_NIL: Value = Value { value: Nil as usize };
 // Helper functions for dealing with Ruby and CStrings
 //
 
-#[inline(always)]
-fn str_to_cstrp(s: &str) -> *const c_char {
-  CString::new(s).unwrap().as_ptr()
+fn str_to_cstr(s: &str) -> CString {
+  CString::new(s).unwrap()
 }
 
-#[inline]
 pub fn rbstr_to_str<'a>(s: *const Value) -> &'a str {
   unsafe {
     let c_strp = string::rb_string_value_cstr(s);
@@ -25,26 +22,26 @@ pub fn rbstr_to_str<'a>(s: *const Value) -> &'a str {
 }
 
 pub fn str_to_sym(s: &str) -> Value {
-  let c_strp = str_to_cstrp(s);
+  let c_str = str_to_cstr(s);
   unsafe {
-    let id = util::rb_intern(c_strp);
+    let id = util::rb_intern(c_str.as_ptr());
     symbol::rb_id2sym(id)
   }
 }
 
 pub fn define_module(name: &str) -> Value {
-  let c_strp = str_to_cstrp(name);
-  unsafe { class::rb_define_module(c_strp) }
+  let c_str = str_to_cstr(name);
+  unsafe { class::rb_define_module(c_str.as_ptr()) }
 }
 
 pub fn define_module_under(parent: &Value, name: &str) -> Value {
-  let c_strp = str_to_cstrp(name);
-  unsafe { class::rb_define_module_under(*parent, c_strp) }
+  let c_str = str_to_cstr(name);
+  unsafe { class::rb_define_module_under(*parent, c_str.as_ptr()) }
 }
 
 pub fn define_method(module: &Value, name: &str, method: CallbackPtr, argc: i32) {
-  let c_strp = str_to_cstrp(name);
-  unsafe { class::rb_define_method(*module, c_strp, method, argc) }
+  let c_str = str_to_cstr(name);
+  unsafe { class::rb_define_method(*module, c_str.as_ptr(), method, argc) }
 }
 
 pub fn extend_object(object: &Value, module: &Value) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanscript
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Tim Bellefleur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby port and extension of Sanscript.js transliterator by learnsanskrit.org