milk 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/milk/application.rb

@@ -47,8 +47,8 @@ module Milk
         when @req.post?
           if path == '/login'
             :login
-          elsif path == '/formmail'
-            :formmail
+          elsif path == '/form_submit'
+            :form_submit
           elsif path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
             :preview
@@ -101,7 +101,34 @@ module Milk
       Digest::MD5.hexdigest("#{password}")
     end
     
-    def logout()
+    def send_email(from, from_alias, to, to_alias, subject, message)
+	    msg = <<END_OF_MESSAGE
+From: #{from_alias} <#{from}>
+To: #{to_alias} <#{to}>
+Subject: #{subject}
+
+#{message}
+END_OF_MESSAGE
+      require 'net/smtp'	
+	    Net::SMTP.start('localhost') do |smtp|
+		    smtp.send_message msg, from, to
+	    end
+    end
+
+    def form_submit
+      instr = eval(decode(@req.params['instructions']))
+      p = @req.params.reject { |k,v| k == 'instructions'}
+      print instr.inspect+"\n"
+      print instr[:sendto].inspect+"\n"
+      print instr[:sendto].split(' ').inspect+"\n"
+      instr[:sendto].split(' ').each do |email|
+        continue unless u = USERS[email]
+        send_email("milk@#{@req.host}", "Milk Server at #{@req.host}", email, u[:name], "Someone messaged you from #{@req.referer}", YAML.dump(p))
+      end
+      @resp.redirect(instr[:dest])
+    end
+    
+    def logout
       @resp.delete_cookie('auth', :path => "/")
       @resp.redirect(@req.params['dest'])
     end
@@ -112,7 +139,7 @@ module Milk
       @req.cookies['flash']
     end
     
-    def login()
+    def login
       email = @req.params['email']
       if email.length > 0
         user = USERS[email]
@@ -153,6 +180,7 @@ module Milk
     end
     
     def load_deps(list, target)
+      return list unless DEPENDENCY_TREE[target]
       DEPENDENCY_TREE[target].each do |more|
         if more.class == Symbol
           load_deps(list, more)
@@ -186,6 +214,7 @@ module Milk
           @resp.status = 404
           page = Milk::Page.find('NotFound')
           Milk::Application.join_tree(page, self)
+          @action = :view
           @resp.write page.view
         when :view
           Milk::Application.join_tree(@page, self)
@@ -213,8 +242,8 @@ module Milk
           login
         when :logout
           logout
-        when :formmail
-          formmail
+        when :form_submit
+          form_submit
         when :access_denied
           @resp.staus = 403
           @resp.write "Access Denied"

data/milk.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milk}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Caswell"]

data/site_template/public/js/edit.js

@@ -43,7 +43,6 @@ function jsonify(form)
     }
     root[part] = value;
   });
-  console.log(data);
   return $.toJSON(data);
 }
 

data/site_template/public/js/form_validate.js

@@ -3,7 +3,6 @@ function form_validate(form)
   var good = true;
   $(".form_field", form).each(function(i,tr){
     var field = $("input,textarea,select", tr);
-    console.log(field);
     var required = $(tr).hasClass('required');
     var message = "";
     var value = field[0].value;
@@ -11,7 +10,6 @@ function form_validate(form)
     {
       if (field.hasClass("email_field"))
       {
-        console.log("Validating email");
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
         if (!filter.test(value))
         {
@@ -20,7 +18,6 @@ function form_validate(form)
       }
       else if (field.hasClass("phone_field"))
       {
-        console.log("Validating phone");
         var stripped = value.replace(/[\s()+\-]|ext\.?/gi, "");
         // 10 is the minimum number of numbers required
         if (!(/\d{10,}/i).test(stripped))
@@ -45,7 +42,6 @@ function form_validate(form)
       message_area.show();
     }
   });
-  console.log(good);
-  return false;
+  return good;
 
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milk
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Caswell