omega-tariffs-custom 0.1.1 → 0.1.2

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/Rakefile CHANGED
@@ -2,13 +2,13 @@ require 'rubygems'
2
2
  require 'rake'
3
3
  require 'echoe'
4
4
 
5
- Echoe.new('omega-tariffs-custom', '0.1.1') do |p|
5
+ Echoe.new('omega-tariffs-custom', '0.1.2') do |p|
6
6
  p.description = "Omega Sector custom tariffs gem"
7
7
  p.url = "http://uniqsystems.ru"
8
8
  p.author = "Uniq Systems"
9
9
  p.email = "ivan@uniqsystems.ru"
10
10
  p.ignore_pattern = ["tmp/*", "script/*"]
11
- p.runtime_dependencies = p.development_dependencies = ["omega-tariffs-base >=0.1.4"]
11
+ p.runtime_dependencies = p.development_dependencies = ["omega-tariffs-base >=0.1.5"]
12
12
  end
13
13
 
14
14
  Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{omega-tariffs-custom}
5
- s.version = "0.1.1"
5
+ s.version = "0.1.2"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Uniq Systems"]
9
- s.date = %q{2010-09-22}
9
+ s.date = %q{2010-09-23}
10
10
  s.description = %q{Omega Sector custom tariffs gem}
11
11
  s.email = %q{ivan@uniqsystems.ru}
12
12
  s.extra_rdoc_files = ["README.rdoc", "lib/omega-tariffs-custom.rb"]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
23
23
  s.specification_version = 3
24
24
 
25
25
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
26
- s.add_runtime_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
27
- s.add_development_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
26
+ s.add_runtime_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
27
+ s.add_development_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
28
28
  else
29
- s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
30
- s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
29
+ s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
30
+ s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
31
31
  end
32
32
  else
33
- s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
34
- s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
33
+ s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
34
+ s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
35
35
  end
36
36
  end
@@ -29,8 +29,8 @@ describe "Common tarif" do
29
29
  it "should allow to start session and continue it all through the day" do
30
30
  now = moment = Time.local(2010, 8, 23, 0, 0, 0)
31
31
  while now < moment + 1.day
32
- @filter.permitted?(DOESNT_MATTER, 1, DOESNT_MATTER).should == true
33
- @filter.start_permitted?(DOESNT_MATTER, 1, DOESNT_MATTER).should == true
32
+ @filter.permitted?(1, DOESNT_MATTER).should == true
33
+ @filter.start_permitted?(1, DOESNT_MATTER).should == true
34
34
  now += 30.seconds
35
35
  end
36
36
  end
@@ -75,7 +75,7 @@ describe "Common tarif" do
75
75
 
76
76
  @filter.process_activity activity, ft
77
77
 
78
- FinTransaction.transactions.sum.should == (495*18 + 295*6)
78
+ FinTransaction.transactions.sum.to_i.should == (495*18 + 295*6)
79
79
  end
80
80
 
81
81
  it "should make correct financial transactions for VIP class #2" do
@@ -12,8 +12,8 @@ describe "Morning packet tarif" do
12
12
 
13
13
  [[0, false, false], [1, true, true], [3600*6, true, true], [1+3600*6, false, false]].each do |variant|
14
14
  Timecop.freeze(moment+variant[0]) do
15
- @filter.start_permitted?(3, 1, 1).should == variant[1]
16
- @filter.permitted?(3, 1, 1).should == variant[2]
15
+ @filter.start_permitted?(1, 1).should == variant[1]
16
+ @filter.permitted?(1, 1).should == variant[2]
17
17
  end
18
18
  end
19
19
  end
@@ -24,8 +24,8 @@ describe "Morning packet tarif" do
24
24
  period_end = Time.parse('2011-03-14 23:59:59 +04:00')
25
25
  while moment < period_end
26
26
  Timecop.freeze(moment) do
27
- @filter.start_permitted?(3, 1, 1).should == false
28
- @filter.permitted?(3, 1, 1).should == false
27
+ @filter.start_permitted?(1, 1).should == false
28
+ @filter.permitted?(1, 1).should == false
29
29
  end
30
30
  moment += 60
31
31
  end
@@ -37,8 +37,8 @@ describe "Morning packet tarif" do
37
37
 
38
38
  [0, 1, 3600*10, 1+3600*10].each do |variant|
39
39
  Timecop.freeze(moment+variant[0]) do
40
- @filter.start_permitted?(3, 2, 1).should == false
41
- @filter.permitted?(3, 2, 1).should == false
40
+ @filter.start_permitted?(2, 1).should == false
41
+ @filter.permitted?(2, 1).should == false
42
42
  end
43
43
  end
44
44
  end
@@ -66,26 +66,26 @@ describe "Morning packet tarif" do
66
66
  Login.set_login_balance(1, 705)
67
67
  moment = Time.parse('2011-03-27 03:59:59 +04:00')
68
68
  Timecop.freeze(moment) do
69
- @filter.start_permitted?(3, 2, 1).should == false
70
- @filter.permitted?(3, 2, 1).should == false
69
+ @filter.start_permitted?(2, 1).should == false
70
+ @filter.permitted?(2, 1).should == false
71
71
  end
72
72
 
73
73
  Timecop.freeze(moment+1) do
74
- @filter.start_permitted?(3, 2, 1).should == true
74
+ @filter.start_permitted?(2, 1).should == true
75
75
  do_several_activities [0, 30, 60], 2
76
76
  actualize_balance!
77
- @filter.permitted?(3, 2, 1).should == true
77
+ @filter.permitted?(2, 1).should == true
78
78
  Login.find(1).balance.should == 5
79
79
  end
80
80
 
81
81
  Timecop.freeze(moment+6.hours) do
82
- @filter.start_permitted?(3, 2, 1).should == true
83
- @filter.permitted?(3, 2, 1).should == true
82
+ @filter.start_permitted?(2, 1).should == true
83
+ @filter.permitted?(2, 1).should == true
84
84
  end
85
85
 
86
86
  Timecop.freeze(moment+6.hours+1) do
87
- @filter.start_permitted?(3, 2, 1).should == false
88
- @filter.permitted?(3, 2, 1).should == false
87
+ @filter.start_permitted?(2, 1).should == false
88
+ @filter.permitted?(2, 1).should == false
89
89
  end
90
90
  end
91
91
 
@@ -13,8 +13,8 @@ describe "Night packet holiday tarif" do
13
13
  [0, 1].each do |weekday|
14
14
  [[0, false, false], [1, true, true], [3600*10, true, true], [1+3600*10, false, false]].each do |variant|
15
15
  Timecop.freeze(moment+variant[0]+weekday*24*3600) do
16
- @filter.start_permitted?(3, 1, 1).should == variant[1]
17
- @filter.permitted?(3, 1, 1).should == variant[2]
16
+ @filter.start_permitted?(1, 1).should == variant[1]
17
+ @filter.permitted?(1, 1).should == variant[2]
18
18
  end
19
19
  end
20
20
  end
@@ -22,15 +22,15 @@ describe "Night packet holiday tarif" do
22
22
  [2, 3, 4, 5, 6].each do |weekday|
23
23
  [0, 1, 3600*10, 1+3600*10].each do |offset|
24
24
  Timecop.freeze(moment+offset+weekday*24*3600) do
25
- @filter.start_permitted?(3, 1, 1).should == false
26
- @filter.permitted?(3, 1, 1).should == false
25
+ @filter.start_permitted?(1, 1).should == false
26
+ @filter.permitted?(1, 1).should == false
27
27
  end
28
28
  end
29
29
  end
30
30
 
31
31
  Timecop.freeze(moment+1) do
32
- @filter.start_permitted?(3, 1, 1).should == true
33
- @filter.permitted?(3, 1, 1).should == true
32
+ @filter.start_permitted?(1, 1).should == true
33
+ @filter.permitted?(1, 1).should == true
34
34
  end
35
35
  end
36
36
 
@@ -40,8 +40,8 @@ describe "Night packet holiday tarif" do
40
40
  period_end = Time.parse('2010-09-27 23:59:59')
41
41
  while moment < period_end
42
42
  Timecop.freeze(moment) do
43
- @filter.start_permitted?(3, 1, 1).should == false
44
- @filter.permitted?(3, 1, 1).should == false
43
+ @filter.start_permitted?(1, 1).should == false
44
+ @filter.permitted?(1, 1).should == false
45
45
  end
46
46
  moment += 60
47
47
  end
@@ -54,8 +54,8 @@ describe "Night packet holiday tarif" do
54
54
  [0, 1, 2, 3, 4, 5, 6].each do |weekday|
55
55
  [0, 1, 3600*10, 1+3600*10].each do |variant|
56
56
  Timecop.freeze(moment+variant[0]+weekday*24*3600) do
57
- @filter.start_permitted?(3, 2, 1).should == false
58
- @filter.permitted?(3, 2, 1).should == false
57
+ @filter.start_permitted?(2, 1).should == false
58
+ @filter.permitted?(2, 1).should == false
59
59
  end
60
60
  end
61
61
  end
@@ -84,26 +84,26 @@ describe "Night packet holiday tarif" do
84
84
  Login.set_login_balance(1, 2000)
85
85
  moment = Time.parse('2010-10-16 21:59:59')
86
86
  Timecop.freeze(moment) do
87
- @filter.start_permitted?(3, 2, 1).should == false
88
- @filter.permitted?(3, 2, 1).should == false
87
+ @filter.start_permitted?(2, 1).should == false
88
+ @filter.permitted?(2, 1).should == false
89
89
  end
90
90
 
91
91
  Timecop.freeze(moment+1) do
92
- @filter.start_permitted?(3, 2, 1).should == true
92
+ @filter.start_permitted?(2, 1).should == true
93
93
  do_several_activities [0, 30, 60], 2
94
94
  actualize_balance!
95
- @filter.permitted?(3, 2, 1).should == true
95
+ @filter.permitted?(2, 1).should == true
96
96
  Login.find(1).balance.should == 5
97
97
  end
98
98
 
99
99
  Timecop.freeze(moment+10.hours) do
100
- @filter.start_permitted?(3, 2, 1).should == true
101
- @filter.permitted?(3, 2, 1).should == true
100
+ @filter.start_permitted?(2, 1).should == true
101
+ @filter.permitted?(2, 1).should == true
102
102
  end
103
103
 
104
104
  Timecop.freeze(moment+10.hours+1) do
105
- @filter.start_permitted?(3, 2, 1).should == false
106
- @filter.permitted?(3, 2, 1).should == false
105
+ @filter.start_permitted?(2, 1).should == false
106
+ @filter.permitted?(2, 1).should == false
107
107
  end
108
108
  end
109
109
 
@@ -13,8 +13,8 @@ describe "Night packet tarif" do
13
13
  [0, 1, 2, 3, 4].each do |weekday|
14
14
  [[0, false, false], [1, true, true], [3600*10, true, true], [1+3600*10, false, false]].each do |variant|
15
15
  Timecop.freeze(moment+variant[0]+weekday*24*3600) do
16
- @filter.start_permitted?(3, 1, 1).should == variant[1]
17
- @filter.permitted?(3, 1, 1).should == variant[2]
16
+ @filter.start_permitted?(1, 1).should == variant[1]
17
+ @filter.permitted?(1, 1).should == variant[2]
18
18
  end
19
19
  end
20
20
  end
@@ -22,15 +22,15 @@ describe "Night packet tarif" do
22
22
  [5, 6].each do |weekday|
23
23
  [0, 1, 3600*10, 1+3600*10].each do |offset|
24
24
  Timecop.freeze(moment+offset+weekday*24*3600) do
25
- @filter.start_permitted?(3, 1, 1).should == false
26
- @filter.permitted?(3, 1, 1).should == false
25
+ @filter.start_permitted?(1, 1).should == false
26
+ @filter.permitted?(1, 1).should == false
27
27
  end
28
28
  end
29
29
  end
30
30
 
31
31
  Timecop.freeze(moment+1) do
32
- @filter.start_permitted?(3, 1, 1).should == true
33
- @filter.permitted?(3, 1, 1).should == true
32
+ @filter.start_permitted?(1, 1).should == true
33
+ @filter.permitted?(1, 1).should == true
34
34
  end
35
35
  end
36
36
 
@@ -40,8 +40,8 @@ describe "Night packet tarif" do
40
40
  period_end = Time.parse('2010-09-28 23:59:59')
41
41
  while moment < period_end
42
42
  Timecop.freeze(moment) do
43
- @filter.start_permitted?(3, 1, 1).should == false
44
- @filter.permitted?(3, 1, 1).should == false
43
+ @filter.start_permitted?(1, 1).should == false
44
+ @filter.permitted?(1, 1).should == false
45
45
  end
46
46
  moment += 60
47
47
  end
@@ -54,8 +54,8 @@ describe "Night packet tarif" do
54
54
  [0, 1, 2, 3, 4, 5, 6].each do |weekday|
55
55
  [0, 1, 3600*10, 1+3600*10].each do |variant|
56
56
  Timecop.freeze(moment+variant[0]+weekday*24*3600) do
57
- @filter.start_permitted?(3, 2, 1).should == false
58
- @filter.permitted?(3, 2, 1).should == false
57
+ @filter.start_permitted?(2, 1).should == false
58
+ @filter.permitted?(2, 1).should == false
59
59
  end
60
60
  end
61
61
  end
@@ -84,26 +84,26 @@ describe "Night packet tarif" do
84
84
  Login.set_login_balance(1, 1500)
85
85
  moment = Time.parse('2010-10-18 21:59:59')
86
86
  Timecop.freeze(moment) do
87
- @filter.start_permitted?(3, 2, 1).should == false
88
- @filter.permitted?(3, 2, 1).should == false
87
+ @filter.start_permitted?(2, 1).should == false
88
+ @filter.permitted?(2, 1).should == false
89
89
  end
90
90
 
91
91
  Timecop.freeze(moment+1) do
92
- @filter.start_permitted?(3, 2, 1).should == true
92
+ @filter.start_permitted?(2, 1).should == true
93
93
  do_several_activities [0, 30, 60], 2
94
94
  actualize_balance!
95
- @filter.permitted?(3, 2, 1).should == true
95
+ @filter.permitted?(2, 1).should == true
96
96
  Login.find(1).balance.should == 5
97
97
  end
98
98
 
99
99
  Timecop.freeze(moment+10.hours) do
100
- @filter.start_permitted?(3, 2, 1).should == true
101
- @filter.permitted?(3, 2, 1).should == true
100
+ @filter.start_permitted?(2, 1).should == true
101
+ @filter.permitted?(2, 1).should == true
102
102
  end
103
103
 
104
104
  Timecop.freeze(moment+10.hours+1) do
105
- @filter.start_permitted?(3, 2, 1).should == false
106
- @filter.permitted?(3, 2, 1).should == false
105
+ @filter.start_permitted?(2, 1).should == false
106
+ @filter.permitted?(2, 1).should == false
107
107
  end
108
108
  end
109
109
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omega-tariffs-custom
3
3
  version: !ruby/object:Gem::Version
4
- hash: 25
4
+ hash: 31
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 1
10
- version: 0.1.1
9
+ - 2
10
+ version: 0.1.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Uniq Systems
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-09-22 00:00:00 +04:00
18
+ date: 2010-09-23 00:00:00 +04:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -26,12 +26,12 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- hash: 19
29
+ hash: 17
30
30
  segments:
31
31
  - 0
32
32
  - 1
33
- - 4
34
- version: 0.1.4
33
+ - 5
34
+ version: 0.1.5
35
35
  type: :runtime
36
36
  version_requirements: *id001
37
37
  - !ruby/object:Gem::Dependency
@@ -42,12 +42,12 @@ dependencies:
42
42
  requirements:
43
43
  - - ">="
44
44
  - !ruby/object:Gem::Version
45
- hash: 19
45
+ hash: 17
46
46
  segments:
47
47
  - 0
48
48
  - 1
49
- - 4
50
- version: 0.1.4
49
+ - 5
50
+ version: 0.1.5
51
51
  type: :development
52
52
  version_requirements: *id002
53
53
  description: Omega Sector custom tariffs gem