ruml 0.0.2 → 0.1.0

data/.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
+  - jruby

data/README.md

@@ -49,4 +49,4 @@ alias_database = hash:/etc/postfix/ml-aliases
 
 ## TODO
 
-* Write tests!
+* Write unit tests!

data/Rakefile

@@ -5,8 +5,41 @@ require 'rake/testtask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-Rake::TestTask.new(:test) do |test|
-  test.test_files = FileList.new('test/*_test.rb')
-  test.libs << 'test'
-  test.verbose = true
+AVAILABLE_TEST_FIXTURES = %w[file yaml]
+
+AVAILABLE_TEST_FIXTURES.each do |test_fixture|
+  namespace :test do
+    Rake::TestTask.new(test_fixture) do |test|
+      ENV['TEST_FIXTURE'] = test_fixture
+      test.test_files = FileList.new('test/*_test.rb')
+      test.libs << 'test'
+      test.verbose = true
+    end
+  end
+end
+
+desc "Run tests for #{AVAILABLE_TEST_FIXTURES.join(', ')}"
+task :test => AVAILABLE_TEST_FIXTURES.map { |f| "test:#{f}" }
+
+SUPPORTED_RUBIES = %w[ree 1.9.2 1.9.3 jruby rbx]
+GEMSPEC = Bundler::GemHelper.new(Dir.pwd).gemspec
+
+def with_ruby(ruby, command)
+  rvm     = "#{ruby}@#{GEMSPEC.name}"
+  command = %{rvm #{rvm} exec bash -c '#{command}'}
+
+  puts "\n" * 3
+  puts "CMD: #{command}"
+  puts "=" * 40
+
+  system(command) or raise "command failed: #{command}"
+end
+
+namespace :rubies do
+  desc "Run tests for following supported platforms #{SUPPORTED_RUBIES.join ", "}"
+  task :test do
+    command = "bundle check || bundle install && bundle exec rake"
+    rubies = ENV['RUBIES'] ? ENV['RUBIES'].split(",") : SUPPORTED_RUBIES
+    rubies.each { |ruby| with_ruby(ruby, command) }
+  end
 end

data/lib/ruml.rb

@@ -1,7 +1,11 @@
 require 'mail'
+require 'moneta'
+require 'moneta/adapters/basic_file'
+require 'moneta/adapters/yaml'
 
 module Ruml
   autoload :List,         'ruml/list'
+  autoload :Config,       'ruml/config'
   autoload :Broadcaster,  'ruml/broadcaster'
   autoload :VERSION,      'ruml/version'
 

data/lib/ruml/broadcaster.rb

@@ -11,7 +11,7 @@ module Ruml
 
     def valid_member?
       expected = @message.from.size
-      actual   = (@message.from(&:downvase) & @ml.members.map(&:downcase)).size
+      actual   = (@message.from.map(&:downcase) & @ml.members.map(&:downcase)).size
       expected == actual
     end
 

data/lib/ruml/config.rb

@@ -0,0 +1,64 @@
+module Ruml
+  class Config
+    attr_reader :path
+
+    def initialize(path)
+      @path = path.to_s
+
+      case @path
+      when /\.ya?ml/
+        construct PlainYAML, :path => @path
+      else
+        raise ArgumentError, "Couldn't find mailing list in #{@path.inspect}" unless File.directory?(@path)
+        construct Moneta::Adapters::BasicFile, :path => @path
+      end
+    end
+
+    def [](name)
+      @moneta[name]
+    end
+
+    def []=(name, value)
+      @moneta[name] = value
+    end
+
+    def construct(adapater, *args)
+      @moneta = Builder.new(adapater.new(*args))
+    end
+
+    class Builder
+      include Moneta::Middleware
+
+      def initialize(adapater)
+        adapater.extend NoSerialization
+        build(adapater)
+      end
+    end
+
+  private
+
+    class PlainYAML < ::Moneta::Adapters::YAML
+      def [](key)
+        string_key = key_for(key)
+        yaml[string_key] if yaml.key?(string_key)
+      end
+
+      def store(key, value, *)
+        hash = yaml
+        hash[key_for(key)] = value
+        save(hash)
+      end
+    end
+
+    module NoSerialization
+      def serialize(value)
+        value
+      end
+
+      def deserialize(value)
+        value
+      end
+    end
+
+  end
+end

data/lib/ruml/list.rb

@@ -1,10 +1,13 @@
 module Ruml
   class List
-    attr_reader :dir
+    attr_reader :config
 
-    def initialize(dir)
-      raise ArgumentError, "Couldn't find mailing list in #{dir.inspect}" unless File.directory?(dir)
-      @dir = dir
+    def initialize(path)
+      @config = Config.new(path)
+    end
+
+    def path
+      config.path
     end
 
     def id
@@ -12,19 +15,19 @@ module Ruml
     end
 
     def name
-      @name ||= readlines("name").first
+      @name ||= lines("name").first
     end
 
     def members
-      @members ||= readlines("members").map(&:downcase).uniq.reject { |member| member =~ /^#|^$/ }
+      @members ||= lines("members").map(&:downcase).uniq.reject { |member| member =~ /^#|^$/ }
     end
 
     def to
-      @to ||= readlines("to").first
+      @to ||= lines("to").first
     end
 
     def bounce_to
-      @bounce_to ||= readlines("bounce_to").first || to
+      @bounce_to ||= lines("bounce_to").first || to
     end
 
     def broadcaster(body)
@@ -40,11 +43,11 @@ module Ruml
 
   private
 
-    def readlines(name)
-      path = File.join(@dir, name)
-      File.readlines(path).map(&:strip)
-    rescue Errno::ENOENT
-      []
+    def lines(name)
+      value = config[name]
+      value = value.split("\n").map(&:strip) if value.respond_to?(:split)
+      value
     end
+
   end
 end

data/lib/ruml/version.rb

@@ -1,3 +1,3 @@
 module Ruml
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/ruml.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "rake",        "~> 0.9.2"
   s.add_development_dependency "minitest"
 
-  s.add_runtime_dependency "mail", "~> 2.3.0"
+  s.add_runtime_dependency "mail",              "~> 2.3.0"
+  s.add_runtime_dependency "moneta-splattael",  "~> 0.7.0"
 end

data/test/fixtures/example_ml.yml

@@ -0,0 +1,8 @@
+---
+name: "[Test ML]"
+to: test-ml@example.com
+bounce_to: test-ml-bounce@example.com
+members:
+- info@example.com
+- foo@example.com
+- Foo@example.com

data/test/helper.rb

@@ -10,6 +10,13 @@ Mail.defaults do
   delivery_method :test
 end
 
+if fixture = ENV['TEST_FIXTURE']
+  TEST_FIXTURE = ENV['TEST_FIXTURE']
+  puts "Using TEST_FIXTURE=#{TEST_FIXTURE}"
+else
+  abort "Please run: TEST_FIXTURE=file rake"
+end
+
 module RumlTestSupport
   def exec_ruml(arg, input)
     # TODO execute "bin/ruml" directly
@@ -31,7 +38,14 @@ module RumlTestSupport
   end
 
   def example_ml_path
-    fixture_path "example_ml"
+    case TEST_FIXTURE
+    when "file"
+      fixture_path "example_ml"
+    when "yaml", "yml"
+      fixture_path "example_ml.yml"
+    else
+      abort "Unknown TEST_FIXTURE #{TEST_FIXTURE.inspect}"
+    end
   end
 end
 

data/test/integration_test.rb

@@ -1,19 +1,22 @@
 require 'helper'
 
 describe "Ruml binary" do
-  it "fails with TypeError w/o arguments" do
+  it "fails with ArgumentError using empty list path" do
     output = exec_ruml nil, nil
-    output.must_match "can't convert nil into String (TypeError)"
+    output.must_match "Couldn't find mailing list in \"\""
+    output.must_match "ArgumentError"
   end
 
   it "fails with ArgumentError using invalid list path" do
     output = exec_ruml "invalid path", nil
-    output.must_match "Couldn't find mailing list in \"invalid path\" (ArgumentError)"
+    output.must_match "Couldn't find mailing list in \"invalid path\""
+    output.must_match "ArgumentError"
   end
 
   it "fails with NoMethodError on empty input" do
     output = exec_ruml example_ml_path, nil
-    output.must_match "undefined method `size' for nil:NilClass (NoMethodError)"
+    output.must_match %r{undefined method `size' (for|on) nil:NilClass}
+    output.must_match "NoMethodError"
   end
 
   describe "with example_ml" do
@@ -21,14 +24,14 @@ describe "Ruml binary" do
 
     it "refuse email from unknown member" do
       mail = compose_mail(mailing_list, :from => "unknown@member.com")
-      output = exec_ruml mailing_list.dir, mail.to_s
+      output = exec_ruml mailing_list.path, mail.to_s
       output.must_be_empty
       deliveries.must_be_empty
     end
 
     describe "from valid member" do
       let(:mail) { compose_mail(mailing_list) }
-      let(:output) { exec_ruml mailing_list.dir, mail.to_s }
+      let(:output) { exec_ruml mailing_list.path, mail.to_s }
       let(:delivery) { output; deliveries.first }
 
       it "output is empty" do

metadata

@@ -1,66 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruml
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: minitest
+date: 2011-11-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &5745740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *5745740
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &5744960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *5744960
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &5743680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id002
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *5743680
+- !ruby/object:Gem::Dependency
+  name: moneta-splattael
+  requirement: &5760440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *5760440
+description: ''
+email:
 - peter@suschlik.de
-executables: 
+executables:
 - ruml
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/ruml
@@ -70,9 +76,11 @@ files:
 - example/testml/to
 - lib/ruml.rb
 - lib/ruml/broadcaster.rb
+- lib/ruml/config.rb
 - lib/ruml/list.rb
 - lib/ruml/version.rb
 - ruml.gemspec
+- test/fixtures/example_ml.yml
 - test/fixtures/example_ml/bounce_to
 - test/fixtures/example_ml/members
 - test/fixtures/example_ml/name
@@ -81,36 +89,26 @@ files:
 - test/integration_test.rb
 homepage: https://github.com/splattael/ruml
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby mailing list software
 test_files: []
-

data/Gemfile.lock

@@ -1,27 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ruml (0.0.1)
-      mail (~> 2.3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    i18n (0.6.0)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    minitest (2.7.0)
-    polyglot (0.3.2)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest
-  ruml!