sanscript 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0ea83dbd9294b3b9513a64d14924b3cf355a241
-  data.tar.gz: 67276e8a661be58cdc5a2a3a3915a2ab2fe90fd0
+  metadata.gz: d1e473866926c96b58966e9a570d1310ae9d8eff
+  data.tar.gz: b6f0165d110775e8f4adb49de170634638afb372
 SHA512:
-  metadata.gz: 522fb05bb1bd21d431ae7077c84b9ef954d5a61a2b14c2a8426bfc72158f4d3d58786b4c3295afa6bad3dcd34cb7e9aa4550d1f1e5a77a76482e57f07dadcf77
-  data.tar.gz: ddd1e7304d03f1bbcc34b67c01b77108f0223dff2af1913562aa7aeea1574ce5bf940937b5e517d050e35dd2cc74c00a45c693ac8b45310dd6e0927a8cd5763c
+  metadata.gz: 6abff0d8586ff49952c7a308d4ddaf142fcc0ae4be41a739ed287a5705b2bca2cf104ef965c37cdc39dd6b0ce34155d2509722275494a87125e8c5b65403f062
+  data.tar.gz: d66c8bfd4cd7faddf4e544e5287e7c83a8c7d855741aac71f2153f457e4e275a47981cff9559009d7d7ce7cc0b7c3faf20c684d11cf1561f09c6924b500f4e73

data/.travis.yml

@@ -2,6 +2,12 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
+  - 2.2
+  - 2.4.0-preview1
+matrix:
+  allow_failures:
+  - rvm: 2.4.0-preview1
+
 before_install: gem install bundler -v 1.12.5
 script: bundle exec rake spec SPEC_OPTS="--format p"
 addons:

data/lib/sanscript/detect.rb

@@ -44,14 +44,17 @@ module Sanscript
     # Match on characters available in Harvard-Kyoto
     RE_HARVARD_KYOTO = /[aAiIuUeoRMHkgGcjJTDNtdnpbmyrlvzSsh]/
 
+    # Match ##...## or {#...#} control blocks.
+    RE_CONTROL_BLOCK = /(?<!\\)##.*?(?<!\\)##|(?<!\\)\{#.*?(?<!\\)#\}/
+
     private_constant :RE_BRAHMIC_RANGE, :RE_BRAHMIC_SCRIPTS, :RE_IAST_OR_KOLKATA_ONLY,
                      :RE_KOLKATA_ONLY, :RE_ITRANS_ONLY, :RE_SLP1_ONLY, :RE_VELTHUIS_ONLY,
-                     :RE_ITRANS_OR_VELTHUIS_ONLY, :RE_HARVARD_KYOTO
+                     :RE_ITRANS_OR_VELTHUIS_ONLY, :RE_HARVARD_KYOTO, :RE_CONTROL_BLOCK
 
     module_function
 
     def detect_script(text)
-      text = text.to_str.gsub(/(?<!\\)##.*?(?<!\\)##|(?<!\\)\{#.*?(?<!\\)#\}/, "")
+      text = text.to_str.gsub(RE_CONTROL_BLOCK, "")
 
       # Brahmic schemes are all within a specific range of code points.
       if RE_BRAHMIC_RANGE === text
@@ -78,5 +81,37 @@ module Sanscript
         :unknown
       end
     end
+
+    # If Ruby 2.4's Regexp#match? method is found, use it for performance
+    if Regexp.method_defined?(:match?)
+      def detect_script(text)
+        text = text.to_str.gsub(RE_CONTROL_BLOCK, "")
+
+        # Brahmic schemes are all within a specific range of code points.
+        if RE_BRAHMIC_RANGE.match?(text)
+          RE_BRAHMIC_SCRIPTS.each do |script, regex|
+            return script if regex.match?(text)
+          end
+        end
+
+        # Romanizations
+        if RE_IAST_OR_KOLKATA_ONLY.match?(text)
+          return :kolkata if RE_KOLKATA_ONLY.match?(text)
+          :iast
+        elsif RE_ITRANS_ONLY.match?(text)
+          :itrans
+        elsif RE_SLP1_ONLY.match?(text)
+          :slp1
+        elsif RE_VELTHUIS_ONLY.match?(text)
+          :velthuis
+        elsif RE_ITRANS_OR_VELTHUIS_ONLY.match?(text)
+          :itrans
+        elsif RE_HARVARD_KYOTO.match?(text)
+          :hk
+        else
+          :unknown
+        end
+      end
+    end
   end
 end

data/lib/sanscript/transliterate.rb

@@ -148,6 +148,7 @@ module Sanscript
     def transliterate(data, from, to, options = {})
       from = from.to_sym
       to = to.to_sym
+      return data if from == to
       raise "Scheme not known ':#{from}'" unless @schemes.key?(from)
       raise "Scheme not known ':#{to}'" unless @schemes.key?(to)
 

data/lib/sanscript/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sanscript
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/sanscript.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.2"
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 11.2"
   spec.add_development_dependency "rspec", "~> 3.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanscript
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tim Bellefleur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,9 +145,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Ruby port and extension of Sanscript.js transliterator by learnsanskrit.org