smartermeter 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.2 (March 29, 2011)
+* Added support for Brighter Planet's Electricity API.
+* Fixed encryption of passwords that had lengths other than multiples of
+  8.
+* Added more extensive documentation of the library.
+
 ## 0.3.1 (March 15th, 2011)
 * Changed name from "Smartermeter" to "SmarterMeter"
 * Updated the .detect\_charset monkeypatch for the newer mechanize

data/Gemfile

@@ -2,5 +2,6 @@ source :rubygems
 gemspec
 
 # Used only in the Java client, which isn't distributed as a gem
-gem "profligacy"
-gem "jruby-openssl"
+gem "nokogiri", ">= 1.4.4", :platforms => :jruby
+gem "profligacy", :platforms => :jruby
+gem "jruby-openssl", :platforms => :jruby

data/README.md

@@ -15,6 +15,25 @@ Getting Started
     gem install smartermeter
     smartermeter
 
+Manipulating the data
+---------------------
+
+After you've successfully downloaded one set of data, you should be able
+to manipulate it using ruby like so:
+
+    require 'rubygems'
+    require 'smartermeter'
+
+    config = YAML.load_file(File.expand_path("~/.smartermeter"))
+    csv_file = Dir.glob(File.join(config[:data_dir], "*.csv")).last
+
+    samples = SmarterMeter::Samples.parse_csv(csv_file)
+    kwh_used = samples.total_kwh
+    api = SmarterMeter::Services::BrighterPlanet.new
+    puts api.calculate_kg_carbon(kwh_used)
+
+For futher information see the [API docs][rdoc]
+
 Google PowerMeter
 -----------------
 
@@ -44,7 +63,7 @@ In order to build the self contained binaries, you'll need Java 1.6 and
     apt-get install nsis sun-java6-jre
     git clone git://github.com/mcolyer/smartermeter.git
     cd smartermeter
-    bundle install --path vendor/gems --without test
+    bundle install --path vendor/gems
     rake package
 
 The installer will be generated in pkg/
@@ -76,3 +95,4 @@ part of their [Fellowship Program][3]
 [1]: http://nsis.sourceforge.net/
 [2]: http://brighterplanet.com/
 [3]: http://brighterplanet.github.com/fellowship.html
+[rdoc]: http://rdoc.info/github/mcolyer/smartermeter/master/frames

data/Rakefile

@@ -48,7 +48,7 @@ task :default => :test
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'specs/**/*_spec.rb'
+  test.pattern = 'spec/**/*_spec.rb'
   test.verbose = true
 end
 
@@ -122,6 +122,10 @@ task :package_gems do
   specifications.reject! { |s| s.include? "rspec" }
   specifications.reject! { |s| s.include? "minitar" }
   specifications.reject! { |s| s.include? "ruby-debug" }
+  specifications.reject! { |s| s.include? "addressable" }
+  specifications.reject! { |s| s.include? "diff-lcs" }
+  specifications.reject! { |s| s.include? "vcr" }
+  specifications.reject! { |s| s.include? "webmock" }
   dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "specifications")
   FileUtils.rm_rf(dest_dir)
   FileUtils.mkdir_p(dest_dir)
@@ -131,6 +135,10 @@ task :package_gems do
   gems.reject! { |s| s.include? "rspec" }
   gems.reject! { |s| s.include? "minitar" }
   gems.reject! { |s| s.include? "ruby-debug" }
+  gems.reject! { |s| s.include? "addressable" }
+  gems.reject! { |s| s.include? "diff-lcs" }
+  gems.reject! { |s| s.include? "vcr" }
+  gems.reject! { |s| s.include? "webmock" }
   dest_dir = File.join(File.dirname(__FILE__), "pkg", "base", "gems", "gems")
   FileUtils.rm_rf(dest_dir)
   FileUtils.mkdir_p(dest_dir)

data/lib/smartermeter/daemon.rb

@@ -4,6 +4,7 @@ require 'yaml'
 require 'date'
 
 module SmarterMeter
+  # @private
   class Daemon
 
     def initialize(interface)
@@ -63,6 +64,8 @@ module SmarterMeter
 
     # Takes the unencrypted password and encrypts it.
     def password=(unencrypted)
+      padding_length = 8 - (unencrypted.bytesize % 8)
+      unencrypted = unencrypted + ("\0" * padding_length)
       @config[:password] = cipher.encrypt_block(unencrypted)
     end
 
@@ -70,7 +73,7 @@ module SmarterMeter
     def password
       password = @config.fetch(:password, nil)
       if password
-        cipher.decrypt_block(password)
+        cipher.decrypt_block(password).gsub("\0", "")
       else
         password
       end
@@ -180,7 +183,7 @@ module SmarterMeter
           next if data.empty?
 
           @ui.log.info("Verifying #{date}")
-          samples = Sample.parse_csv(data).values.first
+          samples = Samples.parse_csv(data).values.first
           first_sample = samples.first
 
           if first_sample.kwh
@@ -207,7 +210,7 @@ module SmarterMeter
       case @config[:transport]
       when :google_powermeter
         @ui.log.info("Uploading #{date} to Google PowerMeter")
-        transport = SmarterMeter::Transports::GooglePowerMeter.new(@config[:google_powermeter])
+        transport = SmarterMeter::Services::GooglePowerMeter.new(@config[:google_powermeter])
         if transport.upload(samples)
           @ui.log.info("Upload for #{date} complete")
         else

data/lib/smartermeter/interfaces/swing.rb

@@ -3,6 +3,7 @@ require 'profligacy/swing'
 require 'profligacy/lel'
 
 module SmarterMeter
+  # @private
   module Interfaces
     class Swing
       include_package "java.awt"
@@ -147,6 +148,7 @@ module SmarterMeter
       end
     end
 
+    # @private
     class Wizard
       include_package "javax.swing"
       include_package "java.awt"

data/lib/smartermeter/sample.rb

@@ -2,67 +2,40 @@ require 'date'
 require 'time'
 
 module SmarterMeter
+  # Represents a single hourly sample taken from the PG&E hourly electricity
+  # data. It's the most basic data unit of SmarterMeter.
   class Sample
     attr_accessor :time, :kwh
 
-    # Parses the CSV returned by PG&E
+    # Creates a new Sample.
     #
-    # data - The string containing the CSV returned by PG&E
-    #
-    # Returns a Hash of with keys as Date objects and values of Arrays of samples.
-    def self.parse_csv(data)
-      samples = {}
-      date_re = /([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})/
-
-      # Apparently they felt the need to put a = outside of the correct place
-      data = data.gsub('=','')
-
-      hour_increment = 60*60
-      CSV.parse(data) do |row|
-        next unless row.length > 0 and date_re.match row[0]
-
-        month, day, year = date_re.match(row[0]).captures
-        month = month.to_i
-        day = day.to_i
-        year = year.to_i
-
-        timestamp = Time.local(year, month, day, 0) - hour_increment
-        next if row[1].include? "$"
-        hourly_samples = row[1..24].map do |v|
-          if v == "-"
-            kwh = nil
-          else
-            kwh = v.to_f
-          end
-
-          timestamp = timestamp + hour_increment
-          Sample.new(timestamp, kwh)
-        end
-        samples[Date.new(year, month, day)] = hourly_samples
-      end
-      samples
-    end
-
+    # @param [Time] time the start of the sample period.
+    # @param [Float] kwh the number of killowatt hours used during the period of this sample.
+    # @return [Sample] the new Sample.
     def initialize(time, kwh)
       @time = time
       @kwh = kwh
     end
 
-    # Public: The start time of this measurement
+    # The start time of this measurement in UTC.
     #
-    # Returns the time in the format of 2011-01-06T09:00:00.000Z
+    # @return [String] the time in the format of 2011-01-06T09:00:00.000Z
     def utc_start_time
       @time.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
     end
 
-    # Public: The stop time of this measurement, it's assumed to be 1 hour after
-    # the start.
+    # The stop time of this measurement in UTC. It's assumed to be 1 hour after
+    # the start as that is the current resolution of PG&E's data.
     #
-    # Returns the time in the format of 2011-01-06T09:00:00.000Z
+    # @return [String] the time in the format of 2011-01-06T09:00:00.000Z
     def utc_stop_time
-      (@time + 60*60).utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
+      one_hour = 60*60
+      (@time + one_hour).utc.strftime("%Y-%m-%dT%H:%M:%S.000Z")
     end
 
+    # Interrogates the current state of the Sample.
+    #
+    # Returns [String] a compact representation of the Sample.
     def inspect
       "<Sample #{@time} #{@kwh}>"
     end

data/lib/smartermeter/samples.rb

@@ -0,0 +1,65 @@
+require 'date'
+require 'time'
+
+module SmarterMeter
+  # Represents a collection of samples. In some cases it's useful to operate on
+  # groups of samples and this class provides that functionality.
+  class Samples < Hash
+    # Parses the CSV returned by PG&E and creates a Samples collection.
+    #
+    # @param [String] data the string containing the CSV returned by PG&E
+    # @return [Samples] creates a Samples collection from the given data.
+    def self.parse_csv(data)
+      samples = Samples.new
+      date_re = /([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{4})/
+
+      # Apparently they felt the need to put a = outside of the correct place
+      data = data.gsub('=','')
+
+      hour_increment = 60*60
+      CSV.parse(data) do |row|
+        next unless row.length > 0 and date_re.match row[0]
+
+        month, day, year = date_re.match(row[0]).captures
+        month = month.to_i
+        day = day.to_i
+        year = year.to_i
+
+        timestamp = Time.local(year, month, day, 0) - hour_increment
+        next if row[1].include? "$"
+        hourly_samples = row[1..24].map do |v|
+          if v == "-"
+            kwh = nil
+          else
+            kwh = v.to_f
+          end
+
+          timestamp = timestamp + hour_increment
+          Sample.new(timestamp, kwh)
+        end
+        samples[Date.new(year, month, day)] = hourly_samples
+      end
+      samples
+    end
+
+    # Calculates the total number of kilowatt hours for all samples.
+    #
+    # @return [Float] the sum of kilowatt hours for all samples within this collection. If no samples are found 0 is  returned.
+    def total_kwh
+      self.keys.reduce(0) { |sum, d| sum + total_kwh_on(d) }
+    end
+
+    # Calculates the total number of kilowatt hours
+    #
+    # @param [Date] date The date of the samples to include within the total.
+    #
+    # @return [Float] the sum of kilowatt hours for samples made of the given day. If none are found 0 is returned.
+    def total_kwh_on(date)
+      if self[date]
+        self[date].reduce(0) { |sum, s| sum + (s.kwh or 0) }
+      else
+        0
+      end
+    end
+  end
+end

data/lib/smartermeter/service.rb

@@ -2,12 +2,21 @@ require 'mechanize'
 require 'csv'
 
 module SmarterMeter
+  # Provides access to the PG&E SmartMeter data through a ruby interface. This
+  # class depends on the PG&E website to function the same that it does today,
+  # so if something stops working its likely that something changed on PG&E's
+  # site and this class will need to be adapted.
   class Service
     LOGIN_URL = "http://www.pge.com/myhome/"
     OVERVIEW_URL = "https://www.pge.com/csol/actions/login.do?aw"
     ENERGYGUIDE_AUTH_URL = "https://www.energyguide.com/LoadAnalysis/LoadAnalysis.aspx?Referrerid=154"
 
+    # Provides access to the last page retrieved by mechanize. Useful for
+    # debugging and reporting errors.
     attr_reader :last_page
+
+    # Provides access to the last exception thrown while accessing PG&E's site.
+    # Useful for debugging/error reporting.
     attr_reader :last_exception
 
     def initialize
@@ -16,7 +25,10 @@ module SmarterMeter
       }
     end
 
-    # Returns true upon succesful login and false otherwise
+    # Authenticates to the PG&E's website. Only needs to be performed once per
+    # instance of this class.
+    #
+    # @return [Boolean] true upon succesful login and false otherwise
     def login(username, password)
       begin
         @agent.get(LOGIN_URL) do |page|
@@ -61,6 +73,15 @@ module SmarterMeter
       end
     end
 
+    # Downloads a CSV containing hourly date on that date. Up to a week worth
+    # of other data will be included depending on which day of the week that
+    # you request.
+    #
+    # PG&E compiles this data on a weekly schedule so if you ask for Monday
+    # you'll get the previous Sunday and the following days upto the next
+    # Sunday.
+    #
+    # @return [String] the CSV data.
     def fetch_csv(date)
       raise RuntimeException, "login must be called before fetch_csv" unless @authenticated
 

data/lib/smartermeter/services/brighterplanet.rb

@@ -0,0 +1,59 @@
+require 'restclient'
+require 'json'
+require 'erb'
+
+module SmarterMeter
+  module Services
+    # Allows users to calculate the carbon produced by their energy usage by
+    # accessing the Brighter Planet CM1 Electricity API.
+    #
+    # More details can be found here:
+    # http://carbon.brighterplanet.com/models/electricity_use
+    #
+    # Example:
+    #   api = SmarterMeter::Services::BrighterPlanet.new
+    #   puts api.calculate_kg_carbon(10.1)
+    #
+    # Prints:
+    #   0.6460529833458619
+    #
+    class BrighterPlanet
+      # The api key required for commericial access to the API. For more detail see:
+      # http://carbon.brighterplanet.com/pricing
+      attr_accessor :api_key
+
+      # Initializes the Brigher Planet CM1 Electricity API.
+      #
+      # Example:
+      #
+      #   SmarterMeter::Services::BrighterPlanet.new do |c|
+      #     c.api_key = "key"
+      #   end
+      #
+      # @return [BrighterPlanet]
+      def initialize
+        yield self if block_given?
+      end
+
+      # Calculates the number of kilograms of carbon produced from the given
+      # electrical energy usage.
+      #
+      # Note: this is an estimate and depends on many factors, to improve
+      # accuracy include an optional zipcode of where this energy was consumed.
+      #
+      # @param [Float] kwh the number of kilowatt hours consumed.
+      # @params [Hash] opts can include `:zip_code` and/or `:date` to increase the accuracy of the estimate. `:date` should be in the following form: YYYY-MM-DD.
+      # @return [Float] kilograms of carbon produced by this much energy.
+      def calculate_kg_carbon(kwh, opts={})
+        allowed_keys = [:zip_code, :date]
+        non_permitted_keys = opts.keys.reject { |k| allowed_keys.include? k }
+        raise ArgumentError, "opts contains keys not found in #{allowed_keys}" unless non_permitted_keys.empty?
+
+        params = {:energy => kwh}
+        params.merge!(opts)
+        response = RestClient.get 'http://carbon.brighterplanet.com/electricity_uses.json', :params => params
+        JSON.parse(response.body)["emission"]
+      end
+    end
+  end
+end

data/lib/smartermeter/{transports → services}/google_powermeter.rb

@@ -2,7 +2,7 @@ require 'net/https'
 require 'erb'
 
 module SmarterMeter
-  module Transports
+  module Services
     class GooglePowerMeter
       def initialize(config)
         @config = config

data/lib/smartermeter.rb

@@ -1,9 +1,11 @@
 require 'smartermeter/sample'
+require 'smartermeter/samples'
 require 'smartermeter/service'
 require 'smartermeter/daemon'
-require 'smartermeter/transports/google_powermeter'
+require 'smartermeter/services/google_powermeter'
+require 'smartermeter/services/brighterplanet'
 require 'smartermeter/interfaces/cli'
 
 module SmarterMeter
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/smartermeter.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'smartermeter'
-  s.version           = '0.3.1'
-  s.date              = '2011-03-15'
+  s.version           = '0.3.2'
+  s.date              = '2011-03-29'
   s.rubyforge_project = 'smartermeter'
 
   ## Make sure your summary is short. The description may be as long
@@ -49,11 +49,15 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('mechanize', ["= 1.0.0"])
-  s.add_dependency('crypt', ["= 1.1.4"])
+  s.add_dependency('crypt19', ["= 1.2.1"])
+  s.add_dependency('rest-client', ["= 1.6.1"])
+  s.add_dependency('json_pure', ["= 1.5.1"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rspec', ["~> 2.4.0"])
+  s.add_development_dependency('rspec', ["~> 2.5.0"])
+  s.add_development_dependency('vcr', ["~> 1.7.0"])
+  s.add_development_dependency('webmock', ["~> 1.6.2"])
   s.add_development_dependency('minitar', ["~> 0.5.2"])
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -79,21 +83,26 @@ Gem::Specification.new do |s|
     lib/smartermeter/interfaces/cli.rb
     lib/smartermeter/interfaces/swing.rb
     lib/smartermeter/sample.rb
+    lib/smartermeter/samples.rb
     lib/smartermeter/service.rb
-    lib/smartermeter/transports/cacert.pem
-    lib/smartermeter/transports/google_powermeter.erb
-    lib/smartermeter/transports/google_powermeter.rb
+    lib/smartermeter/services/brighterplanet.rb
+    lib/smartermeter/services/cacert.pem
+    lib/smartermeter/services/google_powermeter.erb
+    lib/smartermeter/services/google_powermeter.rb
     smartermeter.gemspec
-    specs/fixtures/data.csv
-    specs/fixtures/expected_google_request.xml
-    specs/sample_spec.rb
-    specs/service_spec.rb
-    specs/spec_helper.rb
-    specs/transports/google_powermeter_spec.rb
+    spec/fixtures/data.csv
+    spec/fixtures/expected_google_request.xml
+    spec/fixtures/vcr_cassettes/brighterplanet.yml
+    spec/sample_spec.rb
+    spec/samples_spec.rb
+    spec/service_spec.rb
+    spec/services/brighterplanet_spec.rb
+    spec/services/google_powermeter_spec.rb
+    spec/spec_helper.rb
   ]
   # = MANIFEST =
 
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^specs\/*_spec.rb/ }
+  s.test_files = s.files.select { |path| path =~ /^spec\/*_spec.rb/ }
 end

data/spec/fixtures/vcr_cassettes/brighterplanet.yml

@@ -0,0 +1,106 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://carbon.brighterplanet.com:80/electricity_uses.json?energy=1
+    body: 
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx/0.6.35
+      date: 
+      - Sat, 19 Mar 2011 18:49:12 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      transfer-encoding: 
+      - chunked
+      status: 
+      - 200 OK
+      etag: 
+      - "\"f8891da38901f85f0b33fdd539c84199\""
+      cache-control: 
+      - max-age=0, private, must-revalidate
+      x-ua-compatible: 
+      - IE=Edge,chrome=1
+      x-runtime: 
+      - "0.174617"
+    body: "{\"timeframe\":\"2011-01-01/2012-01-01\",\"emission\":0.6460529833458619,\"emission_units\":\"kilograms\",\"errors\":[],\"reports\":[{\"committee\":{\"name\":\"emission\",\"quorums\":[{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.6460529833458619,\"quorum\":{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"emission_factor\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.606076,\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"loss_factor\",\"quorums\":[{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.0618788,\"quorum\":{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_region\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_region\":{\"loss_factor\":0.0618788,\"name\":\"US\"}},\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_subregion\",\"quorums\":[{\"name\":\"from zip code\",\"requirements\":[\"zip_code\"],\"appreciates\":[],\"complies\":[]},{\"name\":\"default\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_subregion\":{\"abbreviation\":\"US\",\"egrid_region_name\":\"US\",\"electricity_ch4_emission_factor\":0.000309198,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.602982,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.606076,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00278485,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"United States\",\"nerc_abbreviation\":\"US\",\"net_generation\":4056440000.0,\"net_generation_units\":\"megawatt_hours\"}},\"quorum\":{\"name\":\"default\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"date\",\"quorums\":[{\"name\":\"from timeframe\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":\"2011-01-01\",\"quorum\":{\"name\":\"from timeframe\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}}],\"methodology\":\"http://carbon.brighterplanet.com/electricity_uses.html?energy=1&timeframe=2011-01-01%2F2012-01-01\",\"execution_id\":\"cd84d18a392c2782e8b0a114dd65a225184823a4be28aea4896d2d6c01d18dae959051b2a26b06b6\",\"compliance\":[],\"scope\":null,\"energy\":1.0,\"date\":\"2011-01-01\",\"egrid_subregion\":{\"egrid_subregion\":{\"abbreviation\":\"US\",\"egrid_region_name\":\"US\",\"electricity_ch4_emission_factor\":0.000309198,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.602982,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.606076,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00278485,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"United States\",\"nerc_abbreviation\":\"US\",\"net_generation\":4056440000.0,\"net_generation_units\":\"megawatt_hours\"}},\"egrid_region\":{\"egrid_region\":{\"loss_factor\":0.0618788,\"name\":\"US\"}},\"loss_factor\":0.0618788,\"emission_factor\":0.606076}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://carbon.brighterplanet.com:80/electricity_uses.json?energy=1&zip_code=94110
+    body: 
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx/0.6.35
+      date: 
+      - Sat, 19 Mar 2011 19:15:01 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      transfer-encoding: 
+      - chunked
+      status: 
+      - 200 OK
+      etag: 
+      - "\"91afe2c319e60d06dd3b10f60c90a15d\""
+      cache-control: 
+      - max-age=0, private, must-revalidate
+      x-ua-compatible: 
+      - IE=Edge,chrome=1
+      x-runtime: 
+      - "0.041468"
+    body: "{\"timeframe\":\"2011-01-01/2012-01-01\",\"emission\":0.3484751557886446,\"emission_units\":\"kilograms\",\"errors\":[],\"reports\":[{\"committee\":{\"name\":\"emission\",\"quorums\":[{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.3484751557886446,\"quorum\":{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"emission_factor\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.32989,\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"loss_factor\",\"quorums\":[{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.0533328,\"quorum\":{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_region\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_region\":{\"loss_factor\":0.0533328,\"name\":\"W\"}},\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_subregion\",\"quorums\":[{\"name\":\"from zip code\",\"requirements\":[\"zip_code\"],\"appreciates\":[],\"complies\":[]},{\"name\":\"default\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_subregion\":{\"abbreviation\":\"CAMX\",\"egrid_region_name\":\"W\",\"electricity_ch4_emission_factor\":0.000342876,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.328455,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.32989,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00109161,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"WECC California\",\"nerc_abbreviation\":\"WECC\",\"net_generation\":219612000.0,\"net_generation_units\":\"megawatt_hours\"}},\"quorum\":{\"name\":\"from zip code\",\"requirements\":[\"zip_code\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"date\",\"quorums\":[{\"name\":\"from timeframe\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":\"2011-01-01\",\"quorum\":{\"name\":\"from timeframe\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}}],\"methodology\":\"http://carbon.brighterplanet.com/electricity_uses.html?energy=1&timeframe=2011-01-01%2F2012-01-01&zip_code=94110\",\"execution_id\":\"863c7b45fcba5ba36bb2389f518b51be1665166db5f6a3c8d7ce3a3950c38d7e07d551fad2e7f4e7\",\"compliance\":[],\"scope\":null,\"energy\":1.0,\"zip_code\":{\"zip_code\":{\"climate_division_name\":\"CA4\",\"description\":\"San Francisco\",\"egrid_subregion_abbreviation\":\"CAMX\",\"latitude\":\"37.74873\",\"longitude\":\"-122.41545\",\"name\":\"94110\",\"state_postal_abbreviation\":\"CA\"}},\"date\":\"2011-01-01\",\"egrid_subregion\":{\"egrid_subregion\":{\"abbreviation\":\"CAMX\",\"egrid_region_name\":\"W\",\"electricity_ch4_emission_factor\":0.000342876,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.328455,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.32989,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00109161,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"WECC California\",\"nerc_abbreviation\":\"WECC\",\"net_generation\":219612000.0,\"net_generation_units\":\"megawatt_hours\"}},\"egrid_region\":{\"egrid_region\":{\"loss_factor\":0.0533328,\"name\":\"W\"}},\"loss_factor\":0.0533328,\"emission_factor\":0.32989}"
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://carbon.brighterplanet.com:80/electricity_uses.json?date=2011-03-29&energy=1
+    body: 
+    headers: 
+      accept: 
+      - "*/*; q=0.5, application/xml"
+      accept-encoding: 
+      - gzip, deflate
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx/0.6.35
+      date: 
+      - Tue, 29 Mar 2011 15:36:35 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      transfer-encoding: 
+      - chunked
+      status: 
+      - 200 OK
+      etag: 
+      - "\"642c6acc898b96f4017bc27c2f321ee4\""
+      cache-control: 
+      - max-age=0, private, must-revalidate
+      x-ua-compatible: 
+      - IE=Edge,chrome=1
+      x-runtime: 
+      - "0.026969"
+    body: "{\"timeframe\":\"2011-01-01/2012-01-01\",\"emission\":0.6460529833458619,\"emission_units\":\"kilograms\",\"errors\":[],\"reports\":[{\"committee\":{\"name\":\"emission\",\"quorums\":[{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.6460529833458619,\"quorum\":{\"name\":\"from date, emission factor, loss factor and energy\",\"requirements\":[\"date\",\"emission_factor\",\"loss_factor\",\"energy\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"emission_factor\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.606076,\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"loss_factor\",\"quorums\":[{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":0.0618788,\"quorum\":{\"name\":\"from eGRID region\",\"requirements\":[\"egrid_region\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_region\",\"quorums\":[{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_region\":{\"loss_factor\":0.0618788,\"name\":\"US\"}},\"quorum\":{\"name\":\"from eGRID subregion\",\"requirements\":[\"egrid_subregion\"],\"appreciates\":[],\"complies\":[]}},{\"committee\":{\"name\":\"egrid_subregion\",\"quorums\":[{\"name\":\"from zip code\",\"requirements\":[\"zip_code\"],\"appreciates\":[],\"complies\":[]},{\"name\":\"default\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}]},\"conclusion\":{\"egrid_subregion\":{\"abbreviation\":\"US\",\"egrid_region_name\":\"US\",\"electricity_ch4_emission_factor\":0.000309198,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.602982,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.606076,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00278485,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"United States\",\"nerc_abbreviation\":\"US\",\"net_generation\":4056440000.0,\"net_generation_units\":\"megawatt_hours\"}},\"quorum\":{\"name\":\"default\",\"requirements\":[],\"appreciates\":[],\"complies\":[]}}],\"methodology\":\"http://carbon.brighterplanet.com/electricity_uses.html?date=2011-03-29&energy=1&timeframe=2011-01-01%2F2012-01-01\",\"execution_id\":\"dec9aeca7a2b8750494fdd452337a4b6d8ca3649a7aebafce76d3976f91b0943e4669cf580a7a225\",\"compliance\":[],\"scope\":null,\"date\":\"2011-03-29\",\"energy\":1.0,\"egrid_subregion\":{\"egrid_subregion\":{\"abbreviation\":\"US\",\"egrid_region_name\":\"US\",\"electricity_ch4_emission_factor\":0.000309198,\"electricity_ch4_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_co2_biogenic_emission_factor\":0.0,\"electricity_co2_biogenic_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_co2_emission_factor\":0.602982,\"electricity_co2_emission_factor_units\":\"kilograms_per_kilowatt_hour\",\"electricity_emission_factor\":0.606076,\"electricity_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"electricity_n2o_emission_factor\":0.00278485,\"electricity_n2o_emission_factor_units\":\"kilograms_co2e_per_kilowatt_hour\",\"name\":\"United States\",\"nerc_abbreviation\":\"US\",\"net_generation\":4056440000.0,\"net_generation_units\":\"megawatt_hours\"}},\"egrid_region\":{\"egrid_region\":{\"loss_factor\":0.0618788,\"name\":\"US\"}},\"loss_factor\":0.0618788,\"emission_factor\":0.606076}"
+    http_version: "1.1"

data/spec/sample_spec.rb

@@ -0,0 +1,8 @@
+$:.unshift File.join(File.dirname(__FILE__))
+require 'spec_helper'
+
+describe SmarterMeter::Sample do
+  before(:all) do
+    @data = File.read(File.join($FIXTURES_DIR, 'data.csv'))
+  end
+end

data/spec/samples_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe SmarterMeter::Samples do
+  before(:all) do
+    @data = File.read(File.join($FIXTURES_DIR, 'data.csv'))
+    @date_present = Date.new(2009, 9, 27)
+  end
+
+  subject { SmarterMeter::Samples.parse_csv(@data) }
+
+  it "can calculate the total number of kilowatt hours used" do
+    subject.total_kwh.should be_within(0.1).of(43.72)
+  end
+
+  it "can calculate the total number of kilowatt hours used on a specific day" do
+    subject.total_kwh_on(Date.new(2009, 9, 27)).should be_within(0.1).of(16.65)
+  end
+
+  it "can calculate the total number of kilowatt hours used on a day not given" do
+    subject.total_kwh_on(Date.new(2010, 9, 27)).should == 0
+  end
+
+  it "can access samples for a given day" do
+    subject.length.should == 7
+    subject.keys.should include(@date_present)
+    subject[@date_present].length.should == 24
+    subject[@date_present].each{|s| s.should be_kind_of(SmarterMeter::Sample)}
+  end
+
+  it "can handle an incomplete sample" do
+    subject[@date_present][0].kwh.should == nil
+    subject[@date_present][0].time.should == Time.local(2009, 9, 27, 0)
+  end
+
+  it "can handle a complete sample" do
+    subject[@date_present][1].kwh.should == 0.205
+    subject[@date_present][1].time.should == Time.local(2009, 9, 27, 1)
+  end
+end

data/{specs → spec}/service_spec.rb

@@ -1,4 +1,3 @@
-$:.unshift File.join(File.dirname(__FILE__))
 require 'spec_helper'
 
 describe SmarterMeter::Service do

data/spec/services/brighterplanet_spec.rb

@@ -0,0 +1,26 @@
+$:.unshift File.join(File.dirname(__FILE__), "..")
+require 'spec_helper'
+
+describe SmarterMeter::Services::BrighterPlanet do
+  it "can determine kilograms of carbon produced from the number of killowatt hours" do
+    VCR.use_cassette('brighterplanet', :record => :new_episodes) do
+      subject.calculate_kg_carbon(1).should be_within(0.1).of(0.64)
+    end
+  end
+
+  it "can query for electricity from a specific zipcode" do
+    VCR.use_cassette('brighterplanet', :record => :new_episodes) do
+      subject.calculate_kg_carbon(1, :zip_code => "94110").should be_within(0.1).of(0.34)
+    end
+  end
+
+  it "can query for electricity on a specific date" do
+    VCR.use_cassette('brighterplanet', :record => :new_episodes) do
+      subject.calculate_kg_carbon(1, :date => "2011-03-29").should be_within(0.1).of(0.64)
+    end
+  end
+
+  it "doesn't allow electricity queries to include keys other than those specified" do
+    expect { subject.calculate_kg_carbon(1, :energy => 2) }.to raise_error(ArgumentError)
+  end
+end

data/{specs/transports → spec/services}/google_powermeter_spec.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__), "..")
 require 'spec_helper'
 
-describe SmarterMeter::Transports::GooglePowerMeter do
+describe SmarterMeter::Services::GooglePowerMeter do
   before(:each) do
-    @subject = SmarterMeter::Transports::GooglePowerMeter.new(:token => "secret",
-                                                              :variable => "/path")
+    @subject = SmarterMeter::Services::GooglePowerMeter.new(:token => "secret",
+                                                            :variable => "/path")
     data = File.read(File.join($FIXTURES_DIR, 'data.csv'))
-    @results = SmarterMeter::Sample.parse_csv(data)
+    @results = SmarterMeter::Samples.parse_csv(data)
   end
 
   it "can format a request for the API" do

data/{specs → spec}/spec_helper.rb

@@ -2,8 +2,14 @@ require 'rubygems'
 require 'bundler/setup'
 Bundler.require(:default)
 require 'rspec'
+require 'vcr'
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'smartermeter'
 
 $FIXTURES_DIR = File.expand_path(File.join(File.dirname(__FILE__), "fixtures"))
+
+VCR.config do |c|
+  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  c.stub_with :webmock
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: smartermeter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 3
-    - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors: 
   - Matt Colyer
@@ -14,65 +10,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: smartermeter
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: mechanize
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 0
             version: 1.0.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: crypt
+    name: crypt19
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 1
-              - 4
-            version: 1.1.4
+            version: 1.2.1
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: rest-client
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.6.1
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: json_pure
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.5.1
+    type: :runtime
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 4
-              - 0
-            version: 2.4.0
+            version: 2.5.0
     type: :development
-    version_requirements: *id003
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: vcr
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.7.0
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: webmock
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.6.2
+    type: :development
+    version_requirements: *id007
   - !ruby/object:Gem::Dependency 
     name: minitar
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 5
-              - 2
             version: 0.5.2
     type: :development
-    version_requirements: *id004
+    version_requirements: *id008
 description: Fetches SmartMeter data from PG&E and can upload to Google PowerMeter
 email: matt.removethis@nospam.colyer.name
 executables: 
@@ -100,17 +128,22 @@ files:
   - lib/smartermeter/interfaces/cli.rb
   - lib/smartermeter/interfaces/swing.rb
   - lib/smartermeter/sample.rb
+  - lib/smartermeter/samples.rb
   - lib/smartermeter/service.rb
-  - lib/smartermeter/transports/cacert.pem
-  - lib/smartermeter/transports/google_powermeter.erb
-  - lib/smartermeter/transports/google_powermeter.rb
+  - lib/smartermeter/services/brighterplanet.rb
+  - lib/smartermeter/services/cacert.pem
+  - lib/smartermeter/services/google_powermeter.erb
+  - lib/smartermeter/services/google_powermeter.rb
   - smartermeter.gemspec
-  - specs/fixtures/data.csv
-  - specs/fixtures/expected_google_request.xml
-  - specs/sample_spec.rb
-  - specs/service_spec.rb
-  - specs/spec_helper.rb
-  - specs/transports/google_powermeter_spec.rb
+  - spec/fixtures/data.csv
+  - spec/fixtures/expected_google_request.xml
+  - spec/fixtures/vcr_cassettes/brighterplanet.yml
+  - spec/sample_spec.rb
+  - spec/samples_spec.rb
+  - spec/service_spec.rb
+  - spec/services/brighterplanet_spec.rb
+  - spec/services/google_powermeter_spec.rb
+  - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mcolyer/smartermeter
 licenses: []
@@ -121,23 +154,21 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: smartermeter
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 2
 summary: Fetches SmartMeter data from PG&E

data/specs/sample_spec.rb

@@ -1,24 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__))
-require 'spec_helper'
-
-describe SmarterMeter::Sample do
-  before(:all) do
-    @data = File.read(File.join($FIXTURES_DIR, 'data.csv'))
-  end
-
-  it "should be able to parse csv data returned by the api" do
-    date = Date.new(2009, 9, 27)
-    results = SmarterMeter::Sample.parse_csv(@data)
-
-    results.length.should == 7
-    results.keys.should include(date)
-    results[date].length.should == 24
-    results[date].each{|s| s.should be_kind_of(SmarterMeter::Sample)}
-
-    results[date][0].kwh.should == nil
-    results[date][0].time.should == Time.local(2009, 9, 27, 0)
-
-    results[date][1].kwh.should == 0.205
-    results[date][1].time.should == Time.local(2009, 9, 27, 1)
-  end
-end