piggybak 0.6.13 → 0.6.15

data/Gemfile

@@ -17,3 +17,4 @@ gem "jquery-rails"
 # gem 'debugger'
 
 gem "countries"
+gem "rack-ssl-enforcer"

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.13)
+    piggybak (0.6.15)
       activemerchant
       countries
       devise
+      rack-ssl-enforcer
       rails (~> 3.2.8)
       rails_admin
 
@@ -51,7 +52,7 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.1.0.0)
+    bootstrap-sass (2.1.0.1)
     builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -59,7 +60,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     countries (0.8.1)
       currencies (= 0.4.0)
       currencies (>= 0.2.0)
@@ -110,6 +111,7 @@ GEM
       rack (~> 1.3)
     rack-ssl (1.3.2)
       rack
+    rack-ssl-enforcer (0.2.4)
     rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
@@ -170,3 +172,4 @@ DEPENDENCIES
   countries
   jquery-rails
   piggybak!
+  rack-ssl-enforcer

data/app/controllers/piggybak/orders_controller.rb

@@ -37,9 +37,6 @@ module Piggybak
             end
 
             if @order.save
-              # TODO: Imporant: figure out how to have notifications not trigger rollback here. Instead log failed order notification sent.
-              Piggybak::Notifier.order_notification(@order).deliver
-
               if Piggybak.config.logging
                 logger.info "#{request.remote_ip}:#{Time.now.strftime("%Y-%m-%d %H:%M")} Order saved: #{@order.inspect}"
               end

data/app/models/piggybak/order.rb

@@ -21,13 +21,18 @@ module Piggybak
     validate :number_payments
     before_save :postprocess_order, :update_status, :set_new_record
     after_save :record_order_note
+    after_save :deliver_order_confirmation, :if => Proc.new { |order| order.ip_address != "admin" }
 
     default_scope :order => 'created_at DESC'
 
     attr_accessible :user_id, :email, :phone, :billing_address_attributes, 
                     :shipping_address_attributes, :line_items_attributes,
                     :order_notes_attributes, :details, :recorded_changer, :ip_address
-                    
+                   
+    def deliver_order_confirmation
+      Piggybak::Notifier.order_notification(self).deliver
+    end
+ 
     def initialize_defaults
       self.recorded_changes ||= []
 

data/app/views/piggybak/cart/_items.html.erb

@@ -66,6 +66,7 @@
 </table>
 
 <% if page == "cart" %>
+<%= link_to "Proceed to Checkout", piggybak.orders_url, :id => "checkout" %>
 <%= submit_tag "Update", :id => "update" %>
 <% end -%>
 

data/app/views/piggybak/cart/show.html.erb

@@ -8,8 +8,4 @@
 <% end -%>
 
 <%= render "items", :page => "cart" %>
-
-<% if @cart.sellables.any? -%>
-<%= link_to "Proceed to Checkout", piggybak.orders_url, :id => "checkout" %>
-<% end -%>
 </div>

data/lib/piggybak/config.rb

@@ -12,6 +12,7 @@ module Piggybak
       attr_accessor :logging_file
       attr_accessor :whois_url
       attr_accessor :line_item_types
+      attr_accessor :secure_checkout
 
       def reset
         @email_sender = "support@piggybak.org"
@@ -57,6 +58,8 @@ module Piggybak
         @logging_file = "/log/orders.log"
 
         @whois_url = nil
+
+        @secure_checkout = false
       end
     end
 

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.13"
+  VERSION = "0.6.15"
 end

data/lib/piggybak.rb

@@ -6,6 +6,7 @@ require 'active_merchant'
 require 'formatted_changes'
 require 'currency'
 require 'mask_submissions'
+require 'rack-ssl-enforcer'
 
 module Piggybak
   def self.config(entity = nil, &block)
@@ -24,6 +25,17 @@ module Piggybak
   end
 
   class Engine < Rails::Engine
+    initializer "piggybak.ssl_enforcer" do |app|
+      # Note: If your main application also uses rack-ssl-enforcer,
+      # set secure_checkout to false, and copy this and integrate
+      # additional pages that need SSL into your config/application.rb
+      if Piggybak.config.secure_checkout
+        app.config.middleware.use Rack::SslEnforcer,
+          :only => [/\/checkout\/$/, '/checkout/orders/tax', '/checkout/orders/shipping', '/checkout/orders/geodata'],
+          :strict => true
+      end
+    end
+    
     initializer "piggybak.add_helper" do |app|
       ApplicationController.class_eval do
         helper :piggybak

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.15
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,6 +93,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-ssl-enforcer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mountable Ruby on Rails Ecommerce.
 email:
 - piggybak@endpoint.com
@@ -213,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1341771261448397345
+      hash: 3431245891548905163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1341771261448397345
+      hash: 3431245891548905163
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23