orange 0.2.7 → 0.2.8

data/README.markdown

@@ -105,6 +105,8 @@ Required Gems
 * radius
 * crack
 * eventbright
+* spreedly
+* hominid
 
 All dependencies should be loaded if you install the gem except for the datamapper
 adapter relevant to your set up. If, for example, you want to use a mysql database,

data/lib/orange-core/middleware/rerouter.rb

@@ -40,7 +40,7 @@ module Orange
         packet['reroute.to']
       # Parsing for orange urls or something
       when :orange
-        packet.route_to(packet['reroute.to'], packet['reroute.args', []])
+        packet.route_to(packet['reroute.to'], *packet['reroute.args', []])
       else
         packet['reroute.to']
       end

data/lib/orange-core/resources/mapper.rb

@@ -10,7 +10,8 @@ module Orange
     def route_to(packet, resource, *args)
       opts = args.extract_options!
       packet = DefaultHash.new unless packet 
-      context = opts[:context] || packet['route.context', nil]
+      context = opts[:context]
+      context = packet['route.context', nil] unless (context || (packet['route.context'] == :live))
       site = packet['route.faked_site'] ? packet['route.site_url', nil] : nil
       args.unshift(resource)
       args.unshift(context)

data/lib/orange-core/resources/model_resource.rb

@@ -103,11 +103,11 @@ module Orange
     def new(packet, opts = {})
       no_reroute = opts.delete(:no_reroute)
       if packet.request.post? || !opts.blank?
-        params = opts.with_defaults(packet.request.params[@my_orange_name.to_s] || {})
-        beforeNew(packet, params)
-        obj = onNew(packet, params)
-        afterNew(packet, obj, params)
-        obj.save if obj
+        params = opts.with_defaults(opts.delete(:params) || packet.request.params[@my_orange_name.to_s] || {})
+        before = beforeNew(packet, params)
+        obj = onNew(packet, params) if before
+        afterNew(packet, obj, params) if before
+        obj.save if obj && before
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
       obj || false
@@ -121,6 +121,7 @@ module Orange
     # A callback for before a new item is created
     # @param [Orange::Packet] packet the packet being routed
     def beforeNew(packet, opts = {})
+      true
     end
     
     # A callback for after a new item is created
@@ -137,14 +138,15 @@ module Orange
       if packet.request.delete? || !opts.blank?
         id = opts.delete(:resource_id) || packet['route.resource_id']
         m = model_class.get(packet['route.resource_id'])
-        beforeDelete(packet, m, opts)
-        onDelete(packet, m, opts) if m
-        afterDelete(packet, m, opts)
+        before = beforeDelete(packet, m, opts)
+        onDelete(packet, m, opts) if m && before
+        afterDelete(packet, m, opts) if before
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end
     
     def beforeDelete(packet, obj, opts = {})
+      true
     end
     
     # Delete object
@@ -160,18 +162,20 @@ module Orange
     def save(packet, opts = {})
       no_reroute = opts.delete(:no_reroute)
       if packet.request.post? || !opts.blank?
-        params = opts.with_defaults(packet.request.params[@my_orange_name.to_s] || {})
-        m = model_class.get(packet['route.resource_id'])
+        my_id = opts.delete(:resource_id) || packet['route.resource_id']
+        m = opts.delete(:model) || model_class.get(my_id)
+        params = opts.with_defaults(opts.delete(:params) || packet.request.params[@my_orange_name.to_s] || {})
         if m
-          beforeSave(packet, m, params)
-          onSave(packet, m, params)
-          afterSave(packet, m, params)
+          before = beforeSave(packet, m, params)
+          onSave(packet, m, params) if before
+          afterSave(packet, m, params) if before
         end
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
     end
     
     def beforeSave(packet, obj, opts = {})
+      true
     end
     
     def onSave(packet, obj, opts = {})

data/lib/orange-more.rb

@@ -16,4 +16,5 @@ require File.join(libdir, 'orange-more', 'adverts')
 require File.join(libdir, 'orange-more', 'cloud')
 require File.join(libdir, 'orange-more', 'debugger')
 require File.join(libdir, 'orange-more', 'subsites')
-require File.join(libdir, 'orange-more', 'events')
+require File.join(libdir, 'orange-more', 'events')
+require File.join(libdir, 'orange-more', 'members')

data/lib/orange-more/events/resources/event_resource.rb

@@ -42,12 +42,29 @@ module Orange
       extras
     end
     
+    def synchronize_attendees(packet, params = {})
+      no_reroute = params.delete(:no_reroute)
+      params = params.with_defaults(:resource_id => packet['route.resource_id'])
+      if packet.request.post? && orange.loaded?(:members) && 
+        event_orange = model_class.get(params[:resource_id])
+        event = eventbrite_user.events.select{|e| e.id.to_s == event_orange.eventbrite_id}.first
+        orange[:members, true].add_attendee_group(packet, "Eventbrite Attendee", "#{event.title} - #{event.id}")
+        emails = event.attendees.map{|a| a.email}
+        orange[:members, true].batch_update_interest_mailchimp(packet, emails, "Eventbrite Attendee", "#{event.title} - #{event.id}")
+      end
+      packet.reroute(@my_orange_name, :orange, packet['route.resource_id']) unless no_reroute
+    end
+    
+    # Todo - eventbrite crashes when date in past
     def beforeNew(packet, params = {})
       eventbrite_synchronize(packet, params)
+      true
     end
     
+    # Todo - eventbrite crashes when date in past
     def beforeSave(packet, model, params = {})
       eventbrite_synchronize(packet, params)
+      true
     end
     
     def eventbrite_synchronize(packet, params = {})

data/lib/orange-more/events/views/calendar/calendar.haml

@@ -2,4 +2,7 @@
 - for event in list
   .event
     %h2 #{event.name}
-    .description= event.description
+    .description
+      = event.blurb
+      
+      %a{:href => route_to(:events, event.id)} Learn More

data/lib/orange-more/events/views/events/edit.haml

@@ -54,5 +54,6 @@
       at
       %input{:type => 'text', :name => "#{model_name}[ends_time]", :size => 8, :value => model.ends_time }
     %input{:type => 'submit', :value => 'Save Event'}
+  = form_link('Synchronize Eventbrite Attendees to Mailchimp', route_to(model_name, model.id, 'synchronize_attendees'))
 - else
   %p Couldn't find the event.

data/lib/orange-more/events/views/events/show.haml

@@ -0,0 +1,4 @@
+-# Given a list of events...
+.event
+  %h2 #{model.name}
+  .description= model.description

data/lib/orange-more/members.rb

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

data/lib/orange-more/members/cartons/member_carton.rb

@@ -0,0 +1,39 @@
+require 'md5'
+
+class OrangeMember < Orange::Carton
+  id
+  front do
+    text :first_name
+    text :last_name
+    text :email
+    text :position
+    text :company
+  end  
+  text :hashed_password
+  text :salt
+  text :reset_token
+  property :reset_on, DateTime
+  
+  def password=(val)
+    salt = self.salt
+    attribute_set(:hashed_password, Digest::MD5.hexdigest("#{salt}orange-is-awesome#{val}"))
+  end
+  
+  def salt
+    my_salt = attribute_get(:salt)
+    unless(my_salt)
+      my_salt = Digest::MD5.hexdigest(Time.now.iso8601)
+      attribute_set(:salt, my_salt)
+    end
+    my_salt
+  end
+  
+  def reset!
+    token = Digest::MD5.hexdigest(Time.now.iso8601)
+    # Invalidate password
+    attribute_set(:hashed_password, Digest::MD5.hexdigest("#{salt}#{token}"))
+    attribute_set(:reset_on, DateTime)
+    attribute_set(:reset_token, token)
+  end
+  
+end

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

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

data/lib/orange-more/members/resources/members_resource.rb

@@ -0,0 +1,291 @@
+require 'spreedly'
+require 'hominid'
+
+module Orange
+  class MembersResource < Orange::ModelResource
+    use OrangeMember
+    call_me :members
+    def stack_init
+      options[:spreedly_key] = orange.options['spreedly_key'] || false
+      options[:spreedly_plan] = orange.options['spreedly_plan'] || false
+      options[:spreedly_site] = orange.options['spreedly_site'] || false
+      options[:mailchimp_key] = orange.options["mailchimp_key"] || false
+      options[:mailchimp_list] = orange.options["mailchimp_list"] || false
+      options[:mailchimp_interests] = orange.options["mailchimp_interests"] || false
+      Spreedly.configure(options[:spreedly_site], options[:spreedly_key]) if options[:spreedly_key]
+      
+      orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Members')
+      orange[:radius, true].define_tag "if_member" do |tag|
+        packet = tag.locals.packet
+        if packet.session["member"]
+          tag.expand
+        else
+          if(tag.attr["else_view"]) 
+            orange[:members].do_view(packet, tag.attr["else_view"].to_sym)
+          else
+            ""
+          end
+        end
+      end
+      orange[:radius, true].define_tag "if_paid_member" do |tag|
+        packet = tag.locals.packet
+        if packet.session["member"] && orange[:members].paid?(packet, packet.session["member"])
+          tag.expand
+        else
+          if(tag.attr["else_view"]) 
+            orange[:members].do_view(packet, tag.attr["else_view"].to_sym)
+          else
+            ""
+          end
+        end
+      end
+      orange[:radius, true].define_tag "unless_member" do |tag|
+        packet = tag.locals.packet
+        unless packet.session["member"]
+          tag.expand
+        else
+          ""
+        end
+      end
+    end
+    
+    def hominid
+      @hominid ||= Hominid::Base.new({:api_key => options[:mailchimp_key]}) if options[:mailchimp_key]
+    end
+    
+    def hominid_list
+      @hominid_list ||= hominid.find_list_by_id(options[:mailchimp_list]) if options[:mailchimp_list] && hominid
+    end
+    
+    
+    
+    def paid?(packet, member)
+      unless member.is_a? model_class
+        member = model_class.get(member)
+      end
+      subscriber = Spreedly::Subscriber.find(member.id)
+      subscriber ? subscriber.active? : false
+    end
+    
+    def subscription_url(packet, member)
+      unless member.is_a? model_class
+        member = model_class.get(member)
+      end
+      Spreedly.subscribe_url(member.id, options[:spreedly_plan])
+    end
+    
+    def list_groups(packet)
+      hominid.call("listInterestGroupings", options[:mailchimp_list]).select{|g| options[:mailchimp_interests].include? g["name"]}
+    end
+    
+    def list_groups_for_email(packet, email)
+      chimp_info = hominid.member_info(options[:mailchimp_list], email)
+    end
+        # 
+        # def add_to_mailchimp(packet, member_params)
+        #   email = member_params[:email]
+        #   fname = member_params[:first_name]
+        #   lname = member_params[:last_name]
+        #   interests = member_params[:groups].map{|key, val| 
+        #     { "name" => key, "groups" => groups.map{|str| str.gsub(/,/, "\,")}.join(",") }
+        #   }
+        #   hominid.subscribe(options[:mailchimp_list], email, {:FNAME => fname, :LNAME => lname, :INTERESTS => interests}, {:update_existing => true})
+        # end
+    
+    def synchronize_with_mailchimp(packet, member_params)
+      email = member_params["email"]
+      old_email = member_params["old_email"] || email
+      fname = member_params["first_name"] || ''
+      lname = member_params["last_name"] || ''
+      interests = member_params["groups"].blank? ? [] : member_params["groups"].map{|key, val| 
+        { "name" => key, "groups" => val.reject{|str| str.blank? }.map{|str| str.gsub(/,/, '\,')}.join(",") }
+      }
+      hominid.subscribe(options[:mailchimp_list], old_email, {:FNAME => fname, :LNAME => lname, :GROUPINGS => interests}, {:update_existing => true})
+    end
+    
+    def batch_update_interest_mailchimp(packet, emails, grouping_name, groups)
+      interests = [{ "name" => grouping_name, "groups" => groups }]
+      emails = emails.map{|e| {:EMAIL => e, :GROUPINGS => interests}}
+      hominid.subscribe_many(options[:mailchimp_list], emails, {:double_opt_in => true, :update_existing => true, :replace_interests => false})
+    end
+    
+    def add_attendee_group(packet, grouping_name, name, limit = 15)
+      list = options[:mailchimp_list]
+      my_groups = hominid.call("listInterestGroupings", list)
+      grouping = my_groups.select{|a| a["name"] == grouping_name}.first
+      if grouping
+        # Return true if already in the list.
+        return true if grouping["groups"].select{|a| a["name"] == name }.size > 0
+      
+        # Keep group size manageable
+        if grouping["groups"].size > limit
+          remove = grouping["groups"].shift 
+          hominid.call("listInterestGroupDel", list, remove["name"], grouping["id"])
+        end
+        hominid.call("listInterestGroupAdd", list, name, grouping["id"])
+      else
+        hominid.call("listInterestGroupingAdd", list, grouping_name, "checkboxes", [name] )
+      end
+    end
+    
+    def unsubscribe_from_mailchimp(packet, email)
+      hominid.unsubscribe(options[:mailchimp_list], email)
+    end
+    
+    def member_list_groups(packet, member)
+      # Can give member id, hydrate to member before continuing.
+      unless member.is_a? model_class
+        member = model_class.get(member)
+      end
+      
+    end
+    
+    def login(packet, opts = {})
+      if packet.request.post?
+        params = packet.request.params["members"]
+        login = params["login_email"]
+        password = params["login_password"]
+        tester = model_class.new({:password => password})
+        member = model_class.first({:email => login})
+        if member && tester.hashed_password == member.hashed_password
+          packet.session["member"] = member.id
+          packet.reroute(@my_orange_name, :orange, :profile)
+        else
+          packet.flash("error", "Invalid email or password")
+          do_view(packet, :login, opts)
+        end
+      else
+        do_view(packet, :login, opts)
+      end
+    end
+    
+    def register(packet, opts = {})
+      if packet.request.post?
+        params = packet.request.params["members"]
+        
+        member = model_class.first(:email => params["email"])
+        if member
+          # Existing member... do they already have password?
+          if member.hashed_password.blank?
+            # A member who is part of the mailing list, but hasn't
+            # set a password
+            email = params.delete("email")
+            mailing_list = params.delete("email_subscribe")
+            groups = params.delete("groups")
+            save(packet, {:resource_id => member.id, :params => params, :no_reroute => true})
+            member = model_class.first(:email => email)
+            if member.hashed_password.blank?              
+              # Problem, stay on registration
+              do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
+            else
+              packet.flash("info", "Looks like this email address was already on our mailing list. Please take the time to correct our details about you.")
+              packet.session["member"] = member.id
+              # Synchronize with the mailchimp account.
+              params.merge!("groups" => groups)
+              synchronize_with_mailchimp(packet, params.merge("groups" => groups, "email" => email)) if mailing_list
+              packet.reroute(@my_orange_name, :orange, :profile)
+            end
+          else
+            # A person trying to sign up with an email that already
+            # has a password
+            packet.flash("error", "Looks like this email address already has an account. Try logging in instead.")
+            packet.reroute(@my_orange_name, :orange, :login)
+          end
+        else
+          # New member time!
+          mailing_list = params.delete("email_subscribe")
+          groups = params.delete("groups")
+          new(packet, {:no_reroute => true, :params => params})
+          # success ?
+          member = model_class.first(:email => params["email"])
+          if member
+            packet.session["member"] = member.id
+            params.merge!("groups" => groups)
+            synchronize_with_mailchimp(packet, params.merge("groups" => groups)) if mailing_list
+            packet.flash("info", "You've successfully created an account. Please take the time to fill in more details about yourself.")
+            packet.reroute(@my_orange_name, :orange, :profile)
+          else
+            # Problem, stay on registration
+            do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
+          end
+        end # End pre-existing member if 
+      else
+        do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
+      end
+    end
+    
+    def logout(packet, opts = {})
+      packet.session["member"] = nil
+      do_view(packet, :logout, opts)
+    end
+    
+    def profile(packet, opts = {})
+      no_reroute = opts.delete(:no_reroute)
+      # login check
+      unless packet.session["member"]
+        packet.flash("error", "You must log in to view this page")
+        packet.reroute(@my_orange_name, :orange, :login) 
+      end
+      
+      if packet.request.post?
+        params = packet.request.params["members"]
+        if params["current_password"].blank?
+          # Can't change password without confirming current
+          params.delete("password")
+          params.delete("repeat_password")
+          password_change = false
+        else 
+          password_change = true
+        end
+        member = model_class.get(packet.session["member"])
+        check = model_class.new(:password => params.delete("current_password"))
+        if !password_change || member.hashed_password == check.hashed_password
+          
+          mailing_list = params.delete("email_subscribe")
+          groups = params.delete("groups")
+          old_email = member.email
+          save(packet, {:resource_id => packet.session["member"], :no_reroute => true, :params => params})
+          if mailing_list == "1"
+            synchronize_with_mailchimp(packet, params.merge("groups" => groups, "old_email" => old_email))
+          else
+            unsubscribe_from_mailchimp(packet, params["email"])
+          end
+        else
+          packet.flash("error", "Your old password was not input correctly")
+        end
+      end
+      member = model_class.get(packet.session["member"])
+      opts[:model] = member
+      do_view(packet, :profile, opts.merge(:list_groups => list_groups(packet)))
+    end
+    
+    
+    def beforeNew(packet, params)
+      unless params["password"] == params["repeat_password"]
+        packet.flash("error", "New password does not match repeated password")
+        return false 
+      end
+      unless params["password"].blank? || params["password"].size >= 6
+        packet.flash("error", "Password should be over 6 characters")
+        return false
+      end
+      params.delete("password") if params["password"].blank?
+      params.delete("repeat_password")
+      true
+    end
+    
+    def beforeSave(packet, m, params)
+      unless params["password"] == params["repeat_password"]
+        packet.flash("error", "New password does not match repeated password")
+        return false 
+      end
+      unless params["password"].blank? || params["password"].size >= 6
+        packet.flash("error", "Password should be over 6 characters")
+        return false
+      end
+      params.delete("password") if params["password"].blank?
+      params.delete("repeat_password")
+      true
+    end
+  end
+end

data/lib/orange-more/members/views/members/create.haml

@@ -0,0 +1,12 @@
+%form{:action => "#{packet.route_to(model_name, 'new')}", :method => 'post'}
+  - for prop in props
+    %p!= view_attribute(prop, model_name, :label => true)
+  %p
+    %label{:for => "my_password"} Password
+    %br
+    %input{:id => "my_password", :type => "password", :name => "#{model_name}[password]"}
+  %p
+    %label{:for => "my_repeat_password"} Repeat Password
+    %br
+    %input{:id => "my_repeat_password", :type => "password", :name => "#{model_name}[repeat_password]"}
+  %input{:type => 'submit', :value => 'Save New Item'}

data/lib/orange-more/members/views/members/edit.haml

@@ -0,0 +1,15 @@
+- if model
+  %form{:action => packet.route_to(model_name, model[:id], 'save'), :method => 'post'}
+    - for prop in props
+      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %p
+      %label{:for => "my_password"} Password
+      %br
+      %input{:id => "my_password", :type => "password", :name => "#{model_name}[password]"}
+    %p
+      %label{:for => "my_repeat_password"} Repeat Password
+      %br
+      %input{:id => "my_repeat_password", :type => "password", :name => "#{model_name}[repeat_password]"}
+    %input{:type => 'submit', :value => 'Save Changes'}
+- else
+  %p Couldn't find the item you're looking for.

data/lib/orange-more/members/views/members/live.show.haml

@@ -0,0 +1 @@
+%p You don't have permission to view this.

data/lib/orange-more/members/views/members/login.haml

@@ -0,0 +1,17 @@
+%form{:action => packet.route_to(model_name, 'login'), :method => 'post'}
+  - if(packet.flash['error'])
+    .error
+      %p= packet.flash('error')
+  %p
+    %label Email
+    %br
+    %input{:type => "text", :name => "members[login_email]"}
+  %p
+    %label Password
+    %br
+    %input{:type => "password", :name => "members[login_password]"}
+  %input{:type => "submit", :value => "Log in"}
+%hr
+%p 
+  Not a member? You can 
+  %a{:href => route_to(model_name, 'register')} register here

data/lib/orange-more/members/views/members/logout.haml

@@ -0,0 +1 @@
+%p You have been logged out.

data/lib/orange-more/members/views/members/profile.haml

@@ -0,0 +1,50 @@
+- if model
+  %form{:action => packet.route_to(model_name, 'profile'), :method => 'post'}  
+    - if(packet.flash['error'])
+      .error
+        %p= packet.flash('error')
+    - if(packet.flash['info'])
+      .info
+        %p= packet.flash('info')
+    - for prop in props
+      %p!= view_attribute(prop, model_name, :label => true, :value => model.attribute_get(prop[:name]))
+    %fieldset
+      %legend Change Password
+      %p You only need to fill out the following information if you want to change your password
+      %p
+        %label{:for => "my_currrent_password"} Current Password
+        %br
+        %input{:id => "my_currrent_password", :type => "password", :name => "#{model_name}[current_password]"}
+      %p
+        %label{:for => "my_password"} Password
+        %br
+        %input{:id => "my_password", :type => "password", :name => "#{model_name}[password]"}
+      %p
+        %label{:for => "my_repeat_password"} Repeat Password
+        %br
+        %input{:id => "my_repeat_password", :type => "password", :name => "#{model_name}[repeat_password]"}
+    %fieldset
+      %legend Mailing Lists
+      %p 
+        %input{:type => "hidden", :name => "members[email_subscribe]", :value => "0"}
+        %input{:type => "checkbox", :name => "members[email_subscribe]", :value => "1"}
+        Sign up for the mailing list?
+      %p We separate our mailing list into multiple topics to avoid spamming our users with unwanted emails. Choose the information you would like to receive email about.
+      - for group in list_groups
+        %h2= group["name"].capitalize
+        %input{:type => "hidden", :name => "members[groups][#{group['name']}][]", :value => ""}
+        - for opt in group["groups"]
+          %p
+            %input{:type => "checkbox", :name => "members[groups][#{group['name']}][]", :value => opt["name"]}
+            = opt["name"]
+    %fieldset
+      %legend Payment
+      - if(orange[:members].paid?(packet, model))
+        %p Thanks for supporting the WNSF. You can keep your subscription up to date below:
+        %a{:href => orange[:members].subscription_url(packet, model)} Make a payment 
+      - else
+        %p To access parts of this site, you'll need to be a supporting member.
+        %a{:href => orange[:members].subscription_url(packet, model)} You can become a supporting member here.
+    %input{:type => 'submit', :value => 'Save Changes'}
+- else
+  %p Couldn't find the item you're looking for.

data/lib/orange-more/members/views/members/register.haml

@@ -0,0 +1,31 @@
+%form{:action => packet.route_to(model_name, 'register'), :method => 'post'}
+  - if(packet.flash['error'])
+    .error
+      %p= packet.flash('error')
+  %p Fill out the following details to register for an account.
+  %p
+    %label Email
+    %br
+    %input{:type => "text", :name => "members[email]"}
+  %p
+    %label Password
+    %br
+    %input{:type => "password", :name => "members[password]"}
+  %p
+    %label Repeat Password
+    %br
+    %input{:type => "password", :name => "members[repeat_password]"}
+  %fieldset
+    %legend Mailing Lists
+    %p 
+      %input{:type => "checkbox", :name => "members[email_subscribe]", :value => "1"}
+      Sign up for the mailing list?
+    %p We separate our mailing list into multiple topics to avoid spamming our users with unwanted emails. Choose the information you would like to receive email about.
+    - for group in list_groups
+      %h2= group["name"].capitalize
+      %input{:type => "hidden", :name => "members[groups][#{group['name']}][]", :value => ""}
+      - for opt in group["groups"]
+        %p
+          %input{:type => "checkbox", :name => "members[groups][#{group['name']}][]", :value => opt["name"]}
+          = opt["name"]
+  %input{:type => "submit", :value => "Register"}

data/lib/orange-more/news/resources/news_resource.rb

@@ -19,6 +19,7 @@ module Orange
           :link_text => 'Orange News Archive'
         )
       end
+      true
     end
     
     def sitemap_row(packet, opts = {})

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

@@ -7,6 +7,17 @@ module Orange
     call_me :sitemap
     def stack_init
       orange[:admin, true].add_link('Content', :resource => @my_orange_name, :text => 'Sitemap')
+      orange[:radius, true].define_tag "link" do |tag|
+        packet = tag.locals.packet
+        slug = tag.expand
+        route = orange[:sitemap].find_route(packet, {:slug => slug})
+        route = orange[:sitemap].find_route(packet, {:link_text => slug}) unless route
+        
+        full_path = route ? route.full_path : "#not-found"
+        link_text = route ? route.link_text : "(Broken link tag)"
+        link_text = tag.attr["text"] if tag.attr["text"]
+	      "<a href='#{full_path}'>#{link_text}</a>"
+      end
     end
     
     def route_actions(packet, opts = {})
@@ -135,6 +146,15 @@ module Orange
       model_class.all(keys)
     end
     
+    def find_route(packet, opts = {})
+      site_id = packet['site'].id
+      subsite_id = packet['subsite'].blank? ? nil : packet['subsite'].id
+      # First try subsite, if necessary
+      m = model_class.first(opts.merge(:orange_site_id => subsite_id)) if subsite_id
+      m = model_class.first(opts.merge(:orange_site_id => site_id)) unless m
+      m
+    end
+    
     def add_link_for(packet)
       linky = ['add_route']
       linky << (packet['subsite'].blank? ? (packet['site'].blank? ? '0' : packet['site'].id) : packet['subsite'].id)

data/lib/orange-more/sitemap/views/sitemap/breadcrumb.haml

@@ -1,5 +1,12 @@
-%p
-  - for a in model.ancestors
-    %a{:href => a.full_path}= a.link_text
+- if model
+  %p
+    - for a in model.ancestors
+      %a{:href => a.full_path}= a.link_text
+      >
+    %span.here= model.link_text
+- else # Possibly a restful route
+  %p
+    - home = orange[:sitemap].home(packet)
+    %a{:href => home.full_path}= home.link_text
     >
-  %span.here= model.link_text
+    %span.here= packet['route.resource'].to_s.capitalize

data/lib/orange-more/subsites/resources/subsite_resource.rb

@@ -37,7 +37,8 @@ module Orange
     def route_to(packet, resource, *args)
       opts = args.extract_options!
       packet = DefaultHash.new unless packet 
-      context = opts[:context] || packet['route.context', nil]
+      context = opts[:context]
+      context = packet['route.context', nil] unless (context || (packet['route.context'] == :live))
       site = packet['route.faked_site'] ? packet['route.site_url', nil] : nil
       args.unshift(resource)
       args.unshift(orange[:subsites].url_for(packet).gsub(/^\//, '').gsub(/\/$/, '')) if(packet['subsite'])

data/lib/orange-more/testimonials/resources/testimonials_resource.rb

@@ -8,7 +8,7 @@ module Orange
         packet = tag.locals.packet
      	  if tag.attr["tag"] && for_site(packet).with_tag(tag.attr["tag"]).count >0
           m = for_site(packet).with_tag(tag.attr["tag"]).first(:offset => rand(for_site(packet).with_tag(tag.attr["tag"]).count)) #selects testimonial based on tag
-	      elsif for_site(packet).count > 0
+	      elsif for_site(packet).count > 0 && !tag.attr.include?("tag")
       	  m = for_site(packet).first(:offset => rand(for_site(packet).count)) #selects a random testimonial
 	      end
         unless m.nil?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 -04:00
+date: 2010-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,7 +179,19 @@ files:
 - 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