ce-greenbutton 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a9718c675714b41bd7a17acdbceea06b936282
-  data.tar.gz: ca22f65eff6437cd41679f1c209bf73351c9757a
+  metadata.gz: 2fb5f5fcf5c5594ec51732aac929f8f206815504
+  data.tar.gz: d59fb734b908d229f0fa0c8bb1bad625cf85393d
 SHA512:
-  metadata.gz: 821ecd0daf89446136f7f2955bfb4a1d0d3d63573c462b0e85222dd8043164688bb723f009db9021e06b773254803c26262f8a8250d48029dd870e4acc546f8d
-  data.tar.gz: f4d44f1a7cf9a531ce1d198564ca55ba16a8ce12b60e0648076b15f794ea0ed0698a3243712c5717aa374f125cb30612499337d7c6049e2c6b3a9ace406f1d1f
+  metadata.gz: 445f7ba66616d6a1d666150be6d4cb28883b6f25d059d4fa833f022ac664488f346c098a08b7ccdebaa29953c77fe6eba25fb8debb0b8c12aea912398046c8b6
+  data.tar.gz: f08de159c9b9cb83f1e5612c36bb490e527f080885ade4b7ad9296e0c6c1e2109812ce058095b3f9ee3e861de4bf727d0fbde8d0749149dfaa6d1a69258582a4

data/lib/ce-greenbutton/version.rb

@@ -1,3 +1,3 @@
 module GreenButton
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/ce-greenbutton.rb

@@ -120,19 +120,22 @@ module GreenButton
   # Returns an array of gb_data_description
   # Raises ArgumentError if any passed argument is invalid.
   # Propagates errors from OpenURI for any connection/authentication
-  # def self.download_data_ftp(application_id, time=Time.now, utility_name)
-  def self.download_data_ftp(filename)
+  def self.download_data_ftp(application_id, time=Time.now, utility_name)
     check_arguments_ftp(application_id, time, utility_name)
 
     # construct the ftp url
-    # ftp_url = "ftp://#{@ftp_user}:#{@ftp_password}@#{@ftp_host}/#{@ftp_path}/" +
-    #   "D_#{utility_name}_#{application_id}_CONSUMPTION_#{time.strftime('%Y%m%d%H%M%S')}.XML"
+    ftp_url = "ftp://#{@ftp_user}:#{@ftp_password}@#{@ftp_host}/#{@ftp_path}/" +
+      "D_#{utility_name}_#{application_id}_CONSUMPTION_#{time.strftime('%Y%m%d%H%M%S')}.XML"
 
+    parse_data(open(ftp_url))
+  end
+
+  def self.download_data_ftp_by_filename(filename)
     ftp_url = "ftp://#{@ftp_user}:#{@ftp_password}@#{@ftp_host}/#{@ftp_path}/" +
       "#{filename}"
 
     parse_data(open(ftp_url))
-  end
+  end  
 
   # Parses the given greenbutton data to the corresponding ruby objects.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ce-greenbutton
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ahmed.seddiq