sandy 0.0.6 → 0.0.7

data/lib/sandy/area.rb

@@ -31,7 +31,7 @@ module Sandy
        "total_customers" => @total_customers,
        "latitude" => @latitude,
        "longitude" => @longitude, 
-       "estimated_recovery_time" => @longitude,
+       "estimated_recovery_time" => @estimated_recovery_time,
        "children" => @children }.to_json
     end
   end

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

@@ -18,8 +18,7 @@ module Sandy::Provider
       end
 
       def to_json(*a)
-        hash = {}
-        { "areas" => @areas.map(&:to_json) }
+        { "report" => { "areas" => @areas } }.to_json
       end
 
       private

data/lib/sandy/version.rb

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

data/spec/area_spec.rb

@@ -16,17 +16,25 @@ describe Sandy::Area do
 
   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 }
+    let(:current) { Sandy::Area.new(customers_affected, "Downtown", 
+                                 { parent: parent }) }
+    let(:child) { Sandy::Area.new(0, "Battery Park", { parent: current }) }
+    let(:json) { current.to_json }
+
+    it "parses with the correct values" do
+      JSON.parse(json).should == {"name" => "Downtown", 
+                                  "customers_affected" => customers_affected,
+                                  "parent" => "Manhattan",
+                                  "total_customers" => nil,
+                                  "latitude" => nil,
+                                  "longitude" => nil, 
+                                  "estimated_recovery_time" => nil,
+                                  "children" => [] }
+    end
+
+    it "renders only the name for the parent field" do
+      JSON.parse(json)["parent"].should == "Manhattan"
+    end
   end
   
   context "with an area name" do

data/spec/providers/coned/report_spec.rb

@@ -11,8 +11,10 @@ describe Sandy::Provider::ConEd::Report do
   end
 
   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
+    subject {}
+    it 'has areas' do
+      json = JSON.parse(Sandy::Provider::ConEd::Report.new.to_json)
+      json["report"]["areas"].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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty