htmlgrid 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.1 / 09.12.2011
+
+* Updated component.rb to be compatible for both Ruby 1.8 and 1.9
+* Fixed require grid.o for gem install case
+
 === 1.0.0 / 16.12.2010
 
 * htmlgrid is now Ruby 1.9 ready.

data/lib/htmlgrid/component.rb

@@ -22,7 +22,8 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Component -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com 
+# HtmlGrid::Component -- htmlgrid -- 09.12.2012 -- mhatakeyama@ywesee.com 
+# HtmlGrid::Component -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com 
 #++
 
 module HtmlGrid
@@ -213,8 +214,12 @@ module HtmlGrid
 			@attributes.store('tabIndex', tab.to_s)
 		end
 		def to_html(context)
-			_to_html(context, @value).to_s
-		end
+      if RUBY_VERSION > "1.9"
+        _to_html(context, @value).to_s.force_encoding('utf-8')
+      else
+        _to_html(context, @value).to_s
+      end
+    end
     @@nl2br_ptrn = /(\r\n)|(\n)|(\r)/
 		def _to_html(context, value=@value)
 			if(value.is_a?(Array))

data/lib/htmlgrid/grid.rb

@@ -22,10 +22,19 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Grid -- htmlgrid -- hwyss@ywesee.com
+# HtmlGrid::Grid -- htmlgrid -- 09.12.2011 -- mhatakeyama@ywesee.com
+# HtmlGrid::Grid -- htmlgrid -- 12.01.2010 -- hwyss@ywesee.com
 begin
-  VERSION = '1.0.0'
-	require 'htmlgrid.so'
+  VERSION = '1.0.1'
+  begin
+    # for gem install
+    ext_dir = File.expand_path('../../ext/htmlgrid', File.dirname(__FILE__))
+    ext_lib = File.join(ext_dir, 'htmlgrid.so')
+    require ext_lib
+  rescue LoadError
+    # for setup.rb install
+    require 'htmlgrid.so'
+  end
 rescue LoadError
 	puts "could not find htmlgrid.so, falling back to pure-ruby class"
 	module HtmlGrid

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: htmlgrid
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 41
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 9
+        - 1
+        version: 2.9.1
   type: :development
   version_requirements: *id001
 description: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.
@@ -130,6 +130,7 @@ files:
 - test/test_text.rb
 - usage-en.txt
 - widget/Tooltip.js
+- .gemtest
 has_rdoc: true
 homepage: http://scm.ywesee.com/?p=htmlgrid/.git;a=summary
 licenses: []
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: htmlgrid
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.