paypal-subscribe 0.2.0 → 0.3.0

data/README.md

@@ -103,9 +103,17 @@ For more informations which options are already included see [here](https://gith
 Open your view and put a helper in it:
 
 ```ruby
-<%=paypal_subscribe_button :image => "logo.png", :alt => "Button description"%>
+<%=paypal_subscribe_form :image => "logo.png", :alt => "Button description"%>
 ```
 
+To use a ordinary button instead of an image use:
+
+```ruby
+<%= paypal_subscribe_form :button => true, :value => "Pay with Paypal", 
+                          :html => {:class=> "btn btn-alert"} %>
+```
+
+
 **Note** that image is just a file (name) which should be accessible through the asset pipeline.
 
 ## Callbacks
@@ -142,6 +150,10 @@ config.failure_callback = :my_own_failure_callback_route
 config.paypal_notify    = :my_own_notify_callback_route
 ```
 
+## Contributors
+
+Thanks to Paavo Leinonen <paavo@dealmachine.net>. 
+
 ## Contributing to paypal-subscribe
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/paypal-subscribe/action_view/form_helper.rb

@@ -29,41 +29,59 @@ module ActionView
       # </form>
       # 
       # * args - a list of arguments that includes an options hash:
-      #   * image  -  The name of the image which is used within submit button.
-      #               Note that the image should be just a name which is accesible
-      #               through the asset pipeline
-      #   * alt    -  The alt tag content for the button
+      #   * :image  -   The name of the image which is used within submit button.
+      #                 Note that the image should be just a name which is accesible
+      #                 through the asset pipeline. This is only useable if :button is false
+      #                 or not used.
+      #   * :alt    -   The alt tag content for the button (if image is used)
+      #   * :button -   Indicator if a submit button should be used instead of an image
+      #   * :html   -   Any html options. See ActionView::Helpers::FormTagHelper#submit_tag
+      #                 for details.
+      #   * :id     -   The submit tag id. Defaults to "paypal_submit"
       # Other configurations should be made in Rails.root/config/initializers
       #
       # Returns a HTML form.  
       def paypal_subscribe_button(*args)
         options = args.extract_options!
+        id      = options.fetch(:id, "paypal_submit")
         paypal_uri = PaypalSubscribe.paypal_url
-        paypal_form = form_tag(paypal_uri, :method => "POST")
-
-        paypal_form += hidden_field_tag("cmd", "_xclick-subscriptions")
+        paypal_form = form_tag(paypal_uri, :method => :post) do
+          fields = hidden_field_tag("cmd", "_xclick-subscriptions")
         
-        config = PaypalSubscribe.paypal_config
-        callbacks = []
-        callbacks << {:return => config.delete(:return)}
-        callbacks << {:cancel_return => config.delete(:cancel_return)}
-        callbacks << {:notify_url => config.delete(:notify_url)}
+          config = PaypalSubscribe.paypal_config
+          callbacks = []
+          callbacks << {:return => config.delete(:return)}
+          callbacks << {:cancel_return => config.delete(:cancel_return)}
+          callbacks << {:notify_url => config.delete(:notify_url)}
 
-        config.each_pair do |key,value|
-          paypal_form += hidden_field_tag("#{key}", value)
-        end
+          config.each_pair do |key,value|
+            fields << hidden_field_tag("#{key}", (options[key] ? options[key] : value))
+          end
 
-        callbacks.each do |callback_config|
-          callback_config.each_pair do |key,value|
-            paypal_form += hidden_field_tag(key,self.send("#{value}_url"))
+          callbacks.each do |callback_config|
+            callback_config.each_pair do |key,value|
+              fields << hidden_field_tag(key,self.send("#{value}_url"))
+            end
           end
-        end
 
-        image_source = asset_path(options[:image])
+          image_source = asset_path(options[:image])
 
-        paypal_form += image_submit_tag(image_source, :alt => options[:alt], :name => "submit")
+          if options[:button]
+            html_options = options.fetch(:html, {})
+            html_options[:id] = id
+            fields << submit_tag(options[:value],html_options) 
+          else
+            fields << image_submit_tag(image_source, 
+                           { :alt => options[:alt],
+                             :name => "submit",
+                             :id => id
+                           })
+
+          end
+          fields
+        end
 
-        paypal_form
+        paypal_form.html_safe
       end
       alias_method :paypal_subscribe_form,:paypal_subscribe_button
     end

data/paypal-subscribe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "paypal-subscribe"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Schmidt"]
-  s.date = "2012-08-03"
+  s.date = "2013-05-22"
   s.description = "A rails helper to display a PayPal subscribe button."
   s.email = "dsci@code79.net"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paypal-subscribe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70252619067900 !ruby/object:Gem::Requirement
+  requirement: &70337174823380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70252619067900
+  version_requirements: *70337174823380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70252619067420 !ruby/object:Gem::Requirement
+  requirement: &70337174822680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70252619067420
+  version_requirements: *70337174822680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70252619066940 !ruby/object:Gem::Requirement
+  requirement: &70337174822140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70252619066940
+  version_requirements: *70337174822140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70252619066460 !ruby/object:Gem::Requirement
+  requirement: &70337174821600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70252619066460
+  version_requirements: *70337174821600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70252619065980 !ruby/object:Gem::Requirement
+  requirement: &70337174820980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70252619065980
+  version_requirements: *70337174820980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70252619081880 !ruby/object:Gem::Requirement
+  requirement: &70337174820500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252619081880
+  version_requirements: *70337174820500
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70252619081400 !ruby/object:Gem::Requirement
+  requirement: &70337174820020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70252619081400
+  version_requirements: *70337174820020
 description: A rails helper to display a PayPal subscribe button.
 email: dsci@code79.net
 executables: []
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3296455567913997973
+      hash: 4504830316284751824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: