muck-commerce 0.1.9 → 0.2.0

data/lib/test/muck_commerce_factories.rb

@@ -3,11 +3,11 @@ Factory.sequence :sku do |n|
 end
 
 Factory.define :billing_information do |f|
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.name 'test guy'
+  f.first_name { Factory.next(:name) }
+  f.last_name { Factory.next(:name) }
+  f.name { Factory.next(:name) }
   f.company { Factory.next(:name) }
-  f.address1 '345 E'
+  f.address1 { Factory.next(:address) }
   f.city { Factory.next(:name) }
   f.state {|a| a.association(:state) }
   f.country {|a| a.association(:country) }
@@ -23,10 +23,10 @@ Factory.define :billing_information do |f|
 end
 
 Factory.define :live_billing_information, :class => BillingInformation do |f|
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.address1 '345 E'
-  f.city 'smalltown'
+  f.first_name { Factory.next(:name) }
+  f.last_name { Factory.next(:name) }
+  f.address1 { Factory.next(:address) }
+  f.city { Factory.next(:name) }
   f.state {|a| a.association(:state) }
   f.country {|a| a.association(:country) }
   f.postal_code '88888'
@@ -36,20 +36,21 @@ Factory.define :live_billing_information, :class => BillingInformation do |f|
   f.credit_card_number MuckCommerceTestDefinitions::PAYPAL_VISA
   f.credit_card_expiration { Date.new((DateTime.now.year + 2), 10, 10) }
   f.verification_value '999'
+  f.default true
   f.billable   {|a| a.association(:user) }
 end
 
 Factory.define :ach_billing, :class => BillingInformation do |f|
-  f.first_name 'test'
-  f.last_name 'guy'
-  f.address1 '345 E'
-  f.city 'smalltown'
-  f.state {|a| a.association(:state)}
-  f.country {|a| a.association(:country)}
+  f.first_name { Factory.next(:name) }
+  f.last_name { Factory.next(:name) }
+  f.address1 { Factory.next(:address) }
+  f.city { Factory.next(:name) }
+  f.state {|a| a.association(:state) }
+  f.country {|a| a.association(:country) }
   f.postal_code '88888'
   f.telephone '333-444-5555'
   f.payment_method 'ACH'
-  f.achname 'name of ach'
+  f.achname { Factory.next(:name) }
   f.achrouting '3333'
   f.achnumber '22222'
   f.achholder GlobalConfig.achholder_types[0][0]
@@ -132,7 +133,15 @@ def setup_live_user_and_billing(options = {})
   cart = populate_cart(user)
   country = Factory(:country, :name => 'United States of America', :abbreviation => 'US')
   state = Factory(:state, :name => 'Illinois', :abbreviation => 'IL', :country => country)
-  billing = Factory.build(:live_billing_information, {:billable => user, :state => state, :country => country, :city => 'Chicago'}.merge(options))
-  user.billing_informations << billing
+  billing = user.billing_informations.create(Factory.attributes_for(:live_billing_information, :city => 'Chicago').merge(options))
   [user, billing]
 end
+
+def setup_user_and_billing(options = {})
+  user = Factory(:user)
+  cart = populate_cart(user)
+  country = Factory(:country, :name => 'United States of America', :abbreviation => 'US')
+  state = Factory(:state, :name => 'Illinois', :abbreviation => 'IL', :country => country)
+  billing = user.billing_informations.create(Factory.attributes_for(:billing_information, :city => 'Chicago').merge(options))
+  [user, billing]
+end

data/locales/en.yml

@@ -1,13 +1,16 @@
 --- 
 en: 
   muck: 
-    commerce: 
+    commerce:
+      missing_billing_information: No valid billing information was provided.
       subscription_plans_amount: Amount
       save: Save
       invalid_credit_card_information: Invalid credit card information
       authorization_cim: authorization using cim
       billing_information_problem: "There was a problem with your billing information: {{message}}."
+      invalid_billing_information: "Invalid billing information"
       cim_update_user: update cim user
+      cim_update_payment_profile: update cim payment profile
       subscription_plan_updated: Subscription plan updated
       create_new_subscription_plan: Create new subscription plan
       subscription_plans_renewal_period: Renewal Period
@@ -57,6 +60,8 @@ en:
       capture: capture
       billing_information_updated_friendly: Your billing information has been updated successfully.
       cim_validate_profile: cim validate profile
+      cim_get_customer_profile: cim get customer profile
+      cim_get_payment_customer_profile: cim get customer payment profile
       subscription_plan_sku: Sku
       card_expiration: Credit Card Expiration
       verification_value: Security Code

data/muck-commerce.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-commerce}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-08}
   s.description = %q{Add ecommerce functionality to your muck project.  This includes integration with Paypal and Authorize.net.  This gem uses active merchant and so adding other gateways should be simple.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -82,10 +82,12 @@ Gem::Specification.new do |s|
      "db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "db/migrate/20100310180031_create_coupon_types.rb",
      "db/migrate/20100327171239_add_subscription_records.rb",
+     "db/migrate/20100408035338_move_customer_profile_id.rb",
      "lib/action_controller/muck_billing_application.rb",
      "lib/active_record/acts/muck_billing_information.rb",
      "lib/active_record/acts/muck_cart.rb",
      "lib/active_record/acts/muck_cart_coupon.rb",
+     "lib/active_record/acts/muck_cart_item.rb",
      "lib/active_record/acts/muck_commerce_user.rb",
      "lib/active_record/acts/muck_coupon.rb",
      "lib/active_record/acts/muck_coupon_type.rb",
@@ -165,6 +167,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "test/rails_root/db/migrate/20100310180031_create_coupon_types.rb",
      "test/rails_root/db/migrate/20100327171239_add_subscription_records.rb",
+     "test/rails_root/db/migrate/20100408035338_move_customer_profile_id.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/lib/tasks/muck.rake",
@@ -727,6 +730,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/stylesheets/themes/blue/styles.css",
      "test/rails_root/public/stylesheets/themes/red/styles.css",
      "test/rails_root/remote/functional/remote_orders_controller_test.rb",
+     "test/rails_root/remote/functional/remote_subscriptions_controller_test.rb",
      "test/rails_root/remote/remote_helper.rb",
      "test/rails_root/remote/unit/remote_order_test.rb",
      "test/rails_root/remote/unit/remote_order_transaction_test.rb",
@@ -755,6 +759,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/functional/orders_controller_test.rb",
      "test/rails_root/test/functional/subscription_controller_test.rb",
      "test/rails_root/test/test_helper.rb",
+     "test/rails_root/test/unit/billing_information_test.rb",
      "test/rails_root/test/unit/cart_coupon_test.rb",
      "test/rails_root/test/unit/coupon_test.rb",
      "test/rails_root/test/unit/coupon_type_test.rb",
@@ -861,10 +866,12 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20100309183304_add_coupon_subscrption_uses.rb",
      "test/rails_root/db/migrate/20100310180031_create_coupon_types.rb",
      "test/rails_root/db/migrate/20100327171239_add_subscription_records.rb",
+     "test/rails_root/db/migrate/20100408035338_move_customer_profile_id.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
      "test/rails_root/public/dispatch.rb",
      "test/rails_root/remote/functional/remote_orders_controller_test.rb",
+     "test/rails_root/remote/functional/remote_subscriptions_controller_test.rb",
      "test/rails_root/remote/remote_helper.rb",
      "test/rails_root/remote/unit/remote_order_test.rb",
      "test/rails_root/remote/unit/remote_order_transaction_test.rb",
@@ -877,6 +884,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/functional/orders_controller_test.rb",
      "test/rails_root/test/functional/subscription_controller_test.rb",
      "test/rails_root/test/test_helper.rb",
+     "test/rails_root/test/unit/billing_information_test.rb",
      "test/rails_root/test/unit/cart_coupon_test.rb",
      "test/rails_root/test/unit/coupon_test.rb",
      "test/rails_root/test/unit/coupon_type_test.rb",

data/test/rails_root/app/models/billing_information.rb

@@ -1,5 +1,40 @@
+# == Schema Information
+#
+# Table name: billing_informations
+#
+#  id                          :integer(4)      not null, primary key
+#  billable_id                 :integer(4)
+#  billable_type               :string(255)
+#  first_name                  :string(128)     default(""), not null
+#  last_name                   :string(128)     default(""), not null
+#  address1                    :string(512)     default(""), not null
+#  address2                    :string(512)
+#  city                        :string(128)     default(""), not null
+#  state_id                    :integer(4)
+#  country_id                  :integer(4)
+#  postal_code                 :string(255)     default(""), not null
+#  telephone                   :string(255)     default(""), not null
+#  payment_method              :string(255)     default("CC")
+#  credit_card_type            :string(255)
+#  credit_card_last_digits     :string(4)
+#  credit_card_expiration      :datetime
+#  achname                     :string(1024)
+#  achrouting                  :string(1024)
+#  achnumber                   :string(1024)
+#  achholder                   :string(1024)
+#  achtype                     :string(64)
+#  vault_id                    :string(512)
+#  customer_profile_id         :string(512)
+#  customer_payment_profile_id :string(512)
+#  default                     :boolean(1)
+#  created_at                  :datetime
+#  updated_at                  :datetime
+#  name                        :string(256)
+#  company                     :string(256)
+#
+
 class BillingInformation < ActiveRecord::Base
   
   acts_as_muck_billing_information
   
-end
+end

data/test/rails_root/app/models/cart.rb

@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: carts
+#
+#  id            :integer(4)      not null, primary key
+#  cartable_id   :integer(4)
+#  cartable_type :string(255)
+#  token         :string(255)
+#  created_at    :datetime
+#  updated_at    :datetime
+#
+
 class Cart < ActiveRecord::Base
  acts_as_muck_cart
 end

data/test/rails_root/app/models/cart_coupon.rb

@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: cart_coupons
+#
+#  id         :integer(4)      not null, primary key
+#  cart_id    :integer(4)
+#  coupon_id  :integer(4)
+#  created_at :datetime
+#  updated_at :datetime
+#
+
 class CartCoupon < ActiveRecord::Base
   acts_as_muck_cart_coupon
 end

data/test/rails_root/app/models/coupon.rb

@@ -1,3 +1,23 @@
+# == Schema Information
+#
+# Table name: coupons
+#
+#  id             :integer(4)      not null, primary key
+#  code           :string(255)
+#  amount         :integer(4)      default(0), not null
+#  percent        :integer(4)      default(0), not null
+#  uses           :integer(4)      default(0), not null
+#  unlimited      :boolean(1)      not null
+#  expires_at     :datetime
+#  use_limit      :integer(4)      default(1), not null
+#  created_at     :datetime
+#  updated_at     :datetime
+#  use_for_times  :integer(4)
+#  use_for_months :integer(4)
+#  user_id        :integer(4)
+#  coupon_type_id :integer(4)
+#
+
 class Coupon < ActiveRecord::Base
   acts_as_muck_coupon
-end
+end

data/test/rails_root/app/models/coupon_type.rb

@@ -1,3 +1,11 @@
+# == Schema Information
+#
+# Table name: coupon_types
+#
+#  id   :integer(4)      not null, primary key
+#  name :string(255)
+#
+
 class CouponType < ActiveRecord::Base
   acts_as_muck_coupon_type
-end
+end

data/test/rails_root/app/models/order.rb

@@ -1,3 +1,23 @@
+# == Schema Information
+#
+# Table name: orders
+#
+#  id               :integer(4)      not null, primary key
+#  orderable_id     :integer(4)
+#  orderable_type   :string(255)
+#  amount           :integer(4)
+#  discount         :integer(4)
+#  number           :string(255)
+#  first_name       :string(255)
+#  last_name        :string(255)
+#  ip_address       :string(255)
+#  express_token    :string(255)
+#  express_payer_id :string(255)
+#  order_type       :string(255)
+#  created_at       :datetime
+#  updated_at       :datetime
+#
+
 class Order < ActiveRecord::Base
   acts_as_muck_order
-end
+end

data/test/rails_root/app/models/order_coupon.rb

@@ -1,3 +1,14 @@
+# == Schema Information
+#
+# Table name: order_coupons
+#
+#  id         :integer(4)      not null, primary key
+#  order_id   :integer(4)
+#  coupon_id  :integer(4)
+#  created_at :datetime
+#  updated_at :datetime
+#
+
 class OrderCoupon < ActiveRecord::Base
   acts_as_muck_order_coupon
-end
+end

data/test/rails_root/app/models/order_transaction.rb

@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: order_transactions
+#
+#  id                   :integer(4)      not null, primary key
+#  amount               :integer(4)
+#  success              :boolean(1)
+#  reference            :string(255)
+#  message              :string(255)
+#  action               :string(255)
+#  params               :text
+#  test                 :boolean(1)
+#  transactionable_id   :integer(4)
+#  transactionable_type :string(255)
+#  response_code        :integer(4)
+#  created_at           :datetime
+#  updated_at           :datetime
+#
+
 class OrderTransaction < ActiveRecord::Base
   acts_as_muck_order_transaction
-end
+end

data/test/rails_root/app/models/profile.rb

@@ -1,3 +1,26 @@
+# == Schema Information
+#
+# Table name: profiles
+#
+#  id                 :integer(4)      not null, primary key
+#  user_id            :integer(4)
+#  photo_file_name    :string(255)
+#  photo_content_type :string(255)
+#  photo_file_size    :integer(4)
+#  created_at         :datetime
+#  updated_at         :datetime
+#  location           :string(255)
+#  lat                :decimal(15, 10)
+#  lng                :decimal(15, 10)
+#  about              :text
+#  city               :string(255)
+#  state_id           :integer(4)
+#  country_id         :integer(4)
+#  language_id        :integer(4)
+#  profile_views      :integer(4)
+#  policy             :text
+#
+
 class Profile < ActiveRecord::Base
   acts_as_muck_profile
 end

data/test/rails_root/app/models/subscription.rb

@@ -1,3 +1,24 @@
+# == Schema Information
+#
+# Table name: subscriptions
+#
+#  id                      :integer(4)      not null, primary key
+#  user_id                 :integer(4)
+#  amount                  :integer(4)
+#  next_renewal_at         :datetime
+#  aasm_state              :string(255)     default("trial")
+#  subscription_plan_id    :integer(4)
+#  renewal_period          :integer(4)
+#  number                  :string(255)
+#  failed_billing_attempts :integer(4)      default(0), not null
+#  cancelled_at            :datetime
+#  suspended_at            :datetime
+#  activated_at            :datetime
+#  default                 :boolean(1)
+#  created_at              :datetime
+#  updated_at              :datetime
+#
+
 class Subscription < ActiveRecord::Base
   acts_as_muck_subscription
-end
+end

data/test/rails_root/app/models/subscription_plan.rb

@@ -1,3 +1,17 @@
+# == Schema Information
+#
+# Table name: subscription_plans
+#
+#  id             :integer(4)      not null, primary key
+#  name           :string(255)
+#  sku            :string(255)
+#  amount         :integer(4)
+#  renewal_period :integer(4)
+#  trial_period   :integer(4)
+#  created_at     :datetime
+#  updated_at     :datetime
+#
+
 class SubscriptionPlan < ActiveRecord::Base
   acts_as_muck_subscription_plan
-end
+end

data/test/rails_root/app/models/user.rb

@@ -1,3 +1,35 @@
+# == Schema Information
+#
+# Table name: users
+#
+#  id                  :integer(4)      not null, primary key
+#  login               :string(255)
+#  email               :string(255)
+#  first_name          :string(255)
+#  last_name           :string(255)
+#  crypted_password    :string(255)
+#  password_salt       :string(255)
+#  persistence_token   :string(255)     not null
+#  single_access_token :string(255)     not null
+#  perishable_token    :string(255)     not null
+#  login_count         :integer(4)      default(0), not null
+#  failed_login_count  :integer(4)      default(0), not null
+#  last_request_at     :datetime
+#  current_login_at    :datetime
+#  last_login_at       :datetime
+#  current_login_ip    :string(255)
+#  last_login_ip       :string(255)
+#  terms_of_service    :boolean(1)      not null
+#  time_zone           :string(255)     default("UTC")
+#  disabled_at         :datetime
+#  created_at          :datetime
+#  activated_at        :datetime
+#  updated_at          :datetime
+#  identity_url        :string(255)
+#  url_key             :string(255)
+#  access_code_id      :integer(4)
+#
+
 class User < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
@@ -5,4 +37,4 @@ class User < ActiveRecord::Base
   acts_as_muck_user
   has_muck_profile
   acts_as_muck_commerce_user
-end
+end