zillion 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c07c7fc1c9a9d1db83c48d8bd87d27fa6b0fed
-  data.tar.gz: e79f1bbd30dd52bf2f166200dfdefa398a30cb5b
+  metadata.gz: a03fdebc806dd28abd1d3813483727407848d7f1
+  data.tar.gz: 1e1a6a57c2e52d97f5f4b23978b98bb5ea404476
 SHA512:
-  metadata.gz: 9ddf4c476a574cf6e5d74850b3174ce60b03bb225b89a1ce7e31953de3c3176c566ecc2f2891c0ced74dd34c323f79940b88c5d75fa2cdfe84c8df06355c46b1
-  data.tar.gz: 62d318109781177ceb663f6e6ebb664e9a19d14982815b8c43a23aca52791ea1931661588738508990b8dcd7b8e29eef4e8e955c84fb8ee39c29abadb1996257
+  metadata.gz: d46e751cb62241643c8602ed271dff1d071d91d65cd83ce79c7cde2f292d852eb05e751c2a29ca3f1c340f4530f99f00c8e67c2fd28fcd27ba1a96f1534704f8
+  data.tar.gz: 530442ee7467e56ca985051a0a21f1c6cb76d26f8e65e40f0bd7ebf4e38c87aacb2a5d609d0a55707d0b640a4f132bc37176278b04d290b3b52b8a05a4bab1ee

data/lib/zillion/mapper.rb

@@ -39,12 +39,25 @@ class PlanFinder
     self.class.available_plans_for(@counts)
   end
 
-  def sorted_available_plans
-    sorted_keys = available_plans.keys.sort do |a,b|
-      mapper.get(a).monthly_fee_for(@counts) <=> mapper.get(b).monthly_fee_for(@counts)
-    end
+  def previous_plan_of(plan)
+    list = sorted_plans
+    num  = list.index(mapper.get(plan))
+    return if num.to_i <= 0
+    list[num-1]
+  end
 
-    sorted_keys.map { |key| mapper.get(key) }
+  def next_plan_of(plan)
+    list = sorted_plans
+    num  = list.index(mapper.get(plan)) or return
+    list[num+1]
+  end
+
+  def sorted_plans
+    sort_plans(mapper.all)
+  end
+
+  def sorted_available_plans
+    sort_plans(available_plans)
   end
 
   def best_plan
@@ -58,14 +71,27 @@ class PlanFinder
 
   private
 
+  def sort_plans(list)
+    sorted_keys = list.keys.sort do |a, b|
+      fee_for(a) <=> fee_for(b)
+    end
+
+    sorted_keys.map { |key| mapper.get(key) }
+  end
+
   def mapper
     self.class.mapper
   end
 
   def compare(one, two, direction)
-    one = PlanMapper.get(one) unless one.is_a?(Plan)
-    two = PlanMapper.get(two) unless two.is_a?(Plan)
-    one.monthly_fee_for(@counts).send(direction, two.monthly_fee_for(@counts))
+    fee_for(one).send(direction, fee_for(two))
+  end
+
+  # returns fee for counts, if within limits, otherwise zero
+  def fee_for(plan_key)
+    mapper.get(plan_key).monthly_fee_for(@counts)
+  rescue Plan::OverLimitsError
+    0
   end
 
 end
@@ -101,6 +127,7 @@ class PlanMapper
 
   def get(key)
     raise "Please load first. No need to be an ass." if plans.empty?
+    return key if key.is_a?(Plan)
     plans[key.to_sym]
   end
 

data/spec/mapper_spec.rb

@@ -23,8 +23,9 @@ describe 'PlanFinder' do
 
   let (:mapper) {
     PlanMapper.new({
-      small: { monthly_fee: 0, limits: { products: 100 } },
-      large: { monthly_fee: 10, limits: { products: 200 } }
+      small:  { monthly_fee: 0, limits: { products: 100 } },
+      medium: { monthly_fee: 5, limits: { products: 150 } },
+      large:  { monthly_fee: 10, limits: { products: 200 } }
     })
   }
 
@@ -32,6 +33,15 @@ describe 'PlanFinder' do
     expect { PlanFinder.new({}) }.to raise_error # MissingCountError
   end
 
+  describe '#sorted_plans' do
+
+    it 'returns all plans, including unavailable ones' do
+      finder = PlanFinder.init(mapper).new({ products: 120 })
+      expect(finder.sorted_plans.map(&:name)).to eql([:small, :medium, :large])
+    end
+
+  end
+
   describe '#available_plans' do
 
     it 'explodes if no limits passed' do
@@ -51,7 +61,7 @@ describe 'PlanFinder' do
 
     it 'returns array with higher plan if over within both of them' do
       finder = PlanFinder.init(mapper).new({ products: 150 })
-      expect(finder.available_plans).to eql({ large: mapper.get(:large) })
+      expect(finder.available_plans).to eql({ medium: mapper.get(:medium), large: mapper.get(:large) })
     end
 
     it 'returns array with both plans if under the lowest limit' do
@@ -61,6 +71,44 @@ describe 'PlanFinder' do
 
   end
 
+  describe '#previous_plan_of(plan)' do
+
+    it 'returs nil if lowest plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.previous_plan_of(mapper.get(:small))).to be_nil
+    end
+
+    it 'returs small if medium plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.previous_plan_of(:medium)).to be(mapper.get(:small))
+    end
+
+    it 'returs medium if large plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.previous_plan_of(:large)).to be(mapper.get(:medium))
+    end
+
+  end
+
+  describe '#next_plan_of(plan)' do
+
+    it 'returs nil if highest plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.next_plan_of(mapper.get(:large))).to be_nil
+    end
+
+    it 'returs large if medium plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.next_plan_of(:medium)).to be(mapper.get(:large))
+    end
+
+    it 'returs medium if small plan' do
+      finder = PlanFinder.init(mapper).new({ products: 50 })
+      expect(finder.next_plan_of(:small)).to be(mapper.get(:medium))
+    end
+
+  end
+
   describe '#best_plan' do
 
     it 'returns nil if over all limits' do

data/zillion.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zillion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomás Pollak