ae 1.8.2 → 1.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/ae/legacy.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'ae/assertor'
2
+
1
3
  module AE
2
4
 
3
5
  module Legacy #:nodoc:
@@ -21,7 +23,8 @@ module AE
21
23
  # @return nothing
22
24
  def __assert__(test, msg=nil)
23
25
  msg = "failed assertion (no message given)" unless msg
24
- raise Assertion.new(msg, :backtrace=>caller[1..-1]) unless test
26
+ Assertor.assert(test, msg, false, caller[1..-1])
27
+ nil
25
28
  end
26
29
 
27
30
  private :__assert__
@@ -31,14 +34,18 @@ module AE
31
34
  # @example
32
35
  # assert [1, 2].include?(5)
33
36
  #
34
- # @return [Assertor] if `test` not given
35
- def assert(test=nil, msg=nil)
36
- if test
37
- msg = "failed assertion (no message given)" unless msg
38
- raise Assertion.new(msg, :backtrace=>caller) unless test
39
- else
40
- Assertor.new(self, :backtrace=>caller) # TODO: Probably remove this!
37
+ # With a block and no test, it works like #assert_block.
38
+ #
39
+ # @return [Assertor] if neither `test` nor a block is given
40
+ def assert(*args, &block)
41
+ if args.empty?
42
+ return assert_block(&block) if block
43
+ return Assertor.new(self, :backtrace=>caller) # TODO: Probably remove this!
41
44
  end
45
+ test, msg = *args
46
+ msg = "failed assertion (no message given)" unless msg
47
+ Assertor.assert(test, msg, false, caller)
48
+ nil
42
49
  end
43
50
 
44
51
  # Passes if the block yields true.
@@ -52,7 +59,7 @@ module AE
52
59
  #
53
60
  # @return nothing
54
61
  def assert_block(msg=nil) # :yields:
55
- test = ! yield
62
+ test = yield
56
63
  msg = "assertion failed" unless msg
57
64
  __assert__(test, msg)
58
65
  end
@@ -98,8 +105,8 @@ module AE
98
105
  #
99
106
  # @return nothing
100
107
  def assert_instance_of(cls, obj, msg=nil)
101
- test = (cls === obj)
102
- msg = "Expected #{obj} to be a #{cls}" unless msg
108
+ test = obj.instance_of?(cls)
109
+ msg = "Expected #{obj.inspect} to be an instance of #{cls}" unless msg
103
110
  __assert__(test, msg)
104
111
  end
105
112
 
@@ -155,7 +162,7 @@ module AE
155
162
  # @return nothing
156
163
  def assert_no_match(exp, act, msg=nil)
157
164
  test = (act !~ exp)
158
- msg = "Expected #{act.inspect} to match #{exp.inspect}" unless msg
165
+ msg = "Expected #{act.inspect} not to match #{exp.inspect}" unless msg
159
166
  __assert__(test, msg)
160
167
  end
161
168
 
@@ -211,13 +218,14 @@ module AE
211
218
  # @raise [Assertion] if test fails
212
219
  #
213
220
  # @return nothing
214
- def assert_operator(o1, op, o2, msg="")
221
+ def assert_operator(o1, op, o2, msg=nil)
215
222
  test = o1.__send__(op, o2)
216
223
  msg = "Expected #{o1}.#{op}(#{o2}) to be true" unless msg
217
224
  __assert__(test, msg)
218
225
  end
219
226
 
220
- # Passes if the block raises one of the given exceptions.
227
+ # Passes if the block raises one of the given exceptions,
228
+ # or a subclass of one. With none given, StandardError.
221
229
  #
222
230
  # @example
223
231
  # assert_raise RuntimeError, LoadError do
@@ -226,19 +234,23 @@ module AE
226
234
  #
227
235
  # @raise [Assertion] if test fails
228
236
  #
229
- # @return nothing
237
+ # @return [Exception] the exception raised
230
238
  def assert_raises(*args)
231
- msg = (Module === args.last ? nil : args.pop)
239
+ msg = (Module === args.last ? nil : args.pop)
240
+ exps = args.empty? ? [StandardError] : args
232
241
  begin
233
242
  yield
234
- msg = "Expected #{exp} to be raised" unless msg
235
- __assert__(false, msg)
236
- rescue Exception => e
237
- test = (exp === e)
238
- msg = "Expected #{exp} to be raised, but got #{e.class}" unless msg
239
- __assert__(test, msg)
243
+ rescue *exps => e
244
+ Assertor.assert(true)
240
245
  return e
246
+ rescue SignalException, SystemExit, NoMemoryError
247
+ raise
248
+ rescue Exception => e
249
+ msg = "Expected #{exps.join(' or ')} to be raised, but got #{e.class}: #{e.message}" unless msg
250
+ __assert__(false, msg)
241
251
  end
252
+ msg = "Expected #{exps.join(' or ')} to be raised" unless msg
253
+ __assert__(false, msg)
242
254
  end
243
255
 
244
256
  alias_method :assert_raise, :assert_raises
@@ -320,19 +332,17 @@ module AE
320
332
  #
321
333
  # @return nothing
322
334
  def assert_throws(sym, msg=nil)
323
- msg = "Expected #{sym} to have been thrown" unless msg
335
+ default = "Expected #{sym.inspect} to have been thrown"
324
336
  test = true
325
337
  catch(sym) do
326
338
  begin
327
339
  yield
328
- rescue ArgumentError => e # 1.9 exception
329
- default += ", not #{e.message.split(/ /).last}"
330
- rescue NameError => e # 1.8 exception
331
- default += ", not #{e.name.inspect}"
340
+ rescue UncaughtThrowError => e
341
+ default += ", not #{e.tag.inspect}"
332
342
  end
333
343
  test = false
334
344
  end
335
- __assert__(test, msg)
345
+ __assert__(test, msg || default)
336
346
  end
337
347
 
338
348
  # Assert that an Array, or any other object the responds to #include?
data/lib/ae/must.rb CHANGED
@@ -14,8 +14,8 @@ module AE
14
14
  # 4.must == 3 #=> Assertion Error
15
15
  #
16
16
  # @example
17
- # 4.must do
18
- # self == 4
17
+ # 4.must do |x|
18
+ # x == 4
19
19
  # end
20
20
  #
21
21
  # @return [Assertor] Assertion functor.
data/lib/ae/pry.rb CHANGED
@@ -2,11 +2,6 @@ require 'ae/basic_object'
2
2
 
3
3
  module Kernel
4
4
 
5
- # TODO: Is th cache really neccessry?
6
-
7
- #
8
- $PRY_TABLE = {}
9
-
10
5
  # Pry allows you to test private and protected methods
11
6
  # thru a public-only interface.
12
7
  #
@@ -19,21 +14,23 @@ module Kernel
19
14
  #
20
15
  # @return [Pry] pry functor
21
16
  def pry
22
- $PRY_TABLE[self] ||= Pry.new do |op, *a, &b|
23
- __send__(op, *a, &b)
17
+ Pry.new do |op, *a, **kw, &b|
18
+ __send__(op, *a, **kw, &b)
24
19
  end
25
20
  end
26
21
 
27
22
  # Pry Functor
28
23
  class Pry < AE::BasicObject
29
- #instance_methods.each{ |m| private m unless m.to_s =~ /^__/ }
24
+ # Send these to the object too, rather than answering them here.
25
+ private :==, :!, :!=, :equal?, :instance_eval, :instance_exec
26
+
30
27
  def initialize(&function)
31
28
  @function = function
32
29
  end
33
- def method_missing(op, *a, &b)
34
- @function.call(op, *a, &b)
30
+
31
+ def method_missing(op, *a, **kw, &b)
32
+ @function.call(op, *a, **kw, &b)
35
33
  end
36
34
  end
37
35
 
38
36
  end
39
-
data/lib/ae/should.rb CHANGED
@@ -14,8 +14,8 @@ module AE
14
14
  #
15
15
  # 4.should == 3 #=> Assertion Error
16
16
  #
17
- # 4.should do
18
- # self == 4
17
+ # 4.should do |x|
18
+ # x == 4
19
19
  # end
20
20
  #
21
21
  # @return [Assertor] Assertion functor.
data/lib/ae/version.rb CHANGED
@@ -1,21 +1,3 @@
1
1
  module AE
2
- # Access project metadata.
3
- #
4
- # @return [Hash]
5
- def self.metadata
6
- @metadata ||= (
7
- require 'yaml'
8
- YAML.load(File.new(File.dirname(__FILE__) + '/../ae.yml'))
9
- )
10
- end
11
-
12
- #
13
- def self.const_missing(name)
14
- key = name.to_s.downcase
15
- metadata[key] || super(name)
16
- end
17
-
18
- # Becuase Ruby 1.8~ gets in the way :(
19
- VERSION = metadata['version']
2
+ VERSION = '1.9.1'
20
3
  end
21
-
metadata CHANGED
@@ -1,78 +1,108 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ae
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.2
5
- prerelease:
4
+ version: 1.9.1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Trans
9
- autorequire:
10
8
  bindir: bin
11
9
  cert_chain: []
12
- date: 2013-02-18 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
13
11
  dependencies:
14
12
  - !ruby/object:Gem::Dependency
15
13
  name: ansi
16
14
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
15
  requirements:
19
- - - ! '>='
16
+ - - ">="
20
17
  - !ruby/object:Gem::Version
21
18
  version: '0'
22
19
  type: :runtime
23
20
  prerelease: false
24
21
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
22
  requirements:
27
- - - ! '>='
23
+ - - ">="
28
24
  - !ruby/object:Gem::Version
29
25
  version: '0'
30
26
  - !ruby/object:Gem::Dependency
31
- name: detroit
27
+ name: rake
32
28
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
29
  requirements:
35
- - - ! '>='
30
+ - - ">="
36
31
  - !ruby/object:Gem::Version
37
- version: '0'
32
+ version: '13'
38
33
  type: :development
39
34
  prerelease: false
40
35
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
36
  requirements:
43
- - - ! '>='
37
+ - - ">="
44
38
  - !ruby/object:Gem::Version
45
- version: '0'
39
+ version: '13'
46
40
  - !ruby/object:Gem::Dependency
47
41
  name: qed
48
42
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
43
  requirements:
51
- - - ! '>='
44
+ - - ">="
52
45
  - !ruby/object:Gem::Version
53
- version: '0'
46
+ version: '2.9'
54
47
  type: :development
55
48
  prerelease: false
56
49
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
50
  requirements:
59
- - - ! '>='
51
+ - - ">="
60
52
  - !ruby/object:Gem::Version
61
- version: '0'
62
- description: ! "Assertive Expressive is an assertions library specifically designed
63
- \nfor reuse by other test frameworks."
53
+ version: '2.9'
54
+ - !ruby/object:Gem::Dependency
55
+ name: minitest
56
+ requirement: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - ">="
59
+ - !ruby/object:Gem::Version
60
+ version: '5'
61
+ type: :development
62
+ prerelease: false
63
+ version_requirements: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: '5'
68
+ - !ruby/object:Gem::Dependency
69
+ name: test-unit
70
+ requirement: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: '3'
75
+ type: :development
76
+ prerelease: false
77
+ version_requirements: !ruby/object:Gem::Requirement
78
+ requirements:
79
+ - - ">="
80
+ - !ruby/object:Gem::Version
81
+ version: '3'
82
+ description: Assertive Expressive is an assertions library specifically designed for
83
+ reuse by other test frameworks.
64
84
  email:
65
85
  - transfire@gmail.com
66
86
  executables: []
67
87
  extensions: []
68
- extra_rdoc_files:
69
- - DEMO.rdoc
88
+ extra_rdoc_files: []
89
+ files:
70
90
  - HISTORY.md
71
- - README.md
91
+ - LICENSE.txt
72
92
  - NOTICE.md
73
- files:
74
- - .ruby
75
- - .yardopts
93
+ - README.md
94
+ - demo/01_overview.md
95
+ - demo/02_assertion.md
96
+ - demo/03_assert.md
97
+ - demo/04_subjunctive.md
98
+ - demo/05_expect.md
99
+ - demo/06_counts.md
100
+ - demo/07_matchers.md
101
+ - demo/08_check.md
102
+ - demo/09_legacy.md
103
+ - demo/10_adapters.md
104
+ - demo/applique/ae.rb
105
+ - lib/ae.rb
76
106
  - lib/ae/adapter.rb
77
107
  - lib/ae/adapters/minitest.rb
78
108
  - lib/ae/adapters/rspec.rb
@@ -83,9 +113,9 @@ files:
83
113
  - lib/ae/assertor.rb
84
114
  - lib/ae/basic_object.rb
85
115
  - lib/ae/check.rb
116
+ - lib/ae/core_ext.rb
86
117
  - lib/ae/core_ext/exception.rb
87
118
  - lib/ae/core_ext/helpers.rb
88
- - lib/ae/core_ext.rb
89
119
  - lib/ae/expect.rb
90
120
  - lib/ae/legacy.rb
91
121
  - lib/ae/must.rb
@@ -93,36 +123,25 @@ files:
93
123
  - lib/ae/should.rb
94
124
  - lib/ae/subjunctive.rb
95
125
  - lib/ae/version.rb
96
- - lib/ae.rb
97
- - lib/ae.yml
98
- - DEMO.rdoc
99
- - HISTORY.md
100
- - README.md
101
- - NOTICE.md
102
- homepage: http://rubyworks.github.com/ae
126
+ homepage: https://github.com/rubyworks/ae
103
127
  licenses:
104
128
  - BSD-2-Clause
105
- post_install_message:
129
+ metadata: {}
106
130
  rdoc_options: []
107
131
  require_paths:
108
132
  - lib
109
133
  required_ruby_version: !ruby/object:Gem::Requirement
110
- none: false
111
134
  requirements:
112
- - - ! '>='
135
+ - - ">="
113
136
  - !ruby/object:Gem::Version
114
- version: '0'
137
+ version: '3.1'
115
138
  required_rubygems_version: !ruby/object:Gem::Requirement
116
- none: false
117
139
  requirements:
118
- - - ! '>='
140
+ - - ">="
119
141
  - !ruby/object:Gem::Version
120
142
  version: '0'
121
143
  requirements: []
122
- rubyforge_project:
123
- rubygems_version: 1.8.24
124
- signing_key:
125
- specification_version: 3
144
+ rubygems_version: 3.6.9
145
+ specification_version: 4
126
146
  summary: Assertive Expressive
127
147
  test_files: []
128
- has_rdoc:
data/.ruby DELETED
File without changes
data/.yardopts DELETED
@@ -1,7 +0,0 @@
1
- --title "AE API"
2
- --protected
3
- --private
4
- lib/
5
- -
6
- [A-Z]*.*
7
-