m2config 0.5.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1686b2f58b1d2458e9db47c9e88af841b0b15332
-  data.tar.gz: 7c44815043517753897c2e1a680b9a1956d09990
+  metadata.gz: 7628a64cb9b551df57316cd9506e4a27c0711d21
+  data.tar.gz: bb8bc8ed05f08fa132f370e9469fd58734c4e480
 SHA512:
-  metadata.gz: 3047f3a13d345585396c5181044f560090fa6bfe7990c806df72a80cdfb1b88241e60012b35d07f96131ddeefa58ced9d7bbd754d192d209e65b1fa998f5a38a
-  data.tar.gz: a2a09aefbb0c124c40182ab9602171e89f386f87d24770fba2a48835ea3442c447afb7657950b6a0b9aca12e04e9a90ab662948b3214a7f6e4b2c8fb2656894b
+  metadata.gz: 8d8b93c438183dd08ff388de1dc7716aae67a0403b5e84216330a331fa44e3031e4d9aa85503994ffa602eaf549c43ab88d68c17e62f6aa8787a8dc12253bd69
+  data.tar.gz: 66751355ffd58029e51cd2eccbdd65f504d4cd8df36ffab3b55a1b019bf45cb23765f388eee19e1e1d4b342c363594256ab9a02b3f32857250f10c411cd0d8d7

data/README.md

@@ -1,7 +1,7 @@
 CAVEAT EMPTOR
 -------------
 
-THIS LIB IS VERY YOUNG. ALTHOUGH IT SEEMS TO WORK SO FAR I AM JUST
+THIS LIB IS STILL YOUNG. ALTHOUGH IT SEEMS TO WORK SO FAR, I AM JUST
 STARTING TO USE IT IN THE FIELD SO EVEN THOUGH THE SPECS PASS IT MAY
 BREAK STUFF.
 
@@ -10,7 +10,7 @@ M2config
 ========
 [![Build Status](https://travis-ci.org/ameuret/m2config.png?branch=master)](https://travis-ci.org/ameuret/m2config)
 [![Code Climate](https://codeclimate.com/github/ameuret/m2config.png)](https://codeclimate.com/github/ameuret/m2config)  
-  
+[![Gem Version](https://badge.fury.io/rb/m2config.svg)](http://badge.fury.io/rb/m2config)  
 Manage your Mongrel2 configuration database using handy model classes
 that map Servers, Hosts, Routes, Directories, Proxies, Handlers and Settings.
 
@@ -40,8 +40,8 @@ require "m2config"
 
 cfg       = M2Config::Config.new
 server    = M2Config::Server.new
-exComHost = M2Config::Host.new({matching:"example.com"})
-pubDir    = M2Config::Dir.new({base:"/public"})
+exComHost = M2Config::Host.new({name: "ex", matching:"example.com"})
+pubDir    = M2Config::Dir.new({base:"public"})
 pubRoute  = M2Config::Route.new({path:"/", target:pubDir})
 
 exComHost.add_route pubRoute
@@ -54,7 +54,7 @@ for duplicates. This has the benefit of complete flexibility and
 control but *you* must ensure that the DB ends up looking the way you
 want.
 
-You can swiftly dump your config using:
+You can swiftly dump your config using this at the end of your script:
 
 ```ruby
 require "pp"
@@ -67,6 +67,10 @@ pp Route.all
 
 ```
 
+#### Default values
+
+TODO
+
 ### This is Sequel
 
 The classes mapping the configuration are

data/lib/m2config.rb

@@ -23,12 +23,11 @@ module M2Config
       @@foundTables
     end
     
-    def initialize( fileName = DEFAULT_CONFIG )
+    def initialize(fileName = DEFAULT_CONFIG, options={})
       @fileName = fileName
       creating = ! (File.exists? @fileName)
       @db = Sequel.connect "sqlite://#{@fileName}"
       
-
       @db.run SCHEMA if creating
  
       Sequel::Model.db = @db
@@ -42,7 +41,7 @@ module M2Config
       require "m2config/setting"
       require "m2config/mimetype"
 
-      M2Config::MimeType.populate_table if creating
+      M2Config::MimeType.populate_table(nil,options[:ignoreDoubles]) if creating
     end
     
     def add_server( settings = {} )

data/lib/m2config/mimetype.rb

@@ -13,12 +13,13 @@ module M2Config
                              having count(*)>1
                              SQL
   
-    def self.populate_table
+    def self.populate_table(types=nil, ignoreDoubles=false)
       raise RuntimeError, "Table must be empty" if db[:mimetype].count > 0
-      rows = []
-      MIME::Types.each {
+      types ||= MIME::Types
+      rows = [] # Will collect ext<->type rows
+      types.each {
         |type|
-        next if not_dominant(type)
+        next if not_dominant?(type)
         type.extensions.each {
           |ext|
           ext = "."+ext
@@ -30,18 +31,24 @@ module M2Config
       db.transaction {
         db[:mimetype].import([:mimetype, :extension], rows)
       }
-      remove_duplicates
+      remove_duplicates unless ignoreDoubles
     end
   
-    def self.not_dominant( mtype )
-      mtype.obsolete? || superceded?(mtype)
+    # Is it reasonable to ignore this type ?
+    def self.not_dominant?(mtype)
+      mtype.obsolete? || superceded?(mtype)  || !simplest?(mtype)
     end
 
-    def self.superceded?( mtype )
+    def self.superceded?(mtype)
       mtype.docs =~ /instead/
     end
+
+    def self.simplest?(mtype)
+      mtype.content_type == mtype.simplified
+    end
   
     def self.remove_duplicates
+      randomChoices = []
       db[SQL_FIND_DUPLICATES].all.each {
         |r|
         ext = r[:extension]
@@ -50,14 +57,14 @@ module M2Config
           db[:mimetype].where(extension:ext).delete
           db[:mimetype].insert(extension:ext, mimetype:preferred)
         else
-          raise ArgumentError, "#{ext} has multiple content types but no Mongrel2 preference"
+          raise ArgumentError, "#{ext} (#{r[:mimetype]}) has multiple content types but no Mongrel2 preference"
         end
       }
       raise RuntimeError, "Still duplicates after removing duplicates!" if
         db[SQL_FIND_DUPLICATES].all.size > 0
     end
     
-    def initialize( fields )
+    def initialize(fields)
       raise ArgumentError, "Extension must start with a ." unless fields[:extension] =~ /^\./
       type = M2Config::MimeType[extension:fields[:extension]]
       raise ArgumentError, "extension #{fields[:extension]} is already covered by #{type.mimetype} type" if type

data/lib/m2config/mongrel2.mime.yml

@@ -854,5 +854,6 @@
 '.ogv': 'video/ogg'
 '.oga': 'audio/ogg'
 '.cmd': 'application/x-msdownload'
-
+'.rst': 'text/prs.fallenstein.rst'
+'.sub': 'text/vnd.dvb.subtitle'
   

data/lib/m2config/version.rb

@@ -1,3 +1,3 @@
 module M2Config
-  VERSION = "0.5.4"
+  VERSION = "0.7.0"
 end

data/m2config.gemspec

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

data/spec/env.rb

@@ -11,7 +11,7 @@ EXISTING_DB_NAME = "empty.sqlite"
 
 RSpec.configure do |config|
   File.delete DEFAULT_DB_NAME rescue nil
-  CFG = M2Config::Config.new
+  CFG = M2Config::Config.new(DEFAULT_DB_NAME,{ignoreDoubles:true})
   config.around(:each) do |example|
     CFG.db.transaction do
       example.call

data/spec/mimetype_spec.rb

@@ -21,13 +21,32 @@ describe M2Config::MimeType do
   end
   
   describe '::populate_table' do
-    it 'fills up the extension to MIME type mapping table' do
+    it 'fills up the "extension -> MIME type" mapping table (using the list from https://github.com/halostatue/mime-types)' do
       # Clear entire table
       CFG.db[:mimetype].delete
-      M2Config::MimeType.populate_table
+      M2Config::MimeType.populate_table()
+#      M2Config::MimeType.populate_table(nil,ignoreDoubles=true)
       M2Config::MimeType[extension:'.css'].mimetype.should eq('text/css')
     end
   
+    it 'checks for doubles unless asked not to' do
+      CFG.db[:mimetype].delete
+      expect {
+        M2Config::MimeType.populate_table([
+                                           MIME::Type.new(['text/plain', 'zed']),
+                                           MIME::Type.new(['text/complex', 'zed'])
+                                          ])
+      }.to raise_exception(ArgumentError,
+                           /\.zed \(text\/complex\) has multiple content types but no Mongrel2 preference/i) 
+    end
+  
+    it 'accepts an array of MIME::Types if the whole list is too much' do
+      CFG.db[:mimetype].delete
+      M2Config::MimeType.populate_table [MIME::Type.new(['text/plain', 'zed'])]
+      M2Config::MimeType[extension:'.zed'].mimetype.should eq('text/plain')
+      M2Config::MimeType[extension:'.css'].should eq(nil)
+    end
+  
     it 'frowns when asked to populate a non-empty table' do
       # At this point the table has been filled up on creation
       expect {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2config
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Arnaud Meuret
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -56,16 +56,16 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement