pla 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b563329bb284dc1d88d82963b5ee5312208daa4
-  data.tar.gz: d743f239e67902f784d91b5f051fed534b47531a
+  metadata.gz: 13660d050b7cfa88aad173f305e762e0f9c77f84
+  data.tar.gz: 3ca8b095bd9e1e1d3ae4d796c2440f57564c9ac8
 SHA512:
-  metadata.gz: 784ad73ef881942547a48d4ef0400149be5b39ad9f9f893744fde462d6eb856cbf8e60a3eece3329572f8ddd221d7f9dceb6b995eed6e21762b04d3feb3e0f79
-  data.tar.gz: 255e5bd0b487f5a9916cd4758fd540d9d8a59cd5baeec7c36d9e8c2089664c136a1009c83e61cec80f9369e7428c4936521f86477079c9d24cd95aff45d5785f
+  metadata.gz: 3fbdbe48f1614219ceacfd49364d0195cfb8191b48fcd7b55f5416e119053eb77fffd445f23cca3dfa85b57d081133691196053b41bac424f926fc031ab89712
+  data.tar.gz: 782a7bff59d0c00654acea8837afac6da350b7ce264ea9b2222f634681f9d41af18182dba9cb7d8ffccdce5533f7ac4667f83b44bf0bcfa5cac895efa4c0e3fb

data/README.md

@@ -34,10 +34,10 @@ puts in_port
 puts all
 
 # Find next ten boats set to arrive
-puts PLA.arrivals_by_timestamp[0..9]
+puts PLA.sort_arrivals_by_timestamp[0..9]
 
 # List vessels alphabetically, as per PLA website
-puts PLA.all_by_vessel_name
+puts PLA.sort_all_by_vessel_name
 
 # Find all movements made by Panamanian vessels
 puts PLA.find_all_by_country 'Panama'
@@ -47,6 +47,12 @@ puts PLA.find_all_by_vessel_name 'feo swan'
 
 # Listing the movements of a vessel by time
 puts PLA.find_all_by_vessel_name('balmoral').sort_by{|s| s[:timestamp]}
+
+# Find all vessels leaving a location
+puts PLA.find_all_by_from('rotterdam')
+
+# Likewise; all locations
+puts PLA.find_all_by_location('rotterdam')
 ```
 
 Licence

data/lib/pla.rb

@@ -26,7 +26,15 @@ class PLA
   def self.find movement_type, field, key
     if self.methods.include? movement_type
       movements = self.send(movement_type)
-      return self.munge_by_field movements, :select, field, key
+
+      if field == :location
+        return [
+          self.munge_by_field(movements, :select, :to, key),
+          self.munge_by_field(movements, :select, :from, key)
+        ].flatten.uniq
+      else
+        return self.munge_by_field movements, :select, field, key
+      end
     end
     []
   end
@@ -56,22 +64,23 @@ class PLA
   end
 
   def self.method_missing(m, *args, &block)
-    if m.to_s =~ /^(.*)_by_(.*)$/
-      movement_type = $1.to_sym
-      field = $2.to_sym
+    if m.to_s =~ /^(find|sort)_(.*)_by_(.*)$/
+      querier = $1
+      type = $2.to_sym
+      field = $3.to_sym
 
-      if movement_type.to_s =~ /^find_(.*)$/
-        movement_type = $1.to_sym
-        return self.find(movement_type, field, args.first)
-      else
-        return self.sort(movement_type, field)
+      if querier == 'find'
+        return self.find(type, field, args.first)
+      elsif querier == 'sort'
+        return self.sort(type, field)
       end
     end
     super
   end
 
   def self.respond_to?(method_sym, include_private = false)
-    if method_sym.to_s =~ /^(.*)_by_(.*)$/
+    if method_sym.to_s =~ /^(find|sort)_(.*)_by_(.*)$/ and
+      self.methods.include? $2.to_sym
       true
     else
       super

data/lib/pla/movement.rb

@@ -10,6 +10,7 @@ class PLA
     def to_h
       normalise_timestamp!
       normalise_vessel!
+      normalise_notes!
       normalise_fields!
 
       @record
@@ -48,6 +49,10 @@ class PLA
       @record.delete(:at)
     end
 
+    def normalise_notes!
+      @record[:notes].empty? ? @records[:notes] = nil : nil
+    end
+
     def gen_date year, month, day, hour, minute
       # Because the pla doesn't provide a year we run the risk of providing
       # a date in the past if the data wraps around the end of the year.

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.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ["jspc"]
   spec.email         = ["james@zero-internet.org.uk"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pla
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - jspc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler