omega-tariffs-custom 0.1.1 → 0.1.2

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('omega-tariffs-custom', '0.1.1') do |p|  
+Echoe.new('omega-tariffs-custom', '0.1.2') do |p|  
   p.description     = "Omega Sector custom tariffs gem"  
   p.url             = "http://uniqsystems.ru"  
   p.author          = "Uniq Systems"
   p.email           = "ivan@uniqsystems.ru"  
   p.ignore_pattern  = ["tmp/*", "script/*"]  
-  p.runtime_dependencies = p.development_dependencies = ["omega-tariffs-base >=0.1.4"]  
+  p.runtime_dependencies = p.development_dependencies = ["omega-tariffs-base >=0.1.5"]  
 end  
   
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }  

data/omega-tariffs-custom.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{omega-tariffs-custom}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Uniq Systems"]
-  s.date = %q{2010-09-22}
+  s.date = %q{2010-09-23}
   s.description = %q{Omega Sector custom tariffs gem}
   s.email = %q{ivan@uniqsystems.ru}
   s.extra_rdoc_files = ["README.rdoc", "lib/omega-tariffs-custom.rb"]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
-      s.add_development_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
+      s.add_runtime_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
+      s.add_development_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
     else
-      s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
-      s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
+      s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
+      s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
     end
   else
-    s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
-    s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.4"])
+    s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
+    s.add_dependency(%q<omega-tariffs-base>, [">= 0.1.5"])
   end
 end

data/spec/common_tariff_spec.rb

@@ -29,8 +29,8 @@ describe "Common tarif" do
   it "should allow to start session and continue it all through the day" do
     now = moment = Time.local(2010, 8, 23, 0, 0, 0)
     while now < moment + 1.day
-      @filter.permitted?(DOESNT_MATTER, 1, DOESNT_MATTER).should == true
-      @filter.start_permitted?(DOESNT_MATTER, 1, DOESNT_MATTER).should == true
+      @filter.permitted?(1, DOESNT_MATTER).should == true
+      @filter.start_permitted?(1, DOESNT_MATTER).should == true
       now += 30.seconds
     end
   end
@@ -75,7 +75,7 @@ describe "Common tarif" do
 
     @filter.process_activity activity, ft
 
-    FinTransaction.transactions.sum.should == (495*18 + 295*6)
+    FinTransaction.transactions.sum.to_i.should == (495*18 + 295*6)
   end
 
   it "should make correct financial transactions for VIP class #2" do

data/spec/morning_packet_tariff_spec.rb

@@ -12,8 +12,8 @@ describe "Morning packet tarif" do
     
     [[0, false, false], [1, true, true], [3600*6, true, true], [1+3600*6, false, false]].each do |variant|
       Timecop.freeze(moment+variant[0]) do
-        @filter.start_permitted?(3, 1, 1).should == variant[1]
-        @filter.permitted?(3, 1, 1).should == variant[2]
+        @filter.start_permitted?(1, 1).should == variant[1]
+        @filter.permitted?(1, 1).should == variant[2]
       end      
     end
   end
@@ -24,8 +24,8 @@ describe "Morning packet tarif" do
     period_end = Time.parse('2011-03-14 23:59:59 +04:00')
     while moment < period_end
       Timecop.freeze(moment) do
-        @filter.start_permitted?(3, 1, 1).should == false
-        @filter.permitted?(3, 1, 1).should == false
+        @filter.start_permitted?(1, 1).should == false
+        @filter.permitted?(1, 1).should == false
       end 
       moment += 60
     end 
@@ -37,8 +37,8 @@ describe "Morning packet tarif" do
     
     [0, 1, 3600*10, 1+3600*10].each do |variant|
       Timecop.freeze(moment+variant[0]) do
-        @filter.start_permitted?(3, 2, 1).should == false
-        @filter.permitted?(3, 2, 1).should == false
+        @filter.start_permitted?(2, 1).should == false
+        @filter.permitted?(2, 1).should == false
       end      
     end      
   end
@@ -66,26 +66,26 @@ describe "Morning packet tarif" do
     Login.set_login_balance(1, 705)
     moment = Time.parse('2011-03-27 03:59:59 +04:00')
     Timecop.freeze(moment) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
     
     Timecop.freeze(moment+1) do
-      @filter.start_permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
       do_several_activities [0, 30, 60], 2
       actualize_balance!
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.permitted?(2, 1).should == true
       Login.find(1).balance.should == 5
     end
 
     Timecop.freeze(moment+6.hours) do
-      @filter.start_permitted?(3, 2, 1).should == true
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
+      @filter.permitted?(2, 1).should == true
     end
 
     Timecop.freeze(moment+6.hours+1) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
   end
   

data/spec/night_packet_holiday_tariff_spec.rb

@@ -13,8 +13,8 @@ describe "Night packet holiday tarif" do
     [0, 1].each do |weekday|
       [[0, false, false], [1, true, true], [3600*10, true, true], [1+3600*10, false, false]].each do |variant|
         Timecop.freeze(moment+variant[0]+weekday*24*3600) do
-          @filter.start_permitted?(3, 1, 1).should == variant[1]
-          @filter.permitted?(3, 1, 1).should == variant[2]
+          @filter.start_permitted?(1, 1).should == variant[1]
+          @filter.permitted?(1, 1).should == variant[2]
         end      
       end      
     end
@@ -22,15 +22,15 @@ describe "Night packet holiday tarif" do
     [2, 3, 4, 5, 6].each do |weekday|
       [0, 1, 3600*10, 1+3600*10].each do |offset|
         Timecop.freeze(moment+offset+weekday*24*3600) do
-          @filter.start_permitted?(3, 1, 1).should == false
-          @filter.permitted?(3, 1, 1).should == false
+          @filter.start_permitted?(1, 1).should == false
+          @filter.permitted?(1, 1).should == false
         end      
       end      
     end
 
     Timecop.freeze(moment+1) do
-      @filter.start_permitted?(3, 1, 1).should == true
-      @filter.permitted?(3, 1, 1).should == true
+      @filter.start_permitted?(1, 1).should == true
+      @filter.permitted?(1, 1).should == true
     end
   end
   
@@ -40,8 +40,8 @@ describe "Night packet holiday tarif" do
     period_end = Time.parse('2010-09-27 23:59:59')
     while moment < period_end
       Timecop.freeze(moment) do
-        @filter.start_permitted?(3, 1, 1).should == false
-        @filter.permitted?(3, 1, 1).should == false
+        @filter.start_permitted?(1, 1).should == false
+        @filter.permitted?(1, 1).should == false
       end 
       moment += 60     
     end 
@@ -54,8 +54,8 @@ describe "Night packet holiday tarif" do
     [0, 1, 2, 3, 4, 5, 6].each do |weekday|
       [0, 1, 3600*10, 1+3600*10].each do |variant|
         Timecop.freeze(moment+variant[0]+weekday*24*3600) do
-          @filter.start_permitted?(3, 2, 1).should == false
-          @filter.permitted?(3, 2, 1).should == false
+          @filter.start_permitted?(2, 1).should == false
+          @filter.permitted?(2, 1).should == false
         end      
       end      
     end
@@ -84,26 +84,26 @@ describe "Night packet holiday tarif" do
     Login.set_login_balance(1, 2000)
     moment = Time.parse('2010-10-16 21:59:59')
     Timecop.freeze(moment) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
     
     Timecop.freeze(moment+1) do
-      @filter.start_permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
       do_several_activities [0, 30, 60], 2
       actualize_balance!
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.permitted?(2, 1).should == true
       Login.find(1).balance.should == 5
     end
 
     Timecop.freeze(moment+10.hours) do
-      @filter.start_permitted?(3, 2, 1).should == true
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
+      @filter.permitted?(2, 1).should == true
     end
 
     Timecop.freeze(moment+10.hours+1) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
   end
   

data/spec/night_packet_weekday_tariff_spec.rb

@@ -13,8 +13,8 @@ describe "Night packet tarif" do
     [0, 1, 2, 3, 4].each do |weekday|
       [[0, false, false], [1, true, true], [3600*10, true, true], [1+3600*10, false, false]].each do |variant|
         Timecop.freeze(moment+variant[0]+weekday*24*3600) do
-          @filter.start_permitted?(3, 1, 1).should == variant[1]
-          @filter.permitted?(3, 1, 1).should == variant[2]
+          @filter.start_permitted?(1, 1).should == variant[1]
+          @filter.permitted?(1, 1).should == variant[2]
         end      
       end      
     end
@@ -22,15 +22,15 @@ describe "Night packet tarif" do
     [5, 6].each do |weekday|
       [0, 1, 3600*10, 1+3600*10].each do |offset|
         Timecop.freeze(moment+offset+weekday*24*3600) do
-          @filter.start_permitted?(3, 1, 1).should == false
-          @filter.permitted?(3, 1, 1).should == false
+          @filter.start_permitted?(1, 1).should == false
+          @filter.permitted?(1, 1).should == false
         end      
       end      
     end
 
     Timecop.freeze(moment+1) do
-      @filter.start_permitted?(3, 1, 1).should == true
-      @filter.permitted?(3, 1, 1).should == true
+      @filter.start_permitted?(1, 1).should == true
+      @filter.permitted?(1, 1).should == true
     end
   end
   
@@ -40,8 +40,8 @@ describe "Night packet tarif" do
     period_end = Time.parse('2010-09-28 23:59:59')
     while moment < period_end
       Timecop.freeze(moment) do
-        @filter.start_permitted?(3, 1, 1).should == false
-        @filter.permitted?(3, 1, 1).should == false
+        @filter.start_permitted?(1, 1).should == false
+        @filter.permitted?(1, 1).should == false
       end 
       moment += 60     
     end 
@@ -54,8 +54,8 @@ describe "Night packet tarif" do
     [0, 1, 2, 3, 4, 5, 6].each do |weekday|
       [0, 1, 3600*10, 1+3600*10].each do |variant|
         Timecop.freeze(moment+variant[0]+weekday*24*3600) do
-          @filter.start_permitted?(3, 2, 1).should == false
-          @filter.permitted?(3, 2, 1).should == false
+          @filter.start_permitted?(2, 1).should == false
+          @filter.permitted?(2, 1).should == false
         end      
       end      
     end
@@ -84,26 +84,26 @@ describe "Night packet tarif" do
     Login.set_login_balance(1, 1500)
     moment = Time.parse('2010-10-18 21:59:59')
     Timecop.freeze(moment) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
     
     Timecop.freeze(moment+1) do
-      @filter.start_permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
       do_several_activities [0, 30, 60], 2
       actualize_balance!
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.permitted?(2, 1).should == true
       Login.find(1).balance.should == 5
     end
 
     Timecop.freeze(moment+10.hours) do
-      @filter.start_permitted?(3, 2, 1).should == true
-      @filter.permitted?(3, 2, 1).should == true
+      @filter.start_permitted?(2, 1).should == true
+      @filter.permitted?(2, 1).should == true
     end
 
     Timecop.freeze(moment+10.hours+1) do
-      @filter.start_permitted?(3, 2, 1).should == false
-      @filter.permitted?(3, 2, 1).should == false
+      @filter.start_permitted?(2, 1).should == false
+      @filter.permitted?(2, 1).should == false
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omega-tariffs-custom
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Uniq Systems
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 +04:00
+date: 2010-09-23 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   type: :development
   version_requirements: *id002
 description: Omega Sector custom tariffs gem