sbsm 1.2.6 → 1.2.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7ac06f79c0abab4400ca3e02cc81f14812efc908
+  data.tar.gz: 99c20d773e6423627a4b419b51f6368844bf09fe
+SHA512:
+  metadata.gz: e4ab8c7aba17a75a17e395e7e199fc2cc146e93562b1a232138bd77ac5855ffc192dc97e6685c093b3132476583eeb8c8e704d0a0d1337faa52b46b9f16a64fb
+  data.tar.gz: 3d7c7e67fd3df13b56f5889b6de8d1654abb4b6aca2262aa19c3045d80b1257153f8c460e6dc9958aa05f1bde1d35d80f24c6218edc10f4071d85cb860359390

data/.gitignore

@@ -1,2 +1,4 @@
 .bundle/
 vendor/
+pkg/
+coverage/

data/.travis.yml

@@ -1,29 +1,26 @@
 ---
 language: ruby
+
 notifications:
   email:
   - ngiger@ywesee.com
+
+cache: bundler
+
+sudo: false
+
+before_install:
+  - gem --version
+
+script: bundle exec test/suite.rb
+
 bundler_args: --without debugger
+
 rvm:
   - ruby-head
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - rbx-19mode
-  - rbx-18mode
-  - jruby-head
-  - jruby-19mode
-  - jruby-18mode
-  - ree
+  - 2.1.7
+  - 2.2.3
+  - 2.3.0
 matrix:
   allow_failures:
-    - rvm: 2.0.0        # rmail chokes lib/rmail/address.rb:694: invalid multibyte escape
-    - rvm: 1.8.7        # GMT instead of UTC for some time info. Some fields have different order
     - rvm: ruby-head
-    - rvm: rbx-19mode
-    - rvm: rbx-18mode
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: jruby-18mode
-    - rvm: ree

data/Gemfile

@@ -1,25 +1,12 @@
 source "http://rubygems.org"
 
-gem 'hoe'
-gem 'mail', '>=2.2.7'
-gem 'hpricot'
-# gem 'rockit', '0.3.8' Cannot find version 0.3.8 is this really needed?
-
-group :development, :test do
-  gem 'rake'
-  gem "minitest"
-  gem "minitest-reporters"
-  gem 'hoe-travis'
-  gem 'simplecov'
-  gem 'test-unit'
-end
-
-group :development do
-  gem 'racc'
-  gem 'travis-lint'
-end
+gemspec
 
 group :debugger do
-  gem 'pry'
-  gem 'pry-debugger'
-end
+  if RUBY_VERSION.match(/^1/)
+    gem 'pry-debugger'
+  else
+    gem 'pry-byebug'
+    gem 'pry-doc'
+  end
+end

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.7 / 10.05.2016
+
+* Migration to Ruby 2.x works now
+* Removed C-Interface
+* Only Ruby >= 1.9 is supported
+
 === 1.2.6 / 02.07.2014
 
 * Revert "Tried migrating to ruby 2.1.2"
@@ -10,6 +16,16 @@
 * Use Mail instead of (outdated, last release in 2008) RMail for verification of e-mail addresses
 * updated Rakefile so I can release the gem
 Updated Manifest.txt
+=== 1.2.5 / 25.04.2016
+
+* Made it suitable to work with ydim-html
+* Port to Ruby 2.3.0. Removed dependency to rockit and hoe.
+* Prepared for travis
+
+=== 1.2.5 / 25.11.2014
+
+* Port to Ruby 2.1.2
+* Prepared for travis
 
 === 1.2.4 / 05.03.2014
 

data/{README.txt → README.md}

@@ -1,22 +1,20 @@
-= sbsm
+# sbsm
 
-* http://scm.ywesee.com/?p=sbsm/.git;a=summary
+* https://github.com/zdavatz/sbsm
 
-== DESCRIPTION:
+## DESCRIPTION:
 
 Application framework for state based session management
 
-== FEATURES/PROBLEMS:
+## FEATURES/PROBLEMS:
 
 * Could be replaced by Ramaze one day. But lets see.
 
-== REQUIREMENTS:
+## REQUIREMENTS:
 
-* Ruby 1.8
-* Ruby 1.9
-* Ruby 2.0
+* Ruby 2.3
 
-== INSTALL:
+## INSTALL:
 
 * gem install sbsm
 
@@ -24,19 +22,22 @@ or
 
 De-Compress archive and enter its top directory. Then type:
 
-* ruby setup.rb config
-* ruby setup.rb setup
-* su
-* ruby setup.rb install
+* gem install bundler
+* bundle exec rake install:local
 
 You can also install files into your favorite directory by supplying setup.rb some options. Try "ruby setup.rb --help".
 
-== DEVELOPERS:
+## TESTING
+
+* bundle exec test/suite.rb
+
+## DEVELOPERS:
 
 * Masaomi Hatakeyama
 * Zeno Davatz
 * Hannes Wyss (upto Version 1.0)
+* Niklaus Giger (Port to Ruby 2.3.0)
 
-== LICENSE:
+## LICENSE:
 
 * GPLv2.1

data/Rakefile

@@ -1,31 +1,21 @@
-# -*- ruby -*-
+#!/usr/bin/env ruby
+# encoding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sbsm/version'
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-require 'rubygems'
-require 'hoe'
+RSpec::Core::RakeTask.new(:spec)
 
-# Hoe.plugin :compiler
-# Hoe.plugin :cucumberfeatures
-# Hoe.plugin :gem_prelude_sucks
-# Hoe.plugin :inline
-# Hoe.plugin :inline
-# Hoe.plugin :manifest
-# Hoe.plugin :newgem
-# Hoe.plugin :racc
-# Hoe.plugin :rubyforge
-# Hoe.plugin :rubyforge
-# Hoe.plugin :website
+# dependencies are now declared in sbsm.gemspec
 
-Hoe.spec 'sbsm' do
-  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
-  # you'll never have to touch them again!
-  # (delete this comment too, of course)
-
-  license('GPL v2.1')
-  developer('Masaomi Hatakeyama, Zeno R.R. Davatz', 'mhatakeyama@ywesee.com, zdavatz@ywesee.com')
-  test_globs = [ "#{File.dirname(__FILE__)}/test/test_*.rb" ]
+desc 'Offer a gem task like hoe'
+task :gem => :build do
+  Rake::Task[:build].invoke
 end
 
-#require 'minitest/reporters'
-#MiniTest::Reporters.use!
+task :spec => :clean
 
-# vim: syntax=ruby
+require 'rake/clean'
+CLEAN.include FileList['pkg/*.gem']

data/lib/sbsm/cgi.rb

@@ -75,6 +75,7 @@ class CGI
 		pretty
   end
 	def CGI::escapeHTML(string)
-		string.to_s.gsub(/&(?![^;]{2,6};)/, '&amp;').gsub(/\"/, '&quot;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
+    s = string.to_s.frozen? ? string.to_s : string.to_s.force_encoding('UTF-8')
+		s.gsub(/&(?![^;]{2,6};)/, '&amp;').gsub(/\"/, '&quot;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
 	end
 end

data/lib/sbsm/index.rb

@@ -32,15 +32,15 @@ module SBSM
 		def delete(key, value)
 			if (key.size == 0)
 				@values.delete(value)
-			elsif (child = @children.at(key[0]))
+			elsif (child = @children.at(key.chars.first.ord))
 				child.delete(key[1..-1], value)
 			end
 		end
 		def fetch(key)
 			if(key.size == 1)
-				@values + @children[key[0]].to_a
-			elsif(key.size > 1 && @children.at(key[0]))
-				@children.at(key[0])[key[1..-1]]
+				@values + @children[key.chars.first.ord].to_a
+			elsif(key.size > 1 && @children.at(key.chars.first.ord))
+				@children.at(key.chars.first.ord)[key[1..-1]]
 			else
 				[]
 			end
@@ -53,8 +53,8 @@ module SBSM
 			if(key.size == 0)
 				@values += values
 			else
-				@children[key[0]] ||= self.class.new
-				@children.at(key[0]).store(key[1..-1], *values)
+				@children[key.chars.first.ord] ||= self.class.new
+				@children.at(key.chars.first.ord).store(key[1..-1], *values)
 			end
 		end
 		def to_a

data/lib/sbsm/trans_handler.rb

@@ -11,7 +11,8 @@ require 'yaml'
 module SBSM
 	class AbstractTransHandler
 		attr_reader :parser_name
-		CONFIG_PATH = '../etc/trans_handler.yml'
+    CONFIG_PATH = '../etc/trans_handler.yml'
+
 		@@empty_check ||= nil
 		@@lang_check ||= nil
 		@@uri_parser ||= nil
@@ -27,7 +28,7 @@ module SBSM
     def config(request)
       config = Hash.new { {} } 
 			begin
-        path = File.expand_path(CONFIG_PATH, request.server.document_root.untaint)
+        path = File.expand_path(CONFIG_PATH.untaint, request.server.document_root.untaint)
         path.untaint
         config.update(YAML.load(File.read(path)))
         config
@@ -78,7 +79,7 @@ module SBSM
 			ast.children_names.each { |name|
 				case name
 				when'language', 'flavor', 'event', 'zone'
-					values.add(name, ast.send(name).value)
+# 					values.add(name, ast.send(name).value)
 				when 'variables'
 					ast.variables.each { |pair|
 						key = pair.key.value
@@ -133,16 +134,4 @@ module SBSM
 			super('uri')
 		end
 	end
-	class FlavoredTransHandler < AbstractTransHandler
-		include Singleton
-		def initialize
-			super('flavored_uri')
-		end
-	end
-	class ZoneTransHandler < AbstractTransHandler
-		include Singleton
-		def initialize
-			super('zone_uri')
-		end
-	end
 end

data/lib/sbsm/version.rb

@@ -0,0 +1,3 @@
+module SBSM
+  VERSION = '1.2.7'
+end

data/sbsm.gemspec

@@ -0,0 +1,39 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sbsm/version'
+
+Gem::Specification.new do |spec|
+  spec.name        = "sbsm"
+  spec.version     = SBSM::VERSION
+  spec.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz"
+  spec.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com"
+  spec.description = "Application framework for state based session management"
+  spec.summary     = "Application framework for state based session management from ywesee"
+  spec.homepage    = "https://github.com/zdavatz/sbsm"
+  spec.license       = "GPL-v2"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  # We fix the version of the spec to newer versions only in the third position
+  # hoping that these version fix only security/severe bugs
+  # Consulted the Gemfile.lock to get 
+  spec.add_dependency 'rack'
+  spec.add_dependency 'mail'
+  spec.add_dependency 'hpricot'
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "watir"
+  spec.add_development_dependency "watir-webdriver"
+  # gem 'page-object'
+
+end
+

data/test/suite.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# TestSuite -- ydim -- 27.01.2005 -- hwyss@ywesee.com
+require 'simplecov'
+
+$: << File.dirname(File.expand_path(__FILE__))
+SimpleCov.start
+
+Dir.foreach(File.dirname(__FILE__)) do |file|
+  if /^test_.*\.rb$/o.match(file)
+    require file
+  end
+end

data/test/test_drbserver.rb

@@ -27,10 +27,10 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/drbserver'
 
-class TestDRbServer < Test::Unit::TestCase
+class TestDRbServer < Minitest::Test
 	class DRbServer < ::SBSM::DRbServer
 		attr_reader :sessions
 		CAP_MAX_THRESHOLD = 3
@@ -45,7 +45,7 @@ class TestDRbServer < Test::Unit::TestCase
 		assert_equal({'test1'=>ses1}, @server.sessions)
 		ses2 = @server['test2']
 		assert_instance_of(SBSM::Session, ses2)
-		assert_not_equal(ses1, ses2)
+		refute_equal(ses1, ses2)
 		expected = {
 			'test1'	=>	ses1,
 			'test2'	=>	ses2,
@@ -53,8 +53,8 @@ class TestDRbServer < Test::Unit::TestCase
 		assert_equal(expected, @server.sessions)
 		ses3 = @server['test3']
 		assert_instance_of(SBSM::Session, ses3)
-		assert_not_equal(ses1, ses3)
-		assert_not_equal(ses2, ses3)
+		refute_equal(ses1, ses3)
+		refute_equal(ses2, ses3)
 		expected = {
 			'test1'	=>	ses1,
 			'test2'	=>	ses2,
@@ -63,8 +63,8 @@ class TestDRbServer < Test::Unit::TestCase
 		assert_equal(expected, @server.sessions)
 		ses4 = @server['test4']
 		assert_instance_of(SBSM::Session, ses4)
-		assert_not_equal(ses1, ses4)
-		assert_not_equal(ses2, ses4)
+		refute_equal(ses1, ses4)
+		refute_equal(ses2, ses4)
 		expected = {
 			'test2'	=>	ses2,
 			'test3'	=>	ses3,

data/test/test_index.rb

@@ -21,72 +21,66 @@
 # ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zürich, Switzerland
 # hwyss@ywesee.com
 #
-# TestIndex -- sbsm -- 04.03.2003 -- hwyss@ywesee.com 
+# TestIndex -- sbsm -- 04.03.2003 -- hwyss@ywesee.com
 
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'sbsm/index'
 
 module SBSM
-	class Index
-		attr_accessor :values, :children
-	end
+  class Index
+    attr_accessor :values, :children
+  end
 end
 
-class TestIndex < Test::Unit::TestCase
-	def setup
-		@index = SBSM::Index.new
-		o2 = SBSM::Index.new
-		o2.values = ['bar']
-		o1 = SBSM::Index.new
-    omit("Could not find any checkout which did not have: TypeError: can't convert String into Integer")
-		o1.children[?o] = o2
-		f = SBSM::Index.new
-		f.children[?o] = o1
-		r = SBSM::Index.new
-		r.values = ['foo']
-		a = SBSM::Index.new
-		a.children[?r] = r
-		b = SBSM::Index.new
-		b.children[?a] = a
-		@index.children[?b] = b
-		@index.children[?f] = f
-	end
-	def test_to_a
-		assert_equal(['foo', 'bar'], @index.to_a)
-	end
-	def test_fetch1
-		assert_equal(['bar'], @index.fetch('foo'))
-	end
-	def test_fetch2
-		assert_equal([], @index.fetch('Foo'))
-	end
-	def test_fetch3
-		@index.store('bar', ['foobar', 'babar'])
-		assert_equal(['foo', ['foobar', 'babar']], @index['ba'])
-	end
-	def test_store1
-		@index.store('bar', 'babar')
-		assert_equal(['foo', 'babar'], @index.children[?b].children[?a].children[?r].values)
-		assert_equal(['foo', 'babar'], @index['ba'])
-	end
-	def test_store2
-		@index.store('bar', 'foobar', 'babar')
-		assert_equal(['foo', 'foobar', 'babar'], @index.children[?b].children[?a].children[?r].values)
-		assert_equal(['foo', 'foobar', 'babar'], @index['ba'])
-	end
-	def test_store3
-		@index.store('bar', ['foobar', 'babar'])
-		assert_equal(['foo', ['foobar', 'babar']], @index.children[?b].children[?a].children[?r].values)
-	end	
-	def test_replace
-		@index.replace('foo', 'muh', 'bar')
-		assert_equal(['bar'], @index.children[?m].children[?u].children[?h].values)
-	end
-	def test_delete
-		@index.delete('foo', 'bar')
-		assert_equal([], @index.children[?f].children[?o].children[?o].values)
-	end
+class TestIndex < Minitest::Test
+  def setup
+    @index = SBSM::Index.new
+    @index.store('foo', 'bar')
+    @index.store('bar', 'foo')
+    assert_equal(['bar'], @index['foo'])
+    assert_equal(['foo'], @index['bar'])
+  end
+  def test_to_a
+    assert_equal(['foo', 'bar'], @index.to_a)
+  end
+  def test_fetch1
+    assert_equal(['bar'], @index.fetch('foo'))
+  end
+  def test_fetch2
+    assert_equal([], @index.fetch('Foo'))
+  end
+  def test_fetch3
+    @index.store('bar', ['foobar', 'babar'])
+    assert_equal(['foo', ['foobar', 'babar']], @index['ba'])
+  end
+  def test_store1
+    #  store(key, *values)
+    @index.store('bar', 'babar')
+    assert_equal(['foo', 'babar'], @index['bar'])
+    assert_equal(['foo', 'babar'], @index.children['b'.ord].children['a'.ord].children['r'.ord].values)
+    assert_equal(['foo', 'babar'], @index['ba'])
+  end
+  def test_store2
+    @index.store('bar', 'foobar', 'babar')
+    assert_equal(['foo', 'foobar', 'babar'], @index.children['b'.ord].children['a'.ord].children['r'.ord].values)
+    assert_equal(['foo', 'foobar', 'babar'], @index['ba'])
+  end
+  def test_store3
+    @index.store('bar', ['foobar', 'babar'])
+    assert_equal(['foo', ['foobar', 'babar']], @index.children['b'.ord].children['a'.ord].children['r'.ord].values)
+  end
+  def test_replace
+    # replace(oldkey, newkey, value)
+    @index.replace('foo', 'muh', 'bar')
+    assert_equal(['bar'], @index['muh'])
+    assert_equal(['bar'], @index.children['m'.ord].children['u'.ord].children['h'.ord].values)
+  end
+  def test_delete
+    @index.delete('foo', 'bar')
+    assert_equal([], @index.children['f'.ord].children['o'.ord].children['o'.ord].values)
+    assert_equal([], @index['foo'])
+  end
 end