ispusage 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/ispusage/fetchers/iinet.rb

@@ -13,7 +13,7 @@ class IspUsage
       def fetch_usage
         xml = open("https://toolbox.iinet.net.au/cgi-bin/new/volume_usage_xml.cgi?action=login&username=#{@username}&password=#{@password}")
         doc = Nokogiri::XML(xml)
-        used = doc.search("/ii_feed[1]/volume_usage[1]/expected_traffic_types[1]/type[1]/@used").text.to_i / 1048576
+        used = doc.search("/ii_feed[1]/volume_usage[1]/expected_traffic_types[1]/type[1]/@used").text.to_i / 998315 #best I can figure iinet uses base 2 and base 10 bytes
         quota = doc.search("/ii_feed[1]/volume_usage[1]/expected_traffic_types[1]/type[1]/quota_allocation[1]").text.to_i
         self.usage_periods << UsagePeriod.new(:used => used, :quota => quota)
       end

data/spec/fetchers/iinet_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe IspUsage::Fetchers::AUIinet do
   describe "single usage period" do
     before do
-      fixture = File.read(File.dirname(__FILE__) + '/../fixtures/auiinet_single_account.xml')
+      fixture = File.read(File.dirname(__FILE__) + '/../fixtures/au_iinet/single_account.xml')
       FakeWeb.register_uri(:get, 'https://toolbox.iinet.net.au/cgi-bin/new/volume_usage_xml.cgi?action=login&username=user&password=password', :body => fixture)
       options = {:username => 'user', :password => 'password'}
       @usage = IspUsage::Fetchers::AUIinet.new(options)
@@ -11,7 +11,7 @@ describe IspUsage::Fetchers::AUIinet do
     end
 
     it "should return usage correctly" do
-      @usage.usage_periods.first.used.should == 28613
+      @usage.usage_periods.first.used.should == 45106
     end
 
     it "should return quota correctly" do

data/spec/fetchers/internode_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe IspUsage::Fetchers::AUInternode do
   describe "single usage period" do
     before do
-      services = File.read(File.dirname(__FILE__) + '/../fixtures/auinternode_home.xml')
+      services = File.read(File.dirname(__FILE__) + '/../fixtures/au_internode/home.xml')
       FakeWeb.register_uri(:get, 'https://user:password@customer-webtools-api.internode.on.net/api/v1.5/', :body => services)
-      service = File.read(File.dirname(__FILE__) + '/../fixtures/auinternode_home_usage.xml')
+      service = File.read(File.dirname(__FILE__) + '/../fixtures/au_internode/home_usage.xml')
       FakeWeb.register_uri(:get, 'https://user:password@customer-webtools-api.internode.on.net/api/v1.5/1234567/usage', :body => service)
 
 
@@ -21,5 +21,35 @@ describe IspUsage::Fetchers::AUInternode do
     it "should return quota correctly" do
       @usage.usage_periods.first.quota.should == 50000
     end
+
+    it "should return total correctly" do
+      @usage.usage_periods.first.total.should == 50000
+    end
+  end
+
+  describe "single usage period over limit" do
+    before do
+      services = File.read(File.dirname(__FILE__) + '/../fixtures/au_internode/home.xml')
+      FakeWeb.register_uri(:get, 'https://user:password@customer-webtools-api.internode.on.net/api/v1.5/', :body => services)
+      service = File.read(File.dirname(__FILE__) + '/../fixtures/au_internode/home_usage_overlimit.xml')
+      FakeWeb.register_uri(:get, 'https://user:password@customer-webtools-api.internode.on.net/api/v1.5/1234567/usage', :body => service)
+
+
+      options = {:username => 'user', :password => 'password'}
+      @usage = IspUsage::Fetchers::AUInternode.new(options)
+      @usage.fetch_usage
+    end
+
+    it "should return usage correctly" do
+      @usage.usage_periods.first.used.should == 50013
+    end
+
+    it "should return quota correctly" do
+      @usage.usage_periods.first.quota.should == 50000
+    end
+    
+    it "should return total correctly" do
+      @usage.usage_periods.first.total.should == 50013
+    end
   end
 end

data/spec/fixtures/{auiinet_single_account.xml → au_iinet/single_account.xml}

@@ -10,7 +10,7 @@
             <days_remaining>22</days_remaining>
         </quota_reset>        
         <expected_traffic_types>
-            <type classification="anytime" used="30003394620">
+            <type classification="anytime" used="45030021786">
                 <name>non-free</name>
                 <quota_allocation>100000</quota_allocation>
                 <is_shaped speed="0">false</is_shaped>

data/spec/fixtures/au_internode/home_usage_overlimit.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<internode><api><service type="Personal_ADSL" request="usage">2659798</service><traffic name="total" rollover="2010-02-21" plan-interval="Monthly" quota="50000000000" unit="bytes">50013803144</traffic></api></internode>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ispusage
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alan Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +10:00
+date: 2010-02-19 00:00:00 +10:00
 default_executable: ispusage
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,10 @@ files:
 - spec/fetchers/fetcher_spec.rb
 - spec/fetchers/iinet_spec.rb
 - spec/fetchers/internode_spec.rb
-- spec/fixtures/auiinet_single_account.xml
-- spec/fixtures/auinternode_home.xml
-- spec/fixtures/auinternode_home_usage.xml
+- spec/fixtures/au_iinet/single_account.xml
+- spec/fixtures/au_internode/home.xml
+- spec/fixtures/au_internode/home_usage.xml
+- spec/fixtures/au_internode/home_usage_overlimit.xml
 - spec/ispusage_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb