content_type 2.1.1 → 2.1.2

data/Rakefile

@@ -1,9 +1,9 @@
+require 'vendor/gems/environment'
+
 require 'rake'
 require 'spec'
 require 'spec/rake/spectask'
 
-require 'vendor/gems/environment'
-
 task :default => [:clean, :make, :spec]
 
 task :make do

data/ext/content_type.c

@@ -18,6 +18,7 @@ VALUE file_singleton_content_type(VALUE self, VALUE path);
 VALUE string_content_type(VALUE self);
 
 bool content_type_file_ext(VALUE self, char *ext);
+void magic_fail(const char *error);
 
 // http://www.webdeveloper.com/forum/showthread.php?t=162526
 const char *content_type_ext_overrides[][2] = {
@@ -39,8 +40,6 @@ const char *content_type_ext_overrides[][2] = {
 	{ "xltm", "application/vnd.ms-excel.template.macroEnabled.12" },
 	{ "xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
 };
-	
-void magic_fail(const char *error);
 
 void
 Init_content_type()
@@ -65,6 +64,9 @@ Init_content_type()
 	rb_define_method(rb_cString, "content_type", string_content_type, 0);
 }
 
+// iv @content_type, @filepath and @processed are available in all variations
+// because each implementation creates a ContentType obj through here
+// (except String#content_type)
 VALUE
 content_type_initialize(VALUE self, VALUE path)
 {
@@ -76,13 +78,14 @@ content_type_initialize(VALUE self, VALUE path)
 		rb_raise(rb_const_get(rb_cObject, rb_intern("ArgumentError")),
 				"invalid file");
 
-	rb_iv_set(self, "@content_type", rb_str_new("", 0));
-	rb_iv_set(self, "@filepath",	 path);
-	rb_iv_set(self, "@processed",	Qfalse);
+	rb_iv_set(self, "@content_type",	rb_str_new("", 0));
+	rb_iv_set(self, "@filepath",		path);
+	rb_iv_set(self, "@processed",		Qfalse);
 
 	return self;
 }
 
+// content_type_file_ext
 bool
 content_type_file_ext(VALUE self, char *ext)
 {
@@ -92,6 +95,8 @@ content_type_file_ext(VALUE self, char *ext)
 
 	filepath = RSTRING_PTR(rb_iv_get(self, "@filepath"));
 
+	// go back until the first . from the end of the string
+	// then reverse the array
 	j = 0;
 	for (i = RSTRING_LEN(rb_iv_get(self, "@filepath")) - 1;
 			i > 0 && j < MAX_EXT_LEN; i--) {

data/ext/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 extension_name = 'content_type'
 dir_config(extension_name)
@@ -6,6 +7,6 @@ dir_config(extension_name)
 find_header('magic.h', '/opt/local/include')
 find_library('magic', 'magic_open', '/opt/local/lib')
 
-$CFLAGS += '-Werror -Wall'
+$CFLAGS += ' -Werror -Wall'
 
 create_makefile(extension_name)

data/spec/content_type_spec.rb

@@ -107,5 +107,9 @@ describe ContentType do
       str = File.read(@img)
       str.content_type.should == 'image/jpeg'
     end
+
+    it 'should work on empty strings' do
+      ''.content_type.should == 'application/x-empty'
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - David Turnbull
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +10:00
+date: 2010-04-10 00:00:00 +10:00
 default_executable: 
 dependencies: []