pot_of_coffee 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dae6851d3f6b176c848021118ba99f6f0a6a341
-  data.tar.gz: 7da04121b0e181498651568d567938ea43bc054a
+  metadata.gz: 05089f2f5028931efeef8f99a977f53aa21944cf
+  data.tar.gz: 4013f9a0776ec654aefb93b4a1db160b1788d3da
 SHA512:
-  metadata.gz: ccf5fe51ce999c03091ea604c5760f4ee0a083e1fcde1d2ca8e1fca428c37723267baab63e494394b110e5b648b4f2d98d452351e52cc850c98363ddc8c79c64
-  data.tar.gz: ee37badbcdabaaa07f3b1e96a67e9c8f4281e786f5a6e878ebea3f44bb74e77c160fdad0eeeda652a69d7dffd40489d1ecc7f3b10d420d66ff53315835b7150d
+  metadata.gz: 2c1adc9f7a15d11e5865281e60ae48c987ab227a514ea549aacbc5496a3a8024d54bc771009bb1570f527aadafe1d4182e36a46dd4022e0c378de581ec2de392
+  data.tar.gz: bf637452cd89bbd69779c27b8ba4a6bc0b3d1a62d88c38d48f827f3841d0e3e42131b60b4322fa215dd1a2b6aee0cd4047b88e2fee5c531bca18196dfb5b9bf4

data/.gitignore

@@ -5,10 +5,11 @@
 /coverage/
 /doc/
 /pkg/
-/spec/reports/
+/spec/examples.txt
 /tmp/
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+*.gem

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/README.md

@@ -25,8 +25,10 @@ Or install it yourself as:
 
 ### CLI
 ```ruby
-pot_of_coffee 12 normal # "To make 12 cups of coffee, use 8.1 tbsp of grounds."
-pot_of_coffee 12 blagg  # "Sorry: coffee strength must be strong, normal, or weak"
+pot_of_coffee # "To make 12 cups of normal coffee, use 8.1 tbsp of grounds."
+pot_of_coffee --strength strong # "To make 12 cups of strong coffee, use 10.5 tbsp of grounds."
+pot_of_coffee --quantity 11 --strength blagg  # "Sorry: coffee strength must be strong, normal, or weak"
+pot_of_coffee --units metric #To make 12 cups of coffee, use 63.6 g of grounds."
 ```
 
 ### Ruby
@@ -35,13 +37,13 @@ require 'pot_of_coffee'
 
 pot_of_coffee = PotOfCoffee::Brewer.new(quantity: 12, strength: 'weak')
 pot_of_coffee.amount # 6.0
-pot_of_coffee.instructions # 'To make 12 cups of normal strength coffee, use 6.0 tbsp of grounds.'
+pot_of_coffee.instructions # 'To make 12 cups of normal coffee, use 6.0 tbsp of grounds.'
 
 # Metric units
 
 pot_of_coffee = PotOfCoffee::Brewer.new(units: PotOfCoffee::MetricUnit.new)
 pot_of_coffee.amount # 63.6
-pot_of_coffee.instructions # 'To make 12 cups of normal strength coffee, use 63.6 g of grounds.'
+pot_of_coffee.instructions # 'To make 12 cups of normal coffee, use 63.6 g of grounds.'
 ```
 
 ## Using your own units

data/bin/pot_of_coffee

@@ -6,7 +6,7 @@ require 'pot_of_coffee'
 options = {
   quantity: 12,
   strength: :normal,
-  units: PotOfCoffee::ImperialUnit.new
+  units: PotOfCoffee::Units::Imperial.new
 }
 
 OptionParser.new do |opts|
@@ -20,23 +20,23 @@ OptionParser.new do |opts|
     options[:strength] = v.to_sym
   end
 
-  opts.on('-u', '--units [UNITS]', 'Units for your coffee brew (imperial, metric)')  do |v|
+  opts.on('-u', '--units [UNITS]', 'Units for your coffee brew (imperial, metric)') do |v|
     options[:units] = case v
       when 'metric'
-        PotOfCoffee::MetricUnit.new
+        PotOfCoffee::Units::Metric.new
       when 'imperial'
-        PotOfCoffee::ImperialUnit.new
+        PotOfCoffee::Units::Imperial.new
       else
         puts "#{v} is not 'imperial' or 'metric'"
         exit
       end
   end
 
-  opts.on( '-h', '--help', 'Display this screen' ) do
+  opts.on('-h', '--help', 'Display this screen' ) do
     puts opts
     exit
   end
 end.parse!
 
-pot_of_coffee = PotOfCoffee::Brewer.new(options)
+pot_of_coffee = PotOfCoffee::Brewer.new(**options)
 puts pot_of_coffee.instructions

data/lib/pot_of_coffee/units/imperial.rb

@@ -0,0 +1,21 @@
+module PotOfCoffee
+  module Units
+    class Imperial
+      def name
+        'tablespoon'
+      end
+
+      def abbreviation
+        'tbsp'
+      end
+
+      def table
+        {
+          weak: 0.5,
+          normal: 0.675,
+          strong: 0.875,
+        }
+      end
+    end
+  end
+end

data/lib/pot_of_coffee/units/metric.rb

@@ -0,0 +1,21 @@
+module PotOfCoffee
+  module Units
+    class Metric
+      def name
+        'gram'
+      end
+
+      def abbreviation
+        'g'
+      end
+
+      def table
+        {
+          weak: 2,
+          normal: 4.16,
+          strong: 5.3
+        }
+      end
+    end
+  end
+end

data/lib/pot_of_coffee/units.rb

@@ -1,43 +1,7 @@
-module PotOfCoffee
-  class Unit
-    def name; raise NotImplementedError; end
-    def abbreviation; raise NotImplementedError; end
-    def table; raise NotImplementedError; end
-  end
-
-  class ImperialUnit < Unit
-    def name
-      'tablespoon'
-    end
+require 'pot_of_coffee/units/imperial'
+require 'pot_of_coffee/units/metric'
 
-    def abbreviation
-      'tbsp'
-    end
-
-    def table
-      {
-        weak: 0.5,
-        normal: 0.675,
-        strong: 0.875,
-      }
-    end
-  end
-
-  class MetricUnit < Unit
-    def name
-      'gram'
-    end
-
-    def abbreviation
-      'g'
-    end
-
-    def table
-      {
-        weak: 3,
-        normal: 5.3,
-        strong: 10.6
-      }
-    end
+module PotOfCoffee
+  module Units
   end
 end

data/lib/pot_of_coffee/version.rb

@@ -1,3 +1,3 @@
 module PotOfCoffee
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/pot_of_coffee.rb

@@ -1,45 +1,28 @@
 require 'pot_of_coffee/version'
 require 'pot_of_coffee/units'
 require 'pot_of_coffee/errors'
-require 'forwardable'
 
 module PotOfCoffee
   class Brewer
-    extend Forwardable
-    attr_reader :units
+    attr_reader :units, :quantity, :strength
 
-    def_delegator :@units, :table, :ratios
+    def initialize(quantity: 12, strength: :normal, units: Units::Imperial.new)
+      fail NegativeNumberError unless quantity > 0
+      fail WrongStrengthError unless units.table.keys.include?(strength)
 
-    def initialize(args = {})
-      @quantity = args[:quantity] || 12
-      @strength = args[:strength] || :normal
-      @units = args[:units] || ImperialUnit.new
-    end
-
-    def quantity
-      if @quantity > 0
-        @quantity
-      else
-        raise NegativeNumberError
-      end
-    end
-
-    def strength
-      if ratios.include?(@strength.to_sym)
-        @strength
-      else
-        raise WrongStrengthError
-      end
+      @quantity = quantity
+      @strength = strength
+      @units = units
+      # rescue NegativeNumberError, WrongStrengthError => e
+      #   print e.message
     end
 
     def amount
-      (quantity * ratios.fetch(strength)).round(2)
+      (quantity * units.table.fetch(strength)).round(2)
     end
 
     def instructions
       "To make #{quantity} cups of of #{strength} coffee, use #{amount} #{units.abbreviation} of grounds."
-    rescue NegativeNumberError, WrongStrengthError => e
-      print e.message
     end
   end
 end

data/pot_of_coffee.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pot_of_coffee/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pot_of_coffee"
+  spec.name          = 'pot_of_coffee'
   spec.version       = PotOfCoffee::VERSION
-  spec.authors       = ["Dave Shaffer"]
-  spec.email         = ["dave.shaffer@gmail.com"]
-  spec.summary       = %q{Coffee brew strength calculator}
-  spec.description   = %q{This is a small CLI app for calculating the brew strength for an automatic drip coffee maker. It can help keep coffee brews consistent.}
-  spec.homepage      = "http://daveshaffer.co/coffee"
-  spec.license       = "MIT"
+  spec.authors       = ['Dave Shaffer']
+  spec.email         = ['dave.shaffer@gmail.com']
+  spec.summary       = 'Coffee brew strength calculator'
+  spec.description   = 'This is a small CLI app for calculating the brew strength for an automatic drip coffee maker. It can help keep coffee brews consistent.'
+  spec.homepage      = 'http://daveshaffer.co/coffee'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ["pot_of_coffee"]
+  spec.executables   = ['pot_of_coffee']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.6.0'
 end

data/spec/pot_of_coffee/brewer_spec.rb

@@ -0,0 +1,51 @@
+RSpec.describe PotOfCoffee::Brewer do
+  context 'with no arguments' do
+    let(:pot_of_coffee) { PotOfCoffee::Brewer.new }
+
+    it 'has correct properties and gives instructions' do
+      expect(pot_of_coffee.instructions).to eq('To make 12 cups of of normal coffee, use 8.1 tbsp of grounds.')
+      expect(pot_of_coffee.quantity).to eq(12)
+      expect(pot_of_coffee.strength).to eq(:normal)
+    end
+  end
+
+  context 'with invalid quantity' do
+    it 'raises PotOfCoffee::NegativeNumberError' do
+      expect { PotOfCoffee::Brewer.new(quantity: -1) }.to raise_error(PotOfCoffee::NegativeNumberError)
+    end
+  end
+
+  context 'with invalid strength' do
+    it 'raises PotOfCoffee::WrongStrengthError' do
+      expect { PotOfCoffee::Brewer.new(strength: :ultra) }.to raise_error(PotOfCoffee::WrongStrengthError)
+    end
+  end
+
+
+  context 'with own units' do
+    class WhateverUnit
+      def name
+        'grably'
+      end
+
+      def abbreviation
+        'gb'
+      end
+
+      def table
+        {
+          strong: 109109,
+          normal: 279.10,
+          weak: 100
+        }
+      end
+    end
+
+    let(:units) { WhateverUnit.new }
+    let(:pot_of_coffee) { PotOfCoffee::Brewer.new(units: units) }
+
+    it 'can provide your own units' do
+      expect(pot_of_coffee.instructions).to eq('To make 12 cups of of normal coffee, use 3349.2 gb of grounds.')
+    end
+  end
+end

data/spec/pot_of_coffee/units_spec.rb

@@ -0,0 +1,30 @@
+RSpec.shared_examples 'a correct unit' do
+  describe '#name' do
+    subject { units.name }
+    it { is_expected.to be_a(String) }
+  end
+
+  describe '#abbreviation' do
+    subject { units.abbreviation }
+    it { is_expected.to be_a(String) }
+  end
+
+  describe '#table' do
+    subject { units.table }
+    it { is_expected.to satisfy { |t| [:weak, :normal, :strong].each { |key| t.keys.include?(key) } } }
+  end
+end
+
+RSpec.describe PotOfCoffee::Units do
+  describe 'imperial units' do
+    let(:units) { PotOfCoffee::Units::Imperial.new }
+
+    it_behaves_like 'a correct unit'
+  end
+
+  describe 'metric units' do
+    let(:units) { PotOfCoffee::Units::Metric.new }
+
+    it_behaves_like 'a correct unit'
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+require 'pot_of_coffee'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.filter_run_when_matching :focus
+  config.example_status_persistence_file_path = "spec/examples.txt"
+  config.disable_monkey_patching!
+  config.warnings = true
+  if config.files_to_run.one?
+    config.default_formatter = "doc"
+  end
+
+  config.order = :random
+  Kernel.srand config.seed
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pot_of_coffee
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Dave Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 description: This is a small CLI app for calculating the brew strength for an automatic
   drip coffee maker. It can help keep coffee brews consistent.
 email:
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,12 +71,13 @@ files:
 - lib/pot_of_coffee.rb
 - lib/pot_of_coffee/errors.rb
 - lib/pot_of_coffee/units.rb
+- lib/pot_of_coffee/units/imperial.rb
+- lib/pot_of_coffee/units/metric.rb
 - lib/pot_of_coffee/version.rb
 - pot_of_coffee.gemspec
-- test/helper.rb
-- test/test_brewer.rb
-- test/test_units.rb
-- test/whatever_unit.rb
+- spec/pot_of_coffee/brewer_spec.rb
+- spec/pot_of_coffee/units_spec.rb
+- spec/spec_helper.rb
 homepage: http://daveshaffer.co/coffee
 licenses:
 - MIT
@@ -96,12 +98,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Coffee brew strength calculator
 test_files:
-- test/helper.rb
-- test/test_brewer.rb
-- test/test_units.rb
-- test/whatever_unit.rb
+- spec/pot_of_coffee/brewer_spec.rb
+- spec/pot_of_coffee/units_spec.rb
+- spec/spec_helper.rb

data/test/helper.rb

@@ -1,3 +0,0 @@
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'pot_of_coffee'

data/test/test_brewer.rb

@@ -1,28 +0,0 @@
-require 'helper'
-
-class TestBrewer < Minitest::Test
-  def test_gives_instructions_with_no_arguments
-    @pot_of_coffee = PotOfCoffee::Brewer.new
-    assert_equal @pot_of_coffee.instructions, "To make 12 cups of of normal coffee, use 8.1 tbsp of grounds."
-  end
-
-  def test_has_correct_properties_when_created_with_no_arguments
-    @pot_of_coffee = PotOfCoffee::Brewer.new
-    assert_equal @pot_of_coffee.quantity, 12
-    assert_equal @pot_of_coffee.strength, :normal
-  end
-
-  def test_quantity_must_be_positive
-    @pot_of_coffee = PotOfCoffee::Brewer.new(quantity: -1)
-    assert_raises PotOfCoffee::NegativeNumberError do
-      @pot_of_coffee.quantity
-    end
-  end
-
-  def test_strength_must_be_strong_normal_or_weak
-    @pot_of_coffee = PotOfCoffee::Brewer.new(quantity: rand(24), strength: :ultra)
-    assert_raises PotOfCoffee::WrongStrengthError do
-      @pot_of_coffee.strength
-    end
-  end
-end

data/test/test_units.rb

@@ -1,21 +0,0 @@
-require 'helper'
-require 'whatever_unit'
-
-class TestUnits < Minitest::Test
-  def test_can_use_metric_units
-    @pot_of_coffee = PotOfCoffee::Brewer.new(units: PotOfCoffee::MetricUnit.new)
-    assert_equal @pot_of_coffee.instructions, 'To make 12 cups of of normal coffee, use 63.6 g of grounds.'
-  end
-
-  def test_can_provide_your_own_units
-    @pot_of_coffee = PotOfCoffee::Brewer.new(units: WhateverUnit.new)
-    assert_equal @pot_of_coffee.instructions, 'To make 12 cups of of normal coffee, use 3349.2 gb of grounds.'
-  end
-
-  def test_units_must_respond_to_correct_things
-    @whatever_unit = WhateverUnit.new
-    assert_respond_to @whatever_unit, :name
-    assert_respond_to @whatever_unit, :abbreviation
-    assert_respond_to @whatever_unit, :table
-  end
-end

data/test/whatever_unit.rb

@@ -1,17 +0,0 @@
-class WhateverUnit
-  def name
-    'grably'
-  end
-
-  def abbreviation
-    'gb'
-  end
-
-  def table
-    {
-      strong: 109109,
-      normal: 279.10,
-      weak: 100
-    }
-  end
-end