srbovanje 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8585bfc72a559e745f7462a5013b39a895ff3706
-  data.tar.gz: 5635dad2e00b862cee73aae52dafc5646983a7ba
+SHA256:
+  metadata.gz: 023e6dfb500e0f7c94ad43929c393a79d91d7550fd97c728ded531db871460c7
+  data.tar.gz: 29ac77dd8e111626faed8b6c0f901795f8400499d4397adca2def0dc20c47aaa
 SHA512:
-  metadata.gz: 42f900a613b43bdab1b67906fbb2f70a238376619aa4576502e8369a530611599c9633953cb4461b431fce3b07d9391065d4abfcfac26603875b78d4411c3fbd
-  data.tar.gz: a9cd31e141d928ec2a1d5e3680b8ec0442e861d001345ad277054c93e072a9049d44daad057c1c081c5cafaec47e608f194a13dbade7b65571652f8be971ae85
+  metadata.gz: 9a40d1c0c568e411d1251442806de3906bec5b1eae90b7d99a56921bb4898bdfd98b5977808de323f062b59f0ea8522ad8b194f64f4bb59d16d4670fa03a27bd
+  data.tar.gz: e9d4fd5662644a49f50de410fdfa047961c084ad9331facf3ee9d2edf92eca81d0dfdf665d4dab9dfe1724560568620f9c46c0e16b3e3c64317d8c16a04f66e6

data/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2009 Dejan Simic
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,8 +1,7 @@
 srbovanje
 =========
 
-Ruby gem za preslovanjavanje ćirilice na latinicu i tzv. "ošišanu" latinicu
-
+Ruby gem za preslovanjavanje ćirilice na latinicu i tzv. "ošišanu" (ASCII) latinicu.
 
 ## Instaliranje
 
@@ -10,42 +9,51 @@ U Gemfile projekta dodajte:
 
     gem 'srbovanje'
 
-
 ## Korišćenje
 
-    >> "Ђурђевак".latinicom
-    => "Đurđevak"
+```ruby
+>> "Ђурђевак".latinicom
+=> "Đurđevak"
 
-    >> "Ђурђевак".latinicom :ascii
-    => "DJurdjevak"
+>> "Ђурђевак".latinicom_ascii
+=> "Djurdjevak"
+```
 
 Ako zatreba, tu je i niz sa slovima abecede:
 
-    >> Srbovanje.abeceda
-    => ["A", "B", "C", "Č", "Ć", "D", "DŽ", "Đ", "E", "F", "G", "H", "I", "J", "K", "L", "LJ", "M", "N", "NJ", "O", "P", "R", "S", "Š", "T", "U", "V", "Z", "Ž"]
-
+```ruby
+>> Srbovanje.abeceda
+=> ["A", "B", "C", "Č", "Ć", "D", "Dž", "Đ", "E", "F", "G", "H", "I", "J", "K", "L", "Lj", "M", "N", "Nj", "O", "P", "R", "S", "Š", "T", "U", "V", "Z", "Ž"]
+```
 
-Ako koristite Srbovanje uz Rails dobićete setovana pravila za preslovnjavanja 
+Ako koristite Srbovanje uz Rails dobićete setovana pravila za preslovljavanja
 koje koristi i18n gem, tako da će npr. parameterize raditi pravilnije:
 
-    ## bez Srbovanja
+```ruby
+## bez Srbovanja
+
+>> "Karađorđeva šnicla".parameterize
+=> "karadordeva-snicla"
+
+>> "Шабан Шаулић".parameterize
+=> ""
+
+## uz Srbovanje
 
-    >> "Karađorđeva šnicla".parameterize
-    => "karadordeva-snicla"
-    
-    >> "Шабан Шаулић".parameterize
-    => ""
+>> "Karađorđeva šnicla".parameterize
+=> "karadjordjeva-snicla"
 
-    ## uz Srbovanje
-    
-    >> "Karađorđeva šnicla".parameterize
-    => "karadjordjeva-snicla"
+>> "Шабан Шаулић".parameterize
+=> "saban-saulic"
+```
 
-    >> "Шабан Шаулић".parameterize
-    => "saban-saulic"
+## Performanse
 
+Od verzije 3.0, Srbovanje koristi [Go](https://golang.org/) ekstenziju zbog
+dramatično boljih (30x) performansi. Ekstenzija je unapred kompajlirana i
+spakovana uz gem, tako da instaliranje gema nema dodatnih zahteva.
 
-## MIT Licence
+## MIT License
 
 Copyright (c) 2009 Dejan Simic
 

data/ext/lib/preslovi.x86_64-darwin.h

@@ -0,0 +1,82 @@
+/* Code generated by cmd/cgo; DO NOT EDIT. */
+
+/* package command-line-arguments */
+
+
+#line 1 "cgo-builtin-export-prolog"
+
+#include <stddef.h> /* for ptrdiff_t below */
+
+#ifndef GO_CGO_EXPORT_PROLOGUE_H
+#define GO_CGO_EXPORT_PROLOGUE_H
+
+#ifndef GO_CGO_GOSTRING_TYPEDEF
+typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+#endif
+
+#endif
+
+/* Start of preamble from import "C" comments.  */
+
+
+#line 3 "preslovi.go"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#line 1 "cgo-generated-wrapper"
+
+
+/* End of preamble from import "C" comments.  */
+
+
+/* Start of boilerplate cgo prologue.  */
+#line 1 "cgo-gcc-export-header-prolog"
+
+#ifndef GO_CGO_PROLOGUE_H
+#define GO_CGO_PROLOGUE_H
+
+typedef signed char GoInt8;
+typedef unsigned char GoUint8;
+typedef short GoInt16;
+typedef unsigned short GoUint16;
+typedef int GoInt32;
+typedef unsigned int GoUint32;
+typedef long long GoInt64;
+typedef unsigned long long GoUint64;
+typedef GoInt64 GoInt;
+typedef GoUint64 GoUint;
+typedef __SIZE_TYPE__ GoUintptr;
+typedef float GoFloat32;
+typedef double GoFloat64;
+typedef float _Complex GoComplex64;
+typedef double _Complex GoComplex128;
+
+/*
+  static assertion to make sure the file is being used on architecture
+  at least with matching size of GoInt.
+*/
+typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
+
+#ifndef GO_CGO_GOSTRING_TYPEDEF
+typedef _GoString_ GoString;
+#endif
+typedef void *GoMap;
+typedef void *GoChan;
+typedef struct { void *t; void *v; } GoInterface;
+typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
+
+#endif
+
+/* End of boilerplate cgo prologue.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern char* latinicom(char* s);
+extern char* latinicom_ascii(char* s);
+
+#ifdef __cplusplus
+}
+#endif

data/ext/lib/preslovi.x86_64-linux.h

@@ -0,0 +1,66 @@
+/* Created by "go tool cgo" - DO NOT EDIT. */
+
+/* package command-line-arguments */
+
+/* Start of preamble from import "C" comments.  */
+
+
+#line 3 "/home/airninja/tmp/srbovanje/ext/preslovi.go"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+
+
+/* End of preamble from import "C" comments.  */
+
+
+/* Start of boilerplate cgo prologue.  */
+
+#ifndef GO_CGO_PROLOGUE_H
+#define GO_CGO_PROLOGUE_H
+
+typedef signed char GoInt8;
+typedef unsigned char GoUint8;
+typedef short GoInt16;
+typedef unsigned short GoUint16;
+typedef int GoInt32;
+typedef unsigned int GoUint32;
+typedef long long GoInt64;
+typedef unsigned long long GoUint64;
+typedef GoInt64 GoInt;
+typedef GoUint64 GoUint;
+typedef __SIZE_TYPE__ GoUintptr;
+typedef float GoFloat32;
+typedef double GoFloat64;
+typedef float _Complex GoComplex64;
+typedef double _Complex GoComplex128;
+
+/*
+  static assertion to make sure the file is being used on architecture
+  at least with matching size of GoInt.
+*/
+typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1];
+
+typedef struct { const char *p; GoInt n; } GoString;
+typedef void *GoMap;
+typedef void *GoChan;
+typedef struct { void *t; void *v; } GoInterface;
+typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
+
+#endif
+
+/* End of boilerplate cgo prologue.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+extern char* latinicom(char* p0);
+
+extern char* latinicom_ascii(char* p0);
+
+#ifdef __cplusplus
+}
+#endif

data/lib/i18n_config.rb

@@ -1 +1,5 @@
-I18n.backend.store_translations(:sr, :i18n => {:transliterate => {:rule => Srbovanje::latinica_map(:ascii) }})
+I18n.backend.store_translations(:sr, i18n: {
+  transliterate: {
+    rule: ->(string) { Srbovanje.latinicom_ascii(string) }
+  }
+})

data/lib/srbovanje.rb

@@ -1,14 +1,13 @@
 # encoding: utf-8
 
-$KCODE = 'UTF8' if RUBY_VERSION.to_f < 1.9
-
 require 'srbovanje/srbovanje'
+require 'srbovanje/preslovi'
 require 'srbovanje/string_ext'
 
 if defined?(Rails)
   require 'srbovanje/railtie'
 elsif defined?(I18n)
-  require 'i18n_config' 
+  require 'i18n_config'
 end
 
 module Srbovanje

data/lib/srbovanje/preslovi.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+require 'ffi'
+
+module Preslovi
+  extend FFI::Library
+
+  PLATFORM = "#{Gem::Platform.local.cpu}-#{Gem::Platform.local.os}"
+
+  ffi_lib "#{__dir__}/../../ext/lib/preslovi.#{PLATFORM}.so"
+
+  attach_function :latinicom, [:string], :string
+  attach_function :latinicom_ascii, [:string], :string
+
+  extend self
+end

data/lib/srbovanje/srbovanje.rb

@@ -1,103 +1,18 @@
 # encoding: utf-8
-
 module Srbovanje
 
-  def abeceda
-    %w(A B C Č Ć D DŽ Đ E F G H I J K L LJ M N NJ O P R S Š T U V Z Ž)
-  end
+  ABECEDA = %w(A B C Č Ć D Dž Đ E F G H I J K L Lj M N Nj O P R S Š T U V Z Ž)
 
-  def latinica_map(charset)
-    charset.to_s == 'ascii' ? latinica_ascii_map : latinica_full_map
+  def latinicom(text)
+    Preslovi.latinicom(text).force_encoding('utf-8').encode
   end
 
-  def latinica_full_map
-    @@latinica_map ||= {
-      'а' => 'a',
-      'А' => 'A',
-      'б' => 'b',
-      'Б' => 'B',
-      'в' => 'v',
-      'В' => 'V',
-      'г' => 'g',
-      'Г' => 'G',
-      'д' => 'd',
-      'Д' => 'D',
-      'ђ' => 'đ',
-      'Ђ' => 'Đ',
-      'е' => 'e',
-      'Е' => 'E',
-      'ж' => 'ž',
-      'Ж' => 'Ž',
-      'з' => 'z',
-      'З' => 'Z',
-      'и' => 'i',
-      'И' => 'I',
-      'ј' => 'j',
-      'Ј' => 'J',
-      'к' => 'k',
-      'К' => 'K',
-      'л' => 'l',
-      'Л' => 'L',
-      'љ' => 'lj',
-      'Љ' => 'LJ',
-      'м' => 'm',
-      'М' => 'M',
-      'н' => 'n',
-      'Н' => 'N',
-      'њ' => 'nj',
-      'Њ' => 'NJ',
-      'о' => 'o',
-      'О' => 'O',
-      'п' => 'p',
-      'П' => 'P',
-      'р' => 'r',
-      'Р' => 'R',
-      'с' => 's',
-      'С' => 'S',
-      'т' => 't',
-      'Т' => 'T',
-      'ћ' => 'ć',
-      'Ћ' => 'Ć',
-      'ц' => 'c',
-      'Ц' => 'C',
-      'у' => 'u',
-      'У' => 'U',
-      'ф' => 'f',
-      'Ф' => 'F',
-      'х' => 'h',
-      'Х' => 'H',
-      'ч' => 'č',
-      'Ч' => 'Č',
-      'џ' => 'dž',
-      'Џ' => 'DŽ',
-      'ш' => 'š',
-      'Ш' => 'Š' }
+  def latinicom_ascii(text)
+    Preslovi.latinicom_ascii(text).force_encoding('utf-8').encode
   end
 
-  def latinica_ascii_map
-    @@latinica_ascii_map ||= latinica_full_map.merge(
-        'ћ' => 'c',
-        'ć' => 'c',
-        'ч' => 'c',
-        'č' => 'c',
-        'Ћ' => 'C',
-        'Ć' => 'C',
-        'Ч' => 'C',
-        'Č' => 'C',
-        'ж' => 'z',
-        'ž' => 'z',
-        'Ж' => 'Z',
-        'Ž' => 'Z',
-        'š' => 's',
-        'ш' => 's',
-        'Ш' => 'S',
-        'Š' => 'S',
-        'đ' => 'dj',
-        'ђ' => 'dj',
-        'Ђ' => 'DJ',
-        'Đ' => 'DJ', 
-        'џ' => 'dz',
-        'Џ' => 'DZ')
+  def abeceda
+    ABECEDA
   end
 
   extend self

data/lib/srbovanje/string_ext.rb

@@ -3,13 +3,13 @@
 String.class_eval do
 
   # Preslovljava na latinicu
-  # Params:
-  # +charset+:: ako je :ascii preslovljava u "ošišanu" latinicu.
-  def latinicom(charset=:utf8)
-    mapping = Srbovanje.latinica_map(charset)
-    self.gsub(/.+?/) do |chr|
-      mapping[chr] || chr
-    end
+  def latinicom
+    Srbovanje.latinicom(self)
+  end
+
+  # Preslovljava na ASCII ("ošišanu") latinicu
+  def latinicom_ascii
+    Srbovanje.latinicom_ascii(self)
   end
 
 end

metadata

@@ -1,25 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: srbovanje
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Dejan Simic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
-dependencies: []
-description: '"Ђурђевак".latinicom #=> "Đurđevak"'
+date: 2020-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.1
+description: Transliteracija ćirilice na latinicu i tzv. "ošišanu" (ASCII) latinicu.
 email: desimic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE
 - README.md
+- ext/lib/preslovi.x86_64-darwin.h
+- ext/lib/preslovi.x86_64-darwin.so
+- ext/lib/preslovi.x86_64-linux.h
+- ext/lib/preslovi.x86_64-linux.so
 - lib/i18n_config.rb
 - lib/srbovanje.rb
+- lib/srbovanje/preslovi.rb
 - lib/srbovanje/railtie.rb
 - lib/srbovanje/srbovanje.rb
 - lib/srbovanje/string_ext.rb
@@ -42,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Transliteracija ćirilice na latinicu i tzv. ASCII latinicu.
+summary: Transliteracija ćirilice na latinicu i tzv. "ošišanu" (ASCII) latinicu.
 test_files: []