sandy 0.0.5 → 0.0.6

data/lib/sandy/providers/lipa/report.rb

@@ -1,15 +1,21 @@
+require 'tzinfo'
 module Sandy::Provider
   module LIPA
     class Report
-      attr_reader :regions, :neighborhoods
+      include Sandy::Provider::StormCenter
+      attr_reader :areas
 
       def initialize
         raw_report = HTTParty.get(lipa_url, format: :xml)
         area_hash = raw_report.fetch("root").fetch("curr_custs_aff")["areas"]["area"]["areas"].first[1]
-        @regions = regions_from_report(area_hash)
-        @neighborhoods = neighborhoods_from_report(area_hash)
+        
+        @areas = recursive_fetch_areas(
+          area_hash, 
+          ->(area) { area.fetch("areas", {}).fetch("area", nil) } 
+        )
+
       rescue
-        raise LoadError, "ConEd reponse was not recognizable."
+        raise LoadError, "LIPA response was not recognizable."
       end
       
       private
@@ -17,47 +23,16 @@ module Sandy::Provider
       def lipa_url
         base_uri = "http://stormcenter.lipower.org"
 
-        #FIXME: verify timezone is in NYC zone
-        time = Time.now.to_i
+        tz = TZInfo::Timezone.get('America/New_York')
+        time = tz.now.to_i
         directory_url = "#{base_uri}/data/interval_generation_data/metadata.xml?timestamp=#{time}"
         response = HTTParty.get(directory_url, format: :xml)
         directory = response.parsed_response.fetch("root").fetch("directory")
         "#{base_uri}/data/interval_generation_data/#{directory}/data.xml?timestamp=#{time}"
       end
 
-      def regions_from_report(areas)
-        areas.collect do |area|
-          Sandy::Area.new(area.fetch("custs_out"), area.fetch("area_name"),
-                          { estimated_recovery_time: area["etr"],
-                            total_customers: area["total_custs"] })
-
-        end
-      end
-
-      def neighborhoods_from_report(areas_hash)
-        neighborhoods = []
-        areas_hash.each do |region|
-          region["areas"].each do |sub_region|
-            sub_sub_regions = sub_region[1]
-            sub_sub_regions.each do |sub_sub_region|
-              begin
-                hoods = sub_sub_region["areas"]["area"]
-              rescue
-                # FIXME: raise warning if any region is empty
-                next
-              end
-              hoods.each do |hood|
-                total = hood.fetch("total_custs").to_i
-                affected = hood.fetch("custs_out").to_i
-                name = hood.fetch("area_name")
-                region = sub_sub_region.fetch("area_name")
-
-                neighborhoods << Sandy::Area.new(affected, name, { region: region, total_customers: total})
-              end
-            end
-          end
-        end
-        neighborhoods
+      def path
+        File.dirname(__FILE__)
       end
     end
   end

data/lib/sandy/providers/lipa.rb

@@ -1,3 +1,4 @@
+require "sandy/providers/storm_center"
 require "sandy/providers/lipa/report"
 require "sandy/area"
 require "httparty"

data/lib/sandy/providers/pseg/gps_data.yml

@@ -0,0 +1,43 @@
+---
+bergen:
+  :latitude: '40.9262762'
+  :longitude: '-74.07701'
+burlington:
+  :latitude: '40.0647377'
+  :longitude: '-74.8409196'
+camden:
+  :latitude: '39.9259463'
+  :longitude: '-75.1196199'
+essex:
+  :latitude: '40.7947466'
+  :longitude: '-74.2648829'
+gloucester:
+  :latitude: '39.8025'
+  :longitude: '-75.0447222'
+hudson:
+  :latitude: '40.7453199'
+  :longitude: '-74.0535126'
+hunterdon:
+  :latitude: '40.5669515'
+  :longitude: '-74.9208772'
+mercer:
+  :latitude: '40.3028533'
+  :longitude: '-74.7337069'
+middlesex:
+  :latitude: '40.572603'
+  :longitude: '-74.4926541'
+monmouth:
+  :latitude: '40.2589455'
+  :longitude: '-74.123996'
+morris:
+  :latitude: '40.8336038'
+  :longitude: '-74.5463282'
+passaic:
+  :latitude: '40.8567662'
+  :longitude: '-74.1284764'
+somerset:
+  :latitude: '40.5292099'
+  :longitude: '-74.6400432'
+union:
+  :latitude: '40.6975898'
+  :longitude: '-74.2631635'

data/lib/sandy/providers/pseg/report.rb

@@ -0,0 +1,54 @@
+require 'xml'
+
+module Sandy::Provider
+  module PSEG
+    class Report
+      include Sandy::Provider::CoordinateCache
+
+      attr_reader :areas
+
+      def initialize
+        parser = XML::Parser.new
+        parser.string = HTTParty.get(pseg_url).to_s
+        raw_report = parser.parse
+
+        @areas = parse raw_report
+        
+      rescue
+        raise LoadError, "PSEG response was not recognizable."
+      end
+
+      private 
+
+      def parse raw_report
+        arr = []
+        raw_report.find('//ms:polygon').each do |p|
+          begin
+            name = p.find_first('ms:county').content.to_s
+            customers_affected = p.find_first('ms:outage').content.to_s
+
+            latitude, longitude = cached_coordinates_for name.downcase
+
+            options = {
+              :latitude => latitude,
+              :longitude => longitude
+            }
+            arr << Sandy::Area.new(customers_affected, name, options)
+          rescue
+            # FIXME: raise warning if any region is empty.
+            next
+          end
+        end
+        arr
+      end
+
+      def pseg_url
+        'http://www.pseg.com/outagemap/Customer%20Outage%20Application/Web%20Pages/GML/State.gml'
+      end
+
+      def path
+        File.dirname(__FILE__)
+      end
+    end
+  end
+end

data/lib/sandy/providers/pseg.rb

@@ -0,0 +1,9 @@
+require "sandy/providers/pseg/report"
+require "sandy/area"
+require "httparty"
+require "json"
+
+module Sandy::Provider
+  module PSEG
+  end
+end

data/lib/sandy/providers/storm_center.rb

@@ -0,0 +1,39 @@
+module Sandy::Provider
+  module StormCenter
+    include Sandy::Provider::CoordinateCache
+ 
+    def recursive_fetch_areas report_areas, sub_select_func, parent=nil
+      if report_areas
+        arr = []
+          report_areas.each do |report_area|
+            begin
+
+              latitude, longitude = cached_coordinates_for(report_area['area_name'].downcase)
+
+              options = {
+                parent: parent,
+                total_customers: report_area.fetch("total_custs", 0).to_i,
+                estimated_recovery_time: report_area.fetch("etr", nil),
+                latitude: latitude,
+                longitude: longitude,
+                children: recursive_fetch_areas(sub_select_func.call(report_area), sub_select_func, report_area)
+              }
+
+              arr.push Sandy::Area.new(report_area.fetch("custs_out", 0).to_i, sanitize_name(report_area.fetch("area_name", nil)), options)
+            rescue
+              # FIXME: raise warning if any region is empty.
+              next
+            end
+          end
+        arr
+      else
+        []
+      end
+    end
+
+    def sanitize_name str
+      str.split(' ').map {|w| w.downcase.capitalize }.join(' ')
+    end
+
+  end
+end

data/lib/sandy/version.rb

@@ -1,3 +1,3 @@
 module Sandy
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/sandy.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("httparty", "~> 0.9.0")
-  gem.add_development_dependency("rake")                                                                
+  gem.add_dependency("tzinfo", "~> 0.3.35")
+  gem.add_dependency("libxml-ruby", "~> 2.3.3")
+  
+  gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec", "~> 2.11.0")
   gem.add_development_dependency("webmock", "~> 1.8.11")
   gem.add_development_dependency("vcr", "~> 2.3.0")

data/spec/area_spec.rb

@@ -9,6 +9,26 @@ describe Sandy::Area do
     it { should == customers_affected }
   end
 
+  describe "#to_s" do
+    subject { Sandy::Area.new(customers_affected, "Manhattan").to_s }
+    it { should == "Manhattan" }
+  end
+
+  describe "#to_json" do
+    let(:parent) { Sandy::Area.new(0, "Manhattan") }
+    subject { Sandy::Area.new(customers_affected, 
+                              nil, { parent: parent }).to_json }
+
+    it { should == {"name" => nil, 
+                    "customers_affected" => customers_affected,
+                    "parent" => parent.name,
+                    "total_customers" => nil,
+                    "latitude" => nil,
+                    "longitude" => nil, 
+                    "estimated_recovery_time" => nil,
+                    "children" => [] }.to_json }
+  end
+  
   context "with an area name" do
     let(:area_name) { "Battery Park" }
     describe "#name" do
@@ -19,7 +39,7 @@ describe Sandy::Area do
 
   context "with a region name" do
     describe "#parent_region" do
-      subject { Sandy::Area.new(customers_affected, nil, { region: "Manhattan" }).region }
+      subject { Sandy::Area.new(customers_affected, nil, { parent: "Manhattan" }).parent }
       it { should == "Manhattan" }
     end
   end

data/spec/providers/coned/report_spec.rb

@@ -5,19 +5,19 @@ describe Sandy::Provider::ConEd::Report do
     context "with an empty response" do
       before { HTTParty.stub(:get).and_return("") }
       it "raises an informative error" do
-        expect { Sandy::Provider::ConEd::Report.new }.to raise_error(LoadError, "ConEd reponse was not recognizable.")
+        expect { Sandy::Provider::ConEd::Report.new }.to raise_error(LoadError, "ConEd response was not recognizable.")
       end
     end
   end
 
-  describe "#regions" do
-    subject { Sandy::Provider::ConEd::Report.new.regions }
-    it { should be_an_instance_of Array }
-    it { should_not be_empty }
+  describe "#to_json" do
+    it 'has an array of areas' do
+      Sandy::Provider::ConEd::Report.new.to_json["areas"].should be_an_instance_of Array
+    end
   end
 
-  describe "#neighborhoods" do
-    subject { Sandy::Provider::ConEd::Report.new.neighborhoods }
+  describe "#areas" do
+    subject { Sandy::Provider::ConEd::Report.new.areas }
     it { should be_an_instance_of Array }
     it { should_not be_empty }
   end

data/spec/providers/lipa/report_spec.rb

@@ -5,19 +5,13 @@ describe Sandy::Provider::LIPA::Report do
     context "with an empty response" do
       before { HTTParty.stub(:get).and_return("") }
       it "raises an informative error" do
-        expect { Sandy::Provider::LIPA::Report.new }.to raise_error(LoadError, "ConEd reponse was not recognizable.")
+        expect { Sandy::Provider::LIPA::Report.new }.to raise_error(LoadError, "LIPA response was not recognizable.")
       end
     end
   end
 
-  describe "#regions" do
-    subject { Sandy::Provider::LIPA::Report.new.regions }
-    it { should be_an_instance_of Array }
-    it { should_not be_empty }
-  end
-
-  describe "#neighborhoods" do
-    subject { Sandy::Provider::LIPA::Report.new.neighborhoods }
+  describe "#areas" do
+    subject { Sandy::Provider::LIPA::Report.new.areas }
     it { should be_an_instance_of Array }
     it { should_not be_empty }
   end

data/spec/providers/pseg/pseg_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe Sandy::Provider::PSEG::Report do
+  describe ".initialize" do
+    context "with an empty response" do
+      before { HTTParty.stub(:get).and_return("") }
+      it "raises an informative error" do
+        expect { Sandy::Provider::PSEG::Report.new }.to raise_error(LoadError, "PSEG response was not recognizable.")
+      end
+    end
+  end
+
+  describe "#areas" do
+    subject { Sandy::Provider::PSEG::Report.new.areas }
+    it { should be_an_instance_of Array }
+    it { should_not be_empty }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -27,6 +27,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.35
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.35
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +141,22 @@ files:
 - lib/sandy/area.rb
 - lib/sandy/provider.rb
 - lib/sandy/providers/coned.rb
+- lib/sandy/providers/coned/gps_data.yml
 - lib/sandy/providers/coned/report.rb
+- lib/sandy/providers/coordinate_cache.rb
 - lib/sandy/providers/lipa.rb
+- lib/sandy/providers/lipa/gps_data.yml
 - lib/sandy/providers/lipa/report.rb
+- lib/sandy/providers/pseg.rb
+- lib/sandy/providers/pseg/gps_data.yml
+- lib/sandy/providers/pseg/report.rb
+- lib/sandy/providers/storm_center.rb
 - lib/sandy/version.rb
 - sandy.gemspec
 - spec/area_spec.rb
 - spec/providers/coned/report_spec.rb
 - spec/providers/lipa/report_spec.rb
+- spec/providers/pseg/pseg_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.github.com/ckundo/sandy
 licenses: []
@@ -138,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Power outage data for ConEd in NYC
@@ -146,5 +186,6 @@ test_files:
 - spec/area_spec.rb
 - spec/providers/coned/report_spec.rb
 - spec/providers/lipa/report_spec.rb
+- spec/providers/pseg/pseg_spec.rb
 - spec/spec_helper.rb
 has_rdoc: