piggybak 0.2.0 → 0.2.1

data/README.md

@@ -99,17 +99,15 @@ Recipes
         end
 
 
-Roadmap / TODOs
+TODOs
 ========
 
-* Figure out how to make entire payments section read only, except for ability to refund
-* Add refunds: Add actionable link under payments
-* Handle state options in admin: selected state or free text
-
-* Create rake task for copying over views, and make sure app views will override gems
-* Test email send functionality
-* Test a different user model
-* Add unit testing
+* Bug: Handle state options in admin: selected state or free text
+* Feature: Figure out how to make entire payments section read only, except for ability to refund
+* Feature: Add refunds: Add actionable link under payments, include on payments page only
+* Feature: Create rake task for copying over views, and make sure app views will override gems
+* Test: Test email send functionality
+* Test: Add unit testing
 
 Copyright
 ========

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/helpers/piggybak_helper.rb

@@ -5,7 +5,7 @@ module PiggybakHelper
   def cart_link
     cart = Piggybak::Cart.new(request.cookies["cart"]) 
     nitems = cart.items.inject(0) { |nitems, item| nitems + item[:quantity] }
-    if nitems > 0
+    if nitems > 0 && !["piggybak/orders", "piggybak/cart"].include?(params[:controller])
       link_to  "#{pluralize(nitems, 'item')}: #{number_to_currency(cart.total)}", piggybak.cart_url
     end
   end

data/app/models/piggybak/payment_calculator/authorize_net.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class PaymentCalculator::AuthorizeNet < PaymentCalculator
+  class PaymentCalculator::AuthorizeNet
     KEYS = ["login", "password"]
     KLASS = ::ActiveMerchant::Billing::AuthorizeNetGateway
 

data/app/models/piggybak/payment_calculator/fake.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class PaymentCalculator::Fake < PaymentCalculator
+  class PaymentCalculator::Fake
     KEYS = []
     KLASS = ::Piggybak::PaymentCalculator::Fake
 

data/app/models/piggybak/payment_method.rb

@@ -1,12 +1,5 @@
 module Piggybak 
   class PaymentMethod < ActiveRecord::Base
-    
-    # klass_enum requires the ShippingCalculator subclasses to be loaded
-    shipping_calcs_path = File.expand_path("../payment_calculator", __FILE__)
-    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
-      ActiveSupport::Dependencies.require_or_load subclass
-    end 
-    
     has_many :payment_method_values, :dependent => :destroy
     alias :metadata :payment_method_values
 
@@ -16,7 +9,7 @@ module Piggybak
     validates_presence_of :description
 
     def klass_enum 
-       Piggybak::PaymentCalculator.subclasses
+      Piggybak.config.payment_calculators
     end
 
     validates_each :payment_method_values do |record, attr, value|
@@ -24,7 +17,11 @@ module Piggybak
         payment_method = record.klass.constantize
         metadata_keys = value.collect { |v| v.key }.sort
         if payment_method::KEYS.sort != metadata_keys
-          record.errors.add attr, "You must define key values for #{payment_method::KEYS.join(', ')} for this payment method."
+          if payment_method::KEYS.empty?
+            record.errors.add attr, "You don't need any metadata for this method."
+          else
+            record.errors.add attr, "You must define key values for #{payment_method::KEYS.join(', ')} for this payment method."
+          end
         end
       end
     end

data/app/models/piggybak/shipping_calculator/flat_rate.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class ShippingCalculator::FlatRate < ShippingCalculator
+  class ShippingCalculator::FlatRate
     KEYS = ["rate"]
 
     def self.available?(*args)

data/app/models/piggybak/shipping_calculator/free.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class ShippingCalculator::Free < ShippingCalculator
+  class ShippingCalculator::Free
     KEYS = []
 
     def self.available?(method, object)

data/app/models/piggybak/shipping_calculator/range.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class ShippingCalculator::Range < ShippingCalculator
+  class ShippingCalculator::Range
     KEYS = ["cost", "upper", "lower"]
 
     def self.available?(method, object)

data/app/models/piggybak/shipping_method.rb

@@ -1,12 +1,5 @@
 module Piggybak
   class ShippingMethod < ActiveRecord::Base
-    
-    # klass_enum requires the ShippingCalculator subclasses to be loaded
-    shipping_calcs_path = File.expand_path("../shipping_calculator", __FILE__)
-    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
-      ActiveSupport::Dependencies.require_or_load subclass
-    end 
-    
     has_many :shipping_method_values, :dependent => :destroy
     alias :metadata :shipping_method_values
 
@@ -20,13 +13,17 @@ module Piggybak
         calculator = record.klass.constantize
         metadata_keys = value.collect { |v| v.key }.sort
         if calculator::KEYS.sort != metadata_keys
-          record.errors.add attr, "You must define key values for #{calculator::KEYS.join(', ')} for this shipping method."
+          if calculator::KEYS.empty?
+            record.errors.add attr, "You don't need any metadata for this method."
+          else
+            record.errors.add attr, "You must define key values for #{calculator::KEYS.join(', ')} for this shipping method."
+          end
         end
       end
     end
 
     def klass_enum
-      Piggybak::ShippingCalculator.subclasses
+      Piggybak.config.shipping_calculators
     end
 
     def self.available_methods(cart)

data/app/models/piggybak/tax_calculator/percent.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  class TaxCalculator::Percent < TaxCalculator
+  class TaxCalculator::Percent
     KEYS = ["state_abbr", "rate"]
 
     def self.available?(method, object)

data/app/models/piggybak/tax_method.rb

@@ -1,12 +1,5 @@
 module Piggybak
   class TaxMethod < ActiveRecord::Base
-    
-    # klass_enum requires the ShippingCalculator subclasses to be loaded
-    shipping_calcs_path = File.expand_path("../tax_calculator", __FILE__)
-    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
-      ActiveSupport::Dependencies.require_or_load subclass
-    end 
-    
     has_many :tax_method_values, :dependent => :destroy
     alias :metadata :tax_method_values
 
@@ -20,13 +13,17 @@ module Piggybak
         calculator = record.klass.constantize
         metadata_keys = value.collect { |v| v.key }.sort
         if calculator::KEYS.sort != metadata_keys
-          record.errors.add attr, "You must define key values for #{calculator::KEYS.join(', ')} for this tax method."
+          if calculator::KEYS.empty?
+            record.errors.add attr, "You don't need any metadata for this method."
+          else
+            record.errors.add attr, "You must define key values for #{calculator::KEYS.join(', ')} for this tax method."
+          end
         end
       end
     end
 
     def klass_enum 
-      Piggybak::TaxCalculator.subclasses
+      Piggybak.config.tax_calculators
     end
 
     def self.calculate_tax(object)

data/app/views/piggybak/orders/_address_form.html.erb

@@ -7,9 +7,13 @@
 	<%= address.text_field :lastname %>
 </div>
 <div class="item">
-	<%= address.label :address1 %>
+	<%= address.label :address1, "Address" %>
 	<%= address.text_field :address1 %>
 </div>
+<div class="item">
+	<%= address.label :address2, "Address cont." %>
+	<%= address.text_field :address2 %>
+</div>
 <div class="item">
 	<%= address.label :city %>
 	<%= address.text_field :city %>

data/lib/piggybak.rb

@@ -1,9 +1,23 @@
+require 'piggybak/config'
 require 'acts_as_variant/base'
 require 'acts_as_orderer/base'
 require 'active_merchant'
 require 'currency'
 
 module Piggybak
+  def self.config(entity = nil, &block)
+    if entity
+      Piggybak::Config.model(entity, &block)
+    elsif block_given? && ENV['SKIP_RAILS_ADMIN_INITIALIZER'] != "true"
+      block.call(Piggybak::Config)
+    else
+      Piggybak::Config
+    end 
+  end
+
+  def self.reset
+    Piggybak::Config.reset
+  end
 
   class Engine < Rails::Engine
     initializer "piggybak.add_helper" do |app|

data/lib/piggybak/config.rb

@@ -0,0 +1,20 @@
+module Piggybak
+  module Config
+    class << self
+      attr_accessor :payment_calculators
+      attr_accessor :shipping_calculators
+      attr_accessor :tax_calculators
+
+      def reset
+        @payment_calculators = ["::Piggybak::PaymentCalculator::Fake",
+                                "::Piggybak::PaymentCalculator::AuthorizeNet"]
+        @shipping_calculators = ["::Piggybak::ShippingCalculator::FlatRate",
+                                 "::Piggybak::ShippingCalculator::Free",
+                                 "::Piggybak::ShippingCalculator::Range"]
+        @tax_calculators = ["::Piggybak::TaxCalculator::Percent"]
+      end
+    end
+
+    self.reset
+  end
+end

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-01-06"
+  s.date = "2012-01-07"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
@@ -34,21 +34,17 @@ Gem::Specification.new do |s|
     "app/models/piggybak/line_item.rb",
     "app/models/piggybak/order.rb",
     "app/models/piggybak/payment.rb",
-    "app/models/piggybak/payment_calculator.rb",
     "app/models/piggybak/payment_calculator/authorize_net.rb",
     "app/models/piggybak/payment_calculator/fake.rb",
     "app/models/piggybak/payment_method.rb",
     "app/models/piggybak/payment_method_value.rb",
     "app/models/piggybak/shipment.rb",
-    "app/models/piggybak/shipping_calculator.rb",
     "app/models/piggybak/shipping_calculator/flat_rate.rb",
     "app/models/piggybak/shipping_calculator/free.rb",
-    "app/models/piggybak/shipping_calculator/pickup.rb",
     "app/models/piggybak/shipping_calculator/range.rb",
     "app/models/piggybak/shipping_method.rb",
     "app/models/piggybak/shipping_method_value.rb",
     "app/models/piggybak/state.rb",
-    "app/models/piggybak/tax_calculator.rb",
     "app/models/piggybak/tax_calculator/percent.rb",
     "app/models/piggybak/tax_method.rb",
     "app/models/piggybak/tax_method_value.rb",
@@ -86,6 +82,7 @@ Gem::Specification.new do |s|
     "lib/acts_as_variant/base.rb",
     "lib/currency.rb",
     "lib/piggybak.rb",
+    "lib/piggybak/config.rb",
     "piggybak.gemspec"
   ]
   s.homepage = "http://github.com/stephskardal/piggybak"

metadata

@@ -2,7 +2,7 @@
 name: piggybak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Steph Skardal
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-06 00:00:00 Z
+date: 2012-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: countries
@@ -128,21 +128,17 @@ files:
 - app/models/piggybak/line_item.rb
 - app/models/piggybak/order.rb
 - app/models/piggybak/payment.rb
-- app/models/piggybak/payment_calculator.rb
 - app/models/piggybak/payment_calculator/authorize_net.rb
 - app/models/piggybak/payment_calculator/fake.rb
 - app/models/piggybak/payment_method.rb
 - app/models/piggybak/payment_method_value.rb
 - app/models/piggybak/shipment.rb
-- app/models/piggybak/shipping_calculator.rb
 - app/models/piggybak/shipping_calculator/flat_rate.rb
 - app/models/piggybak/shipping_calculator/free.rb
-- app/models/piggybak/shipping_calculator/pickup.rb
 - app/models/piggybak/shipping_calculator/range.rb
 - app/models/piggybak/shipping_method.rb
 - app/models/piggybak/shipping_method_value.rb
 - app/models/piggybak/state.rb
-- app/models/piggybak/tax_calculator.rb
 - app/models/piggybak/tax_calculator/percent.rb
 - app/models/piggybak/tax_method.rb
 - app/models/piggybak/tax_method_value.rb
@@ -180,6 +176,7 @@ files:
 - lib/acts_as_variant/base.rb
 - lib/currency.rb
 - lib/piggybak.rb
+- lib/piggybak/config.rb
 - piggybak.gemspec
 homepage: http://github.com/stephskardal/piggybak
 licenses: 
@@ -194,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4394646372034307498
+      hash: 2778086706911643141
       segments: 
       - 0
       version: "0"

data/app/models/piggybak/payment_calculator.rb

@@ -1,7 +0,0 @@
-module Piggybak
-  class PaymentCalculator
-    def self.authorize(*args)
-      self::KLASS.authorize(*args)
-    end
-  end
-end

data/app/models/piggybak/shipping_calculator.rb

@@ -1,12 +0,0 @@
-module Piggybak
-  class ShippingCalculator
-    def self.available?(*args)
-      false
-    end
-
-    def self.lookup(*args)
-      { :available => false,
-        :rate => 0.00 }
-    end
-  end
-end

data/app/models/piggybak/shipping_calculator/pickup.rb

@@ -1,23 +0,0 @@
-module Piggybak
-  class ShippingCalculator::Pickup < ShippingCalculator
-    KEYS = ["state_abbr", "rate"]
-
-    def self.available?(method, object)
-      abbr = method.metadata.detect { |t| t.key == "state_abbr" }.value
-
-      if object.is_a?(Cart)
-        state = State.find(object.extra_data["state_id"])
-        return true if state && state.abbr == abbr
-      else
-        if object.billing_address && object.billing_address.state 
-          return object.billing_address.state.abbr == abbr
-        end
-      end
-      return false
-    end
-
-    def self.rate(method, object)
-      method.metadata.detect { |m| m.key == "rate" }.value.to_f.to_c
-    end
-  end
-end

data/app/models/piggybak/tax_calculator.rb

@@ -1,7 +0,0 @@
-module Piggybak
-  class TaxCalculator
-    def self.available?(*args)
-      false
-    end
-  end
-end