simplepay-rails4 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef46ea6bb69dc3366398b471120553cfbec077f
-  data.tar.gz: 3e7084f940dafe07a7104aab5b6127c3082097b7
+  metadata.gz: 9c6b3573c1791b1f46173f7dd12100eda651f875
+  data.tar.gz: 0071f403b025c2d023089f048a76ebcebc8909e0
 SHA512:
-  metadata.gz: 6d98dfc5e5901720bd17acae15784d3613e6ad29aa99772917037b02d551739b72c8048ec1f263d820df531f1557b3d1755b55433c43f4da0847e8f268f6f7c6
-  data.tar.gz: 5558772269c4af90c94583bc5f6895903866d5a76301be09f0fd0b109a1445852f01f95718239f91bb7aebbb1cde397e59c74a9a92406011f06e9e172ec0e2a9
+  metadata.gz: 6cc107ddac364869a7382fdbeed87886b2722a3f3b8d87393488f2f8884a6dd6002f996a990c791978c859b32507bdd8616df38bad8243b1cefe391eeeae7390
+  data.tar.gz: 3f132ad19a8b4dd747431fb841d1c7742eb6c835487cc44e0563e59c246dd1aa2727501c23e5856f9682c9a3e13ab0dc9a308c2ab9056c01064a39aa5b01e1ce

data/Gemfile

@@ -6,3 +6,4 @@ gem "rails", "~> 4.1.0"
 gem 'rake'
 gem 'minitest-spec-rails'
 gem "mocha"
+gem 'debugger'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simplepay-rails4 (0.4.0)
+    simplepay-rails4 (0.4.1)
       nokogiri (~> 1.6)
       rails (~> 4)
 
@@ -36,6 +36,13 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
+    columnize (0.8.9)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.5)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
@@ -97,6 +104,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
   minitest-spec-rails
   mocha
   rails (~> 4.1.0)

data/README.md

@@ -73,6 +73,32 @@ optional.  This is done like so:
 }) %>
 ```
 
+### Custom Submit
+
+You can add a custom submit button (and indeed custom form elements) using
+either an attribute or a block (not both)
+
+```erb
+<%= simplepay_form_for(:subscription, {
+  :amount                 => 10.95,
+  :description            => "MORE Profit!",
+  :recurring_frequency    => "1 month"
+}, submit_tag('Custom Submit')) %>
+
+<%# OR #%>
+
+<%= simplepay_form_for :marketplace, 
+  :amount => invoice.total, 
+  :description => "Mutual profit!", 
+  :recipient_email => 'seller@gmail.com', 
+  :fixed_marketplace_fee => 10.00, 
+  :variable_marketplace_fee => 5 do %>
+  <div>
+    <%= submit_tag 'Pay With Amazon', class: 'btn btn-primary' %>
+  </div>
+<% end %>
+```
+
 ### Marketplace forms
 
 Amazon Simple Pay Marketplace makes it easy to facilitate payments between

data/app/helpers/simplepay/rails/simplepay_helper.rb

@@ -20,6 +20,9 @@ module Simplepay
       # 
       def simplepay_form_for(service_name, attributes = {}, submit_tag = nil)
         service = get_simplepay_service(service_name)
+        if block_given?
+          submit_tag = capture(&Proc.new)
+        end
         service.form(attributes, submit_tag).html_safe
       end
       

data/lib/simplepay/service.rb

@@ -1,4 +1,4 @@
-require 'simplepay/helpers/form_helper'
+require 'action_view'
 
 module Simplepay
   
@@ -14,6 +14,9 @@ module Simplepay
   # signature:: The validation string, guaranteeing that you are the one generating the request and that the values were not tampered with enroute (automatically generated by the form generators)
   # 
   class Service
+    include ActionView::Helpers::CaptureHelper
+    include ActionView::Helpers::TagHelper
+    include ActionView::Helpers::FormTagHelper
 
     # Fully-qualified URL for the production endpoint for the service.
     ENDPOINT_URL  = 'https://authorize.payments.amazon.com/pba/paypipeline'
@@ -68,6 +71,7 @@ module Simplepay
       
     end
     
+    attr_accessor :output_buffer
     
     ##
     # Returns the fields for the service instance.
@@ -85,25 +89,23 @@ module Simplepay
     end
     
     def form(attributes = {}, submit = nil)
+      self.output_buffer = ActionView::OutputBuffer.new
       set_accessor_fields
       set_fields(attributes)
       set_signature
-      content = generate_input_fields + generate_submit_field(submit)
-      Simplepay::Helpers::FormHelper.content_tag(:form, content, {:method => 'post', :action => url})
-    end
-    
+      content = generate_input_fields
+      content += submit ? submit.to_s : generate_submit_field()
+      content_tag(:form, content.html_safe, method: 'post', action: url)
+    end    
     
     private
-    
-    
+        
     def generate_input_fields
       self.fields.collect { |f| f.to_input }.join
     end
     
-    def generate_submit_field(submit)
-      options = {:type => 'submit'}
-      options.merge!(:value => self.class.submit_tag) if self.class.submit_tag
-      submit ? submit.to_s : Simplepay::Helpers::FormHelper.tag(:input, options)
+    def generate_submit_field
+      submit_tag(self.class.submit_tag)
     end
     
     def set_accessor_fields

data/lib/simplepay/support/field.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'action_view'
 
 module Simplepay
   module Support
@@ -8,6 +9,7 @@ module Simplepay
     # form.  These fields are often unique to their service.
     # 
     class Field
+      include ActionView::Helpers::FormTagHelper
       include Comparable
       
       ALLOWED_OPTIONS = [:as, :class, :required, :value]
@@ -120,15 +122,10 @@ module Simplepay
       end
       
       
-      private
-      
+      private      
       
       def html_input_tag #:nodoc:
-        Simplepay::Helpers::FormHelper.tag(:input, {
-          :name   => service_name,
-          :value  => value,
-          :type   => 'hidden'
-        })
+        hidden_field_tag(service_name, value)
       end
       
       def normalize_options!(options) #:nodoc:
@@ -144,4 +141,4 @@ module Simplepay
     end
     
   end
-end
+end

data/lib/simplepay/version.rb

@@ -1,3 +1,3 @@
 module Simplepay
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/test/simplepay/test_service.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'rexml/document'
 require 'simplepay/service'
+require 'action_view'
 
 class TestService < Simplepay::Service
   ENDPOINT_URL  = 'http://test.host.url/api'
@@ -15,6 +16,7 @@ class TestService < Simplepay::Service
 end
 
 class Simplepay::TestService < ActiveSupport::TestCase
+  include ActionView::Helpers::FormTagHelper
   
   context 'Simplepay::Service' do
     
@@ -109,7 +111,7 @@ class Simplepay::TestService < ActiveSupport::TestCase
     end
     
     should 'allow the HTML SUBMIT button to be overridden' do
-      document = REXML::Document.new(@service.form({:required => 'set'}, Simplepay::Helpers::FormHelper.tag(:input, {:type => 'submit', :value => 'Send It'})))
+      document = REXML::Document.new(@service.form({:required => 'set'}, submit_tag('Send It')))
       assert_not_nil document.root.elements["input[@type='submit' and @value='Send It']"]
     end
     

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'active_support'
 require 'minitest-spec-rails'
 require 'minitest-spec-rails/init/active_support'
 require 'minitest-spec-rails/init/mini_shoulda'
+require 'debugger'
 
 require File.dirname(__FILE__) + '/../lib/simplepay'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplepay-rails4
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nathaniel E. Bibler
@@ -61,7 +61,6 @@ files:
 - lib/simplepay/constants.rb
 - lib/simplepay/engine.rb
 - lib/simplepay/errors.rb
-- lib/simplepay/helpers/form_helper.rb
 - lib/simplepay/service.rb
 - lib/simplepay/services/donation.rb
 - lib/simplepay/services/marketplace.rb

data/lib/simplepay/helpers/form_helper.rb

@@ -1,31 +0,0 @@
-module Simplepay
-  module Helpers
-    
-    module FormHelper
-      
-      def self.tag(name, options = nil, open = false)
-        "<#{name}#{tag_options(options) if options}" + (open ? ">" : " />")
-      end
-      
-      def self.content_tag(name, content, options = nil)
-        tag = "<#{name}#{tag_options(options)}>#{content}</#{name}>"
-        tag = tag.html_safe if tag.respond_to?(:html_safe)
-        tag
-      end
-      
-      
-      private
-      
-      
-      def self.tag_options(options)
-        unless options.blank?
-          attrs = []
-          attrs = options.map { |key, value| %(#{key}="#{value}") }
-          " #{attrs.sort * ' '}" unless attrs.empty?
-        end
-      end
-      
-    end
-    
-  end
-end