forecast_io-cache 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3a830da7beaf6331d52777a3f4063cee109e2a
-  data.tar.gz: 6520296466e74b33bc0bb9376cd13cdfd6402bae
+  metadata.gz: d991786947e787fb6e855ca1bafc6a463e93bc69
+  data.tar.gz: 4d367c34d9b6b4fe4c33cdfcc25bbee3f1825e08
 SHA512:
-  metadata.gz: fb851a96237711c48c802ad39ce747453c3e2604a1c12ec07f55403477ade4d640e630911f38de3553c8b5449c23b1a9f731d4685e40482b89aba52be7bf5725
-  data.tar.gz: c15589b920e5b570c6021b648fcc38f2add074dfa32d74c88f3b8bc95007b3b89444852c021fe1349e70d5f2c5975624daaa36790ffbc462aea5faeaf3b443be
+  metadata.gz: 7e5438f5eb36476ce5be126ad89b9260e54f95786038173b968e2b089cdf377af81450b74090c0a445a926210b931e0145ff7a64799b6ad1dde2acc7f2df34cf
+  data.tar.gz: 5c9bda5074194ec975414e9f1a15ba4c9425544dd493c3cc33ef109d538c4f41accc6ebfd92392d67c54baab5632d728642538d76496a882bdc86cd6bae3e368

data/features/step_definitions/cache_steps.rb

@@ -1,18 +1,21 @@
 Given "I have cached this forecast recently" do
-  @position = [151.238823,-33.857444]
-  setup "position" => @position, "time" => 123456789
+  @latitude = -33.857444
+  @longitude = 151.238823
+  setup "latitude" => @latitude, "longitude" => @longitude, "time" => 123456789
 end
 
 Given "I have a cache result nearby" do
-  @position = [151.238823,-33.857333]
-  setup "position" => @position, "time" => 123456789
+  @latitude = -33.857333
+  @longitude = 151.238823
+  setup "latitude" => @latitude, "longitude" => @longitude, "time" => 123456789
 end
 
 Given "I have a cache result for close by" do
-  @position = [151.238823,-33.957333]
-  setup "position" => @position, "time" => 123456789
+  @latitude = -33.957333
+  @longitude = 151.238823
+  setup "latitude" => @latitude, "longitude" => @longitude, "time" => 123456789
 end
 
 Given "I have a cached result but for a time beyond the threshold" do
-  setup "position" => [151.238823,-33.757444], "time" => 1234567890
+  setup "latitude" => -33.757444, "longitude" => 151.238823, "time" => 1234567890
 end

data/features/step_definitions/forecast_steps.rb

@@ -21,8 +21,8 @@ Then "I am given the cached forecast" do
   expect_ok { get @path }
   expect(parsed_response).to eq({
     "time"         => 123456789,
-    "latitude"     => @position[1],
-    "longitude"    => @position[0],
+    "latitude"     => @latitude,
+    "longitude"    => @longitude,
     "wind_speed"   => 6.66,
     "wind_bearing" => 200,
     "humidity"     => 0.9,

data/features/support/cassettes/forecast_for_latitude_and_longitude.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.forecast.io/forecast/API_KEY/-33.857444,151.238823,123456789
+    uri: https://api.darksky.net/forecast/API_KEY/-33.857444,151.238823,123456789
     body:
       encoding: US-ASCII
       string: ''

data/features/support/config.rb

@@ -1,9 +1,8 @@
-require 'bson'
-
-Forecast::IO.configure do |config|
+ForecastIO.configure do |config|
   config.api_key = ENV['API_KEY']
 end
 
 Forecast::IO::Cache.configure do |config|
-  config.mongo_uri 'mongodb://localhost/forecast-test'
+  config.radius = 1
+  config.db_uri = 'postgres://localhost/forecast-test'
 end

data/features/support/fixtures.rb

@@ -1,11 +1,16 @@
-require './features/support/mongo'
+require './features/support/pg'
 module Fixtures
 
+  def db
+    @db ||= Sequel.connect 'postgres://localhost/forecast-test'
+  end
+
   def setup attrs = {}
-    MongoAdaptor.db.collection('forecasts').insert(
+    db[:forecasts].insert(
       {
         "time"         => 123456789,
-        "position"     => [151.238823,-33.857444],
+        "latitude"     => -33.857444,
+        "longitude"    => 151.238823,
         "wind_speed"   => 6.66,
         "wind_bearing" => 200,
         "humidity"     => 0.9,

data/features/support/pg.rb

@@ -0,0 +1,6 @@
+After do
+  PGAdaptor.db.tables.each do |table|
+    next if table == :schema_migrations
+    PGAdaptor.db.execute "TRUNCATE #{table};"
+  end
+end

data/forecast_io-cache.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "forecast_io", '~> 2.0.1'
   spec.add_runtime_dependency "sinatra"
-  spec.add_runtime_dependency "mongo_adaptor"
+  spec.add_runtime_dependency "pg_adaptor"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
@@ -29,8 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "vcr"
 
-  spec.add_development_dependency "mongo"
-  spec.add_development_dependency "bson"
-  spec.add_development_dependency "bson_ext"
-
 end

data/lib/forecast_io/cache.rb

@@ -13,11 +13,11 @@ module Forecast
       def self.configure
         yield configuration
       end
+
       def self.configuration
         @config ||= Configuration.new
       end
 
-
       def self.initialize!
         @app ||= App.new
       end

data/lib/forecast_io/cache/configuration.rb

@@ -1,4 +1,4 @@
-require 'mongo-configure'
+require 'pg_adaptor'
 
 module Forecast
   module IO
@@ -6,6 +6,7 @@ module Forecast
       class Configuration
 
         attr_writer :radius, :timeframe
+        attr_reader :db_uri, :db
 
         def radius
           @radius ||= 5
@@ -15,8 +16,10 @@ module Forecast
           @timeframe ||= 60
         end
 
-        def mongo_uri uri
-          Mongo::Configure.from_uri uri
+        def db_uri= value
+          @db_uri = value
+          @db = PGAdaptor.db = Sequel.connect(db_uri)
+          value
         end
 
       end

data/lib/forecast_io/cache/forecast_data.rb

@@ -1,27 +1,28 @@
 module Forecast
   module IO
     module Cache
-      class ForecastData < Struct.new(:position, :time, :wind_speed, :wind_bearing,
+      class ForecastData < Struct.new(:latitude, :longitude, :time, :wind_speed, :wind_bearing,
                                       :humidity, :pressure, :visibility, :temperature)
 
         def self.generate lat, lon, forecast
           new.tap do |data|
-            data.position = [lon,lat].map(&:to_f)
-            data.time             = forecast['time']
-            data.wind_speed       = forecast['windSpeed']
-            data.wind_bearing     = forecast['windBearing']
-            data.humidity         = forecast['humidity']
-            data.pressure         = forecast['pressure']
-            data.visibility       = forecast['visibility']
-            data.temperature      = forecast['temperature']
+            data.latitude     = lat.to_f
+            data.longitude    = lon.to_f
+            data.time         = forecast['time']
+            data.wind_speed   = forecast['windSpeed']
+            data.wind_bearing = forecast['windBearing']
+            data.humidity     = forecast['humidity']
+            data.pressure     = forecast['pressure']
+            data.visibility   = forecast['visibility']
+            data.temperature  = forecast['temperature']
           end
         end
 
         def to_json
           {
             time:         time,
-            latitude:     position[1],
-            longitude:    position[0],
+            latitude:     latitude,
+            longitude:    longitude,
             wind_speed:   wind_speed,
             wind_bearing: wind_bearing,
             humidity:     humidity,

data/lib/forecast_io/cache/generate.rb

@@ -9,7 +9,7 @@ module Forecast
           new(lat, lon, time, cache).forecasts.first
         end
 
-        def initialize lat, lon, time, cache, api = ::Forecast::IO
+        def initialize lat, lon, time, cache, api = ::ForecastIO
           @lat, @lon, @time, @cache, @api = lat, lon, time, cache, api
         end
 

data/lib/forecast_io/cache/store.rb

@@ -1,4 +1,4 @@
-require 'mongo_adaptor'
+require 'pg_adaptor'
 require 'forecast_io/cache/forecast_data'
 
 module Forecast
@@ -8,19 +8,23 @@ module Forecast
 
         def initialize config = Cache.configuration
           @config = config
-          @backend = MongoAdaptor.new('forecasts',ForecastData)
+          @backend = PGAdaptor.new('forecasts', ForecastData)
         end
 
         def fetch lat, lon, time
-          @backend.fetch 'position' => { '$near' => [lon,lat], '$maxDistance' => radius },
-                         'time' => { '$lt' => time+offset, '$gt' => time-offset }
-        rescue Mongo::OperationFailure => error
-          if index_error? error
-            ensure_index!
-            retry
-          else
-            raise
-          end
+          @backend.fetch Sequel.lit(<<-SQL),
+            time >= :start AND time <= :end AND earth_box(
+              ll_to_earth(:lat, :lon), :radius
+            ) @> ll_to_earth(
+              latitude,
+              longitude
+            )
+            SQL
+            start: time - offset,
+            end: time + offset,
+            lat: lat,
+            lon: lon,
+            radius: radius
         end
 
         def store forecast
@@ -28,22 +32,17 @@ module Forecast
           forecast
         end
 
-        private
-          def radius
-            @config.radius * (1/111.694)
-          end
+      private
 
-          def offset
-            @config.timeframe*60
-          end
+        def radius
+          # nm to m
+          @config.radius * 1852
+        end
 
-          def index_error? error
-            error.message =~ /can't find any special indices/ || error.message =~ /unable to find index/
-          end
+        def offset
+          @config.timeframe * 60
+        end
 
-          def ensure_index!
-            MongoAdaptor.db.collection('forecasts').ensure_index position: Mongo::GEO2D
-          end
       end
     end
   end

data/lib/forecast_io/cache/version.rb

@@ -1,7 +1,7 @@
 module Forecast
   module IO
     module Cache
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
     end
   end
 end

data/spec/forecast_io/cache/configuration_spec.rb

@@ -22,9 +22,11 @@ describe 'service configuration' do
     expect(config.timeframe).to eq 12
   end
 
-  it 'loads mongo config urls' do
-    expect(Mongo::Configure).to receive(:from_uri).with 'mongodb://example.com'
-    config.mongo_uri 'mongodb://example.com'
+  it 'loads db from db_uri' do
+    config.db_uri = 'postgres://localhost/forecast-test'
+    expect(config.db).to be_a Sequel::Database
+    expect(config.db.opts[:database]).to eq 'forecast-test'
+    expect(PGAdaptor.db).to eq config.db
   end
 
 end

data/spec/forecast_io/cache/forecast_data_spec.rb

@@ -24,7 +24,8 @@ describe 'representing data from the api' do
     expect(forecast.time).to eq time
   end
   it "exposes position" do
-    expect(forecast.position).to eq [-1.2, 1.1]
+    expect(forecast.latitude).to eq 1.1
+    expect(forecast.longitude).to eq -1.2
   end
   it "exposes wind_speed" do
     expect(forecast.wind_speed).to eq wind_speed

data/spec/forecast_io/cache/store_spec.rb

@@ -1,14 +1,14 @@
-require 'support/mongo'
+require 'support/pg'
 require 'forecast_io/cache/store'
 
-describe database: true do
+RSpec.describe 'Forecast::IO::Cache::Store', database: true do
   let(:config) { double radius: 1, timeframe: 3 }
   let(:store)  { Forecast::IO::Cache::Store.new config }
   let(:data)   { Forecast::IO::Cache::ForecastData }
 
   describe 'retrieving forecasts from the store' do
-    let(:forecast_1) { data.new [151.23775,-33.858264], 1 }
-    let(:forecast_2) { data.new [151.23675,-33.858664], 3 }
+    let(:forecast_1) { data.new -33.858264, 151.23775, 1, 0, 0, 0, 0, 0, 0 }
+    let(:forecast_2) { data.new -33.858664, 151.23675, 3, 0, 0, 0, 0, 0, 0 }
 
     before do
       store.store forecast_1
@@ -27,11 +27,10 @@ describe database: true do
   end
 
   describe 'inserting forecasts into the store' do
-    let(:forecast) { data.new [151.23775,-33.858264], 1 }
+    let(:forecast) { data.new 151.23775, -33.858264, 1, 0, 0, 0, 0, 0, 0 }
 
     it 'returns the forecast' do
       expect(store.store forecast).to eq forecast
     end
   end
-
 end

data/spec/support/pg.rb

@@ -0,0 +1,13 @@
+require 'pg_adaptor'
+PGAdaptor.db = Sequel.connect 'postgres://localhost/forecast-test'
+
+RSpec.configure do |config|
+
+  config.after :example, database: true do
+    PGAdaptor.db.tables.each do |table|
+      next if table == :schema_migrations
+      PGAdaptor.db.execute "TRUNCATE #{table};"
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forecast_io-cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forecast_io
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo_adaptor
+  name: pg_adaptor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,48 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Caching layer for forecast_io
 email:
 - hello@jonrowe.co.uk
@@ -199,8 +157,8 @@ files:
 - features/support/env.rb
 - features/support/expect.rb
 - features/support/fixtures.rb
-- features/support/mongo.rb
 - features/support/parse.rb
+- features/support/pg.rb
 - features/support/time.rb
 - features/support/vcr.rb
 - forecast_io-cache.gemspec
@@ -219,7 +177,7 @@ files:
 - spec/forecast_io/cache/generate_spec.rb
 - spec/forecast_io/cache/store_spec.rb
 - spec/forecast_io/cache_spec.rb
-- spec/support/mongo.rb
+- spec/support/pg.rb
 homepage: https://github.com/Tacktical/forecast_io-cache
 licenses:
 - MIT
@@ -257,8 +215,8 @@ test_files:
 - features/support/env.rb
 - features/support/expect.rb
 - features/support/fixtures.rb
-- features/support/mongo.rb
 - features/support/parse.rb
+- features/support/pg.rb
 - features/support/time.rb
 - features/support/vcr.rb
 - spec/forecast_io/cache/configuration_spec.rb
@@ -267,4 +225,4 @@ test_files:
 - spec/forecast_io/cache/generate_spec.rb
 - spec/forecast_io/cache/store_spec.rb
 - spec/forecast_io/cache_spec.rb
-- spec/support/mongo.rb
+- spec/support/pg.rb

data/features/support/mongo.rb

@@ -1,5 +0,0 @@
-require 'mongo-configure'
-
-After do
-  Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:remove
-end

data/spec/support/mongo.rb

@@ -1,11 +0,0 @@
-require 'mongo-configure'
-
-Mongo::Configure.from_database 'forecast-test-spec'
-
-RSpec.configure do |config|
-
-  config.after :each, database: true do
-    Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:remove
-  end
-
-end