zillion 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe94dcc79501b639c14f6102eee9bdc93f7bdf42
-  data.tar.gz: c72ee7eff41512f0f4414808b5fcf52f6deedae5
+  metadata.gz: 6ce05db824e474efb57c076724e898b942e9d1e7
+  data.tar.gz: 4b9cd7809dfe54aebde95a44e20c367d5fecdd1e
 SHA512:
-  metadata.gz: 0bd984ac1c8abb7f114975ff7781d20c974c5259628d0fa22821cfc14a8f54a5a00a504e11714e1289656abb672992e7f9e656469b393e74212e2a436ab151ee
-  data.tar.gz: 3850bd41d6b6d5c80018396de7403c7921fff39d7009e0171ceadb340e2f00da7f5b615d8db2d7920f6eaea5be842cc52e927978d998b5ff31b17005313029ef
+  metadata.gz: 5474bb4ab5fbec4aa0dfdb1d8d6739086760b76737534e934b8b8149e45a046acc3b9ae48d2262fdb9a90e1522f91da0fb016b48baa7f35c49765f9d23360df6
+  data.tar.gz: 8034f57e84d372f1209fc6f074c39661ee21a810860cf2c250d6f968c280ffd5a69ec5d5bf9d3c4944c8b1f3b5c5792fec183591475a321ca5f22aa58c1c5a91

data/lib/zillion/plan.rb

@@ -91,7 +91,7 @@ class Plan
 
   def ensure_available!(counts)
     unless available_for?(counts)
-      raise OverLimitsError.new("This plan has lower limits than: #{counts}")
+      raise OverLimitsError.new("The #{name} plan has lower limits than: #{counts}")
     end
   end
 
@@ -158,9 +158,9 @@ class TieredPlan < Plan
     arr = tiers.select { |t| t[0].include?(units) }
 
     if arr.empty?
-      raise TierNotFoundError.new("No matching tiers found for #{units} units.")
+      raise TierNotFoundError.new("No matching tiers found for #{units} units (#{name} plan)")
     elsif arr.count > 1
-      raise MultipleTiersFoundError.new("Unit count is in more than one tier!")
+      raise MultipleTiersFoundError.new("Unit count is in more than one tier! (#{name} plan)")
     end
 
     arr.first # + [tiers.index(arr.first)]
@@ -200,7 +200,6 @@ class MeteredPlan < TieredPlan
       units = units_for(tier.last, counts)
       obj[tier.last.to_sym] = units * tier[1]
     end
-
     obj
   end
 
@@ -267,7 +266,7 @@ class FixedMeteredPlan < MeteredPlan
   def get_matching_tiers(counts)
     tier_groups.map do |key, tiers|
       units = counts[key] or raise "Unit count required for #{key}"
-      next if limits[key] and limits[key] > units.to_i
+      next if limits[key] and limits[key] >= units.to_i
 
       find_tier_for(tiers, units.to_i) + [key]
     end.compact

data/spec/plans_spec.rb

@@ -68,7 +68,7 @@ describe 'FreePlan' do
       expect(plan.available_for?({ bananas: 100 }) ).to eql(true)
     end
 
-    it 'raises not all units for limits are fed' do
+    it 'raises if not all units for limits are fed' do
       other = FreePlan.new(limits: { bananas: 10 })
       expect { other.available_for?({ apples: 10 }) }.to raise_error
     end
@@ -275,7 +275,7 @@ describe 'TieredPlan', 'Multiple tiers' do
       expect { plan.available_for?({ bananas: 5, products: -5 }) }.to raise_error
     end
 
-    it 'returns monthly fee for tier if within its limit' do
+    it 'returns true if within tier limits' do
       expect(plan.available_for?({ bananas: 5, orders: 5, products: 25 })).to eql(true)
     end
 
@@ -338,7 +338,7 @@ describe 'MeteredPlan', 'Single tier' do
       expect { plan.available_for?({ bananas: 5, products: -5 }) }.to raise_error
     end
 
-    it 'returns monthly fee for tier if within its limit' do
+    it 'returns true if within its limit' do
       expect(plan.available_for?({ bananas: 5, products: 25 })).to eql(true)
     end
 
@@ -406,7 +406,7 @@ describe 'MeteredPlan', 'Multiple tiers' do
       expect { plan.available_for?({ bananas: 5, products: -5 }) }.to raise_error
     end
 
-    it 'returns monthly fee for tier if within its limit' do
+    it 'returns true if within its limit' do
       expect(plan.available_for?({ bananas: 5, orders: 5, products: 25 })).to eql(true)
     end
 
@@ -422,7 +422,7 @@ describe 'FixedMeteredPlan' do
       limits: { bananas: 10, orders: 10, products: 10 },
       tiers: {
         orders: [
-          { from: 10, to: 15, monthly_unit_cost: 3 },
+          { from: 11, to: 15, monthly_unit_cost: 3 },
           { from: 16, to: 20, monthly_unit_cost: 1 }
         ],
         products: [
@@ -461,6 +461,10 @@ describe 'FixedMeteredPlan' do
       expect(plan.monthly_fee_for({ bananas: 5, orders: 5, products: 5 })).to eql(10.0)
     end
 
+    it 'returns monthly fee for if just within limit limits' do
+      expect(plan.monthly_fee_for({ bananas: 10, orders: 10, products: 10 })).to eql(10.0)
+    end
+
     it 'returns monthly fee for tier if within its limit' do
       expect(plan.monthly_fee_for({ bananas: 5, orders: 5, products: 25 })).to eql(40.0)
     end
@@ -499,11 +503,11 @@ describe 'FixedMeteredPlan' do
       expect(plan.available_for?({ bananas: 5, orders: 5, products: 15 })).to eql(false)
     end
 
-    it 'returns true if within its limit' do
+    it 'returns true if above fixed limit but within tier limit' do
       expect(plan.available_for?({ bananas: 5, orders: 5, products: 15 })).to eql(true)
     end
 
-    it 'returns true if within its limit' do
+    it 'returns true e if above fixed limit but within tier limit' do
       expect(plan.available_for?({ bananas: 5, orders: 15, products: 25 })).to eql(true)
     end
 

data/zillion.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "zillion"
-  s.version     = '0.0.7'
+  s.version     = '0.0.8'
   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.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler