1967

pending completion

Build # 1967

Build Type

Pull #666

travis-ci

Committed by

web-flow

Commit Message

Remove `SAFE=1` and `Safe::safe` in tDiary.

  Ruby 2.6 will be modified scope of SAFE level.

  https://github.com/ruby/ruby/commit/c39bdb798

  It break Thread local usage of SAFE level. So, We gave up to
  support SAFE mechanism in core module of tDiary.

Pull Request Pull Request #666: Remove `SAFE=1` and `Safe::safe`

Run Details

12 of 12 new or added lines in 3 files covered. (100.0%)

2207 of 2626 relevant lines covered (84.04%)

2056.87 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.59

/lib/tdiary.rb

=begin
== NAME
tDiary: the "tsukkomi-able" web diary system.

Copyright (C) 2001-2013, TADA Tadashi <t@tdtds.jp>
You can redistribute it and/or modify it under GPL2 or any later version.
=end

Encoding::default_external = 'UTF-8'

require 'tdiary/version'
TDIARY_VERSION = TDiary::VERSION

$:.unshift File.join(File::dirname(__FILE__), '../misc/lib').untaint
['../misc/lib/*/lib', '../vendor/*/lib'].each do |path|
        Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir.untaint }
end

require 'cgi'
require 'uri'
require 'fileutils'
require 'pstore'
require 'json'
require 'erb'
require 'tdiary/environment'
require 'tdiary/compatible'
require 'tdiary/core_ext'

#
# module TDiary
#
module TDiary
        PATH = File::dirname( __FILE__ ).untaint

        # tDiary configuration class, initialize tdiary.conf and stored configuration.
        autoload :Configuration,            'tdiary/configuration'
        autoload :Config,                   'tdiary/configuration'
        # tDiary plugin class, loading all Plugin and eval plugins in view context.
        autoload :Plugin,                   'tdiary/plugin'
        # tDiary Filter class, all filters is loaded by in TDiaryView.
        autoload :Filter,                   'tdiary/filter'

        # CGI standalone server
        autoload :Server,                   'tdiary/server'
        # Rack Application, TODO: integrate Server and Application
        autoload :Application,              'tdiary/application'
        autoload :Extensions,               'tdiary/extensions'

        # Diary model class
        autoload :Style,                    'tdiary/style'
        autoload :Comment,                  'tdiary/comment'
        autoload :DiaryContainer,           'tdiary/diary_container'

        # Routing and Dispatch
        autoload :Dispatcher,               'tdiary/dispatcher'
        # Rack Request and Reponse, If you don't use Rack, adopt Rack interface.
        autoload :Request,                  'tdiary/request'
        autoload :Response,                 'tdiary/response'

        # ViewController created by Dispatcher
        autoload :TDiaryBase,               'tdiary/base'
        autoload :TDiaryCategoryView,       'tdiary/base'
        autoload :TDiarySearch,             'tdiary/base'
        autoload :TDiaryPluginView,         'tdiary/base'
        autoload :TDiaryAuthorOnlyBase,     'tdiary/author_only_base'
        autoload :TDiaryFormPlugin,         'tdiary/author_only_base'
        autoload :TDiaryConf,               'tdiary/author_only_base'
        autoload :TDiarySaveConf,           'tdiary/author_only_base'
        autoload :TDiaryAdmin,              'tdiary/admin'
        autoload :TDiaryForm,               'tdiary/admin'
        autoload :TDiaryEdit,               'tdiary/admin'
        autoload :TDiaryPreview,            'tdiary/admin'
        autoload :TDiaryUpdate,             'tdiary/admin'
        autoload :TDiaryAppend,             'tdiary/admin'
        autoload :TDiaryReplace,            'tdiary/admin'
        autoload :TDiaryShowComment,        'tdiary/admin'
        autoload :TDiaryView,               'tdiary/view'
        autoload :TDiaryDay,                'tdiary/view'
        autoload :TDiaryDayWithoutFilter,   'tdiary/view'
        autoload :TDiaryComment,            'tdiary/view'
        autoload :TDiaryMonthBase,          'tdiary/view'
        autoload :TDiaryMonth,              'tdiary/view'
        autoload :TDiaryNYear,              'tdiary/view'
        autoload :TDiaryMonthWithoutFilter, 'tdiary/view'
        autoload :TDiaryLatest,             'tdiary/view'

        # Helper, these module called from ViewController and Plugins
        autoload :ViewHelper,               'tdiary/view_helper'

        #
        # exception classes
        #
        class TDiaryError < StandardError; end
        class PermissionError < TDiaryError; end
        class PluginError < TDiaryError; end
        class BadStyleError < TDiaryError; end
        class NotFound < TDiaryError;        end

        # class ForceRedirect
        #  force redirect to another page
        #
        class ForceRedirect < StandardError
                attr_reader :path
                def initialize( path )
                        @path = path
                end
        end

        class << self
                def logger
                        @@logger
                end

                def logger=(obj)
                        @@logger = obj
                end

                def root
                        File.expand_path(File.join(library_root, '..'))
                end

                # directory where tDiary libraries is located
                def library_root
                        File.expand_path('..', __FILE__)
                end

                # directory where the server was started
                def server_root
                        Dir.pwd.untaint
                end

                def configuration
                        @@configuration ||= Configuration.new
                end
        end
end

# Local Variables:
# mode: ruby
# indent-tabs-mode: t
# tab-width: 3
# ruby-indent-level: 3
# End:
# vim: ts=3

1	=begin
2	== NAME
3	tDiary: the "tsukkomi-able" web diary system.
4
5	Copyright (C) 2001-2013, TADA Tadashi <t@tdtds.jp>
6	You can redistribute it and/or modify it under GPL2 or any later version.
7	=end
8
9	Encoding::default_external = 'UTF-8'	10✔
10
11	require 'tdiary/version'	10✔
12	TDIARY_VERSION = TDiary::VERSION	10✔
13
14	$:.unshift File.join(File::dirname(__FILE__), '../misc/lib').untaint	10✔
15	['../misc/lib//lib', '../vendor//lib'].each do \|path\|	10✔
16	Dir[File.join(File.dirname(__FILE__), path)].each {\|dir\| $:.unshift dir.untaint }	30✔
17	end
18
19	require 'cgi'	10✔
20	require 'uri'	10✔
21	require 'fileutils'	10✔
22	require 'pstore'	10✔
23	require 'json'	10✔
24	require 'erb'	10✔
25	require 'tdiary/environment'	10✔
26	require 'tdiary/compatible'	10✔
27	require 'tdiary/core_ext'	10✔
28
29	#
30	# module TDiary
31	#
32	module TDiary	10✔
33	PATH = File::dirname( __FILE__ ).untaint	10✔
34
35	# tDiary configuration class, initialize tdiary.conf and stored configuration.
36	autoload :Configuration, 'tdiary/configuration'	10✔
37	autoload :Config, 'tdiary/configuration'	10✔
38	# tDiary plugin class, loading all Plugin and eval plugins in view context.
39	autoload :Plugin, 'tdiary/plugin'	10✔
40	# tDiary Filter class, all filters is loaded by in TDiaryView.
41	autoload :Filter, 'tdiary/filter'	10✔
42
43	# CGI standalone server
44	autoload :Server, 'tdiary/server'	10✔
45	# Rack Application, TODO: integrate Server and Application
46	autoload :Application, 'tdiary/application'	10✔
47	autoload :Extensions, 'tdiary/extensions'	10✔
48
49	# Diary model class
50	autoload :Style, 'tdiary/style'	10✔
51	autoload :Comment, 'tdiary/comment'	10✔
52	autoload :DiaryContainer, 'tdiary/diary_container'	10✔
53
54	# Routing and Dispatch
55	autoload :Dispatcher, 'tdiary/dispatcher'	10✔
56	# Rack Request and Reponse, If you don't use Rack, adopt Rack interface.
57	autoload :Request, 'tdiary/request'	10✔
58	autoload :Response, 'tdiary/response'	10✔
59
60	# ViewController created by Dispatcher
61	autoload :TDiaryBase, 'tdiary/base'	10✔
62	autoload :TDiaryCategoryView, 'tdiary/base'	10✔
63	autoload :TDiarySearch, 'tdiary/base'	10✔
64	autoload :TDiaryPluginView, 'tdiary/base'	10✔
65	autoload :TDiaryAuthorOnlyBase, 'tdiary/author_only_base'	10✔
66	autoload :TDiaryFormPlugin, 'tdiary/author_only_base'	10✔
67	autoload :TDiaryConf, 'tdiary/author_only_base'	10✔
68	autoload :TDiarySaveConf, 'tdiary/author_only_base'	10✔
69	autoload :TDiaryAdmin, 'tdiary/admin'	10✔
70	autoload :TDiaryForm, 'tdiary/admin'	10✔
71	autoload :TDiaryEdit, 'tdiary/admin'	10✔
72	autoload :TDiaryPreview, 'tdiary/admin'	10✔
73	autoload :TDiaryUpdate, 'tdiary/admin'	10✔
74	autoload :TDiaryAppend, 'tdiary/admin'	10✔
75	autoload :TDiaryReplace, 'tdiary/admin'	10✔
76	autoload :TDiaryShowComment, 'tdiary/admin'	10✔
77	autoload :TDiaryView, 'tdiary/view'	10✔
78	autoload :TDiaryDay, 'tdiary/view'	10✔
79	autoload :TDiaryDayWithoutFilter, 'tdiary/view'	10✔
80	autoload :TDiaryComment, 'tdiary/view'	10✔
81	autoload :TDiaryMonthBase, 'tdiary/view'	10✔
82	autoload :TDiaryMonth, 'tdiary/view'	10✔
83	autoload :TDiaryNYear, 'tdiary/view'	10✔
84	autoload :TDiaryMonthWithoutFilter, 'tdiary/view'	10✔
85	autoload :TDiaryLatest, 'tdiary/view'	10✔
86
87	# Helper, these module called from ViewController and Plugins
88	autoload :ViewHelper, 'tdiary/view_helper'	10✔
89
90	#
91	# exception classes
92	#
93	class TDiaryError < StandardError; end	10✔
94	class PermissionError < TDiaryError; end	10✔
95	class PluginError < TDiaryError; end	10✔
96	class BadStyleError < TDiaryError; end	10✔
97	class NotFound < TDiaryError; end	10✔
98
99	# class ForceRedirect
100	# force redirect to another page
101	#
102	class ForceRedirect < StandardError	10✔
103	attr_reader :path	10✔
104	def initialize( path )	10✔
105	@path = path	×
106	end
107	end
108
109	class << self	10✔
110	def logger	10✔
111	@@logger	×
112	end
113
114	def logger=(obj)	10✔
115	@@logger = obj	×
116	end
117
118	def root	10✔
119	File.expand_path(File.join(library_root, '..'))	30✔
120	end
121
122	# directory where tDiary libraries is located
123	def library_root	10✔
124	File.expand_path('..', __FILE__)	30✔
125	end
126
127	# directory where the server was started
128	def server_root	10✔
129	Dir.pwd.untaint	×
130	end
131
132	def configuration	10✔
133	@@configuration \|\|= Configuration.new	×
134	end
135	end
136	end
137
138	# Local Variables:
139	# mode: ruby
140	# indent-tabs-mode: t
141	# tab-width: 3
142	# ruby-indent-level: 3
143	# End:
144	# vim: ts=3

tdiary / tdiary-core / 1967

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous