orange 0.5.1 → 0.5.2

data/lib/orange-core/carton.rb

@@ -45,7 +45,7 @@ module Orange
       include DataMapper::Resource
       property(:id, Serial)
       self.scaffold_properties ||= []
-      init
+      self.init
     end
     
     # Stub init method

data/lib/orange-core/views/default_resource/list.haml

@@ -2,7 +2,7 @@
   %thead
     %tr
       - for prop in props
-        %th= prop[:name].to_s.capitalize
+        %th= prop[:name].to_s.split("_").each{|str| str.capitalize!}.join(" ")
       %th
   %tbody
     - for obj in list

data/lib/orange-more.rb

@@ -15,6 +15,7 @@ require File.join(libdir, 'orange-more', 'testimonials')
 require File.join(libdir, 'orange-more', 'adverts')
 require File.join(libdir, 'orange-more', 'contactforms')
 require File.join(libdir, 'orange-more', 'analytics')
+require File.join(libdir, 'orange-more', 'donations')
 require File.join(libdir, 'orange-more', 'cloud')
 require File.join(libdir, 'orange-more', 'debugger')
 require File.join(libdir, 'orange-more', 'subsites')

data/lib/orange-more/analytics/resources/analytics_resource.rb

@@ -16,7 +16,7 @@ module Orange
     def pageviews(route, opts = {})
       return "No GA" unless gattica
       r = route.to_s
-      # Strip of trailing slash if present. GA doesn't like it.
+      # Strip trailing slash if present. GA doesn't like it.
       if r.rindex('/') > 0
         r[r.rindex('/')] = ''
       end

data/lib/orange-more/donations.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'donations', 'plugin')

data/lib/orange-more/donations/cartons/donation_carton.rb

@@ -0,0 +1,9 @@
+class OrangeDonation < Orange::Carton
+  id
+  admin do
+    title :donor_name, :length => 255
+    text :donor_company, :length => 255
+    text :donor_email, :length => 255
+    text :donation_amount
+  end
+end

data/lib/orange-more/donations/plugin.rb

@@ -0,0 +1,12 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'cartons', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Donations < Base
+    views_dir   File.join(File.dirname(__FILE__), 'views')
+    
+    resource    Orange::DonationsResource.new
+  end
+end
+
+Orange.plugin(Orange::Plugins::Donations.new)

data/lib/orange-more/donations/resources/donations_resource.rb

@@ -0,0 +1,51 @@
+module Orange
+  class DonationsResource < Orange::ModelResource
+    use OrangeDonation
+    call_me :donations
+    def stack_init
+      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Donations')
+      orange[:radius].define_tag "donations" do |tag|
+        template = tag.attr["template"] || "donate_form"
+        orange[:donations].form(tag.locals.packet, {:template => template})
+      end
+    end
+    
+    def form(packet, opts = {})
+      template = opts[:template].to_sym || :donate_form
+      packet['route.return_path'] = packet.request.path.to_s
+      do_view(packet, template, opts)
+    end
+    
+    def donate_cancel(packet, opts = {})
+      id = packet.session['donation_id']
+      m = model_class.get(id)
+      m.destroy!
+      packet.flash['error'] = "There was an issue completing the process on Paypal."
+      packet.reroute((packet.flash('reroute.to') || '/'))
+    end
+    
+    def process(packet, opts = {})
+      params = packet.request.params
+      route = params.delete('r')
+      params['donation_amount'] = params['donation_amount'].sub(/\$/, '')
+      if params['donor_phone'] == '' && packet.request.post? && params['donation_amount'] != '' && params['donation_amount'].to_f >= 0
+        template = "paypal_form"
+        params.delete('donor_phone')
+        obj = self.new(packet, {:no_reroute => true, :params => params})
+        packet.session['donation_id'] = obj.id
+        packet.flash['reroute.to'] = route
+        opts[:donation_amount] = params['donation_amount']
+        opts[:paypal_id] = orange.options['paypal_id'] || ''
+        do_view(packet, template, opts)
+      else
+        packet.flash['error'] = "An error has occurred. Please try your submission again."
+        packet.reroute(route)
+      end
+    end
+    
+    def donate_success(packet, opts = {})
+      template = "donate_thanks"
+      do_view(packet, template, opts)
+    end
+  end
+end

data/lib/orange-more/donations/views/donations/donate_form.haml

@@ -0,0 +1,21 @@
+:javascript
+  $(function(){ 
+    $('#donate_form').validate();
+  });
+%p
+  - if(flash['error'])
+    .error= flash('error')
+  %form{ :class => 'donate_form', :id => 'donate_form', :action => route_to(:donations, :process), :method => 'POST' }
+    %label{ :for => 'donor_name'} Your Name
+    %input{ :type => 'text', :minlength => '4', :maxlength => '80', :id => 'donor_name', :name => 'donor_name', :class => 'required' }
+    %div.donor_phone
+      %label{ :for => 'donor_phone'} Your Phone
+      %input{ :type => 'text', :minlength => '4', :maxlength => '80', :id => 'donor_phone', :name => 'donor_phone', :value => '' }
+    %label{ :for => 'donor_company'} Your Company
+    %input{ :type => 'text', :minlength => '4', :maxlength => '180', :id => 'donor_company', :name => 'donor_company', :value => '' }
+    %label{ :for => 'donor_email'} Your E-mail
+    %input{ :type => 'text', :class => 'email', :id => 'donor_email', :name => 'donor_email' }
+    %label{ :for => 'donation_amount'} Donation Amount: $
+    %input{ :type => 'text', :class => 'donation_amount', :id => 'donation_amount', :name => 'donation_amount' }
+    %input{ :type => 'submit', :value => 'Submit' }
+    %input{ :type => 'hidden', :id => 'r', :name => 'r', :value => packet['route.return_path'] }

data/lib/orange-more/donations/views/donations/donate_thanks.haml

@@ -0,0 +1,2 @@
+%h3 Thank You!
+%p Thanks for your donation!

data/lib/orange-more/donations/views/donations/paypal_form.haml

@@ -0,0 +1,13 @@
+%h3 Redirecting to PayPal...
+%form{ :id => 'pform', :name => '_xclick', :action => 'https://www.paypal.com/cgi-bin/webscr', :method => "post" }
+  %input{ :type => 'hidden', :name => 'cmd', :value => "_donations" }
+  %input{ :type => 'hidden', :name => 'business', :value => paypal_id }
+  %input{ :type => 'hidden', :name => 'item_name', :value => "WNSF Donation" }
+  %input{ :type => 'hidden', :name => 'currency_code', :value => "USD" }
+  %input{ :type => 'hidden', :name => 'amount', :value => donation_amount }
+  %input{ :type => 'hidden', :name => 'return', :value => 'http://'+packet['route.site_url'] + route_to(:donations, :donate_success) }
+  %input{ :type => 'hidden', :name => 'cancel_return', :value => 'http://'+packet['route.site_url'] + route_to(:donations, :donate_cancel)}
+:javascript
+  $(function(){
+    $('#pform').submit();
+  })

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -232,7 +232,7 @@ module Orange
       hash = model.attributes
       # return slug(model.title) if hash.has_key?(:title)
       # return slug(model.name) if hash.has_key?(:name)
-      return 'page-'+model.id
+      return 'page-'+model.id.to_s
     end
     
     def link_text_for(route)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,6 +186,13 @@ files:
 - lib/orange-more/disqus/plugin.rb
 - lib/orange-more/disqus/resources/disqus_resource.rb
 - lib/orange-more/disqus/views/disqus/comment_thread.haml
+- lib/orange-more/donations.rb
+- lib/orange-more/donations/cartons/donation_carton.rb
+- lib/orange-more/donations/plugin.rb
+- lib/orange-more/donations/resources/donations_resource.rb
+- lib/orange-more/donations/views/donations/donate_form.haml
+- lib/orange-more/donations/views/donations/donate_thanks.haml
+- lib/orange-more/donations/views/donations/paypal_form.haml
 - lib/orange-more/events.rb
 - lib/orange-more/events/assets/js/events.js
 - lib/orange-more/events/cartons/orange_calendar.rb