ninoxe 1.1.2 → 1.1.3
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.
- checksums.yaml +8 -8
- data/app/models/chouette/time_table.rb +4 -4
- data/lib/ninoxe/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
OTVmYzlhODAxNTc2NDUyNzA3ZjBlYTIwYTM2NDE2ODk4MWFhZmIzMA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZTJmOTZlMmMwYTY0ZmEyMzM3YmEzOGE3MGRmZjdkMWMxNTk2MjNiZg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
ZWExMzk3Nzk1MWYwMDgwNWY5NDY2Njk2Y2ZmOGM2MjNlMGI3NTM3OGE2MTgz
|
10
|
+
OWRmYzE5NzQ5MGZmNTk4YzUzMWE2ZjQyZGQyY2Y5MmRjMjZkNmNiYTRmNzQz
|
11
|
+
Y2M2MmE2ZGU5YjM4MjJlNDdjYWNlZjc0MWQ1Y2E3YzRkOTQxNjA=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NmZiZmY3Zjc3MTRhOTg2ODQ1MTcyMjU5NTIxYTlhZTVkNjE1M2VlMzdkMzgy
|
14
|
+
NTQ1ZjdiN2MwOWE4ZjVlZTgyMTg0ZGVhZmMwOTFhNGE5YmRjYmUxYzFjNjE1
|
15
|
+
MmNjNWJjNWQ4YWQ0ZDY3ZmRhNzRiNjdkZTJhZmEwMWVjZDE1NDE=
|
@@ -447,7 +447,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
|
|
447
447
|
self.int_day_types = common_day_types
|
448
448
|
days_of_periods = self.effective_days_of_periods
|
449
449
|
excluded_days.each do |day|
|
450
|
-
self.dates << Chouette::TimeTableDate.new( :date =>day, :in_out => false) if days_of_periods.
|
450
|
+
self.dates << Chouette::TimeTableDate.new( :date =>day, :in_out => false) if days_of_periods.include?(day)
|
451
451
|
end
|
452
452
|
end
|
453
453
|
else
|
@@ -468,7 +468,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
|
|
468
468
|
transaction do
|
469
469
|
common_day_types = self.int_day_types & another_tt.int_day_types & 508
|
470
470
|
# if both tt have periods with common day_types, reduce first ones to exclude second
|
471
|
-
if !self.periods.
|
471
|
+
if !self.periods.blank? && !another_tt.periods.blank?
|
472
472
|
if common_day_types != 0
|
473
473
|
periods = []
|
474
474
|
days = []
|
@@ -513,7 +513,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
|
|
513
513
|
days |= self.effective_days_of_period(p2,remain_days)
|
514
514
|
end
|
515
515
|
end
|
516
|
-
unless deleted || self.effective_days_of_period(p1,valid_days).
|
516
|
+
unless deleted || self.effective_days_of_period(p1,valid_days).blank?
|
517
517
|
if p1.period_start != p1.period_end
|
518
518
|
periods << p1
|
519
519
|
else
|
@@ -523,7 +523,7 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
|
|
523
523
|
end
|
524
524
|
# rebuild periods and dates
|
525
525
|
self.periods = periods
|
526
|
-
self.int_day_types = 0 if periods.
|
526
|
+
self.int_day_types = 0 if periods.blank?
|
527
527
|
days.each { |d| self.dates |= [Chouette::TimeTableDate.new( :date =>d, :in_out => true)] }
|
528
528
|
end
|
529
529
|
else
|
data/lib/ninoxe/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ninoxe
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Marc Florisson
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2014-11-
|
14
|
+
date: 2014-11-27 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: georuby-ext
|