orange 0.3.8 → 0.3.9

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

@@ -6,8 +6,8 @@ class OrangeMember < Orange::Carton
     text :first_name
     text :last_name
     text :email
-    text :position
-    text :company
+    text :title
+    text :organization
   end  
   text :hashed_password
   text :salt
@@ -15,7 +15,6 @@ class OrangeMember < Orange::Carton
   property :reset_on, DateTime
   
   def password=(val)
-    salt = self.salt
     attribute_set(:hashed_password, Digest::MD5.hexdigest("#{salt}orange-is-awesome#{val}"))
   end
   

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

@@ -12,6 +12,7 @@ module Orange
       options[:mailchimp_key] = orange.options["mailchimp_key"] || false
       options[:mailchimp_list] = orange.options["mailchimp_list"] || false
       options[:mailchimp_interests] = orange.options["mailchimp_interests"] || false
+      options[:mailchimp_merge_fields] = orange.options["mailchimp_merge_fields"] || {}
       Spreedly.configure(options[:spreedly_site], options[:spreedly_key]) if options[:spreedly_key]
       
       orange[:admin, true].add_link("Settings", :resource => @my_orange_name, :text => 'Members')
@@ -99,10 +100,23 @@ module Orange
       old_email = member_params["old_email"] || email
       fname = member_params["first_name"] || ''
       lname = member_params["last_name"] || ''
+      others = {}
+      for key, val in options[:mailchimp_merge_fields]
+        others[val.upcase.to_sym] = member_params[key] || ''
+      end
       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})
+      hominid.subscribe(options[:mailchimp_list], old_email, {:FNAME => fname, :LNAME => lname, :GROUPINGS => interests}.merge(others), {:update_existing => true})
+    end
+    
+    def synchronize_from_mailchimp(packet, member)
+      email = member.email
+      member_info = mailchimp_member_info(packet, member)
+      for key, val in options[:mailchimp_merge_fields]
+        member.attribute_set(key, member_info["merges"][val])
+      end
+      member.save
     end
     
     def batch_update_interest_mailchimp(packet, emails, grouping_name, groups)
@@ -134,12 +148,19 @@ module Orange
       hominid.unsubscribe(options[:mailchimp_list], email)
     end
     
-    def member_list_groups(packet, member)
+    def mailchimp_member_info(packet, member)
       # Can give member id, hydrate to member before continuing.
       unless member.is_a? model_class
         member = model_class.get(member)
       end
-      
+      return [] unless member && options[:mailchimp_list]
+      list = options[:mailchimp_list]
+      begin
+        mailchimp_info = hominid.member_info(list, member.email)
+      rescue Hominid::ListError => e
+        mailchimp_info = {}
+      end
+      mailchimp_info
     end
     
     def login(packet, opts = {})
@@ -148,7 +169,8 @@ module Orange
         login = params["login_email"]
         password = params["login_password"]
         member = model_class.first({:email => login})
-        tester = model_class.new({:password => password, :salt => member.salt})
+        tester = model_class.new({:salt => (member.salt || "")})
+        tester.password = password
         if member && tester.hashed_password == member.hashed_password
           packet.session["member"] = member.id
           packet.reroute(@my_orange_name, :orange, :profile)
@@ -165,7 +187,12 @@ module Orange
     def register(packet, opts = {})
       if packet.request.post?
         params = packet.request.params["members"]
-        
+        unless params["name"].blank?
+          # Problem, stay on registration
+          packet.flash("error", "It looks like you might be a spam robot. Make sure you didn't fill out an extra field by mistake.")
+          return do_view(packet, :register, opts.merge(:list_groups => list_groups(packet)))
+        end
+        params.delete("name")
         member = model_class.first(:email => params["email"])
         if member
           # Existing member... do they already have password?
@@ -201,7 +228,13 @@ module Orange
           new(packet, {:no_reroute => true, :params => params})
           # success ?
           member = model_class.first(:email => params["email"])
-          if member
+          if member && !(mailchimp_member_info(packet, member).blank?)
+            packet.session["member"] = member.id
+            synchronize_from_mailchimp(packet, member)
+            synchronize_with_mailchimp(packet, params.merge("groups" => groups)) if mailing_list
+            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.reroute(@my_orange_name, :orange, :profile)
+          elsif member
             packet.session["member"] = member.id
             params.merge!("groups" => groups)
             synchronize_with_mailchimp(packet, params.merge("groups" => groups)) if mailing_list

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

@@ -7,6 +7,12 @@
     %label Email
     %br
     %input{:type => "text", :name => "members[email]"}
+  %p.registration-name
+    %label Name*
+    %br
+    *Ignore this field unless you are a spam robot.
+    %br
+    %input{:type => "text", :name => "members[name]"}
   %p
     %label Password
     %br

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency