zillion 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8276136e7e27c0603ec082e51760f7a554b4b01c
-  data.tar.gz: 53a3b14a5e67fac2d7e594930a6c9fc4e4039398
+SHA256:
+  metadata.gz: aa5e49662e1f608430f15149830de87cf410c8ff6fbcfdfb815b43a58224345c
+  data.tar.gz: d3a5d3476423dcf3c8bd35e7f22aefc6709f0d6134792cb1e6c465fdf97de466
 SHA512:
-  metadata.gz: 0fb31ace43c7617b33d2521bb67675d9fa4748cf46923e49ead862546aa6611169bb5a1da0ceeae1817d3ff72e2947d8cd3226ae432fba9d8cd0400fdf62bb9e
-  data.tar.gz: 9f0964b5a4412bc0afa34217eb9f9b1173ca1a79dcfdf7ac9f92e127498e45766be55c4e794e613b277fd791bed93634f0124d99f9cfc56895f41fc0857cf187
+  metadata.gz: 698359ad81c9ba5a1af1b450fef3472c6b56bf41890f5a0f8d0c63d73e17d299c9d03b096bf2899e268c57b8735fb8bcf7066e87b90ebe01991207b7ba9c7f68
+  data.tar.gz: 9571b0b84a001b4139cf1566add53fc8847f2d6dd3c263f5d1ed825312c8d566536344dc76febc17ede68a0f2e635d30c93107bdb97cc578404ea2717cc36f20

data/lib/zillion/plan.rb

@@ -58,13 +58,13 @@ class Plan
     self.monthly_fee <=> other_plan.monthly_fee
   end
 
-  def amounts_for(counts)
-    { monthly_fee: monthly_fee }
+  def amounts_for(counts, custom_monthly_fee: nil, fallback: false)
+    { monthly_fee: custom_monthly_fee.nil? ? monthly_fee : custom_monthly_fee }
   end
 
-  def monthly_fee_for(counts)
+  def monthly_fee_for(counts, custom_monthly_fee: nil)
     ensure_available!(counts)
-    sum(amounts_for(counts))
+    sum(amounts_for(counts, custom_monthly_fee: custom_monthly_fee))
   end
 
   def available_for?(counts)
@@ -125,7 +125,8 @@ end
 
 class TieredPlan < Plan
 
-  def amounts_for(counts)
+  def amounts_for(counts, custom_monthly_fee: nil, fallback: false)
+    raise "Tiered plans don't have fixed monthly fees! (Use FixedTieredPlan for that)" if custom_monthly_fee
     tier = matching_tier_for(counts)
     obj = {}
     obj[tier.last.to_sym] = tier[1] # tier[1] is monthly cost
@@ -181,13 +182,13 @@ class TieredPlan < Plan
     end
   end
 
-  def matching_tiers_for(counts, fallback_to_highest_tier = false)
+  def matching_tiers_for(counts, fallback: false)
     tier_groups.map do |key, tiers|
       units = counts[key] or raise MissingCountError.new("Unit count required for #{key}")
       begin
         find_tier_for(tiers, units.to_i) + [key]
       rescue TierNotFoundError
-        raise unless fallback_to_highest_tier
+        raise unless fallback # to highest tier
         last_existing_tier_for(key)
       end
     end.compact
@@ -201,9 +202,11 @@ end
 
 class MeteredPlan < TieredPlan
 
-  def amounts_for(counts, fallback_to_highest_tier = false)
+  def amounts_for(counts, custom_monthly_fee: nil, fallback: false)
+    # raise "Tiered plans don't have fixed monthly fees! (Use FixedTieredPlan for that)" if custom_monthly_fee
+
     obj = {}
-    matching_tiers_for(counts, fallback_to_highest_tier).map do |tier|
+    matching_tiers_for(counts, fallback: fallback).map do |tier|
       units = units_for(tier.last, counts)
       obj[tier.last.to_sym] = units * tier[1] # tier[1] is monthly unit cost
     end
@@ -228,9 +231,9 @@ class FixedMeteredPlan < MeteredPlan
     spec[:monthly_fee] ? spec[:monthly_fee].to_f : 0
   end
 
-  def amounts_for(counts, fallback_to_highest_tier = false)
+  def amounts_for(counts, custom_monthly_fee: nil, fallback: false)
     obj = super
-    obj[:base_fee] = base_fee
+    obj[:base_fee] = custom_monthly_fee.nil? ? base_fee : custom_monthly_fee
     obj
   end
 
@@ -275,7 +278,7 @@ class FixedMeteredPlan < MeteredPlan
     :monthly_unit_cost
   end
 
-  def matching_tiers_for(counts, fallback_to_highest_tier = false)
+  def matching_tiers_for(counts, fallback: false)
     tier_groups.map do |key, tiers|
       units = counts[key] or raise MissingCountError.new("Unit count required for #{key}")
       next if limits[key] and limits[key] >= units.to_i
@@ -283,7 +286,7 @@ class FixedMeteredPlan < MeteredPlan
       begin
         find_tier_for(tiers, units.to_i) + [key]
       rescue TierNotFoundError
-        raise unless fallback_to_highest_tier
+        raise unless fallback # to_highest_tier
         last_existing_tier_for(key)
       end
     end.compact

data/spec/plans_spec.rb

@@ -138,6 +138,10 @@ describe 'FixedPlan' do
       expect(other.monthly_fee_for({ bananas: 10 })).to eql(10.0)
     end
 
+    it 'uses custom_monthly_fee if passed' do
+      expect(plan.monthly_fee_for({ apples: 10 }, custom_monthly_fee: 20)).to eql(20)
+    end
+
     it 'raises if not within limits' do
       other = FixedPlan.new(monthly_fee: 10, limits: { bananas: 10 })
       expect { other.monthly_fee_for({ bananas: 11 }) }.to raise_error(Zillion::Plan::OverLimitsError)
@@ -212,6 +216,10 @@ describe 'TieredPlan', 'Single tier' do
       expect(plan.monthly_fee_for({ bananas: 5, products: 25 })).to eql(20)
     end
 
+    it 'raises if custom_monthly_fee passed (because these plans dont have one)' do
+      expect { plan.monthly_fee_for({ bananas: 5, products: 25 }, custom_monthly_fee: 5) }.to raise_error
+    end
+
   end
 
 end
@@ -279,6 +287,10 @@ describe 'TieredPlan', 'Multiple tiers' do
       expect(plan.monthly_fee_for({ bananas: 1, orders: 5, products: 25 })).to eql(20)
     end
 
+    it 'raises if custom_monthly_fee passed (because these plans dont have one)' do
+      expect { plan.monthly_fee_for({ bananas: 1, orders: 5, products: 25 }, custom_monthly_fee: 100) }.to raise_error
+    end
+
   end
 
 end
@@ -342,6 +354,10 @@ describe 'MeteredPlan', 'Single tier' do
       expect(plan.monthly_fee_for({ bananas: 5, products: 25 })).to eql(50)
     end
 
+    xit 'raises if custom_monthly_fee passed (because these plans dont have one)' do
+      expect { plan.monthly_fee_for({ bananas: 5, products: 25 }, custom_monthly_fee: 100) }.to raise_error
+    end
+
   end
 
   describe '#amounts_for(counts)' do
@@ -363,14 +379,18 @@ describe 'MeteredPlan', 'Single tier' do
     end
 
     it 'doesnt raise if not within limits but second arg is true' do
-      expect { plan.amounts_for({ products: 250 }, true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
-      expect(plan.amounts_for({ products: 250 }, true)).to eql({ products: 375.0 })
+      expect { plan.amounts_for({ products: 250 }, fallback: true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
+      expect(plan.amounts_for({ products: 250 }, fallback: true)).to eql({ products: 375.0 })
     end
 
     it 'returns amounts if within limits' do
       expect(plan.amounts_for({ bananas: 5, products: 25 })).to eql({ products: 50 })
     end
 
+    xit 'raises if custom_monthly_fee passed (because these plans dont have one)' do
+      expect { plan.amounts_for({ bananas: 5, products: 25 }, custom_monthly_fee: 100) }.to raise_error
+    end
+
   end
 
 end
@@ -460,8 +480,8 @@ describe 'MeteredPlan', 'Multiple tiers' do
     end
 
     it 'doesnt raise if not within limits but second arg is true' do
-      expect { plan.amounts_for({ products: 250, orders: 5 }, true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
-      expect(plan.amounts_for({ products: 250, orders: 5 }, true)).to eql({ orders: 15, products: 375.0 })
+      expect { plan.amounts_for({ products: 250, orders: 5 }, fallback: true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
+      expect(plan.amounts_for({ products: 250, orders: 5 }, fallback: true)).to eql({ orders: 15, products: 375.0 })
     end
 
     it 'returns amounts if within limits' do
@@ -472,6 +492,10 @@ describe 'MeteredPlan', 'Multiple tiers' do
       expect(plan.amounts_for({ bananas: 5, products: 25, orders: 1 })).to eql({ orders: 3, products: 50 })
     end
 
+    xit 'raises if custom_monthly_fee passed (because these plans dont have one)' do
+      expect { plan.amounts_for({ bananas: 5, products: 25, orders: 1 }, custom_monthly_fee: 100) }.to raise_error
+    end
+
   end
 
 end
@@ -574,9 +598,13 @@ describe 'FixedMeteredPlan' do
       expect(plan.monthly_fee_for({ bananas: 5, orders: 15, products: 25 })).to eql(55.0)
     end
 
-  end
+    it 'uses custom_monthly_fee if passed' do
+      expect(plan.monthly_fee_for({ bananas: 5, orders: 15, products: 25 }, custom_monthly_fee: 100)).to eql(145)
+    end
 
 
+  end
+
   describe '#amounts_for(counts)' do
 
     it 'raises if missing unit for tier' do
@@ -592,8 +620,8 @@ describe 'FixedMeteredPlan' do
     end
 
     it 'doest raises if over limits but second arg is true' do
-      expect { plan.amounts_for({ orders: 1000, products: 5 }, true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
-      expect(plan.amounts_for({ orders: 1000, products: 5 }, true)).to eql({ orders: 990, base_fee: 10.0 })
+      expect { plan.amounts_for({ orders: 1000, products: 5 }, fallback: true) }.not_to raise_error(Zillion::Plan::TierNotFoundError)
+      expect(plan.amounts_for({ orders: 1000, products: 5 }, fallback: true)).to eql({ orders: 990, base_fee: 10.0 })
     end
 
     it 'doesnt explode if negative key for tiered count, but under fixed limit' do
@@ -616,6 +644,10 @@ describe 'FixedMeteredPlan' do
       expect(plan.amounts_for({ bananas: 5, orders: 15, products: 25 })).to eql({:orders=>15, :products=>30, :base_fee=>10.0})
     end
 
+    it 'uses custom_monthly_fee if passed' do
+      expect(plan.amounts_for({ bananas: 5, orders: 15, products: 25 }, custom_monthly_fee: 100)).to eql({:orders=>15, :products=>30, :base_fee=>100})
+    end
+
   end
 
 end

data/zillion.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "zillion"
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillion
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A model for SaaS plans with fixed, tiered and metered pricing.