barometer 0.9.4 → 0.9.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0f0ccdc7bdbe2c204520c8e83a96a65e8713218
+  data.tar.gz: 857448624a6845d4212d5072a04e7e7e804667d8
+SHA512:
+  metadata.gz: e06c1684eb7a0128e885112f24a3f4be74b3232092c76518b2d2c7b9eb1908a18a76727898c2d455d9a765d992cd0246f19c6035849abb557f655f77e12183ad
+  data.tar.gz: 68bf94862598ae243583813e28e52437ab97b777f4dcfec2c3543786f5b479827eb580f6fcff3254f34b7a7de9e3f65b6cd082f11e35ba75e435ff3548fe283a

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
+cache: bundler
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2
-  - rbx-19mode
-script: 'rake'
 branches:
   only:
     - master
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode

data/Gemfile

@@ -1,13 +1,17 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-group :assets do
-  platforms :rbx do
-    gem 'pelusa'
-  end
+gemspec
+
+gem 'rake'
+
+group :development, :test do
+  gem 'rspec', '>= 2.11'
+  gem 'pry'
 end
 
 group :test do
+  gem 'barometer-support', '>= 0.0.3'
+  gem 'webmock'
+  gem 'vcr'
   gem 'coveralls', require: false
 end
-
-gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2013 Mark G
+Copyright (c) 2009-2014 Mark Gangl
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -19,7 +19,7 @@ support the query directly. See the "[Queries](#queries)" section for more info.
 
 ## Key Features
 
-* works with ruby 1.9.x, 2.0, Rubinius (see
+* works with ruby 1.9.x, 2.x (see
   [Travis CI status](https://travis-ci.org/attack/barometer) to confirm)
 * supports 5 weather services, more planned
 * the same query can be used with any supported weather service
@@ -84,7 +84,7 @@ The current available sources are:
 
 * Wunderground.com (:wunderground) [default]
 * Yahoo! Weather (:yahoo)
-* WeatherBug.com (:weather_bug) [requires key]
+* WeatherBug.com (:weather_bug) [requires key + [barometer-weather_bug gem](https://github.com/attack/barometer-weather_bug)]]
 * NOAA (:noaa)
 * Forecast.io (:forecast_io) [requires key + [barometer-forecast_io gem](https://github.com/attack/barometer-forecast_io)]
 
@@ -223,4 +223,4 @@ Thank you to these developers who have contributed. No contribution is too small
 
 ## Copyright
 
-Copyright (c) 2009-2013 Mark G. See LICENSE for details.
+Copyright (c) 2009-2014 Mark Gangl. See LICENSE for details.

data/barometer.gemspec

@@ -5,8 +5,8 @@ require 'barometer/version'
 Gem::Specification.new do |s|
   s.name = 'barometer'
   s.version = Barometer::VERSION
-  s.authors = ['Mark G']
-  s.email = ['barometer@attackcorp.com']
+  s.authors = ['Mark Gangl']
+  s.email = ['mark@attackcorp.com']
   s.description = 'A multi API consuming weather forecasting superstar.'
   s.summary = s.description
   s.homepage = 'http://github.com/attack/barometer'
@@ -18,19 +18,16 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ['--charset=UTF-8']
 
+  s.platform = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 1.9.0'
+
   s.add_dependency 'httpclient'
   s.add_dependency 'tzinfo', '>= 0.3.14'
   s.add_dependency 'nokogiri'
   s.add_dependency 'addressable'
-  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_dependency 'choc_mool'
 
-  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'
-  s.add_development_dependency 'barometer-support'
+  s.add_development_dependency 'bundler'
 end

data/lib/barometer/utils/json_reader.rb

@@ -1,11 +1,10 @@
-require 'yajl'
+require 'json' unless defined?(JSON)
 
 module Barometer
   module Utils
     module JsonReader
       def self.parse(json, *nodes_to_remove)
-        json_reader = Yajl::Parser.new
-        output = json_reader.parse(json)
+        output = JSON.parse(json)
 
         nodes_to_remove.each do |node|
           output = output.fetch(node, output)

data/lib/barometer/utils/payload.rb

@@ -1,100 +1,19 @@
+require 'delegate'
+require 'choc_mool'
+
 module Barometer
   module Utils
-    class Payload
-      attr_reader :hash, :regex, :query
+    class Payload < SimpleDelegator
+      attr_reader :query
 
       def initialize(hash, query=nil)
-        @hash = hash
         @query = query
-      end
-
-      def using(regex)
-        @regex = regex
-        self
-      end
-
-      def fetch(*paths)
-        if hash
-          result = fetch_value_or_attribute(paths)
-        else
-          result = nil
-        end
-
-        result = _apply_regex(result)
-        result = _cleanup(result)
-        result = _convert_alternate_nil_values(result)
-
-        result
-      end
-
-      def each(*paths, &block)
-        path = fetch(*paths)
-        if path
-          path.each do |result|
-            result_payload = Barometer::Utils::Payload.new(result)
-            block.call(result_payload)
-          end
-        end
-      end
-
-      def each_with_index(*paths, &block)
-        fetch(*paths).each_with_index do |result, index|
-          result_payload = Barometer::Utils::Payload.new(result)
-          block.call(result_payload, index)
-        end
-      end
-
-      def fetch_each(*paths, &block)
-        each(*paths, &block)
-      end
-
-      def fetch_each_with_index(*paths, &block)
-        each_with_index(*paths, &block)
+        super( ChocMool.new(hash) )
       end
 
       def units
         query.units if query
       end
-
-      private
-
-      def fetch_value_or_attribute(paths)
-        result = paths.inject(hash) do |result, path|
-          fetch_value(result, path) || fetch_attribute(result, path) || break
-        end
-      end
-
-      def fetch_value(result, path)
-        if result.respond_to? :fetch
-          result.fetch(path, nil)
-        end
-      end
-
-      def fetch_attribute(result, path)
-        if path.to_s.start_with?('@') && result.respond_to?(:attributes)
-          result.attributes.fetch(path.slice(1..-1))
-        end
-      end
-
-      def _apply_regex(result)
-        if @regex && @regex.is_a?(Regexp) && matched = result.to_s.match(@regex)
-          result = matched[1] if matched[1]
-        end
-        @regex = nil
-        result
-      end
-
-      def _cleanup(result)
-        result.respond_to?(:strip) ? result.strip : result
-      end
-
-      def _convert_alternate_nil_values(result)
-        if result == "NA"
-          nil
-        else
-          result
-        end
-      end
     end
   end
 end

data/lib/barometer/utils/translations/zone_codes.yml

@@ -49,6 +49,7 @@ CET : 1
 CHADT : 13.75
 CHAST : 12.75
 CHST : 10
+CIT : 8
 CKT : -10
 CLST : -3
 CLT : -4

data/lib/barometer/version.rb

@@ -1,3 +1,3 @@
 module Barometer
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

data/lib/barometer/weather_service.rb

@@ -36,5 +36,4 @@ end
 
 require_relative 'weather_services/wunderground_v1'
 require_relative 'weather_services/yahoo'
-require_relative 'weather_services/weather_bug'
 require_relative 'weather_services/noaa'

data/spec/barometer_spec.rb

@@ -19,6 +19,12 @@ describe Barometer do
   end
 
   describe ".timeout" do
+    around do |example|
+      cached_timeout = Barometer.timeout
+      example.run
+      Barometer.timeout = cached_timeout
+    end
+
     it "has a default value" do
       expect( Barometer.timeout ).to eq 15
     end

data/spec/spec_helper.rb

@@ -10,21 +10,10 @@ require 'barometer/support'
 
 require_relative '../lib/barometer'
 
-WEATHERBUG_CODE = Barometer::Support::KeyFileParser.find(:weather_bug, :code) || 'weatherbug'
-FORECAST_IO_APIKEY = Barometer::Support::KeyFileParser.find(:forecast_io, :apikey) || 'forecastio'
-downcased_weatherbug_code = WEATHERBUG_CODE.to_s
-downcased_weatherbug_code[0] = WEATHERBUG_CODE.to_s[0..0].downcase
-
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/cassettes'
   config.hook_into :webmock
   config.default_cassette_options = { record: :none, serialize_with: :json }
-
-  config.filter_sensitive_data('WEATHERBUG_CODE') { WEATHERBUG_CODE.to_s }
-  # weather bug uses api as host name.  this is downcased when the request it made
-  config.filter_sensitive_data('WEATHERBUG_CODE') { downcased_weatherbug_code }
-  config.filter_sensitive_data('FORECAST_IO_APIKEY') { FORECAST_IO_APIKEY.to_s }
-
   config.configure_rspec_metadata!
 end
 

data/spec/utils/payload_spec.rb

@@ -1,168 +1,35 @@
 require_relative '../spec_helper'
 
-describe Barometer::Utils::Payload do
-  describe "#fetch" do
-    it "returns the value for the key provided" do
-      hash = {one: 1}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one).should == 1
-    end
-
-    it "returns nil when the key cannot be found" do
-      hash = {}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one).should be_nil
-    end
-
-    it "traverses multiple levels to get the value" do
-      hash = {one: {two: {three: 3}}}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one, :two, :three).should == 3
-    end
-
-    it "returns nil when any level cannot be found" do
-      hash = {one: {two: {three: {four: 4}}}}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one, :too, :three).should be_nil
-    end
-
-    it "returns nil when the starting value is nil" do
-      hash = nil
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one).should be_nil
-    end
-
-    it "returns a stripped result" do
-      hash = {one: " one "}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one).should == "one"
-    end
-
-    it "returns nil when the value is NA" do
-      hash = {one: "NA"}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.fetch(:one).should be_nil
-    end
-
-    context "when the data is accessed via an attribute" do
-      it "returns the value of the key" do
-        hash = {one: {'@two' => 2}}
-        parser = Barometer::Utils::Payload.new(hash)
-        parser.fetch(:one, '@two').should == 2
+module Barometer::Utils
+  describe Payload do
+    describe '#fetch' do
+      it 'returns the value for the key provided' do
+        hash = {one: 1}
+        parser = Payload.new(hash)
+        expect( parser.fetch(:one) ).to eq 1
       end
 
-      it "returns the value accessed via :attributes" do
-        class StringWithAttributes < String
-          attr_accessor :attributes
-        end
-        value_with_attributes = StringWithAttributes.new('one')
-        value_with_attributes.attributes = {'two' => 2}
-        hash = {one: value_with_attributes}
-        parser = Barometer::Utils::Payload.new(hash)
-        parser.fetch(:one, '@two').should == 2
+      it 'traverses multiple levels to get the value' do
+        hash = {one: {two: {three: 3}}}
+        parser = Payload.new(hash)
+        expect( parser.fetch(:one, :two, :three) ).to eq 3
       end
     end
 
-    context "when the data is accessed via an index" do
-      it "returns the value at that index" do
-        hash = {one: [2]}
-        parser = Barometer::Utils::Payload.new(hash)
-        parser.fetch(:one, 0).should == 2
-      end
-    end
-  end
+    describe '#units' do
+      it 'returns the query units when the query is present' do
+        units = double(:units)
+        query = double(:query, units: units)
 
-  describe "#fetch_each" do
-    it "returns a payload for each result found at the key" do
-      hash = {one: [{two: 2}, {two: 2}]}
-      parser = Barometer::Utils::Payload.new(hash)
+        payload = Payload.new({}, query)
 
-      expect { |b|
-        parser.fetch_each(:one, &b)
-      }.to yield_successive_args(Barometer::Utils::Payload, Barometer::Utils::Payload)
-    end
-
-    it "returns a payload for each result found at the key" do
-      hash = {one: [{two: 2}, {two: 2}]}
-      parser = Barometer::Utils::Payload.new(hash)
-
-      parser.fetch_each(:one) do |each_parser|
-        each_parser.fetch(:two).should == 2
+        expect( payload.units ).to eq units
       end
-    end
-
-    it "raises an error when result is not an array" do
-      hash = {one: 1}
-      parser = Barometer::Utils::Payload.new(hash)
 
-      expect {
-        parser.fetch_each(:one){ |p| nil }
-      }.to raise_error(NoMethodError)
-    end
-  end
-
-  describe "#fetch_each_with_index" do
-    it "returns a payload for each result found at the key" do
-      hash = {one: [{two: 2}, {two: 2}]}
-      parser = Barometer::Utils::Payload.new(hash)
-
-      i = 0
-      parser.fetch_each_with_index(:one) do |each_parser, index|
-        each_parser.fetch(:two).should == 2
-        index.should == i
-        i += 1
+      it 'returns nil when the query is not present' do
+        payload = Payload.new({}, nil)
+        expect( payload.units ).to be_nil
       end
     end
-
-    it "raises an error when result is not an array" do
-      hash = {one: 1}
-      parser = Barometer::Utils::Payload.new(hash)
-
-      expect {
-        parser.fetch_each_with_index(:one){ |p| nil }
-      }.to raise_error(NoMethodError)
-    end
-  end
-
-  describe "#using" do
-    it "applies the regex to the fetched result" do
-      hash = {one: 'two, three'}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.using(/^(.*),/).fetch(:one).should == 'two'
-    end
-
-    it "does nothing if valid regex does not exist" do
-      hash = {one: 'two, three'}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.using(:invalid_regex).fetch(:one).should == 'two, three'
-    end
-
-    it "does nothing if regex does not capture proper result" do
-      hash = {one: 'two, three'}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.using(/^.*,.*$/).fetch(:one).should == 'two, three'
-    end
-
-    it "forgets the regex" do
-      hash = {one: 'two, three'}
-      parser = Barometer::Utils::Payload.new(hash)
-      parser.using(/^(.*),/).fetch(:one).should == 'two'
-      parser.fetch(:one).should == 'two, three'
-    end
-  end
-
-  describe '#units' do
-    it 'returns the query units when the query is present' do
-      units = double(:units)
-      query = double(:query, units: units)
-      payload = Barometer::Utils::Payload.new({}, query)
-      expect( payload.units ).to eq units
-    end
-
-    it 'returns nil when the query is not present' do
-      payload = Barometer::Utils::Payload.new({}, nil)
-      expect( payload.units ).to be_nil
-    end
   end
 end
-