barometer 0.8.0 → 0.9.0

data/Rakefile

@@ -9,4 +9,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = ["--color"]
 end
 
-task :default => :spec
+task default: :spec

data/barometer.gemspec

@@ -1,36 +1,34 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.push File.expand_path('../lib', __FILE__)
 require 'barometer/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{barometer}
+  s.name = 'barometer'
   s.version = Barometer::VERSION
-  s.authors = ["Mark G"]
-  s.email = %q{barometer@attackcorp.com}
-  s.summary = %q{A multi API consuming weather forecasting superstar.}
-  s.description = %q{A multi API consuming weather forecasting superstar.}
-  s.homepage = %q{http://github.com/attack/barometer}
-
-  s.default_executable = %q{barometer}
+  s.authors = ['Mark G']
+  s.email = ['barometer@attackcorp.com']
+  s.description = 'A multi API consuming weather forecasting superstar.'
+  s.summary = s.description
+  s.homepage = 'http://github.com/attack/barometer'
+  s.license = 'MIT'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rdoc_options = ['--charset=UTF-8']
 
-  s.add_dependency %q<httparty>, ">= 0.4.5"
-  s.add_dependency %q<tzinfo>, ">= 0.3.14"
-  s.add_dependency "nokogiri"
-  s.add_dependency "yajl-ruby"
-  s.add_dependency "crack"
+  s.add_dependency 'httpclient'
+  s.add_dependency 'tzinfo', '>= 0.3.14'
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'yajl-ruby'
+  s.add_dependency 'nori'
+  s.add_dependency 'multi_json', '~> 1.0'
+  s.add_dependency 'virtus', '>= 1.0.0'
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "webmock"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "vcr"
-  s.add_development_dependency "fakefs"
+  s.add_development_dependency 'rspec', '>= 2.11'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'vcr'
 end

data/lib/barometer.rb

@@ -1,76 +1,25 @@
-$:.unshift(File.dirname(__FILE__))
-
-require 'barometer/version'
-require 'barometer/base'
-require 'barometer/query'
-require 'barometer/weather'
-require 'barometer/services'
-require 'barometer/data'
-require 'barometer/formats'
-require 'barometer/key_file_parser'
+require_relative 'barometer/version'
+require_relative 'barometer/utils'
+require_relative 'barometer/base'
+require_relative 'barometer/query'
+require_relative 'barometer/weather'
+require_relative 'barometer/data'
+require_relative 'barometer/response'
+require_relative 'barometer/weather_service'
 
 module Barometer
+  @@config = { 1 => {wunderground: {version: :v1}} }
+  def self.config; @@config; end;
+  def self.config=(hash); @@config = hash; end;
 
-  @@debug_mode = false
-  def self.debug; @@debug_mode; end;
-  def self.debug=(value); @@debug_mode = value; end;
-  def self.debug!; @@debug_mode = true; end;
-  def self.debug?; @@debug_mode; end;
-
-  def self.google_geocode_key
-    warn "[DEPRECATION] `Barometer.google_geocode_key` is deprecated.  A Google API key is no longer needed"
-  end
-  def self.google_geocode_key=(google_key)
-    warn "[DEPRECATION] `Barometer.google_geocode_key=(key)` is deprecated.  A Google API key is no longer needed"
-  end
-
-  @@yahoo_placemaker_app_id = nil
-  def self.yahoo_placemaker_app_id; @@yahoo_placemaker_app_id; end;
-  def self.yahoo_placemaker_app_id=(yahoo_key); @@yahoo_placemaker_app_id = yahoo_key; end;
-
-  # sometimes a query is used as is and never gets geocoded (ie zipcode)
-  # often, it is useful to have queries geocoded to know where in the
-  # world that query points to.  you can force the geocoding of
-  # queries (even when not required) so that you have the geocoded
-  # data.  the reason this isn't the default is that it will use an
-  # extra web service query when not normally required
-  #
-  @@force_geocode = false
-  def self.force_geocode; @@force_geocode; end;
-  def self.force_geocode=(value); @@force_geocode = value; end;
-  def self.force_geocode!; @@force_geocode = true; end;
-
-  @@enhance_timezone = false
-  def self.enhance_timezone; @@enhance_timezone; end;
-  def self.enhance_timezone=(value); @@enhance_timezone = value; end;
-  def self.enhance_timezone!; @@enhance_timezone = true; end;
-
-  # adjust the timeout used when interactind with external web services
-  #
   @@timeout = 15
   def self.timeout; @@timeout; end;
   def self.timeout=(value); @@timeout = value; end;
 
-  def self.new(query=nil)
-    Barometer::Base.new(query)
-  end
-
-  # update the Barometer configuration
-  #
-  def self.config=(config=nil)
-    Barometer::Base.config = config
+  def self.new(*args)
+    Barometer::Base.new(*args)
   end
 
-  # shortcut to Barometer::Service.source method
-  # allows Barometer.source(:wunderground)
-  #
-  def self.source(source)
-    Barometer::WeatherService.source(source)
-  end
-
-  # custom errors
-  #
   class OutOfSources < StandardError; end
-
+  class TimeoutError < StandardError; end
 end
-

data/lib/barometer/base.rb

@@ -1,83 +1,53 @@
 module Barometer
   class Base
+    attr_reader :weather
 
-    # allow the configuration of specific weather APIs to be used,
-    # and the order in which they would be used
-    #
-    @@config = { 1 => [:wunderground] }
-    def self.config; @@config; end;
-    def self.config=(hash); @@config = hash; end;
-
-    attr_reader   :query
-    attr_accessor :weather, :success
-
-    def initialize(query=nil)
-      @query = Barometer::Query.new(query)
-      @weather = Barometer::Weather.new
-      @success = false
+    def initialize(query, units=:metric)
+      @query = Query.new(query, units)
+      @weather = Weather.new(units)
     end
 
-    # iterate through all the configured sources and
-    # collect weather data for each one
-    #
-    def measure(metric=nil)
-      return nil unless @query
-      @weather.start_at = Time.now.utc
-
-      level = 1
-      until self.success?
-        if sources = @@config[level]
-          _dig(sources, nil, metric)
-        else
-          raise OutOfSources
-        end
-        level += 1
+    def measure
+      record_time do
+        measure_until_successful or raise OutOfSources
       end
-
-      @weather.end_at = Time.now.utc
-      @weather
+      weather
     end
 
-    def success?; @success; end
-
     private
 
-    # iterate through the setup until we have a source name (and possibly
-    # a config for that source), then measure with that source
-    #
-    # this allows for many different config formats, like
-    # { 1 => :wunderground }
-    # { 1 => [:wunderground]}
-    # { 1 => [:wunderground, :yahoo]}
-    # { 1 => [:wunderground, {:yahoo => {:weight => 2}}]}
-    # { 1 => {:wunderground => {:weight => 2}}}
-    # { 1 => [{:wunderground => {:weight => 2}}]}
-    #
-    def _dig(data, config=nil, metric=nil)
-      if data.is_a?(String) || data.is_a?(Symbol)
-        _measure(data, config, metric)
-      elsif data.is_a?(Array)
-        data.each do |datum|
-          _dig(datum, nil, metric)
-        end
-      elsif data.is_a?(Hash)
-        data.each do |datum, config|
-          _dig(datum, config, metric)
-        end
+    attr_reader :query
+
+    def record_time
+      weather.start_at = Time.now.utc
+      yield
+      weather.end_at = Time.now.utc
+    end
+
+    def measure_until_successful
+      Utils::ConfigReader.take_level_while do |level|
+        measure_using_all_services_in_level(level)
+        measure_with_next_level?
       end
+      success?
     end
 
-    # do that actual source measurement
-    #
-    def _measure(datum, config=nil, metric=nil)
-      Barometer.source(datum.to_sym).keys = config[:keys] if (config && config[:keys])
-      measurement = Barometer.source(datum.to_sym).measure(@query, metric)
-      if config && config[:weight]
-        measurement.weight = config[:weight]
+    def measure_using_all_services_in_level(level)
+      Utils::ConfigReader.services(level) do |source, config|
+        measure_and_record(source, config)
       end
-      @success = true if measurement.success?
-      @weather.measurements << measurement
     end
 
+    def measure_and_record(source, config)
+      weather.responses << WeatherService.new(source, config[:version]).measure(query, config)
+    end
+
+    def success?
+      weather.success?
+    end
+
+    def measure_with_next_level?
+      !success?
+    end
   end
 end

data/lib/barometer/data.rb

@@ -1,21 +1,16 @@
-$:.unshift(File.dirname(__FILE__))
+module Barometer
+  module Data
+  end
+end
 
-# units
-#
-require 'data/zone'
-require 'data/sun'
-require 'data/geo'
-require 'data/location'
-require 'data/units'
-require 'data/temperature'
-require 'data/distance'
-require 'data/speed'
-require 'data/pressure'
-require 'data/local_time'
-require 'data/local_datetime'
-
-# measurements
-#
-require 'measurements/measurement'
-require 'measurements/result'
-require 'measurements/result_array'
+require_relative 'data/convertable_units'
+require_relative 'data/temperature'
+require_relative 'data/distance'
+require_relative 'data/vector'
+require_relative 'data/pressure'
+require_relative 'data/zone'
+require_relative 'data/coordinates'
+require_relative 'data/location'
+require_relative 'data/geo'
+require_relative 'data/sun'
+require_relative 'data/attribute'

data/lib/barometer/data/attribute.rb

@@ -0,0 +1,19 @@
+require 'virtus'
+
+module Barometer
+  module Data
+    module Attribute
+    end
+  end
+end
+
+require_relative 'attributes/temperature.rb'
+require_relative 'attributes/vector.rb'
+require_relative 'attributes/pressure.rb'
+require_relative 'attributes/distance.rb'
+require_relative 'attributes/location.rb'
+require_relative 'attributes/zone.rb'
+require_relative 'attributes/sun.rb'
+require_relative 'attributes/time.rb'
+require_relative 'attributes/float.rb'
+require_relative 'attributes/integer.rb'

data/lib/barometer/data/attributes/distance.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Distance < Virtus::Attribute
+        def coerce(value)
+          value.is_a?(Barometer::Data::Distance) ? value : Barometer::Data::Distance.new(*value)
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/float.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Float < Virtus::Attribute
+        def coerce(value, *args)
+          value ? value.to_f : default_value.call
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/integer.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Integer < Virtus::Attribute
+        def coerce(value, *args)
+          value ? value.to_i : default_value.call
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/location.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Location < Virtus::Attribute
+        def coerce(value)
+          value.is_a?(Barometer::Data::Location) ? value : Barometer::Data::Location.new(*value)
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/pressure.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Pressure < Virtus::Attribute
+        def coerce(value)
+          value.is_a?(Barometer::Data::Pressure) ? value : Barometer::Data::Pressure.new(*value)
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/sun.rb

@@ -0,0 +1,15 @@
+module Barometer
+  module Data
+    module Attribute
+      class Sun < Virtus::Attribute
+        def coerce(value)
+          if value.nil?
+            Barometer::Data::Sun.new
+          elsif value.is_a?(Barometer::Data::Sun)
+            value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/temperature.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Temperature < Virtus::Attribute
+        def coerce(value, *args)
+          value.is_a?(Barometer::Data::Temperature) ? value : Barometer::Data::Temperature.new(*value)
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/time.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Time < Virtus::Attribute
+        def coerce(value)
+          value.nil? || value.is_a?(::Time) ? value : Utils::Time.parse(*value)
+        end
+      end
+    end
+  end
+end

data/lib/barometer/data/attributes/vector.rb

@@ -0,0 +1,11 @@
+module Barometer
+  module Data
+    module Attribute
+      class Vector < Virtus::Attribute
+        def coerce(value)
+          value.is_a?(Barometer::Data::Vector) ? value : Barometer::Data::Vector.new(*value)
+        end
+      end
+    end
+  end
+end