typedown2blog 0.0.0 → 0.1.1

data/.gitignore

@@ -19,3 +19,7 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+example/config/config.yaml
+*.pid
+*.sqlite3
+*.log

data/README.rdoc

@@ -10,31 +10,19 @@ emails once processed. If you don't want this behaviour you can easily create
 your own version of the script. You have to move the mail out of the
 watched directory though, or the mail will be reprocessed every 3 seconds.
 
+== NEW STUFF
+
+0.1.0
+
+* Major refactoring of the whole library.
+
 == USAGE
 
-To use the bin/blog or bin/typedown2blog_batcher create blog_config.rb
-in your ruby path, with content similar to:
-
-
-    Typedown2Blog::Spec::setup do
-      blog do
-        email 'blog@example.com'
-      end
-
-      mail_defaults do 
-        delivery_method :smtp, {
-          :address              => 'your_mail_server',
-          :port                 => 25,
-          :domain               => 'example.com',
-          :user_name            => 'you@example.com',
-          :password             => 'your_password',
-          :authentication       => :plain,
-        }
-      end
-
-      # Only used by bin/typedown2blog_batcher
-      glob "your_home/Maildir/new/*"
-    end
+Check out the example dir. You may copy this directory to
+start your own project. Remember to create your own
+config/config.yaml from config/config.template.yaml
+
+example/bin/pop2blog.rb depends on the 'secret_mail' gem
 
 
 == Note on Patches/Pull Requests

data/Rakefile

@@ -11,8 +11,9 @@ begin
     gem.homepage = "http://github.com/wrimle/typedown2blog"
     gem.authors = ["Rune Myrland"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency('attachments','>= 0.0.7')
-    gem.add_dependency('typedown','>= 0.0.3')
+    gem.add_dependency('attachments','>= 0.0.11')
+    gem.add_dependency('typedown','>= 0.0.5')
+    gem.add_dependency('mail_processor','>= 0.0.2')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.1

data/example/bin/blog.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'rubygems'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'typedown2blog'
+
+include Typedown2Blog
+
+
+config = YAML::load(File.open("config/config.yaml"))
+
+Typedown2Blog::Spec::setup do
+  retriever_method :pop3, config["pop3"]
+  delivery_method :smtp, config["smtp"]
+end
+
+post = BlogPost.new config["blog_post"]
+
+isFirst = true
+ARGV.each do |filename|
+  if isFirst
+    post.typedown_body = File.read(filename)
+    isFirst = false
+  else
+    post.add_attachment filename
+  end
+end
+post.post!

data/example/bin/mail2test.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'rubygems'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'typedown2blog'
+
+include Typedown2Blog
+
+
+config = YAML::load(File.open("config/config.yaml"))
+Typedown2Blog::Spec::setup do
+  delivery_method :smtp, config["smtp"]
+end
+
+mail = Mail.new do
+  to config["test"]["secret_mail"]
+  from config["test"]["mail_from"]
+end
+
+isFirst = true
+ARGV.each do |filename|
+  if isFirst
+    mail.body File.read(filename)
+    isFirst = false
+  else
+    mail.add_file filename
+  end
+end
+mail.deliver!

data/example/bin/pop2blog.rb

@@ -0,0 +1,79 @@
+#!/bin/env ruby
+
+require 'rubygems'
+# from 'mail' gem
+require 'mail'
+# from 'secret_mail' gem
+require 'secret_mail'
+# from 'uuidtools' gem
+require 'uuidtools'
+# from 'log4r' gem
+require 'log4r'
+require 'log4r/outputter/syslogoutputter'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'typedown2blog'
+
+include Log4r
+
+log = Log4r::Logger.new("pop2blog")
+outputter = Outputter.stdout
+#outputter = Log4r::FileOutputter.new "pop2blog", { :filename => "pop2blog.log" }
+#outputter = Log4r::SyslogOutputter.new "pop2blog"
+Log4r::Logger[ "pop2blog" ].outputters = outputter
+Log4r::Logger[ "Typedown2Blog" ].outputters = outputter
+Log4r::Logger[ "MailProcessor" ].outputters = outputter
+
+config = YAML::load(File.open("config/config.yaml"))
+
+Typedown2Blog::Spec::setup do
+  retriever_method :pop3, config["pop3"]
+  delivery_method :smtp, config["smtp"]
+end
+
+SecretMail::MailAction.mail_domain config["secret_mail"]["mail_domain"]
+ActiveRecord::Base.establish_connection(config["db"])
+
+
+loop do
+  didWork = Spec::retriever.process do |popped|
+    begin
+      SecretMail::Controller.process Mail.new(popped) do |action, record, mail|
+        blog_post = Typedown2Blog::BlogPost.new do 
+          case action.to_sym
+          when :created then
+            self.mail_to = mail.from[0]
+            self.mail_from = record.secret_mail
+            self.typedown_body = "! Your typedown2blog gateway\n#{record.secret_mail}\n"
+            self.format = 'blogger'
+          when :mail_to_blogger then
+            self.mail_to = record.params
+            self.format = 'blogger'
+            self.import_mail :mail => mail
+          when :mail_to_wordpress then
+            self.mail_to = record.params
+            self.format = 'wordpress'
+            self.import_mail :mail => mail
+          else
+            raise "Unsupported action: " + action.to_s
+          end
+        end
+        blog_post.post!
+      end
+    rescue => err
+      now = Time.now.strftime("%Y%m%d-%H%M%S")
+      uuid = UUIDTools::UUID.random_create.to_s
+      filename = "failed/#{now}-#{uuid}"
+      log.error filename + ", " + err.message
+      f = File.new(filename, "wb")
+      f.write(popped)
+      f.close()
+      f = File.new(filename + ".error", "wb")
+      f.write("#{err.message}\n#{err.backtrace.join("\n")}")
+      f.close()
+    end
+  end
+  sleep(10) unless(didWork)
+end

data/example/config/config.template.yaml

@@ -0,0 +1,27 @@
+# Used by both
+smtp:
+  address: smtp.your_provider.example.com
+  port: 25
+
+# Used only by pop2blog.rb
+pop3:
+  address: pop.your_provider.example.com
+  username: your_pop_user_name
+  password: **secret**
+
+db:
+  adapter: sqlite3
+  database: db/production.sqlite3
+
+secret_mail:
+  mail_domain: your_domain.example.com
+
+test:
+  secret_mail: your_test_account@server.example.com
+  mail_to: your_test_blog_or_personal_mail@some_blog.example.com
+  mail_from: you@example.com
+
+# Used only by blog.rb
+blog_post:
+  mail_to: your@server.example.com
+  mail_from: you@example.com

data/example/script/db_init.rb

@@ -0,0 +1,52 @@
+#!/bin/env ruby
+
+require 'rubygems'
+require 'secret_mail'
+require 'secret_mail/../../db/create_tables'
+require 'fileutils'
+
+config = YAML::load(File.open("config/config.yaml"))
+
+db_file = config["db"]["database"]
+file_exist = false
+if File.exists?(db_file)
+   puts "Db already exists"
+   file_exist = true
+   exit
+end
+
+SecretMail::MailAction.mail_domain config["secret_mail"]["mail_domain"]
+ActiveRecord::Base.establish_connection(config["db"])
+ActiveRecord::Base.connection
+
+CreateTables.up
+domain = SecretMail::MailAction.mail_domain
+
+
+SecretMail::MailAction.new({
+	:secret_mail => "blogger@#{domain}", 
+	:action => "create",
+	:params => "mail_to_blogger"
+}).save
+
+
+SecretMail::MailAction.new({
+	:secret_mail => "wordpress@#{domain}", 
+	:action => "create",
+	:params => "mail_to_wordpress"
+}).save
+
+
+SecretMail::MailAction.new({
+	:secret_mail => "posterous@#{domain}", 
+	:action => "create",
+	:params => "mail_to_wordpress"
+}).save
+
+
+SecretMail::MailAction.new({
+        :secret_mail => config["test"]["secret_mail"],
+	:action => "mail_to_wordpress",
+        :from => config["test"]["mail_from"], 
+	:params => config["test"]["mail_to"]
+}).save

data/example/test/data/example.tpd

@@ -0,0 +1,21 @@
+! Heading
+
+//. A lead-in saying what the article is about.
+Some more lead-in. 
+And more.
+
+Some body copy.
+
+!! Subheading
+
+More body copy.
+
+- Dialogue like this, he said. - I tell you.
+
+- Oh, yeah?
+
+More body copy. Standard markdown /italic/ and //bold//.
+
+!! Another subheading
+
+And body copy again.

data/lib/typedown2blog/base.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+require 'rubygems'
+require 'log4r'
+
+module Typedown2Blog
+  include Log4r
+  class UnkownRetrieverError < StandardError; end
+
+  log = Log4r::Logger.new "Typedown2Blog"
+  log.outputters = Log4r::Outputter.stdout
+
+  class Base
+    def self.log
+      Log4r::Logger["Typedown2Blog"]
+    end
+
+    def log
+      self.class.log
+    end
+
+
+    # Symbolizes keys from yaml hashes while merging
+    def merge_to_attributes other
+      h = @attributes
+      other.each do |k, v|
+        h[k.to_sym] = v
+      end
+      self
+    end
+  end
+end
+
+
+class File
+  def self.read_binary filename
+    f = File.new(filename, "rb")
+    content = f.read()
+    f.close()
+    content
+  end
+end
+

data/lib/typedown2blog/blog_post.rb

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+require 'attachments'
+require 'typedown'
+
+include Typedown2Blog
+module Typedown2Blog
+
+  class BlogPost < Base
+    attr_accessor :mail_from, :mail_to, :typedown_body, :format
+    
+    begin
+      @formatters = {}
+    end
+
+
+    def initialize options = {}, &block
+      @mail_to = nil
+      @mail_from = nil
+      @typedown_body = ""
+      @format = nil
+      @attachments = []
+
+      options.each do |k, v|
+        send("#{k}=", v)
+      end
+
+      instance_eval &block if block_given?
+    end
+
+    def self.add_formatter name, formatter
+      @formatters[ name ] = formatter
+    end
+
+
+    def self.formatters
+      @formatters
+    end
+
+    def add_attachment options = {}
+      options[:content] = File.read_binary(options[:tmpfile]) unless options[:content]
+      @attachments << options
+    end
+
+
+    def post!
+      mail_to = self.mail_to
+      mail_from = self.mail_from
+      mail_subject, mail_body, mail_content_type = self.format_body(self.typedown_body)
+
+      mail_attachments = @attachments
+
+      mail = Mail.new do
+        from mail_from
+        to mail_to
+        subject mail_subject
+
+        if mail_attachments.length == 0
+          body mail_body
+          content_type mail_content_type
+        else
+          text_part do
+            self.charset = "UTF-8"
+            body mail_body
+            content_type mail_content_type
+          end
+        end
+
+        mail_attachments.each do |a|
+          add_file(:filename => a[:save_as], :content => a[:content])
+          attachments[a[:save_as]][:content_type] = a[:mime_type]
+        end
+
+        #text_part.body mail_body
+        #text_part.content_type mail_content_type
+      end
+
+      log.info((mail_subject || "(No subject)") + " delivered to " + (mail_to || "(nobody)"))
+      mail.deliver!
+    end
+
+    def import_mail filename_or_hash
+      post = nil
+      extract = Attachments::Extract.new [ "image/jpeg" ]
+      begin
+        extract.parse filename_or_hash
+        self.mail_from = extract.from
+
+        typedown_root = Typedown::Section.sectionize(extract.text_body, extract.subject)
+        self.typedown_body = typedown_root.doc
+
+        extract.files.each do |f|
+          self.add_attachment f
+        end
+      ensure
+        extract.close
+      end
+    end
+
+    protected
+    def format_body typedown
+      if(format)
+        self.class.formatters[format].format_body typedown
+      else
+        doc = Typedown::Section.sectionize(typedown)
+        body = "#{doc.body.to_html}\n\n"
+        [ doc.title, body, "plain/text" ]
+      end
+    end
+
+  end
+end

data/lib/typedown2blog/formatters.rb

@@ -0,0 +1,37 @@
+
+module Typedown2Blog
+  class BlogFormatter
+    def initialize name = nil
+      BlogPost.add_formatter(name || self.class.to_s, self)
+    end
+
+    def format_body typedown
+      raise "Pleas subclass and override this method."
+      [ "Subject", "Body", "mime/type" ]
+    end
+  end
+
+
+  class HtmlTagsInText < BlogFormatter
+    def format_body typedown
+      doc = Typedown::Section.sectionize(typedown)
+      body = "#{doc.body.to_html}\n\n"
+      [ doc.title, body, "plain/text" ]
+    end
+
+    new "wordpress"
+    new "posterous"
+  end
+
+
+  class HtmlDocument < BlogFormatter
+    def format_body typedown
+      doc = Typedown::Section.sectionize(typedown)
+      body = "<html>\n<body>\n#{doc.body.to_html}\n</body>\n</html>\n\n"
+      [ doc.title, body, "plain/text" ]
+    end
+
+    new "blogger"
+  end
+
+end

data/lib/typedown2blog/instance_exec.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+class Object
+  module InstanceExecHelper; end
+  include InstanceExecHelper
+  def instance_exec(*args, &block) # !> method redefined; discarding old instance_exec
+    mname = "__instance_exec_#{Thread.current.object_id.abs}_#{object_id.abs}"
+    InstanceExecHelper.module_eval{ define_method(mname, &block) }
+    begin
+      ret = send(mname, *args)
+    ensure
+      InstanceExecHelper.module_eval{ undef_method(mname) } rescue nil
+    end
+    ret
+  end
+end
+

data/lib/typedown2blog/spec.rb

@@ -1,27 +1,50 @@
 # -*- coding: utf-8 -*-
 
+require 'mail_processor'
 
 module Typedown2Blog
-  class Spec
-    begin
-      @glob = ARGV[0] || ENV['TYPEDOWN_MAIL_GLOB']
-    end
+  def symbolize_keys(hash)
+    hash.inject({}){|result, (key, value)|  
+      new_key = case key  
+                when String then key.to_sym  
+                else key  
+                end  
+      new_value = case value  
+                  when Hash then symbolize_keys(value)  
+                  else value  
+                  end  
+      result[new_key] = new_value  
+      result  
+    }  
+  end
 
 
+  class Spec
     def self.setup &block
-      instance_eval &block
+      instance_eval &block if block_given?
+      self
     end
 
-
-    def self.blog &block
-      Blog.setup &block
+    def self.retriever_method method, options={}, &block
+      @retriever = MailProcessor::Processor.new do
+        retriever method, symbolize_keys(options), &block
+      end
+      @retriever
     end
 
+    def self.retriever
+      @retriever
+    end
 
     def self.mail_defaults &block
       Mail.defaults &block
     end
 
+    def self.delivery_method m, options= {}
+      Mail.defaults do
+        delivery_method m, symbolize_keys(options)
+      end
+    end
 
     def self.glob v = nil
       if v
@@ -32,4 +55,3 @@ module Typedown2Blog
     end
   end
 end
-

data/lib/typedown2blog.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-require 'typedown2blog/parse_mail.rb'
-require 'typedown2blog/blog.rb'
+require 'typedown2blog/instance_exec.rb'
+require 'typedown2blog/base.rb'
+require 'typedown2blog/blog_post.rb'
+require 'typedown2blog/formatters.rb'
 require 'typedown2blog/spec.rb'
-

data/test/data/example.tpd

@@ -0,0 +1,21 @@
+! Heading
+
+//. A lead-in saying what the article is about.
+Some more lead-in. 
+And more.
+
+Some body copy.
+
+!! Subheading
+
+More body copy.
+
+- Dialogue like this, he said. - I tell you.
+
+- Oh, yeah?
+
+More body copy. Standard markdown /italic/ and //bold//.
+
+!! Another subheading
+
+And body copy again.

data/test/test_blog_post.rb

@@ -0,0 +1,43 @@
+require 'helper'
+require 'typedown2blog'
+require 'yaml'
+
+include Typedown2Blog
+
+
+class TestBlogPost < Test::Unit::TestCase
+  context "BlogPost.new" do
+    setup do
+      @config = if(File.exists?("test/config.yaml"))
+                  YAML.load_file("test/config.yaml")
+                else
+                  nil
+                end
+
+      config = @config
+      Mail.defaults do
+        case
+        when config["smtp"] then
+          delivery_method :smtp, { :smtp => "smtp.get.no" } #config["smtp"] 
+        else
+          delivery_method :test
+        end
+      end
+    end
+
+    should "should accept parameters from a yaml file" do
+      assert_not_nil(@config, "needs a real mail account")
+
+      blog_post = BlogPost.new @config['blog']
+    end
+
+
+    should "should post a message" do
+      pending("needs a real mail account") unless @config
+      c = File.read_binary("test/data/example.tpd")
+      blog_post = BlogPost.new @config['blog']
+      blog_post.typedown_body c
+      blog_post.post!
+    end
+  end
+end

data/test/test_typedown2blog.rb

@@ -6,9 +6,9 @@ include Typedown2Blog
 class TestTypedown2Blog < Test::Unit::TestCase
   context "Parser" do
     should "parse test mails without raising exceptions" do
-      assert_nothing_raised do
-        Dir.glob("./test/data/mail_*.eml") do |filename|
-          parse_mail "./test/data/mail_0001.eml"
+      Dir.glob("./test/data/mail_*.eml") do |filename|
+        assert_nothing_raised do
+          convert_mail filename
         end
       end
     end
@@ -16,7 +16,7 @@ class TestTypedown2Blog < Test::Unit::TestCase
 
   context "Attached image" do
     setup do
-      @mail = parse_mail "./test/data/mail_0002.eml"
+      @mail = convert_mail "./test/data/mail_0002.eml"
     end
 
     teardown do
@@ -34,14 +34,42 @@ class TestTypedown2Blog < Test::Unit::TestCase
   end
 
   context "Blog" do
-    should "parse mail_0002 without raising exceptions" do
-      assert_nothing_raised do
-        Blog.setup do
-          email "rune@epubify.com"
+    setup do
+      Spec.setup do
+        blog do
+          mail_to "test@wrimle.com"
+          #format "wordpress"
+          #format "blogger"
+        end
+        mail_defaults do 
+          delivery_method :test
+        end
+      end
+    end
+
+    should "post mails without raising exceptions" do
+      Spec.setup.blog do
+        format "wordpress"
+      end
+
+      Dir.glob("./test/data/*.eml") do |filename|
+        assert_nothing_raised do
+          Blog.post filename
         end
-        #Blog.post "./test/data/mail_0002.eml"
       end
     end
 
+    should "post mails in blogger formatword without raising exceptions" do
+      Spec.setup.blog do
+        format "wordpress"
+      end
+
+      Dir.glob("./test/data/*.eml") do |filename|
+        assert_nothing_raised do
+          Blog.post filename
+        end
+      end
+    end
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typedown2blog
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 0
-  version: 0.0.0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rune Myrland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 9
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,20 +56,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 21
         segments: 
         - 0
         - 0
-        - 3
-        version: 0.0.3
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mail_processor
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id004
 description: The script will forward to the blog via a Mail2Blog interface.
 email: rune@epubify.com
-executables: 
-- typedown2blog_batcher
-- control_typedown2blog_batcher.rb
-- blog
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -82,18 +96,25 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- bin/blog
-- bin/control_typedown2blog_batcher.rb
-- bin/typedown2blog_batcher
+- example/bin/blog.rb
+- example/bin/mail2test.rb
+- example/bin/pop2blog.rb
+- example/config/config.template.yaml
+- example/script/db_init.rb
+- example/test/data/example.tpd
 - lib/typedown2blog.rb
-- lib/typedown2blog/blog.rb
-- lib/typedown2blog/parse_mail.rb
+- lib/typedown2blog/base.rb
+- lib/typedown2blog/blog_post.rb
+- lib/typedown2blog/formatters.rb
+- lib/typedown2blog/instance_exec.rb
 - lib/typedown2blog/spec.rb
+- test/data/example.tpd
 - test/data/mail_0001.eml
 - test/data/mail_0002.eml
 - test/data/mail_0002.jpg
 - test/data/mail_0003.eml
 - test/helper.rb
+- test/test_blog_post.rb
 - test/test_typedown2blog.rb
 has_rdoc: true
 homepage: http://github.com/wrimle/typedown2blog
@@ -132,3 +153,4 @@ summary: Email gateway for reformatting typedown documents before forwarding to
 test_files: 
 - test/test_typedown2blog.rb
 - test/helper.rb
+- test/test_blog_post.rb

data/bin/blog

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-require 'rubygems'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'typedown2blog'
-
-include Typedown2Blog
-
-begin
-  require 'blog_config'
-rescue MissingSourceFile => err
-  puts "Put your mail settings in blog_config.rb"
-  exit
-end
-
-
-unless Typedown2Blog::Blog.email
-  puts "#{__FILE__} blog_email incoming_mails_glob"
-  puts "Or specify in blog_config.rb"
-  exit
-end
-
-ARGV.each do |filename|
-  Blog.post filename
-end

data/bin/control_typedown2blog_batcher.rb

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'daemons'
-
-Daemons.run('typedown2blog_batcher.rb')

data/bin/typedown2blog_batcher

@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'fileutils'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rubygems'
-require 'typedown2blog'
-
-include Typedown2Blog
-
-
-begin
-  require 'blog_config'
-rescue MissingSourceFile => err
-  puts "Put your settings in blog_config.rb"
-  exit
-end
-
-puts Typedown2Blog::Blog.email
-puts Typedown2Blog::Spec.glob
-
-unless Typedown2Blog::Blog.email && Typedown2Blog::Spec.glob
-  puts "#{__FILE__} blog_email incoming_mails_glob"
-  puts "Or specify in blog_config.rb"
-  exit
-end
-
-
-loop do
-  # Read maildir and parse them if they are there
-  didWork = false
-  Dir.glob(Spec::glob) do |filename|
-    Blog.post filename
-    FileUtils::rm(filename)
-    didWork = true
-  end
-
-  # If no mails where found, sleep a bit before looking again
-  sleep(3) unless didWork
-end

data/lib/typedown2blog/blog.rb

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module Typedown2Blog
-  class Blog
-    begin
-      @email = nil
-    end
-
-
-    def self.setup &block
-      instance_eval &block
-    end
-
-
-    def self.email v = nil
-      if v
-        @email = v
-      else
-        @email
-      end
-    end
-
-
-    def self.email= v
-      @email = v
-    end
-
-
-    def self.post filename
-      mail_to = @email
-      mail = Typedown2Blog::parse_mail filename do
-        to mail_to
-
-        typedown = text_part.body.decoded
-        typedown_root = Typedown::Section.sectionize(typedown, subject)
-        text_part.body = "#{typedown_root.body.to_html}\n\n"
-      end
-      mail.deliver!
-    end
-  end
-end

data/lib/typedown2blog/parse_mail.rb

@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'attachments'
-require 'typedown'
-
-module Typedown2Blog
-
-  def parse_mail filename, &block
-    out = nil
-    extract = Attachments::Extract.new [ "image/jpeg" ]
-    begin
-      out = Mail.new do
-        extract.parse filename
-        from extract.from
-
-        typedown_root = Typedown::Section.sectionize(extract.text_body, extract.subject)
-
-        subject typedown_root.title
-        text_part do
-          charset = 'UTF-8'
-          body typedown_root.body
-        end
-
-        extract.files.each do |f|
-          file = File.new(f[:tmpfile], "rb")
-          data = file.read()
-          file.close()
-
-          add_file(:filename => f[:save_as], :content =>  data )
-          attachments[f[:save_as]][:mime_type] = f[:mime_type]
-
-          #convert_to_multipart unless self.multipart?
-          #add_multipart_mixed_header
-          #attachments[f[:save_as]] = {
-          #  :mime_type => f[:mime_type],
-          #  :content =>  data,
-          #}
-        end
-
-        if block_given?
-          instance_eval &block
-        end
-      end
-    ensure
-      extract.close
-    end
-    out
-  end
-
-
-  def send_to_blog filename, secret_mail
-    mail = Typedown2Blog::parse_mail filename do
-      to secret_mail
-
-      typedown = text_part.body.decoded
-      typedown_root = Typedown::Section.sectionize(typedown, subject)
-      text_part.body = "#{typedown_root.body.to_html}\n\n"
-    end
-    mail.deliver!
-  end
-
-
-
-  def parse_glob glob_name, &block
-    didWork = false
-    Dir.glob(glob_name) do |filename|
-      block.call filename
-      didWork = true
-    end
-  
-    didWork
-  end
-
-end