mime-types-mini 0.1.0 → 0.2.0

data/ext/MimeTypeMiniDatabase/MimeTypes.trenni

@@ -1,13 +1,14 @@
-
-extern const struct MimeType MIME_TYPES[] = {
-<?r mime_types.each do |mime_type| 
-	content_type, encoding, extensions, registered = mime_type.values_at('content-type', 'encoding', 'extensions', 'registered')
-	?>
-	{
-		.content_type = #{content_type.inspect},
-		.encoding = #{encoding.inspect},
-		.extensions = #{extensions_struct(extensions)},
-		.registered = #{registered == true ? 1 : 0},
-	},
-<?r end ?>
+%language=ANSI-C
+%define slot-name content_type
+%define hash-function-name mime_type_hash
+%define lookup-function-name lookup_mime_type_by_content_type
+%enum
+%switch=4
+struct MimeType {
+	const char * content_type;
+	const char * encoding;
+	const char * extensions;
 };
+%%<?r mime_types.each do |mime_type|
+	content_type, encoding, extensions = mime_type.values_at('content-type', 'encoding', 'extensions') ?>
+#{content_type}, #{encoding.inspect}, #{extensions_struct(extensions)}<?r end ?>

data/ext/MimeTypeMiniDatabase/MimeTypesMiniDatabase.c

@@ -2,16 +2,17 @@
 #include "ruby.h"
 
 #include "Extensions.h"
+#include "MimeTypes.h"
 
 VALUE MimeTypesMiniDatabase = Qnil;
 
 void Init_MimeTypesMiniDatabase();
 
 static VALUE method_content_type_for_extension(VALUE self, VALUE extension) {
-	int len = RSTRING_LEN(extension);
+	long len = RSTRING_LEN(extension);
 	char* str = RSTRING_PTR(extension);
 	
-	const struct ContentTypeExtension * result = lookup_content_type_by_extension(str, len);
+	const struct ContentTypeExtension * result = lookup_content_type_by_extension(str, (unsigned)len);
 	
 	if (result) {
 		return rb_str_new_cstr(result->content_type);
@@ -20,12 +21,63 @@ static VALUE method_content_type_for_extension(VALUE self, VALUE extension) {
 	}
 }
 
+VALUE MimeType = Qnil;
+
+static VALUE method_mime_type_for_content_type(VALUE self, VALUE content_type) {
+	long len = RSTRING_LEN(content_type);
+	char* str = RSTRING_PTR(content_type);
+	
+	const struct MimeType * result = lookup_mime_type_by_content_type(str, (unsigned)len);
+	
+	if (result) {
+		VALUE args[3] = {
+			rb_str_new_cstr(result->content_type),
+			rb_str_new_cstr(result->encoding),
+			Qnil,
+		};
+		
+		if (result->extensions) {
+			args[2] = rb_str_split(
+				rb_str_new_cstr(result->extensions),
+				" "
+			);
+		}
+		
+		return rb_class_new_instance(3, args, MimeType);
+	} else {
+		return Qnil;
+	}
+}
+
+static ID id_content_type, id_encoding, id_extensions;
+
+static VALUE MimeType_initialize(VALUE self, VALUE content_type, VALUE encoding, VALUE extensions) {
+	rb_ivar_set(self, id_content_type, content_type);
+	rb_ivar_set(self, id_encoding, encoding);
+	rb_ivar_set(self, id_extensions, extensions);
+	
+	return self;
+}
+
 void Init_MimeTypesMiniDatabase() {
+	id_content_type = rb_intern("@content_type");
+	id_encoding = rb_intern("@encoding");
+	id_extensions = rb_intern("@extensions");
+	
 	VALUE Mime = rb_define_module("Mime");
+	
+	MimeType = rb_define_class_under(Mime, "Type", rb_cObject);
+	rb_define_attr(MimeType, "content_type", 1, 0);
+	rb_define_attr(MimeType, "encoding", 1, 0);
+	rb_define_attr(MimeType, "extensions", 1, 0);
+	rb_define_method(MimeType, "initialize", MimeType_initialize, 3);
+	
 	VALUE MimeTypes = rb_define_module_under(Mime, "Types");
+	
 	VALUE MimeTypesMini = rb_define_module_under(MimeTypes, "Mini");
 
 	MimeTypesMiniDatabase = rb_define_module_under(MimeTypesMini, "Database");
 	
 	rb_define_module_function(MimeTypesMiniDatabase, "content_type_for_extension", method_content_type_for_extension, 1);
+	rb_define_module_function(MimeTypesMiniDatabase, "mime_type_for_content_type", method_mime_type_for_content_type, 1);
 }

data/ext/MimeTypeMiniDatabase/Rakefile

@@ -4,18 +4,6 @@ require 'trenni'
 require 'json'
 require 'ostruct'
 
-class TemplateState < Struct.new(:mime_types)
-	NULL = 'NULL'
-	
-	def extensions_struct(extensions)
-		if extensions
-			'(const char*[]){' + (extensions.collect(&:inspect) + [0]).join(', ') + '}'
-		else
-			0
-		end
-	end
-end
-
 task :load_mime_types do
 	mime_types_json_path = File.join(MIME::Types::Data::PATH, "mime-types.json")
 	@mime_types = JSON::load(File.open mime_types_json_path)
@@ -45,17 +33,28 @@ task :generate_extensions => :generate_extensions_hashtable do
 	sh 'gperf', '-CD', '-t', 'Extensions.gperf', '--output-file', 'Extensions.h'
 end
 
-task :generate_code do
-	mime_types_json_path = File.join(MIME::Types::Data::PATH, "mime-types.json")
-	mime_types = JSON::load(File.open mime_types_json_path)
-	
+class TemplateState < Struct.new(:mime_types)
+	def extensions_struct(extensions)
+		if extensions
+			extensions.join(' ').inspect
+		else
+			0
+		end
+	end
+end
+
+task :generate_mime_types_hashtable => :load_mime_types  do
 	template_path = File.expand_path("MimeTypes.trenni", __dir__)
 	template = Trenni::Template.load_file(template_path)
 	
-	template_state = TemplateState.new(mime_types)
+	template_state = TemplateState.new(@mime_types)
 	result = template.to_string(template_state)
 	
-	File.write("MimeTypes.c", result)
+	File.write("MimeTypes.gperf", result)
+end
+
+task :generate_mime_types => :generate_mime_types_hashtable do
+	sh 'gperf', '-C', '-t', 'MimeTypes.gperf', '--output-file', 'MimeTypes.h'
 end
 
-task :default => :generate_code
+task :default => [:generate_extensions, :generate_mime_types]

data/lib/mime/types.rb

@@ -0,0 +1,18 @@
+
+module MIME
+	module Types
+		def self.type_for(filename)
+			# Return mime types
+		end
+		
+		def self.[](content_type)
+			# Return mime types
+		end
+		
+		def self.content_type_for(extension)
+		end
+		
+		def self.extensions_for(content_type)
+		end
+	end
+end

data/lib/mime/types/mini/version.rb

@@ -21,7 +21,7 @@
 module Mime
 	module Types
 		module Mini
-			VERSION = "0.1.0"
+			VERSION = "0.2.0"
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mime-types-mini
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -62,13 +62,17 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Rakefile
+- benchmark/content_type_lookup.rb
 - ext/MimeTypeMiniDatabase/Extensions.gperf
 - ext/MimeTypeMiniDatabase/Extensions.h
 - ext/MimeTypeMiniDatabase/Extensions.trenni
+- ext/MimeTypeMiniDatabase/MimeTypes.gperf
+- ext/MimeTypeMiniDatabase/MimeTypes.h
 - ext/MimeTypeMiniDatabase/MimeTypes.trenni
 - ext/MimeTypeMiniDatabase/MimeTypesMiniDatabase.c
 - ext/MimeTypeMiniDatabase/Rakefile
 - ext/MimeTypeMiniDatabase/extconf.rb
+- lib/mime/types.rb
 - lib/mime/types/mini.rb
 - lib/mime/types/mini/version.rb
 - mime-types-mini.gemspec