work_surfer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb41f0781d7dc4c27cd0c65f693cfcb9cc95e6f1
-  data.tar.gz: 4acd6534f45640819f9c4b6913a2c107be46d3d0
+  metadata.gz: c456764defdde3b3827c67ae0666f72a8a500780
+  data.tar.gz: 35e2173c4f097597631d3a9b86636a419d6eba7c
 SHA512:
-  metadata.gz: be9c3cb2c02a6aa5dac5c660c41f893d15d67b6ab850162ebb35d50be6e9f2c374be3a7a03dfe4725ba00aa0527db07c479b55fffb685f17347c3ab61694c0b7
-  data.tar.gz: 2dc3e10684f9286d44760a9c786b2bddf16e4f2b8640c180cddcf328819fb0824190d8465237d7a89895477a38d71d0e7f7c77b7f7815f59875e0ec4e26ba30a
+  metadata.gz: c1eb2b9e3cbaf0a72e8545871ff30c295112023ee8b83f2f1adb910a5df4815be2bf557ecaab204fb0f6b64472e63b55376a4bc647c78bfad9c3b57089fa5332
+  data.tar.gz: d201a387bdbb4eff926f96d84c831e415d74656be2de4bdba7d1c6238c9f2e4d295d1b88cc1728c1424439856dcb14476b6a5da4e7fd90378b95025aa01fafcf

data/lib/work_surfer/api/approved_plans.rb

@@ -2,14 +2,14 @@
 
 module WorkSurfer
   module API
-    class ApprovedPlans
+    class ApprovedPlans < Base
       class << self
         def get(route_id, territory_id: WorkSurfer::Client.default_territory_id)
-          API.client.get("territories/#{territory_id}/approved/routes/#{route_id}")
+          client.get("territories/#{territory_id}/approved/routes/#{route_id}")
         end
 
         def list(date: "today", territory_id: WorkSurfer::Client.default_territory_id)
-          API.client.get("territories/#{territory_id}/approved/routes?date=#{date}")
+          client.get("territories/#{territory_id}/approved/routes?date=#{formatted_date(date)}")
         end
       end
     end

data/lib/work_surfer/api/base.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module WorkSurfer
+  module API
+    class Base
+      class << self
+        protected
+
+        def client
+          Client.default_client
+        end
+
+        def formatted_date(date = nil)
+          return date if date.to_s              == "today"
+          return nil  if date.to_s.strip.length <= 0
+
+          date = date.respond_to?(:to_date)
+            if date.respond_to?(:to_date)
+              date.to_date
+            else
+              Date.parse(date.to_s)
+            end
+
+          date.strftime("%Y%m%d")
+        end
+      end
+    end
+  end
+end

data/lib/work_surfer/api/territories.rb

@@ -2,10 +2,10 @@
 
 module WorkSurfer
   module API
-    class Territories
+    class Territories < Base
       class << self
         def list
-          API.client.get("territories")
+          client.get("territories")
         end
       end
     end

data/lib/work_surfer/api/time_of_arrival.rb

@@ -2,15 +2,15 @@
 
 module WorkSurfer
   module API
-    class TimeOfArrival
+    class TimeOfArrival < Base
       class << self
         def get(route_id, territory_id: WorkSurfer::Client.default_territory_id)
-          API.client.get("territories/#{territory_id}/toa/routes/#{route_id}")
+          client.get("territories/#{territory_id}/toa/routes/#{route_id}")
         end
 
         def list(date: nil, territory_id: WorkSurfer::Client.default_territory_id, vehicle_id: nil)
-          API.client.get("territories/#{territory_id}/toa/routes", { params: {
-            date: date,
+          client.get("territories/#{territory_id}/toa/routes", { params: {
+            date: formatted_date(date),
             territory_id: territory_id,
             vehicle: vehicle_id,
           }.reject { |k, v| v.nil? } })

data/lib/work_surfer/api.rb

@@ -2,14 +2,11 @@
 
 module WorkSurfer
   module API
-    class << self
-      def client
-        Client.default_client
-      end
-    end
   end
 end
 
+require "work_surfer/api/base"
+
 require "work_surfer/api/approved_plans"
 require "work_surfer/api/territories"
 require "work_surfer/api/time_of_arrival"

data/lib/work_surfer/client.rb

@@ -12,14 +12,27 @@ module WorkSurfer
     ].freeze
 
     OPTIONS_WITH_CLASS_DEFAULT.each do |option|
-      cattr_accessor  option
-      attr_accessor   option
+      define_singleton_method(option) do
+        instance_variable_get("@#{option}")
+      end
+
+      define_singleton_method("#{option}=") do |*args|
+        instance_variable_set("@#{option}", *args)
+      end
+
+      define_method(option) do
+        instance_variable_get("@#{option}")
+      end
+
+      define_method("#{option}=") do |*args|
+        instance_variable_set("@#{option}", *args)
+      end
     end
 
     self.connection_builder = ->(builder) {
       builder.adapter   Faraday.default_adapter
       builder.request   :url_encoded
-      builder.response  :parse_json
+      builder.response  :json
     }
 
     self.connection_options = {}

data/lib/work_surfer.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "faraday"
+require "faraday_middleware"
+
 module WorkSurfer
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_surfer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Niels Ganser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -53,6 +53,7 @@ files:
 - lib/work_surfer.rb
 - lib/work_surfer/api.rb
 - lib/work_surfer/api/approved_plans.rb
+- lib/work_surfer/api/base.rb
 - lib/work_surfer/api/territories.rb
 - lib/work_surfer/api/time_of_arrival.rb
 - lib/work_surfer/client.rb