farmingengineers 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/farmingengineers.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{farmingengineers}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Burke"]

data/invoice.rb

@@ -3,13 +3,15 @@ $: << 'lib'
 require 'egg_csa_invoice'
 
 
-egg_csa_invoice do
+egg_csa_invoice(:id => '20101008-001') do
   customer 'Sample customer'
   address  ['123 Street', 'City, IN', '317-xxx-xxxx']
   deposit    '8/1/2010', 500
   deliver  '10/11/2010', 11
   deliver  '10/11/2010', 4, :rate => 4.50
   egg delivery '10/12/2010', 1
+  line_item '11/1/2010', 'Another line item', 3, 4
+  line_item :date => '11/2/2010', :description => 'Another line item', :total => 5
   purchase '11/1/2010', 'Doughnuts', 10
   notes 'Notes to customer'
 end

data/lib/egg_csa_invoice.rb

@@ -5,7 +5,7 @@ require 'farming_engineers'
 module EggCsaInvoice
 
 $invoice_count = 0
-def egg_csa_invoice(&block)
+def egg_csa_invoice(opts = {}, &block)
   invoice = FarmingEngineers::Invoices::Eggs::Invoice.new
   invoice.instance_eval(&block)
 
@@ -15,7 +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)]
+    t << ['', '', '', opts[:total_label] || 'TOTAL', d(balance)]
   end
 
   history_table.rename_columns(
@@ -26,8 +26,8 @@ def egg_csa_invoice(&block)
     :balance => 'Balance'
   )
 
-  invoice_id = "#{Date.today.strftime('%Y%m%d')}-#{$invoice_count += 1}"
-  invoice_file = File.expand_path("../invoice-#{invoice_id}.pdf", $0)
+  invoice_id = opts[:id] || "#{Date.today.strftime('%Y%m%d')}-#{$invoice_count += 1}"
+  invoice_file = invoice_id + '.pdf'
   puts invoice_file
 
   Ruport::Controller::Invoice.render :pdf, :file => invoice_file do |i|
@@ -51,6 +51,6 @@ end
 extend self
 end
 
-def egg_csa_invoice(&block)
-  EggCsaInvoice.egg_csa_invoice(&block)
+def egg_csa_invoice(*args, &block)
+  EggCsaInvoice.egg_csa_invoice(*args, &block)
 end

data/lib/farming_engineers/invoices/common.rb

@@ -12,18 +12,23 @@ module FarmingEngineers ; module Invoices ; module Common
     end
   end
 
-  class History < Array
-    def deposit date, amount
-      push Deposit.new(date, amount)
-    end
-
-    def purchase date, description, amount
-      push Purchase.new(date, description, amount)
-    end
-  end
   class HistoryItem
     attr_reader :date, :description, :quantity, :total
   end
+  class LineItem < HistoryItem
+    def initialize(*args)
+      case args.first
+      when Hash
+        args = args.first
+        @date = args[:date]
+        @description = args[:description]
+        @quantity = args[:quantity]
+        @total = args[:total]
+      else
+        @date, @description, @quantity, @total = args
+      end
+    end
+  end
   class Deposit < HistoryItem
     def initialize(date, amount)
       @date = date
@@ -38,4 +43,15 @@ module FarmingEngineers ; module Invoices ; module Common
       @total = amount
     end
   end
+  class History < Array
+    def self.generator(name, klass)
+      define_method(name) do |*args|
+        push klass.new(*args)
+      end
+    end
+    generator :deposit, Deposit
+    generator :purchase, Purchase
+    generator :line, LineItem
+    generator :line_item, LineItem
+  end
 end ; end ; end

data/lib/farming_engineers/invoices/eggs.rb

@@ -6,19 +6,10 @@ module FarmingEngineers ; module Invoices ; module Eggs
     end
   end
 
-  class History < Common::History
-    def deliver date, dozens, opts = {}
-      push Delivery.new(date, dozens, opts)
-    end
-    alias delivery deliver
-    alias egg_delivery deliver
-    def egg(*args) ; end
-  end
-
   class Delivery < Common::HistoryItem
     def initialize(date, dozens, opts = {})
       @date = date
-      @description = 'Delivery'
+      @description = 'Egg Delivery'
       @quantity = dozens
       @total = calculate opts.merge(:dozens => dozens)
     end
@@ -35,4 +26,11 @@ module FarmingEngineers ; module Invoices ; module Eggs
           end)
     end
   end
+
+  class History < Common::History
+    generator :deliver, Delivery
+    generator :delivery, Delivery
+    generator :egg_delivery, Delivery
+    def egg(*args) ; end
+  end
 end ; end ; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: farmingengineers
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Matt Burke