pla 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae56ee6e048b9a588f913223ea882f5e577cd02
-  data.tar.gz: c887b5cde11e4cde6ee833a2aa59ff41cdbdb7f0
+  metadata.gz: a6ff26195cda03de8489dfa3bed93742008759fc
+  data.tar.gz: ce5325c8586cc7bcd5724f35680fae04eaa8d4e2
 SHA512:
-  metadata.gz: 94b36aa30506420c922153951efce3d49044aa140c0af6959bd3a4413aae69f04c6e2ee6d4049919a75384edd1c54bf5f78cd19d1353c2d5bee080508a201623
-  data.tar.gz: 7198c2c6d800a1914302cb07496459903da5720d7704e829c69d2370a7980bdfb6216a1d8ec5fa6ce2d5e63248f7f11f94e6478623d524549c2a67b94ac36687
+  metadata.gz: aee1d6bc76d3715cdff4dd8e45f815b82ec2ba3f0e5fd3a179979bd42c101752dffd2f39590b29797b78f2c8225caa3e4dc55c52022815410e828ba5a612a36d
+  data.tar.gz: 9d908c1af6c73deff77aca7ac8c02db2e56ac136bdac3804c3dd717cc037bc4023c847383007a578bb37c6995ebaeafcde7d23bae9147b1203328b44e5f9f324

data/lib/pla/movement.rb

@@ -1,6 +1,4 @@
-require 'iso_country_codes'
-
-require 'pla/ship'
+require 'pla/vessel'
 
 class PLA
   class Movement
@@ -11,8 +9,7 @@ class PLA
 
     def to_h
       normalise_timestamp!
-      normalise_ship!
-      normalise_country!
+      normalise_vessel!
       normalise_fields!
 
       @record
@@ -39,21 +36,12 @@ class PLA
       @record[:timestamp] = date
     end
 
-    def normalise_ship!
+    def normalise_vessel!
       name = @record.delete(:'vessel name')
-      @record[:vessel] = PLA::Ship.new(name).to_h
-    end
-
-    def normalise_country!
-      country_code = @record.delete(:nationality)
-      begin
-        country = IsoCountryCodes.find(country_code).name
-      rescue IsoCountryCodes::UnknownCodeError
-        STDERR.puts "WARNING: Invalid country code #{country_code.upcase}"
-        country = country_code
-      end
+      country = @record.delete(:nationality)
+      agent = @record.delete(:agent)
 
-      @record[:country] = country
+      @record[:vessel] = PLA::Vessel.new(name, country, agent).to_h
     end
 
     def normalise_fields!

data/lib/pla/vessel.rb

@@ -0,0 +1,32 @@
+require 'iso_country_codes'
+
+class PLA
+  class Vessel
+    def initialize name, country, agent
+      @name = name
+      @country = normalise_country(country)
+      @agent = agent
+    end
+
+    def to_h
+      {
+        name: @name,
+        country: @country,
+        agent: @agent,
+        google: "https://www.google.co.uk/search?q=site:vesselfinder.com #{@name}"
+      }
+    end
+
+    def normalise_country country_code
+      begin
+        country = IsoCountryCodes.find(country_code).name
+      rescue IsoCountryCodes::UnknownCodeError
+        STDERR.puts "WARNING: Invalid country code #{country_code.upcase}"
+        country = country_code
+      end
+
+      country
+    end
+
+  end
+end

data/pla.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "pla"
-  spec.version       = '0.2.0'
+  spec.version       = '0.3.0'
   spec.authors       = ["jspc"]
   spec.email         = ["james@zero-internet.org.uk"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pla
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - jspc
@@ -101,7 +101,7 @@ files:
 - lib/pla/departures.rb
 - lib/pla/movement.rb
 - lib/pla/movements.rb
-- lib/pla/ship.rb
+- lib/pla/vessel.rb
 - pla.gemspec
 homepage: https://github.com/jspc/pla
 licenses:

data/lib/pla/ship.rb

@@ -1,14 +0,0 @@
-class PLA
-  class Ship
-    def initialize ship
-      @name = ship
-    end
-
-    def to_h
-      {
-        name: @name,
-        google: "https://www.google.co.uk/search?q=site:vesselfinder.com #{@name}"
-      }
-    end
-  end
-end