rs.ge 0.0.2 → 0.0.3

data/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>rs.ge</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

data/README.md

@@ -8,7 +8,7 @@
 
 გამოყენებისათვის უნდა ჩასვათ შემდეგი ხაზი თქვენს Gemfile-ში:
 
-	gem 'rs.ge', '~> 0.0.1'
+	gem 'rs.ge', '~> 0.0.3'
 
 შემდეგი გამოყენება ძალიან მარტივია:
 

data/lib/rs/dict.rb

@@ -64,7 +64,7 @@ module RS
   protected
 
   def self.normalize_excise_name(name)
-    index = name =~ /\([0-9]+\)/
+    index = name =~ /\([0-9]*\)/
     index ? name[0..index-1].strip : name
   end
 
@@ -76,18 +76,20 @@ module RS
   #
   # su -- სერვისის მომხმარებლის სახელი
   # sp -- სერვისის მომხმარებლის პაროლი
+  # normilize -- კი/არა, გამოიყენოს თუ არა სახელების ნორმალიზებული მნიშვნელობები (საწყისად ნორმალიზებულია)
   def self.get_excise_codes(params)
     RS.validate_presence_of(params, 'su', 'sp')
     client = RS.waybill_service
     response = client.request 'get_akciz_codes' do
       soap.body = params
     end
+    normalize = params['normilize'] || true
     codes_hash = response.to_hash[:get_akciz_codes_response][:get_akciz_codes_result][:akciz_codes][:akciz_code]
     codes = []
     codes_hash.each do |hash|
       code = ExciseCode.new
       code.id = hash[:id]
-      code.name = normalize_excise_name(hash[:title])
+      code.name = normalize ? normalize_excise_name(hash[:title]) : hash([:title])
       code.measure = hash[:measurement]
       code.code = hash[:sakon_kodi]
       code.value = hash[:akcis_ganakv].to_f

data/lib/rs/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module RS
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/rs/dict_spec.rb

@@ -4,6 +4,21 @@ require 'rs'
 
 # excise codes
 
+describe 'excise name normalization' do
+  context 'name 1 (1234) _ msr _ (1)' do
+    subject { RS.normalize_excise_name('name 1 (1234) _ msr _ (1)') }
+    it { should == 'name 1' }
+  end
+  context 'name 2      (019048999) _     msr _ (1)' do
+    subject { RS.normalize_excise_name('name 2       (019048999) _     msr _ (1)') }
+    it { should == 'name 2' }
+  end
+  context 'name 3 () _ msr __ ' do
+    subject { RS.normalize_excise_name('name 3 () _ msr __ ') }
+    it { should == 'name 3' }
+  end
+end
+
 describe 'getting excise codes' do
   before(:all) do
     @codes = RS.get_excise_codes(RS.su_params)
@@ -24,17 +39,6 @@ describe 'getting excise codes' do
   end
 end
 
-describe 'excise name normalization' do
-  context 'name (1234) _ msr _ (1)' do
-    subject { RS.normalize_excise_name('name (1234) _ msr _ (1)') }
-    it { should == 'name' }
-  end
-  context 'name       (019048999) _     msr _ (1)' do
-    subject { RS.normalize_excise_name('name       (019048999) _     msr _ (1)') }
-    it { should == 'name' }
-  end
-end
-
 # waybill types
 
 describe 'getting waybill types' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs.ge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70273400862040 !ruby/object:Gem::Requirement
+  requirement: &79699980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70273400862040
+  version_requirements: *79699980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70273400861640 !ruby/object:Gem::Requirement
+  requirement: &79699740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70273400861640
+  version_requirements: *79699740
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70273400861180 !ruby/object:Gem::Requirement
+  requirement: &79699360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273400861180
+  version_requirements: *79699360
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70273400860760 !ruby/object:Gem::Requirement
+  requirement: &79699050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273400860760
+  version_requirements: *79699050
 description: ruby client for rs.ge web services
 email:
 - dimitri@c12.ge
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .project
 - .rspec
 - Gemfile
 - README.md
@@ -99,13 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rs
-rubygems_version: 1.8.15
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: rs.ge web services
-test_files:
-- spec/rs/dict_spec.rb
-- spec/rs/sys_spec.rb
-- spec/rs/waybill_spec.rb
-- spec/spec_helper.rb
+test_files: []
 has_rdoc: