farmingengineers 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/farmingengineers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{farmingengineers}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Burke"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-10-18}
   s.description = %q{Invoice generators, etc.}
   s.email = %q{mr.matt.burke@gmail.com}
   s.extra_rdoc_files = [

data/invoice.rb

@@ -7,7 +7,8 @@ egg_csa_invoice do
   customer 'Sample customer'
   address  ['123 Street', 'City, IN', '317-xxx-xxxx']
   deposit    '8/1/2010', 50
-  deliver  '10/11/2010', 4
+  deliver  '10/11/2010', 11
+  deliver  '10/11/2010', 4, :rate => 4.50
   purchase '11/1/2010', 'Doughnuts', 10
   notes 'Notes to customer'
 end

data/lib/egg_csa_invoice.rb

@@ -15,6 +15,7 @@ def egg_csa_invoice(&block)
       balance += line.total
       t << [line.date, line.description, line.quantity, d(line.total), d(balance)]
     end
+    t << ['', '', '', 'TOTAL', d(balance)]
   end
 
   history_table.rename_columns(

data/lib/farming_engineers/invoices/eggs.rb

@@ -7,25 +7,29 @@ module FarmingEngineers ; module Invoices ; module Eggs
   end
 
   class History < Common::History
-    def deliver date, dozens
-      push Delivery.new(date, dozens)
+    def deliver date, dozens, opts = {}
+      push Delivery.new(date, dozens, opts)
     end
   end
 
   class Delivery < Common::HistoryItem
-    def initialize(date, dozens)
+    def initialize(date, dozens, opts = {})
       @date = date
       @description = 'Delivery'
       @quantity = dozens
+      @total = calculate opts.merge(:dozens => dozens)
     end
-    def total
-      if @quantity < 8
-        @quantity * 5
-      elsif @quantity < 12
-        @quantity * 4.50
-      else
-        @quantity * 4
-      end
+    private
+    def calculate opts
+      opts[:total] ||
+        opts[:dozens] * (opts[:rate] || opts[:price] ||
+          if opts[:dozens] < 8
+            5
+          elsif opts[:dozens] < 12
+            4.50
+          else
+            4
+          end)
     end
   end
 end ; end ; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: farmingengineers
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Matt Burke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency