schild 0.6.3 → 0.6.4

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/lib/schild/version.rb +1 -1
  4. data/lib/schild.rb +2 -2
  5. data/specs/schueler_spec.rb +3 -2
  6. data/specs/spec_helper.rb +4 -1
  7. metadata +17 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 64372e5477ea960457da0e009f5a3f7edf0bf961
4
- data.tar.gz: 3b991155a353b55802d0560d3157c36625114890
3
+ metadata.gz: 985daa649779c23a1ce26eb12afc3c80f6c5307d
4
+ data.tar.gz: 425dd7ec9f81953c115de2f3b9f3f2d5633bca54
5
5
  SHA512:
6
- metadata.gz: a8018f3e29ab9b4be51aca601f36825bf7c1a80df44a02c428dade44ff2cd08df0ec5c3577326b76e69e80524bdc00e41cd15ae45f34e77ecede3b78eff6d82f
7
- data.tar.gz: 9d1377aa062efe8ddee2680104d9edbe61af65d088bba956e40a43826cfa93bfdc87b30bc318d02739e9c04db0ec0dca11c5b73f34efef8e6998fa6e1cfa0214
6
+ metadata.gz: cf56c050c36c715ad8b3835039b11c4f30f5bb712c183be54f34d1edf74026fa883ccbb22c46b0fc8ffb5accb93c787c6782fa6912b32c41544517f668ee91bb
7
+ data.tar.gz: f2a09b463538e158c48197df3cd82c59c143d04ae9bef16a9ab6a0acc4cf5c74a992e9f13c1253bc5f559a58d8b6be99abb31492519fb252d0bd7fcc9a7138ad
data/.gitignore CHANGED
@@ -13,3 +13,4 @@
13
13
  *.a
14
14
  mkmf.log
15
15
  /config/env.yml
16
+ *.gem
data/lib/schild/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Schild
2
- VERSION = "0.6.3"
2
+ VERSION = "0.6.4"
3
3
  end
data/lib/schild.rb CHANGED
@@ -118,7 +118,7 @@ end
118
118
  # Das Schild Modul, das alle Klassen für die Datenbankanbindung bereitstellt
119
119
  module Schild
120
120
  # ist die Datenbank-Verbindung. Alle Daten können über diese Konstante abgerufen werden
121
- DB = Sequel.connect("#{ENV['S_ADAPTER']}://#{ENV['S_HOST']}/#{ENV['S_DB']}?user=#{ENV['S_USER']}&password=#{ENV['S_PASSWORD']}")
121
+ DB = Sequel.connect("#{ENV['S_ADAPTER']}://#{ENV['S_HOST']}/#{ENV['S_DB']}?user=#{ENV['S_USER']}&password=#{ENV['S_PASSWORD']}&zeroDateTimeBehavior=convertToNull")
122
122
 
123
123
  # Stellt die Schüler-Tabelle samt Assoziationen bereit.
124
124
  class Schueler < Sequel::Model(:schueler)
@@ -252,7 +252,7 @@ module SchildErweitert
252
252
 
253
253
  # gibt an, ob der Schüler zu einem Zeitpunkt *datum* volljährig war.
254
254
  def volljaehrig_bei?(datum)
255
- return Time.new(1899) if datum.nil? || self.Geburtsdatum.nil?
255
+ return false if datum.nil? || self.Geburtsdatum.nil?
256
256
  geb, datum = self.Geburtsdatum.to_date, datum.to_date
257
257
  (datum.year - geb.year - ((datum.month > geb.month || (datum.month == geb.month && datum.day >= geb.day)) ? 0 : 1)) >= 18
258
258
  end
data/specs/schueler_spec.rb CHANGED
@@ -145,8 +145,9 @@ describe Schueler do
145
145
  end
146
146
 
147
147
  it 'gibt an, ob Schüler im Vergelich zu *datum* volljährig ist' do
148
- @sm.volljaehrig_bei?(@sm.halbjahr(2013,2).zeugnis_datum).must_equal false
149
- Schueler[24].volljaehrig_bei?(Time.new).must_equal true
148
+ @sm.Geburtsdatum=Time.new(1990)
149
+ @sm.volljaehrig_bei?(@sm.geburtsdatum).must_equal false
150
+ @sm.volljaehrig_bei?(Time.now).must_equal true
150
151
  end
151
152
 
152
153
  it 'gibt zurück, ob ein Foto vorhanden ist' do
data/specs/spec_helper.rb CHANGED
@@ -1,9 +1,12 @@
1
- # encoding: UTF-8
2
1
  require 'sequel'
3
2
  require 'minitest/autorun'
4
3
  require 'minitest/rg'
5
4
  require 'envyable'
5
+
6
6
  Envyable.load('./config/env.yml', 'local_test')
7
+ if RUBY_ENGINE == 'jruby'
8
+ ENV['S_ADAPTER'] = "jdbc:mysql"
9
+ end
7
10
 
8
11
  require 'schild'
9
12
  include SchildErweitert
metadata CHANGED
@@ -1,108 +1,108 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: schild
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3
4
+ version: 0.6.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - HMT
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-07 00:00:00.000000000 Z
11
+ date: 2015-11-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
+ type: :development
14
15
  name: bundler
16
+ prerelease: false
15
17
  requirement: !ruby/object:Gem::Requirement
16
18
  requirements:
17
19
  - - "~>"
18
20
  - !ruby/object:Gem::Version
19
21
  version: '1'
20
- type: :development
21
- prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1'
27
27
  - !ruby/object:Gem::Dependency
28
+ type: :development
28
29
  name: rake
30
+ prerelease: false
29
31
  requirement: !ruby/object:Gem::Requirement
30
32
  requirements:
31
33
  - - "~>"
32
34
  - !ruby/object:Gem::Version
33
35
  version: '10'
34
- type: :development
35
- prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10'
41
41
  - !ruby/object:Gem::Dependency
42
+ type: :development
42
43
  name: minitest
44
+ prerelease: false
43
45
  requirement: !ruby/object:Gem::Requirement
44
46
  requirements:
45
47
  - - "~>"
46
48
  - !ruby/object:Gem::Version
47
49
  version: '5'
48
- type: :development
49
- prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '5'
55
55
  - !ruby/object:Gem::Dependency
56
+ type: :development
56
57
  name: minitest-rg
58
+ prerelease: false
57
59
  requirement: !ruby/object:Gem::Requirement
58
60
  requirements:
59
61
  - - "~>"
60
62
  - !ruby/object:Gem::Version
61
63
  version: '5'
62
- type: :development
63
- prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '5'
69
69
  - !ruby/object:Gem::Dependency
70
+ type: :development
70
71
  name: mysql2
72
+ prerelease: false
71
73
  requirement: !ruby/object:Gem::Requirement
72
74
  requirements:
73
75
  - - "~>"
74
76
  - !ruby/object:Gem::Version
75
77
  version: '0.4'
76
- type: :development
77
- prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0.4'
83
83
  - !ruby/object:Gem::Dependency
84
+ type: :runtime
84
85
  name: sequel
86
+ prerelease: false
85
87
  requirement: !ruby/object:Gem::Requirement
86
88
  requirements:
87
89
  - - "~>"
88
90
  - !ruby/object:Gem::Version
89
91
  version: '4'
90
- type: :runtime
91
- prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '4'
97
97
  - !ruby/object:Gem::Dependency
98
+ type: :runtime
98
99
  name: envyable
100
+ prerelease: false
99
101
  requirement: !ruby/object:Gem::Requirement
100
102
  requirements:
101
103
  - - "~>"
102
104
  - !ruby/object:Gem::Version
103
105
  version: '0'
104
- type: :runtime
105
- prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  version: '0'
150
150
  requirements: []
151
151
  rubyforge_project:
152
- rubygems_version: 2.4.6
152
+ rubygems_version: 2.4.8
153
153
  signing_key:
154
154
  specification_version: 4
155
155
  summary: Schild-API