un_locode 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f843ce7d89a6836d813645eef8e25604b5e668a7
-  data.tar.gz: 9d4ef8ae89b500d2a5a6497a6b71beee39014100
+  metadata.gz: 7b06f8f05e17efdeda5e901a32f34d708f84ab9e
+  data.tar.gz: a700f46dc345bc712b7c088a7afb58e30bb32794
 SHA512:
-  metadata.gz: 90090d9612bb9440bcf1d3c347edc025ac52dff7efb7497be3bccc9c420dde6e657a0d36a1f4119ed660c75fe79ebb957d1227b04e3e94caf15195837583329c
-  data.tar.gz: 55c0660472fb6dd682a06feff090d466bd1ee460d16a9b1b1ec6adf0e00a37e5e64f8f0ef9fd01d082721a28174457a3e1379947f4843fe2f2fe0e46bd8712ee
+  metadata.gz: f665092d6646483001e569b5bb699ccdd4b61d38e0fdaa68c9204cd91731c499ccf43ed0719ba445e8cd9d01c5e1bbea01710dfee0e71f55927d138ab7de5213
+  data.tar.gz: 4c8d8faf20e6534a93032e287b34a782b347fc439f9d76ddfa4604ae4dc1168c0270c27ae1723b7926239a15045398b03c00812eb43022a12fbd4b0f8221816d

data/README.md

@@ -1,5 +1,8 @@
 # Locode
 
+[![Build Status](https://travis-ci.org/kabisaict/un_locode.png)](https://travis-ci.org/kabisaict/un_locode)
+[![Gem Version](https://badge.fury.io/rb/un_locode.png)](http://badge.fury.io/rb/un_locode)
+
 The un_locode gem gives you the ability to lookup UN/LOCODE codes. You can read more about the UN/LOCODE specifications here: [wiki](http://en.wikipedia.org/wiki/UN/LOCODE) and [UNECE](http://www.unece.org/fileadmin/DAM/cefact/locode/Service/LocodeColumn.htm).
 
 All data used by this gem has been taken from the *UN Centre for Trade Facilitation and E-business* official website. **No guarantees for the accuracy or up-to-dateness are given.**
@@ -37,6 +40,11 @@ Like above you can limit the query result.
         UnLocode::Locode.find_by_name_and_function('US', :port)
         #=> ActiveRecord::Relation [#<UnLocode::Locode name: "Abu Musa", ... >, #<UnLocode::Locode name: "Mussafah",...>, ...
     
+- **find_by_locode**: Return Locode object based on locode string. String needs to be in format `NL VEN`. You can access country code using `#country.code`.
+
+        UnLocode::Locode.find_by_locode('NL VEN')
+        => #<UnLocode::Locode id: 65419, country_id: 165, city_code: "VEN", name: "Venlo">
+
 - **find_by_function**: Find all locations for a certain function.You can find a list of possible functions @ UnLocode::FUNCTIONS. Like all find methods, the default limit is 10 but can be specified to your own needs.
 
         UnLocode::Locode.find_by_function(:port, 2)
@@ -54,11 +62,11 @@ Like above you can limit the query result.
  
  You can find more explaination of the functions over [here](http://www.unece.org/fileadmin/DAM/cefact/locode/Service/LocodeColumn.htm)
  
-## TODO
+## TODO's
 - add locode method to location (also export with as_json)
 - add tests for limit's
-- add find_by_locode method
 - use connectionpool for connection management
+- make logging configurable option
 
 ## Contributing
 
@@ -66,4 +74,4 @@ Like above you can limit the query result.
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/lib/un_locode/locode.rb

@@ -28,8 +28,14 @@ module UnLocode
       find_by_fuzzy_name(name).find_by_function(function, limit)
     end
 
+    def self.find_by_locode(locode)
+      locode = locode.split(' ')
+      includes(:country).where(city_code: locode.last)
+        .where(countries: { code: locode.first }).first
+    end
+
     def as_json options = {}
       super(options.merge!(except: [:id, :country_id])).merge('country' => country.as_json)
     end
   end
-end
+end

data/lib/un_locode/version.rb

@@ -1,3 +1,3 @@
 module UnLocode
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/un_locode_spec.rb

@@ -89,6 +89,19 @@ describe UnLocode::Locode do
         end
       end
     end
+
+    describe 'retrieving country by locode' do
+      let!(:country) { UnLocode::Country.create name: 'NETHERLANDS', code: 'NL' }
+      let!(:location) { UnLocode::Locode.create name: 'Venlo', city_code: 'VEN', country: country }
+
+      context 'with supported functions' do
+        subject { UnLocode::Locode.find_by_locode(search_term) }
+        let(:search_term) { 'NL VEN' }
+
+        its(:name) { should eql('Venlo') }
+        its(:country) { should eql(country) }
+      end
+    end
   end
 
   describe 'as_json' do

data/un_locode.gemspec

@@ -6,8 +6,8 @@ require 'un_locode/version'
 Gem::Specification.new do |spec|
   spec.name = 'un_locode'
   spec.version = UnLocode::VERSION
-  spec.authors = ['Michel de Graaf', 'Rui Salgado', 'Niels Stevens']
-  spec.email = ['michel@kabisa.nl', 'rui.salgado@kabisa.nl', 'niels@kabisa.nl']
+  spec.authors = ['Michel de Graaf', 'Rui Salgado', 'Niels Stevens', 'Jean Mertz']
+  spec.email = ['michel@kabisa.nl', 'rui.salgado@kabisa.nl', 'niels@kabisa.nl', 'jean@kabisa.nl']
   spec.description = %q{The Locode gem gives you the ability to lookup UN/LOCODE codes.}
   spec.summary = %q{The Locode gem gives you the ability to lookup UN/LOCODE codes.}
   spec.homepage = 'https://github.com/kabisaict/un_locode'
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3.5'
+  spec.add_development_dependency 'bundler', '~> 1.5.1'
   spec.add_development_dependency 'rake', '~> 10.1.0'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'pry', '~> 0.9.12.3'

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: un_locode
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Michel de Graaf
 - Rui Salgado
 - Niels Stevens
+- Jean Mertz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +19,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +116,7 @@ email:
 - michel@kabisa.nl
 - rui.salgado@kabisa.nl
 - niels@kabisa.nl
+- jean@kabisa.nl
 executables: []
 extensions: []
 extra_rdoc_files: []