m2config 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 409e5df6b21362f88633bc922d489f2c17ec6a46
-  data.tar.gz: a97d5200c35196fac07995abc668330bfe8bf9f7
+  metadata.gz: 22149dceed17d88788e956fe65fbf666350426e3
+  data.tar.gz: 6c8871d2b828cdd74696d14c7e647c8b5d87b301
 SHA512:
-  metadata.gz: c916730148ca203090fb412222e5f7386bb8c65c51b6b91b63f8d0c9a6f134165d76fc3ee862ff2d0a1df961e9d380af56a638564d22c48ff8cbf208bd52f709
-  data.tar.gz: e79f22f6bb17f04321cf68de59bdb33e2c5def72ed632a34cdb59338190e4e87d875c9dc641066aa471725dc4d441c7113dcd8b1ddd50c5a0e2e25c79ba6db41
+  metadata.gz: 87479944f11ec8be606b18ba960e4bc8178dd65d5cba95a40463cfd79a3d0038781dc6f1d242b82c92b8af66fc86add5753566abcfe58833783f01f3f2f65b39
+  data.tar.gz: 77d1fab253e7b2782f47c15eb3dcbf7fa9bb8fbbf41f9f0fc3cb5ec8e4990b51e10ed8039cbfe3b13ee2d8e0210b6f16bf393c21bd537c29a9f7b0812ec02761

data/Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gemspec
+gem 'mime-types', git: "git://github.com/ameuret/mime-types.git", branch: 'enumerable'
 
 group :dev do
   gem 'guard'

data/lib/m2config/mimetype.rb

@@ -0,0 +1,24 @@
+require "mime/types"
+  
+module M2Config
+  class MimeType < Sequel::Model(:mimetype)
+
+    def self.populate_table
+      rows = []
+      MIME::Types.each {
+        |type|
+        type.extensions.each {
+          |ext|
+          rows << [type.content_type, ext]
+        }
+      }
+      db[:mimetype].import([:mimetype, :extension], rows)
+    end
+  
+    def initialize( fields )
+      super(fields, false)
+      save
+    end
+  
+  end
+end

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/m2config.rb

@@ -28,8 +28,9 @@ module M2Config
       creating = ! (File.exists? @fileName)
       @db = Sequel.connect "sqlite://#{@fileName}"
       
-      @db.run SCHEMA if creating
 
+      @db.run SCHEMA if creating
+ 
       Sequel::Model.db = @db
   
       require "m2config/server"
@@ -39,6 +40,9 @@ module M2Config
       require "m2config/proxy"
       require "m2config/handler"
       require "m2config/setting"
+      require "m2config/mimetype"
+
+      M2Config::MimeType.populate_table if creating
     end
     
     def add_server( settings = {} )

data/m2config.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3"
   spec.add_dependency "sequel"
   spec.add_dependency "uuid"
+  spec.add_dependency "mime-types"
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/sample/full.rb

@@ -5,7 +5,7 @@ include M2Config
 cfg       = M2Config::Config.new
 server    = M2Config::Server.new
 exComHost = M2Config::Host.new({matching:"example.com", name:"ex"})
-pubDir    = M2Config::Dir.new({base:"public/"})
+pubDir    = M2Config::Dir.new({base:"public/",default_ctype: "text/html"})
 pubRoute  = M2Config::Route.new( {path:"/", target:pubDir} )
 appHand   = M2Config::Handler.new({ send_spec:"tcp://10.0.0.1:8989",
                                     recv_spec:"tcp://10.0.0.1:9898",

data/spec/m2config_spec.rb

@@ -4,27 +4,26 @@ TABLES = %w(directory handler host log mimetype proxy route server setting stati
   
 describe M2Config do
   
-  before(:all) do
-  end
-    
-  after(:each) do
-    @db.close if @db && !@db.closed?
-  end  
+  describe "::new" do
+    it 'creates a default database when name absent' do
+      File.should exist DEFAULT_DB_NAME
+    end
   
-  it 'creates a default database when name absent' do
-    File.should exist DEFAULT_DB_NAME
-  end
+    it 'learns the DB schema from the official schema dump' do
+      for table in TABLES do
+        M2Config::Config.tables.should include table
+      end
+    end
   
-  it 'learns the DB schema from the official schema dump' do
-    for table in TABLES do
-      M2Config::Config.tables.should include table
+    it 'creates a valid database structure' do
+      for table in M2Config::Config.tables do
+        expect {CFG.db["SELECT * FROM #{table};"].first}.to_not raise_error
+      end
     end
-  end
   
-  it 'creates a valid database structure' do
-    @db = SQLite3::Database.new DEFAULT_DB_NAME
-    for table in M2Config::Config.tables do
-      expect {@db.execute("SELECT * FROM #{table};")}.to_not raise_error
+    it 'populates the MIME table with a nice set of mappings' do
+      M2Config::MimeType[extension:"html"].mimetype.should eq("text/html")
+      M2Config::MimeType[extension:"css"].mimetype.should eq("text/css")
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +112,7 @@ files:
 - lib/m2config/dir.rb
 - lib/m2config/handler.rb
 - lib/m2config/host.rb
+- lib/m2config/mimetype.rb
 - lib/m2config/proxy.rb
 - lib/m2config/route.rb
 - lib/m2config/schema.sql