rs.ge 0.0.13 → 0.0.14

data/lib/rs.rb

@@ -6,6 +6,7 @@ require 'rs/dict'
 require 'rs/waybill'
 require 'rs/print'
 require 'rs/invoice'
+require 'rs/car'
 
 module RS
   # ელქტრონული ზედნადების ფორმის WSDL მისამართი
@@ -72,5 +73,4 @@ module RS
     end
     params['attributes!'] = attributes unless attributes.empty?
   end
-
-end
+end

data/lib/rs/car.rb

@@ -0,0 +1,6 @@
+# -*- encoding : utf-8 -*-
+module RS
+  def self.valid_vehicle_number?(num)
+    not not (num =~ /^[a-zA-Z]{3}[0-9]{3}$/)
+  end
+end

data/lib/rs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RS
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/lib/rs/waybill.rb

@@ -266,6 +266,9 @@ module RS
           unless RS.is_valid_personal_tin(self.driver_tin)
             RS.append_validation_error(@validation_errors, :driver_tin, 'მძღოლის პირადი ნომერი არასწორია')
           end
+          unless RS.valid_vehicle_number?(self.car_number)
+            RS.append_validation_error(@validation_errors, :car_number, 'არასწორი მანქანის ნომერი: ჩაწერეთ ABC123 ფორმატში!')
+          end
         else
           if self.driver_name.nil? or self.driver_name.strip.empty?
             RS.append_validation_error(@validation_errors, :driver_name, 'ჩაწერეთ მძღოლის სახელი')

data/rs.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'savon'
   s.add_runtime_dependency 'httpi'
   s.add_runtime_dependency 'prawn', '~>0.12'
-  s.add_runtime_dependency 'c12-commons'
-end
+  s.add_runtime_dependency 'c12-commons', '~> 0.0.5'
+end

data/spec/rs/car_spec.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+require 'spec_helper'
+
+def valid_vehicle_number(number)
+  describe "#{number} სწორი სახელმწიფო ნომერია" do
+    it { RS.valid_vehicle_number?(number).should == true }
+  end
+end
+
+def invalid_vehicle_number(number)
+  describe "#{number} არასწორი სახელმწიფო ნომერია" do
+    it { RS.valid_vehicle_number?(number).should == false }
+  end
+end
+
+describe 'მანქანის ნომრების შემოწმება' do
+  valid_vehicle_number 'WDW842'
+  valid_vehicle_number 'KFK061'
+  valid_vehicle_number 'wdw467'
+  valid_vehicle_number 'kfk061'
+  invalid_vehicle_number 'WDW-842'
+  invalid_vehicle_number 'Subaru WDW842'
+  invalid_vehicle_number 'Mercedes KFK061'
+end

data/tmp/waybill.pdf

@@ -173,7 +173,7 @@ S
 BT
 216.128 787.246 Td
 /F1.0 7 Tf
-<313720> Tj
+<323620> Tj
 /F1.1 7 Tf
 <2d222e2f2b20> Tj
 /F1.0 7 Tf
@@ -243,7 +243,11 @@ S
 BT
 367.06 787.246 Td
 /F1.0 7 Tf
-<30303a3234> Tj
+<<<<<<< HEAD
+<31343a3538> Tj
+=======
+<32303a3534> Tj
+>>>>>>> 84f0ea474301dd0749ab57c9daca9a0af5902545
 ET
 
 0.000 0.000 0.000 scn
@@ -6027,7 +6031,7 @@ S
 BT
 328.628 112.88399999999965 Td
 /F1.0 7 Tf
-<313720> Tj
+<323620> Tj
 /F1.1 7 Tf
 <2d222e2f2b20> Tj
 /F1.0 7 Tf
@@ -6064,7 +6068,11 @@ S
 BT
 439.56 112.88399999999965 Td
 /F1.0 7 Tf
-<30303a3234> Tj
+<<<<<<< HEAD
+<31343a3538> Tj
+=======
+<32303a3534> Tj
+>>>>>>> 84f0ea474301dd0749ab57c9daca9a0af5902545
 ET
 
 0.000 0.000 0.000 scn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs.ge
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 description: ruby client for rs.ge web services
 email:
 - dimitri@c12.ge
@@ -121,6 +121,7 @@ files:
 - README.md
 - Rakefile
 - lib/rs.rb
+- lib/rs/car.rb
 - lib/rs/dict.rb
 - lib/rs/invoice.rb
 - lib/rs/print.rb
@@ -128,6 +129,7 @@ files:
 - lib/rs/version.rb
 - lib/rs/waybill.rb
 - rs.gemspec
+- spec/rs/car_spec.rb
 - spec/rs/dict_spec.rb
 - spec/rs/open_user.rb
 - spec/rs/pdf_spec.rb