idn_ffi 0.1.1 → 0.1.2

data/lib/idn_ffi.rb

@@ -3,7 +3,11 @@ require File.join(File.dirname(__FILE__), %w{ idn_ffi idn_lib } )
 require File.join(File.dirname(__FILE__), %w{ idn_ffi methods } )
 
 module IDNFFI
+
+  IDNA_ALLOW_UNASSIGNED = 0x0001      # Don't reject strings containing unassigned Unicode code points.
+  IDNA_USE_STD3_ASCII_RULES = 0x0002  # Validate strings according to STD3 rules (i.e., normal host name rules).
+
   extend IDNFFI::Methods
  
   class Error < Exception; end  
-end
+end

data/lib/idn_ffi/methods.rb

@@ -1,14 +1,10 @@
 module IDNFFI::Methods
 
-  # flags 
-  IDNA_ALLOW_UNASSIGNED = 0x0001      # Don't reject strings containing unassigned Unicode code points.
-  IDNA_USE_STD3_ASCII_RULES = 0x0002  # Validate strings according to STD3 rules (i.e., normal host name rules).
-
-  def to_ascii(str, flags = IDNA_ALLOW_UNASSIGNED)
+  def to_ascii(str, flags = IDNFFI::IDNA_ALLOW_UNASSIGNED)
     transform(:idna_to_ascii_8z, str, flags)
   end
   
-  def to_unicode(str, flags = IDNA_ALLOW_UNASSIGNED)
+  def to_unicode(str, flags = IDNFFI::IDNA_ALLOW_UNASSIGNED)
     transform(:idna_to_unicode_8z8z, str, flags)
   end
   
@@ -16,29 +12,16 @@ private
 
   UTF8 = "UTF-8"
 
-  if RUBY_VERSION >= "1.9"
-    def transform(method, str, flags)
-      return unless str
-      pointer = FFI::MemoryPointer.new :pointer
-      int = IDNFFI::Lib.send(method, str, pointer, flags)
-      raise IDNFFI::Error, "bad answer from libidn #{ind}, http://www.gnu.org/software/libidn/reference/libidn-idna.html#IDNA-SUCCESS:CAPS" if int != 0
-      strptr = pointer.read_pointer()
-      result = strptr.read_string()
-      pointer.free
-      result.force_encoding(UTF8)
-      result                                      
-    end
-  else
-    def transform(method, str, flags)
-      return unless str
-      pointer = FFI::MemoryPointer.new :pointer
-      int = IDNFFI::Lib.send(method, str, pointer, flags)
-      raise IDNFFI::Error, "bad answer from libidn #{ind}, http://www.gnu.org/software/libidn/reference/libidn-idna.html#IDNA-SUCCESS:CAPS" if int != 0
-      strptr = pointer.read_pointer()
-      result = strptr.read_string()
-      pointer.free
-      result
-    end                                          
+  def transform(method, str, flags)
+    return unless str
+    pointer = FFI::MemoryPointer.new :pointer
+    int = IDNFFI::Lib.send(method, str, pointer, flags)
+    raise IDNFFI::Error, "bad answer from libidn #{int}, http://www.gnu.org/software/libidn/reference/libidn-idna.html#IDNA-SUCCESS:CAPS" if int != 0
+    strptr = pointer.read_pointer()
+    result = strptr.read_string()
+    pointer.free
+    result.force_encoding(UTF8) if result.respond_to?(:force_encoding)
+    result                                      
   end
 
 end

data/lib/idn_ffi/version.rb

@@ -1,3 +1,3 @@
 module IDNFFI
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,75 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: idn_ffi
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Konstantin Makarchev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-30 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+date: 2013-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LibIdn FFI ruby binding
-email: 
+email:
 - kostya27@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -82,40 +78,36 @@ files:
 - lib/idn_ffi/version.rb
 - spec/idn_spec.rb
 - spec/test_vectors.rb
-has_rdoc: true
 homepage: https://github.com/kostya/idn_ffi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 515023181
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 515023181
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: LibIdn FFI ruby binding
-test_files: 
+test_files:
 - spec/idn_spec.rb
 - spec/test_vectors.rb