omega-tariffs-base 0.1.6 → 0.1.7

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('omega-tariffs-base', '0.1.6') do |p|  
+Echoe.new('omega-tariffs-base', '0.1.7') do |p|  
   p.description     = "Omega Sector base tariffs"  
   p.url             = "http://uniqsys.ru/"  
   p.author          = "Uniq Systems"

data/lib/single_time_filter.rb

@@ -8,9 +8,10 @@ module UniqSysOmega
           @payments.member? [ tarif_id, login_id, period_id ]
         end
 
-        def register_single_payment(tarif_id, login_id, period_id)
+        def register_single_payment(tarif_id, login_id, period_id, fin_transaction_id)
           @payments ||= [ ]
           @payments << [ tarif_id, login_id, period_id ] unless had_single_payment?(tarif_id, login_id, period_id)
+          true
         end
       end
     end
@@ -50,12 +51,9 @@ module UniqSysOmega
       def make_single_payment(ft, login_id, options)
         return false unless can_make_single_payment?(login_id)
 
-        # TODO: Make it transactional!
-        SingleTimeFilterRepository.register_single_payment(tarif_id, login_id, options[:period].begin)
-    
         ft = ft.dup
         ft.volume = @price
-        ft.save
+        ft.save and SingleTimeFilterRepository.register_single_payment(tarif_id, login_id, options[:period].begin, ft.id)
       end
 
       def after_initialize

data/omega-tariffs-base.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{omega-tariffs-base}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Uniq Systems"]

data/spec/single_time_filter_spec.rb

@@ -6,8 +6,8 @@ describe "SingleTimeFilterRepository" do
   end
 
   it "should return true for registered payments and false for the others" do
-    SingleTimeFilterRepository.register_single_payment(1, 2, 3)
-    SingleTimeFilterRepository.register_single_payment(1, 2, 7)
+    SingleTimeFilterRepository.register_single_payment(1, 2, 3, 4)
+    SingleTimeFilterRepository.register_single_payment(1, 2, 7, 4)
     SingleTimeFilterRepository.had_single_payment?(1, 2, 3).should == true
     SingleTimeFilterRepository.had_single_payment?(1, 2, 4).should == false
     SingleTimeFilterRepository.had_single_payment?(1, 5, 3).should == false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omega-tariffs-base
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Uniq Systems