saasaparilla 0.1.8 → 0.2.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3@saasaparilla

data/Gemfile

@@ -1,19 +1,19 @@
 source "http://rubygems.org"
 
 gemspec
-gem "rails", "3.0.5"
+gem "rails", "3.0.6"
 
 gem "sqlite3"
 gem 'haml'
 gem 'will_paginate'
-
+gem "pry"
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-gem RUBY_VERSION.include?('1.9') ? 'ruby-debug19' : 'ruby-debug'
+#gem RUBY_VERSION.include?('1.9') ? 'ruby-debug19' : 'ruby-debug'
 
 gem "jquery-rails"
 gem "dynamic_attributes"
 gem "authlogic"
-gem 'activemerchant', ">= 1.20.0"
+gem 'activemerchant', "1.20.0"
 gem 'simple_form'
 gem 'dynamic_form'
 gem 'state_machine'
@@ -24,7 +24,7 @@ group :development, :test do
 	gem "autotest-growl"
 	gem "autotest-fsevent"
   gem "autotest-rails"
-  gem "factory_girl_rails", ">= 1.0.1"
+  gem "factory_girl_rails", "1.0.1"
   gem "rspec-rails"
 
   gem 'database_cleaner'

data/app/controllers/saasaparilla/admin/subscriptions_controller.rb

@@ -6,7 +6,7 @@ class Saasaparilla::Admin::SubscriptionsController < ApplicationController
   
   # GET /admin/subscriptions
   def index
-    @subscriptions = Subscription.all.paginate(:page => params[:page], :per_page => 20, :order => "created_at DESC")
+    @subscriptions = Subscription.paginate(:page => params[:page], :per_page => 20, :order => "created_at DESC")
   end
   
   def show

data/app/controllers/saasaparilla/subscription_controller.rb

@@ -1,6 +1,6 @@
 class Saasaparilla::SubscriptionController < ApplicationController
   unloadable
-  ssl_required :new, :create, :show 
+  ssl_required :new, :create, :show if Rails.env == "production"
   include Authentication::InstanceMethods
   before_filter :get_subscription, :only => [:show, :destroy, :reactivate]
 
@@ -14,7 +14,6 @@ class Saasaparilla::SubscriptionController < ApplicationController
   
   def create
     @subscription = current_billable.build_subscription(params[:subscription])
-    
     begin
       if @subscription.save
         redirect_to subscription_path

data/app/models/billing_activity.rb

@@ -3,6 +3,8 @@ class BillingActivity < ActiveRecord::Base
   has_one :invoice
   has_one :transaction
   
+  attr_accessible :action, :amount, :response, :subscription, :invoice, :message
+
   MESSAGES = {:success => "Thank you for your payment."}
   scope :recent, order("created_at DESC")
   

data/app/models/contact_info.rb

@@ -5,6 +5,8 @@ class ContactInfo < ActiveRecord::Base
   validates_format_of :email, :with => ::Authlogic::Regex.email
   validates_presence_of :email
 
+  attr_accessible :first_name, :last_name, :email, :address, :city, :state, :zip, :country, :phone_area_code, :phone_prefix, :phone_suffix, :phone_number
+
   with_options :if => :require_billing_address? do |contact_info|
     contact_info.validates_presence_of :address
     contact_info.validates_presence_of :city

data/app/models/credit_card.rb

@@ -18,6 +18,8 @@ class CreditCard < ActiveRecord::Base
   MONTHS = (1..12).to_a
   YEARS = ((Date.today.year)..(Date.today.year + 8)).to_a
   
+  attr_accessible :card_type, :card_number, :expiry_month, :expiry_year, :card_verification
+
   belongs_to :subscription
   
   before_save :mask_card_number

data/app/models/invoice.rb

@@ -9,6 +9,7 @@ class Invoice < ActiveRecord::Base
 
   
   def amount
+    
     invoice_line_items.sum(:price)
   end
   
@@ -25,6 +26,7 @@ class Invoice < ActiveRecord::Base
     end
     
     def send_invoice_created_email
+      
       Saasaparilla::Notifier.invoice_created(billing_activity.subscription, self).deliver
     end
     

data/app/models/invoice_line_item.rb

@@ -1,3 +1,4 @@
 class InvoiceLineItem < ActiveRecord::Base
   belongs_to :invoice 
-end
+  attr_accessible :description, :from, :to, :price
+end

data/app/models/plan.rb

@@ -7,6 +7,8 @@ class Plan < ActiveRecord::Base
   
   has_many :subscriptions
 
+  attr_accessible :name, :price, :billing_period
+  
   BILLING_PERIODS = ["Monthly", "Annually"]
   
   def respond_to?(method_sym, include_private = false)

data/app/models/subscription.rb

@@ -11,10 +11,12 @@ class Subscription < ActiveRecord::Base
   belongs_to :billable, :polymorphic => true
   has_one :credit_card
   accepts_nested_attributes_for :credit_card
+  before_validation :set_status
+  before_validation :set_credit_card_name
+  before_create :set_status
   before_create :create_cim_profile
   before_create :create_payment_profile
-  before_validation :set_status, :on => :create
-  before_validation :set_credit_card_name
+ 
   before_create :set_initial_balance
   after_rollback :delete_profile
   after_create :initial_bill
@@ -23,6 +25,7 @@ class Subscription < ActiveRecord::Base
   validates_presence_of :plan, :message => "can't be blank"
   validates_associated :credit_card, :contact_info, :on => :create
   
+  attr_accessible :plan_id, :contact_info_attributes, :credit_card_attributes, :billing_date, :status, :invoice, :invoiced_on, :balance, :plan, :downgrade_to_plan
 
   scope :active, where("status != ?", "canceled")
   
@@ -32,7 +35,7 @@ class Subscription < ActiveRecord::Base
   
   scope :all_invoiceable, lambda {|date|
     #find all subscriptions not been invoiced within the last month
-    where("billing_date <= ? and (invoiced_on > ? OR invoiced_on is null) and id not in (select id from subscriptions where invoiced_on > ?) ", date + 5.days, (date - 1.months).to_time, date - 5.days)
+    where("billing_date <= ? and (invoiced_on > ? OR invoiced_on is null)", date + 5.days, (date - 1.months).to_time)
     }
 
   scope :all_paid, where("no_charge != ?", true)
@@ -75,6 +78,10 @@ class Subscription < ActiveRecord::Base
       end
     end
   end
+
+
+
+ 
   
   def downgrade
     self.plan = downgrade_to_plan
@@ -137,9 +144,10 @@ class Subscription < ActiveRecord::Base
   
   
   def invoice!
+
     add_to_balance(plan.price)
     create_invoice
-    self.update_attributes(:invoiced_on => Date.today)
+    self.update_attributes!(:invoiced_on => Date.today)
     #if invoice_subscription
     #  set_next_invoice_date()
   end
@@ -176,10 +184,11 @@ class Subscription < ActiveRecord::Base
   private
   
   def create_invoice
-    @invoice = Invoice.create(:subscription => self, :price => plan.price, :from => get_beginning_of_billing_cycle, :to => billing_date)
+    @invoice = Invoice.create!(:subscription => self, :price => plan.price, :from => get_beginning_of_billing_cycle, :to => billing_date)
   end
   
   def get_beginning_of_billing_cycle
+
     if monthly?
       return billing_date - 1.months
     elsif annually?
@@ -272,7 +281,9 @@ class Subscription < ActiveRecord::Base
   end
   
   def set_status
-    self.status = "active"
+    unless self.status.present?
+     self.status = "active"
+   end
   end
   
   def set_initial_balance
@@ -286,6 +297,7 @@ class Subscription < ActiveRecord::Base
                                                :customer_profile_id => customer_cim_id,
                                                :customer_payment_profile_id => customer_payment_profile_id})
 
+
     transaction = self.transactions.create(:action => "purchase", :amount => amount, :response => response, :subscription => self)
     if response.success?
       self.update_attributes(:balance => balance - amount)

data/app/models/transaction.rb

@@ -5,6 +5,7 @@ class Transaction < ActiveRecord::Base
   belongs_to :billing_activity
   after_create :generate_billing_activity
   
+  attr_accessible :action, :amount, :response, :subscription
   
   def response=(response)
     self.success       = response.success?

data/app/views/saasaparilla/notifier/invoice_created.html.haml

@@ -4,6 +4,7 @@
    = "You will be billed in 5 days for the following:"
 
 %table
+   
    - @invoice.invoice_line_items.each do |item|
       %tr
          %td

data/app/views/saasaparilla/subscription/new.html.haml

@@ -1,11 +1,11 @@
 .saasaparilla
 	%h1 Create Subscription
 	
-	= simple_form_for @subscription, :url => subscription_path(:secure => true) do |f|
+	= simple_form_for @subscription, :url => subscription_path(:secure => Rails.env == "production") do |f|
 
 		.info
 			%h2 Plan
-			= f.association :plan, :as => 'radio', :label => false
+			= f.association :plan, :as => 'radio_buttons', :label => false
 	
 	
 		= f.simple_fields_for :contact_info, @subscription.contact_info do |cif|

data/config/routes.rb

@@ -1,11 +1,11 @@
 Rails.application.routes.draw do
   
-  scope '/admin', :name_prefix => 'admin' do
-    resources :plans, :controller => "saasaparilla/admin/plans"
-    resources :subscriptions, :controller => "saasaparilla/admin/subscriptions" do
+  namespace "admin", :module => 'saasaparilla/admin' do
+    resources :plans
+    resources :subscriptions do
       get 'cancel', :on => :member
       get 'toggle_no_charge', :on => :member
-      resources :transactions, :controller => "saasaparilla/admin/transactions", :only => [:index]
+      resources :transactions, :only => [:index]
     end
   end
   
@@ -13,13 +13,13 @@ Rails.application.routes.draw do
     get 'reactivate', :on => :member
   end
   
-  scope '/subscription', :name_prefix => 'subscription' do
-    resources :payments, :controller => "saasaparilla/payments"
-    resource :credit_card, :controller => "saasaparilla/credit_card"
-    resource :plan, :controller => "saasaparilla/plans", :only => [:edit, :update]
-    resource :contact_info, :controller => "saasaparilla/contact_info"
-    resource :billing_history, :controller => "saasaparilla/billing_history" 
-    resources :invoices, :controller => "saasaparilla/invoices"
+  namespace 'subscription', :module => "saasaparilla" do
+    resources :payments
+    resource :credit_card, :controller => "credit_card"
+    resource :plan,  :only => [:edit, :update]
+    resource :contact_info, :controller => "contact_info"
+    resource :billing_history, :controller => "billing_history"
+    resources :invoices
   end
   
   

data/lib/saasaparilla/engine.rb

@@ -16,7 +16,7 @@ module Saasaparilla
       require 'initializers/time_format'
       if File.exists?(Rails.root.to_s + "/config/saasaparilla.yml")
         raw_config = File.read(Rails.root.to_s + "/config/saasaparilla.yml")
-        Saasaparilla::CONFIG = YAML.load(raw_config)[RAILS_ENV]
+        Saasaparilla::CONFIG = YAML.load(raw_config)[Rails.env]
       end
       require 'initializers/auth_dot_net'
       

data/lib/saasaparilla/version.rb

@@ -1,3 +1,3 @@
 module Saasaparilla
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

data/spec/dummy/config/saasaparilla.yml

@@ -14,8 +14,8 @@ test:
   from_email: test@dev.com
   trial_period: 0
   include_free_account: false
-  auth_dot_net_login: 4fQ6B3Uyz
-  auth_dot_net_password: 4QH8JM8929epy2gt
+  auth_dot_net_login: 96CsW6wJ
+  auth_dot_net_password: 4m74Fc7nk2BX4743
   authorization: none
   require_billing_address: true
   require_phone_number: true