pla 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 273a1bcd783512a908076b9d4bd1bda7547dd3c5
-  data.tar.gz: b48cfa6a31e46cbbaf9e8fdc4164d4f9598fea54
+  metadata.gz: aae56ee6e048b9a588f913223ea882f5e577cd02
+  data.tar.gz: c887b5cde11e4cde6ee833a2aa59ff41cdbdb7f0
 SHA512:
-  metadata.gz: 02d74b7a88c34231e7503976af12ca9320c0476e0bb5f250455e5144092623157775a8972a5929ba76114f63745515050965c10cba7e3bb7f8a3a84781959ca4
-  data.tar.gz: bf9e30967ddbf7d42085d30bcc5c039096b96739ae4c3df87910f264fdb32721873f6b29fbdd14aff3d9c01de786f73ba8567fd98f81942ef37df95455ebd903
+  metadata.gz: 94b36aa30506420c922153951efce3d49044aa140c0af6959bd3a4413aae69f04c6e2ee6d4049919a75384edd1c54bf5f78cd19d1353c2d5bee080508a201623
+  data.tar.gz: 7198c2c6d800a1914302cb07496459903da5720d7704e829c69d2370a7980bdfb6216a1d8ec5fa6ce2d5e63248f7f11f94e6478623d524549c2a67b94ac36687

data/README.md

@@ -26,15 +26,26 @@ require 'pla'
 arrivals = PLA.arrivals
 departures = PLA.departures
 
+# Note: all is an amalgam of arrivals and departures.
+# the 'movements' on the PLA website is incomplete; it just
+# shows movements within the port
+all = PLA.all
+
 puts arrivals
 puts departures
+puts all
 
 # Find next ten boats set to arrive
-puts PLA.arrivals.sort_by{|a| a[:timestamp]}[0..9]
+puts PLA.arrivals_by_timestamp[0..9]
+
+# List vessels alphabetically, as per PLA website
+puts PLA.all_by_vessel_name
 
-# Find all boats from Panama
-puts PLA.arrivals.select{|b| b[:country] == 'Panama'}
+# Find all movements made by Panamanian vessels
+puts PLA.find_all_by_country 'Panama'
 
+# Find all movements by a particular vessel
+puts PLA.find_all_by_vessel_name 'feo swan'
 ```
 
 Licence

data/lib/pla.rb

@@ -9,4 +9,64 @@ class PLA
   def self.departures
     PLA::Departures.new.records
   end
+
+  def self.all
+    [PLA::Arrivals.new.records,
+     PLA::Departures.new.records].flatten.uniq
+  end
+
+  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
+    end
+    []
+  end
+
+  def self.sort movement_type, field
+    if self.methods.include? movement_type
+      movements = self.send(movement_type)
+      return self.munge_by_field movements, :sort_by, field
+    end
+    []
+  end
+
+  def self.munge_by_field movements, method, field, search_value=nil
+    if field =~ /^(.*)_(.*)$/
+      field = $1
+      field_key = $2
+
+      search_value.nil? ?
+        movements.send(method){|m| m[field.to_sym][field_key.to_sym]} :
+        movements.send(method){|m| m[field.to_sym][field_key.to_sym] == search_value}
+
+    else
+      search_value.nil? ?
+        movements.send(method){|m| m[field.to_sym]} :
+        movements.send(method){|m| m[field.to_sym] == search_value}
+    end
+  end
+
+  def self.method_missing(m, *args, &block)
+    if m.to_s =~ /^(.*)_by_(.*)$/
+      movement_type = $1.to_sym
+      field = $2.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)
+      end
+    end
+    super
+  end
+
+  def self.respond_to?(method_sym, include_private = false)
+    if method_sym.to_s =~ /^(.*)_by_(.*)$/
+      true
+    else
+      super
+    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.1.1'
+  spec.version       = '0.2.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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - jspc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-28 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler