awscosts 0.0.8 → 0.0.9

data/lib/awscosts/s3_requests.rb

@@ -1,10 +1,9 @@
 require 'httparty'
-require 'json'
 
 class AWSCosts::S3Requests
 
   def initialize data
-    @data= data
+    @data = data
   end
 
   def price tier = nil
@@ -12,14 +11,14 @@ class AWSCosts::S3Requests
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-requests.json") do |data|
+    transformed = AWSCosts::Cache.get_jsonp("/pricing/1/s3/pricing-requests-s3.min.js") do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         tiers = {}
-        region['tiers'].each do |tier|
+        r['tiers'].each do |tier|
           tiers[tier['name']] = { rate: tier['rate'], price: tier['prices']['USD'].to_f}
         end
-        result[region['region']] = tiers
+        result[r['region']] = tiers
       end
       result
     end

data/lib/awscosts/s3_storage.rb

@@ -1,10 +1,9 @@
 require 'httparty'
-require 'json'
 
 class AWSCosts::S3Storage
 
   def initialize data
-    @data= data
+    @data = data
   end
 
   def price tier = nil
@@ -12,18 +11,19 @@ class AWSCosts::S3Storage
   end
 
   def self.fetch region
-    transformed= AWSCosts::Cache.get("/s3/pricing/pricing-storage.json") do |data|
+    transformed = AWSCosts::Cache.get_jsonp("/pricing/1/s3/pricing-storage-s3.min.js") do |data|
       result = {}
-      data['config']['regions'].each do |region|
+      data['config']['regions'].each do |r|
         tiers = {}
-        region['tiers'].each do |tier|
+        r['tiers'].each do |tier|
           storage_type = {}
           tiers[tier['name']] = storage_type
           tier['storageTypes'].each do |type|
-            storage_type[type['type']] = type['prices']['USD'].to_f
+            # Don't return 0.0 for "N/A*" since that is misleading
+            storage_type[type['type']] = type['prices']['USD'] == 'N/A*' ? nil : type['prices']['USD'].to_f
           end
         end
-        result[region['region']] = tiers
+        result[r['region']] = tiers
       end
       result
     end

data/lib/awscosts/version.rb

@@ -1,3 +1,3 @@
 module AWSCosts
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/awscosts/ec2_ebs_spec.rb

@@ -7,40 +7,24 @@ describe AWSCosts::EBS do
     context "in the region of #{region}" do
       subject { AWSCosts.region(region).ec2.ebs}
 
-      describe 'standard EBS volume' do
-        let(:price) { subject.price(:standard) }
-
-        it 'should provide price per GB / month for provisioned storage' do
-          price['perGBmoProvStorage'].should > 0
-        end
-
-        it 'should provide price per Million requests per month' do
-          price['perMMIOreq'].should > 0
-        end
-      end
-
-      describe 'provisioned IOPS price' do
-        let(:price) { subject.price(:provisioned_iops) }
-
-        it 'should provide price per GB / month for provisioned storage' do
-          price['perGBmoProvStorage'].should > 0
-        end
-
-        it 'should provide a price per PIOPS' do
-          price['perPIOPSreq'].should > 0
-        end
-      end
-
-      describe 'Snapshots to S3' do
-        let(:price) { subject.price(:snapshots_to_s3) }
-
-        it 'should provide a price per GB stored / month' do
-          price['perGBmoDataStored'].should > 0
-        end
-      end
-    end
+      ['Amazon EBS General Purpose (SSD) volumes',
+       'Amazon EBS Provisioned IOPS (SSD) volumes',
+       'Amazon EBS Magnetic volumes', 'ebsSnapsToS3'].each do |name|
+
+          describe "for '#{name}'" do
+            let(:price) { subject.price.find { |p| p['name'] == name } }
+
+            it 'should provide a name' do
+              price['name'].should_not be_nil
+            end
+
+            it 'should provide values ' do
+              price['values'].should_not be_nil
+            end
+          end
+       end
+     end
   end
-
 end
 
 

data/spec/awscosts/ec2_elastic_ips_spec.rb

@@ -4,6 +4,8 @@ describe AWSCosts::ElasticIPs do
   use_vcr_cassette
 
   AWSCosts::Region::SUPPORTED.keys.each do |region|
+    # no pricing for Frankfurt, yet!
+    next if region == 'eu-central-1'
 
     context "in the region of #{region}" do
       subject { AWSCosts.region(region).ec2.elastic_ips}

data/spec/awscosts/ec2_reserved_instances_spec.rb

@@ -6,6 +6,9 @@ describe AWSCosts::EC2ReservedInstances do
 
     AWSCosts::Region::SUPPORTED.keys.each do |r|
 
+      # no pricing for Frankfurt, yet!
+      next if r == 'eu-central-1'
+
       context "in the #{r} region" do
         [:windows, :linux, :windows_with_sql, :windows_with_sql_web, :rhel, :sles].each do |type|
           context "EC2 type of #{type}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awscosts
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Stephen Bartlett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ files:
 - lib/awscosts/cache.rb
 - lib/awscosts/ec2.rb
 - lib/awscosts/ec2_ebs.rb
+- lib/awscosts/ec2_ebs_optimized.rb
 - lib/awscosts/ec2_elastic_ips.rb
 - lib/awscosts/ec2_elb.rb
 - lib/awscosts/ec2_on_demand.rb