scms 4.2.4 → 4.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWI5MmI3NjMwMGM3MWNkMTNhZjM1NGM2OTg4N2Y1NzIxYmY5NWUyMw==
+    MzQ5Mzk5NDlkOTllY2EzNThiOTRkN2RiMGVkYmI0ZGViMmUwYzQyNA==
   data.tar.gz: !binary |-
-    ODRjY2QzODk0NjU5YTlkZTUzMTYwZDA0N2UwNzQwOGMxNWVlZGViYQ==
+    NTUwNWNlMDE5MjBjZmU4Zjk4NDExNzRhYzg0ZTAyZDI5YTY2OTY3Mg==
 SHA512:
   metadata.gz: !binary |-
-    ZTNjOGQ1N2RjMGUzNGVlNjVkNjJkOTNkYWIzYjI5YjMxZGNkYzkzZmZjZDQ5
-    MjIzNTk3OTczZTE2NWRmMTU2NzQwNDI2NGNkM2RmNGMyZWY2MzMxMjg5NWU5
-    NDBkMjdiNjkxOGMzYjE4ZTY3NzYzMmU3YzQyZDJkZDNhNDc1M2M=
+    MWE2YzE2NjFmNDI2NDA1Y2Y3YjRmMDc0NWZmODIzNjVmZDI3NzI5ODk4MTll
+    ZmJjNGNhMGQ5N2MzOGViM2VlZDYxYzEzMWExNzQ0YmE5NjA0NzJjMjNkMmMz
+    MGU2YjQ1YjMxYWIzNTUzNTI5OTgwNDc0ZWE4MzBmZTk2NWJiNDk=
   data.tar.gz: !binary |-
-    OTI5MTdmZWZhMTViZWE5ZDMyNDdkYWU0ZmYwNDcwYjQxZDc2ZDE3MGI3MDgz
-    YWYyYTk5M2MzZTY4MDVhYzg4MDgxMWY2NjQ1Y2EyM2QyODcxYjVlOWE3NDQ0
-    OWJkOTMzZGMyNjdiZGU4OTJlY2M3MTQ0NTJhNmM1NDg4YTBkNDY=
+    ZDc5YmE3NGFhMGI0MTE0NDU5NTRmMjU3ZTMzZWE3NGY2OGRmOGUwZGJlNmVi
+    ZWM5ZjJjNjJkNjRiYjRjY2IzMzM2MTYyNDQzOGQ1MDNiN2U0M2NhMDc5MjE2
+    YzJiYTllYThlYzc0Nzc3YzY3YmVmNGQwYWNiYjQzYzRmMGEzMzQ=

data/lib/scms/scms-parser.rb

@@ -32,6 +32,7 @@ module Scms
 	                page = @model 
 	                erb = ERB.new(@template)
 	                result = erb.result(page.instance_eval { binding })
+	                result = result.encode('UTF-8', :invalid => :replace, :undef => :replace)
 
 	                # only do cms click edit on sub views not layout templates
 	                if page.view != nil

data/lib/scms/scms-utils.rb

@@ -101,6 +101,7 @@ module ScmsUtils
     
 	def ScmsUtils.txt_2_html(rawsnippet)
 		if rawsnippet != nil
+            rawsnippet = rawsnippet.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => "")
 			rawsnippet.gsub!(/(http:\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
             rawsnippet.gsub!(/(file:\/\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
 			rawsnippet.gsub!(/\n/, "<br />")

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.2.4"
+  VERSION = "4.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync