ifmapper 1.2.4 → 1.2.5

data/HISTORY.txt

@@ -1,3 +1,5 @@
+v1.2.4  Bug fixed for bad release of v1.2.3.
+
 v1.2.3  Fixed SVG Export of room number.
 
 v1.2.2  Removed some ruby1.9 warnings.

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '1.2.4'
+	spec.version = '1.2.5'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'

data/lib/IFMapper/FXMapperSettings.rb

@@ -1,6 +1,8 @@
 
 begin
-  require 'iconv'
+  if RUBY_VERSION.to_f < 1.9
+    require 'iconv'
+  end
 rescue LoadError
   $stderr.puts 'Iconv could not be loaded.  Languages other than English will have problems'
   class Iconv

data/lib/IFMapper/IFMWriter.rb

@@ -69,8 +69,14 @@ class IFMWriter
     return @elem[e] if @elem.has_key?(e)
 
     tag = t.dup
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    tag = utf.iconv( tag )
+
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      tag = utf.iconv( tag )
+    else
+      tag = tag.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     tag.gsub!(/[\-\(\s,\.!'&"#$@\/\\\-\)]+/, '_')
     tag.gsub!(/__/, '')                  # remove reduntant __ repetitions

data/lib/IFMapper/Inform7Writer.rb

@@ -211,8 +211,13 @@ class Inform7Writer
     tag = str.dup
 
     # Take text from Unicode utf-8 to iso-8859-1
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    tag = utf.iconv( tag )
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      tag = utf.iconv( tag )
+    else
+      tag = tag.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Remove redundant spaces
     tag.sub!(/^\s/, '')
@@ -316,9 +321,14 @@ class Inform7Writer
   def inform_quote(text)
     str = text.dup
 
-    # Take text from Unicode utf-8 to iso-8859-1
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    str = utf.iconv( str )
+    # Take text from Unicode utf-8 to iso-8859-1859-1
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      str = utf.iconv( str )
+    else
+      str = str.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Quote special characters
 #     str.gsub!(/@/, '@@64')

data/lib/IFMapper/InformWriter.rb

@@ -35,8 +35,13 @@ class InformWriter
 
   def new_tag(elem, str)
     tag = str.dup
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    tag = utf.iconv( tag )
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      tag = utf.iconv( tag )
+    else
+      tag = tag.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Invalid tag characters, replaced with _
     tag.gsub!(/[\s"'\/\\\-&#\,.:;!\?\n\(\)]/,'_')
@@ -107,8 +112,13 @@ class InformWriter
     str = text.dup
 
     # Take text from Unicode utf-8 to iso-8859-1
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    str = utf.iconv( str )
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      str = utf.iconv( str )
+    else
+      str = str.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Quote special characters
     str.gsub!(/@/, '@@64')

data/lib/IFMapper/TADSWriter.rb

@@ -1,4 +1,4 @@
-
+s
 
 class TADSWriter
 
@@ -38,8 +38,13 @@ class TADSWriter
     tag = str.dup
 
     # Take text from Unicode utf-8 to iso-8859-1
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    tag = utf.iconv( tag )
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      tag = utf.iconv( tag )
+    else
+      tag = tag.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Invalid tag characters, replaced with _
     tag.gsub!(/[\s"'\/\\\-&#\,.:;!\?\n\(\)]/,'_')
@@ -115,8 +120,13 @@ class TADSWriter
     str = text.dup
 
     # Take text from Unicode utf-8 to iso-8859-1
-    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
-    str = utf.iconv( str )
+    if RUBY_VERSION < 1.9
+      utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+      str = utf.iconv( str )
+    else
+      str = str.encode( 'utf-8', :invalid => :replace, 
+                        :undef => :replace, :replace => '' )
+    end
 
     # Quote special characters
     str.gsub!(/"/, '\"')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-03 00:00:00 Z
+date: 2013-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler