orange-more 0.5.8 → 0.6.0

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

@@ -259,7 +259,12 @@ module Orange
       if match = route.link_text.match(/^\{([-a-z0-9A-Z_]+)\}$/)
         resource = route.resource.to_sym
         return route.link_text unless orange.loaded?(resource)
-        orange[resource].model_class.get(route.resource_id).__send__(match[1])
+        return route.link_text if route.resource_id.blank?
+        if my_resource = orange[resource].model_class.get(route.resource_id)
+          my_resource.__send__(match[1])
+        else
+          route.link_text
+        end
       else
         route.link_text
       end

data/lib/orange-more/slices/resources/slices.rb

@@ -6,12 +6,15 @@ module Orange
         content = ''
         resource = (tag.attr['resource'] || :slices).to_sym
         id = tag.attr['id'] || nil
-        mode = (tag.attr['mode'] || tag.attr['chunk'] || (id ? :show : :index )).to_sym
+        mode = (tag.attr['mode'] || tag.attr['action'] || tag.attr['chunk'] || (id ? :show : :index )).to_sym
         if orange.loaded?(resource)
-          if orange[resource].respond_to?(mode) || resource == :slices
-            content << (id ? orange[resource].__send__(mode, tag.locals.packet, :id => id) : orange[resource].__send__(mode, tag.locals.packet, {:attrs => tag.attr}))
+          opts = {:attrs => tag.attr, :mode => mode}
+          opts.merge!(:id => id) if id
+          ret = orange[resource].view(tag.locals.packet, opts)            
+          if ret.blank? 
+            content << "resource #{resource} doesn't respond to #{mode}" 
           else
-            content << "resource #{resource} doesn't respond to #{mode}"
+            content << ret
           end
         else
           content << "resource #{resource} not loaded"
@@ -21,7 +24,8 @@ module Orange
     end
     
     def view(packet, *args)
-      mode = packet['route.resource_action']
+      opts = args.extract_options!
+      mode = opts[:mode] || packet['route.resource_action']
       do_view(packet, mode, args.extract_options!)
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orange-more
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - David Haslem
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -04:00
+date: 2010-08-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -207,11 +207,6 @@ files:
 - lib/orange-more/administration/views/openid_login.haml
 - lib/orange-more/administration/views/users/create.haml
 - lib/orange-more/administration/views/users/edit.haml
-- lib/orange-more/adverts.rb
-- lib/orange-more/adverts/cartons/adverts_carton.rb
-- lib/orange-more/adverts/plugin.rb
-- lib/orange-more/adverts/resources/adverts_resource.rb
-- lib/orange-more/adverts/views/adverts/adverts.haml
 - lib/orange-more/analytics.rb
 - lib/orange-more/analytics/middleware/analytics.rb
 - lib/orange-more/analytics/plugin.rb
@@ -244,7 +239,7 @@ files:
 - lib/orange-more/contactforms/assets/js/lib/jquery.form.js
 - lib/orange-more/contactforms/assets/js/lib/jquery.js
 - lib/orange-more/contactforms/assets/js/lib/jquery.metadata.js
-- lib/orange-more/contactforms/cartons/contactforms_carton.rb
+- lib/orange-more/contactforms/cartons/contactform_carton.rb
 - lib/orange-more/contactforms/plugin.rb
 - lib/orange-more/contactforms/resources/contactforms_resource.rb
 - lib/orange-more/contactforms/views/contactforms/contactform.haml
@@ -257,37 +252,6 @@ 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
-- lib/orange-more/events/cartons/orange_event.rb
-- lib/orange-more/events/plugin.rb
-- lib/orange-more/events/resources/calendar_resource.rb
-- lib/orange-more/events/resources/event_resource.rb
-- lib/orange-more/events/views/calendar/calendar.haml
-- lib/orange-more/events/views/events/create.haml
-- lib/orange-more/events/views/events/edit.haml
-- lib/orange-more/events/views/events/list.haml
-- lib/orange-more/events/views/events/show.haml
-- lib/orange-more/events/views/events/table_row.haml
-- lib/orange-more/members.rb
-- lib/orange-more/members/cartons/member_carton.rb
-- lib/orange-more/members/plugin.rb
-- lib/orange-more/members/resources/members_resource.rb
-- lib/orange-more/members/views/members/create.haml
-- lib/orange-more/members/views/members/edit.haml
-- lib/orange-more/members/views/members/live.show.haml
-- lib/orange-more/members/views/members/login.haml
-- lib/orange-more/members/views/members/logout.haml
-- lib/orange-more/members/views/members/profile.haml
-- lib/orange-more/members/views/members/register.haml
 - lib/orange-more/news.rb
 - lib/orange-more/news/cartons/news.rb
 - lib/orange-more/news/plugin.rb
@@ -330,17 +294,6 @@ files:
 - lib/orange-more/slices/plugin.rb
 - lib/orange-more/slices/resources/radius.rb
 - lib/orange-more/slices/resources/slices.rb
-- lib/orange-more/subsites.rb
-- lib/orange-more/subsites/cartons/subsite.rb
-- lib/orange-more/subsites/middleware/subsite_load.rb
-- lib/orange-more/subsites/plugin.rb
-- lib/orange-more/subsites/resources/subsite_resource.rb
-- lib/orange-more/subsites/views/subsites/index.haml
-- lib/orange-more/testimonials.rb
-- lib/orange-more/testimonials/cartons/testimonials_carton.rb
-- lib/orange-more/testimonials/plugin.rb
-- lib/orange-more/testimonials/resources/testimonials_resource.rb
-- lib/orange-more/testimonials/views/testimonials/testimonials.haml
 - README.markdown
 - spec/orange-core/application_spec.rb
 - spec/orange-core/carton_spec.rb

data/lib/orange-more/adverts.rb

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

data/lib/orange-more/adverts/cartons/adverts_carton.rb

@@ -1,14 +0,0 @@
-class OrangeAdvert < Orange::Carton
-  id
-  admin do
-    title :title
-    asset :asset_id
-    text :link
-    text :alt_text
-  end
-  
-  def self.with_tag(tag)
-    all(:tags.like => "%#{tag}%")
-  end
-
-end

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

@@ -1,13 +0,0 @@
-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 Adverts < Base
-    views_dir   File.join(File.dirname(__FILE__), 'views')
-    
-    resource    Orange::AdvertsResource.new
-  end
-end
-
-Orange.plugin(Orange::Plugins::Adverts.new)
-

data/lib/orange-more/adverts/resources/adverts_resource.rb

@@ -1,27 +0,0 @@
-module Orange
-  class AdvertsResource < Orange::ModelResource
-    use OrangeAdvert
-    call_me :adverts
-    def stack_init
-      orange[:admin, true].add_link("Content", :resource => @my_orange_name, :text => 'Advertisements')
-      orange[:radius].define_tag "adverts" do |tag|
-     	  if tag.attr["tag"] && model_class.with_tag(tag.attr["tag"]).count >0
-          m = model_class.with_tag(tag.attr["tag"]).first(:offset => rand(model_class.with_tag(tag.attr["tag"]).count)) #selects advert based on tag
-	      elsif model_class.all.count > 0
-      	  m = model_class.first(:offset => rand(model_class.all.count)) #selects a random advert
-	      end
-        unless m.nil?
-          template = tag.attr["template"] || "adverts"
-          orange[:adverts].advert(tag.locals.packet, {:model => m, :template => template})
-        else
-          ""
-        end
-      end
-    end
-    
-    def advert(packet, opts = {})
-      template = opts[:template].to_sym || :adverts
-      do_view(packet, template, opts)
-    end
-  end
-end

data/lib/orange-more/adverts/views/adverts/adverts.haml

@@ -1,2 +0,0 @@
-%a{ :href => model.link, :target => "_blank", :rel => "external" }
-  = orange[:assets].asset_html(packet, model.asset_id)

data/lib/orange-more/donations.rb

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

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

@@ -1,9 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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

@@ -1,21 +0,0 @@
-: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

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

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

@@ -1,13 +0,0 @@
-%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/events.rb

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

data/lib/orange-more/events/assets/js/events.js

@@ -1,55 +0,0 @@
-$(function(){
-	$('.new-venue').hide();
-	$('.show-venue-details').toggle(venue_details_show, venue_details_hide);
-	$("#events-venue").change(function(){
-		if($(this).val() == "new"){
-			venue_details_blank();
-			if($('.new-venue').css('display') == 'none') $('.show-venue-details').click();
-		}
-		else{
-			load_venue_details($(this).val());
-		}
-	});
-	$('input[name*=link_to_eventbrite]').change(function(){ 
-		if($(this).attr('checked')){
-			$('p.eventbrite-link').show();
-		}
-		else{
-			$('p.eventbrite-link').hide();
-		}
-	});
-	$('#events-eventbrite-id').change(function(){ 
-		load_event_details($(this).val());
-	});
-	$("input[name*='location']").change(function(){$("#events-venue").val("new")});
-});
-
-function venue_details_show(){
-	$('.show-venue-details').text('Hide'); 
-	$('.new-venue').show();
-}
-
-function venue_details_hide(){
-	$('.show-venue-details').text('(Details)'); 
-	$('.new-venue').hide();
-}
-
-function load_venue_details(id){
-	var obj = venues[id];
-	$("input[name*=location_name]").val(obj.name);
-	$("input[name*=location_address]").val(obj.address);
-	$("input[name*=location_address2]").val(obj.address_2);
-	$("input[name*=location_city]").val(obj.city);
-	$("input[name*=location_state]").val(obj.region);
-	$("input[name*=location_zip]").val(obj.postal_code);
-}
-
-function load_event_details(id){
-	var obj = events[id];
-	$("input[name*='events[name]']").val(obj.title);
-	$("textarea[name*=description]").val(obj.description);
-}
-
-function venue_details_blank(){
-	$("input[name*='location']").val('');
-}

data/lib/orange-more/events/cartons/orange_calendar.rb

@@ -1,8 +0,0 @@
-class OrangeCalendar < Orange::SiteCarton
-  id
-  admin do
-    title :name
-    boolean :main, :default => false, :display_name =>'Main Calendar?'
-  end
-  has n, :events, "OrangeEvent"
-end

data/lib/orange-more/events/cartons/orange_event.rb

@@ -1,60 +0,0 @@
-class OrangeEvent < Orange::Carton
-  id
-  admin do
-    title :name
-    text :location_name
-    text :location_address
-    text :location_address2
-    text :location_city
-    text :location_state
-    text :location_zip
-    boolean :link_to_eventbrite, :default => false
-    text :eventbrite_id
-    fulltext :blurb
-    fulltext :description
-  end
-  orange do
-    time :starts
-    time :ends
-  end
-  
-  def starts_time
-    self.starts.strftime("%I:%M %p")
-  end
-  def starts_date
-    self.starts.strftime("%m/%d/%Y")
-  end
-  def ends_time
-    self.ends.strftime("%I:%M %p")
-  end
-  def ends_date
-    self.ends.strftime("%m/%d/%Y")
-  end
-  def date_attr(attribute, datestr = false)
-    time_attr(attribute, false, datestr)
-  end
-  
-  def attribute_time_get(attribute)
-    attribute_get(attribute) || Time.now
-  end
-  def time_attr(attribute, timestr = false, datestr = false)
-    date = datestr || attribute_time_get(attribute).strftime("%m/%d/%Y")
-    time = timestr || attribute_time_get(attribute).strftime("%I:%M %p")
-    attribute_set(attribute, Time.parse(date + " " + time))
-  end
-  
-  def starts_time=(time)
-    time_attr(:starts, time)
-  end
-  def starts_date=(date)
-    date_attr(:starts, date)
-  end
-  def ends_time=(time)
-    time_attr(:ends, time)
-  end
-  def ends_date=(date)
-    date_attr(:ends, date)
-  end
-  
-  belongs_to :calendar, "OrangeCalendar", :child_key => [:orange_calendar_id]
-end