knmi 0.3.0 → 0.3.1

data/README.mkdn

@@ -23,77 +23,83 @@ Installation
 Example Usage
 -------------
 
-# Quick Script
+Launch console e.g. irb at the command line
 
-  require 'knmi'
+### Quick Script
 
-  station = KNMI.station_by_id(235)
-  parameter = KNMI.parameters(period = "daily", params = nil, categories = ["TEMP", "WIND"])
-  starts = Time.utc(2010, 6, 28) # 2010 April 28th
-  ends = Time.utc(2010, 6, 29) # 2010 April 29th
-  request = KNMI.get_data(station, parameter, starts, ends)
-  data = KNMI::Calculations.convert(request.data)
+```Ruby
+require 'knmi'
 
-# Elaborated Script
+station = KNMI.station_by_id(235)
+parameters = KNMI.parameters(period = "daily", params = nil, categories = ["TEMP", "WIND"])
+starts = Time.utc(2010, 6, 28) # 2010 April 28th
+ends = Time.utc(2010, 6, 29) # 2010 April 29th
+request = KNMI.get_data(station, parameters, starts, ends)
+data = KNMI.convert(parameters, request)
+```
+### Elaborated Script
 
-  require 'knmi'
+```Ruby
+require 'knmi'
 
-  # Get station object by station ID
-  station = KNMI.station_by_id(235)
+# Get station object by station ID
+station = KNMI.station_by_id(235)
 
-  station
-  #=> #<KNMI::Station:0x0000010133c938> # A struct object
+station
+#=> #<KNMI::Station:0x0000010133c938> # A struct object
 
-  # Available Instance Variables
-  station.instance_variables
-  #=> [:@id, :@name, :@elevation, :@photo, :@map, :@web, :@instrumentation, :@coordinates]
-  station.id
-  #=> 235
-  station.name
-  #=>"De kooy"
-  station.coordinates
-  #=> 52.924,4.785
+# Available Instance Variables
+station.instance_variables
+#=> [:@id, :@name, :@elevation, :@photo, :@map, :@web, :@instrumentation, :@coordinates]
+station.id
+#=> 235
+station.name
+#=>"De kooy"
+station.coordinates
+#=> 52.924,4.785
 
 
-  # Get parameter object at the time interval you wish to use "hourly" or "daily"
-  # Params can be a single term or an array of terms such as "TG" or ["TG", TX]
-  # Categories can be a single term or an array of terms such as "WIND" or ["WIND", "TEMP"]
-  parameters = KNMI.parameters(period = "daily", params = nil, categories = ["TEMP", "WIND"])
+# Get parameter object at the time interval you wish to use "hourly" or "daily"
+# Params can be a single term or an array of terms such as "TG" or ["TG", TX]
+# Categories can be a single term or an array of terms such as "WIND" or ["WIND", "TEMP"]
+parameters = KNMI.parameters(period = "daily", params = nil, categories = ["TEMP", "WIND"])
 
-  parameters # returns an array of parameter objects
-  #=> [#<KNMI::Parameters:0x000001011387e0 @parameter="TX", @category="TEMP", @description="Maximum Temperature", @validate="n.integer?", @conversion="n / 10", @units="C", @period="daily">]
+parameters # returns an array of parameter objects
+#=> [#<KNMI::Parameters:0x000001011387e0 @parameter="TX", @category="TEMP", @description="Maximum Temperature", @validate="n.integer?", @conversion="n / 10", @units="C", @period="daily">]
 
-  # Available Instance Variables
-  parameters[0].instance_variables
-  #=>[:@parameter, :@category, :@description, :@validate, :@conversion, :@units, :@period]
+# Available Instance Variables
+parameters[0].instance_variables
+#=>[:@parameter, :@category, :@description, :@validate, :@conversion, :@units, :@period]
 
-  parameters[0].parameter
-  #=> "TX"
+parameters[0].parameter
+#=> "TX"
 
 
-  # Define Time period of interest
-  starts = Time.utc(2010, 6, 28) 	# 2010 April 28th
-  ends = Time.utc(2010, 7, 01) 		# 2010 April 29th
+# Define Time period of interest
+starts = Time.utc(2010, 6, 28) 	# 2010 April 28th
+ends = Time.utc(2010, 7, 01) 		# 2010 April 29th
 
-  # Get Data using previously retrieved objects
-  request = KNMI.get_data(station, parameters, starts, ends)
+# Get Data using previously retrieved objects
+request = KNMI.get_data(station, parameters, starts, ends)
 
-  # Available Instance Variables
-  request.instance_variables
-  #=> [:@query, :@data]
+# Available Instance Variables
+request.instance_variables
+#=> [:@query, :@data]
 
-  request.query
-  #=>["stns=235", "vars=TX", "start=20100628", "end=20100629"]
+request.query
+#=>["stns=235", "vars=TX", "start=20100628", "end=20100629"]
 
-  request.data
-  #=>[{:STN=>"235", :YYYYMMDD=>"20100628", :TX=>"263"}, {:STN=>"235", :YYYYMMDD=>"20100629", :TX=>"225"}]
+request.data
+#=>[{:STN=>"235", :YYYYMMDD=>"20100628", :TX=>"263"}, {:STN=>"235", :YYYYMMDD=>"20100629", :TX=>"225"}]
 
-  request.data[0]
-  #=>{:STN=>"235", :YYYYMMDD=>"20100628", :TX=>"263"}
+request.data[0]
+#=>{:STN=>"235", :YYYYMMDD=>"20100628", :TX=>"263"}
 
 
-  # Convert data from storage format to operating format
-  data = KNMI.convert(parameters, request)
+# Convert data from storage format to operating format
+data = KNMI.convert(parameters, request)
+```
+
 
 Available Parameters
 --------------------

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/knmi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knmi}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bullfight"]

data/lib/knmi/calculations.rb

@@ -11,7 +11,7 @@ module KNMI
         
         array.each_with_index do |a, index|
           x[index] = {}
-          x[index][:stn] = a
+          x[index][:STN] = a[:STN]
           a.each_pair { |key,value| x[index].merge!( {key => converts_daily(key, value)} ) }
         
         end
@@ -28,6 +28,7 @@ module KNMI
         
         array.each_with_index do |a, index|
           x[index] = {}
+          x[index][:STN] = a[:STN]
           a.each_pair { |key,value| x[index].merge!( {key => converts_daily(key, value)} ) }
           x[index][:Time] = x[index][:YYYYMMDD] + x[index][:HH]
           

metadata

@@ -2,7 +2,7 @@
 name: knmi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - bullfight
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3402158507789262008
+      hash: -844904374873182274
       segments: 
       - 0
       version: "0"