zwemwater 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57cbb1b51c79d08ee6f79a37a62bb8a71b01f0f0
-  data.tar.gz: d254d64e865a5f2099137ea3c1d3f45f71ebeb09
+  metadata.gz: 0833e6b6e55e445770354184a9f3899a382b9a0f
+  data.tar.gz: a7d49ccf9e25a1e6b047550ab8d83e550319426d
 SHA512:
-  metadata.gz: f47168f459b060cc5583b602afbe588b3a3e60922153c457018caea40fae9d77568f4e324943d6ec32f3aae5fb0d4f52340c08e7609d2ca5393c4d5429e3cca1
-  data.tar.gz: 5277659b8a3b55f071993ef95abd8d63e5458cb4dca1ab716bb6a4419795f20ef13dc47f1c47804f88bace0b54dfc7da0854e26687770ebf25d91a7fae16fa98
+  metadata.gz: 9f854489bb3b9bb86989f7bb226ee8c3dcf406d570083ae07c907442c497a0d75f89caaed24f4e8ef57e7552797a05119ff13e2d606ecee602b3d902149f9846
+  data.tar.gz: 418fa2593ef4d8721126c766113d0b2595d135f08ae4e254248ce841f5b98e63c62c0a44d36d595154fc5f4d1999db54a7855c5516c3b8d4ae469f98f679b953

data/lib/zwemwater/base.rb

@@ -1,20 +1,13 @@
 module Zwemwater
   class Base
-    attr_reader :query
+    attr_reader :query, :data
     
     def initialize(query)
       @query = query
+      @data = Zwemwater::Response.for(@query)
     end
     
-    def get_data
-      Zwemwater::Service.download_statusses if Zwemwater.statusses.nil?
-      @data = Zwemwater.statusses['features'].select { |f| f['properties']['naam'] == @query }.first || {}
-    end
-    
-    def data; @data || get_data; end;
-    
     def status
-      get_data if @data.nil?
       return nil if @data.empty?
       return @status unless @status.nil?
       

data/lib/zwemwater/response.rb

@@ -0,0 +1,17 @@
+module Zwemwater
+  module Response
+    @@statuses = nil
+    def self.statuses; @@statuses; end;
+    def self.statuses=(value); @@statuses = value; end;
+    
+    @@locations = nil
+    def self.locations
+      return @@locations unless @@locations.nil?
+      @@locations = @@statuses['features'].collect { |f| f['properties']['naam'] }
+    end
+    
+    def self.for(query)
+       @@statuses['features'].select { |f| f['properties']['naam'] == query }.first || {}
+    end
+  end
+end

data/lib/zwemwater/service.rb

@@ -5,9 +5,9 @@ module Zwemwater
   module Service
     SOURCE_URL = 'http://www.zwemwater.nl/get_all_plekken'
     
-    def self.download_statusses
+    def self.get_statuses
       response = HTTParty.get(SOURCE_URL)
-      Zwemwater.statusses = JSON.parse(response.body)
+      Zwemwater::Response.statuses = JSON.parse(response.body)
     end
   end
 end

data/lib/zwemwater/version.rb

@@ -1,3 +1,3 @@
 module Zwemwater
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/lib/zwemwater.rb

@@ -1,13 +1,11 @@
 require 'zwemwater/version'
 require 'zwemwater/base'
 require 'zwemwater/service'
+require 'zwemwater/response'
 
 module Zwemwater
-  @@statusses = nil
-  def self.statusses; @@statusses; end;
-  def self.statusses=(value); @@statusses = value; end;
-  
   def self.new(query)
+    Zwemwater::Service.get_statuses if Zwemwater::Response.statuses.nil?
     Zwemwater::Base.new(query)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zwemwater
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Richard Venneman
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/zwemwater/base.rb
+- lib/zwemwater/response.rb
 - lib/zwemwater/service.rb
 - lib/zwemwater/version.rb
 - lib/zwemwater.rb