mac-spotlight 0.0.1 → 0.0.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems'
 require 'echoe'
 require 'rake/extensiontask'
 
-Echoe.new('mac-spotlight', '0.0.1') do |p|
+Echoe.new('mac-spotlight', '0.0.2') do |p|
   p.description     = "Spotlight - Ruby interface to Mac OSX Spotlight"
   p.url             = "https://github.com/xli/spotlight"
   p.author          = "Li Xiao"

data/ext/spotlight/spotlight.c

@@ -11,36 +11,25 @@
 
 #define RELEASE_IF_NOT_NULL(ref) { if (ref) { CFRelease(ref); } }
 
-void MDItemSetAttribute(MDItemRef item, CFStringRef name, CFTypeRef value);
+Boolean MDItemSetAttribute(MDItemRef item, CFStringRef name, CFTypeRef value);
 
-VALUE method_search(VALUE self, VALUE queryString, VALUE scopeDirectory);
-VALUE method_attributes(VALUE self, VALUE path);
-VALUE method_set_attribute(VALUE self, VALUE path, VALUE name, VALUE value);
-VALUE method_get_attribute(VALUE self, VALUE path, VALUE name);
-
-void Init_spotlight (void)
-{
-  VALUE Spotlight = rb_define_module("Spotlight");
-  VALUE SpotlightIntern = rb_define_module_under(Spotlight, "Intern");
-  rb_define_module_function(SpotlightIntern, "search", method_search, 2);
-  rb_define_module_function(SpotlightIntern, "attributes", method_attributes, 1);
-  rb_define_module_function(SpotlightIntern, "set_attribute", method_set_attribute, 3);
-  rb_define_module_function(SpotlightIntern, "get_attribute", method_get_attribute, 2);
-}
-
-VALUE cfstring2rbstr(CFStringRef str) {
-  CFIndex len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(str), kCFStringEncodingUTF8);
-  char *result = (char *)malloc(sizeof(char) * len);
-  CFStringGetCString(str, result, len, kCFStringEncodingUTF8);
-  free(result);
-  return rb_str_new2(result);
+static VALUE cfstring2rbstr(CFStringRef str) {
+  const char *result;
+  VALUE rb_result = Qnil;
+  CFDataRef data = CFStringCreateExternalRepresentation(kCFAllocatorDefault, str, kCFStringEncodingUTF8, 0);
+  if (data) {
+    result = (const char *)CFDataGetBytePtr(data);
+    rb_result = rb_str_new2(result);
+  }
+  RELEASE_IF_NOT_NULL(data)
+  return rb_result;
 }
 
-CFStringRef rbstr2cfstring(VALUE str) {
+static CFStringRef rbstr2cfstring(VALUE str) {
   return CFStringCreateWithCString(kCFAllocatorDefault, StringValuePtr(str), kCFStringEncodingUTF8);
 }
 
-CFStringRef date_string(CFDateRef date) {
+static CFStringRef date_string(CFDateRef date) {
   CFLocaleRef locale = CFLocaleCopyCurrent();
   CFDateFormatterRef formatter = CFDateFormatterCreate(kCFAllocatorDefault, locale, kCFDateFormatterFullStyle, kCFDateFormatterFullStyle);
   CFStringRef result = CFDateFormatterCreateStringWithDate(kCFAllocatorDefault, formatter, date);
@@ -49,13 +38,13 @@ CFStringRef date_string(CFDateRef date) {
   return result;
 }
 
-VALUE convert2rb_type(CFTypeRef ref) {
+static VALUE convert2rb_type(CFTypeRef ref) {
   VALUE result = Qnil;
   double double_result;
   int int_result;
   long long_result;
   int i;
-  if (ref != nil) {
+  if (ref) {
     if (CFGetTypeID(ref) == CFStringGetTypeID()) {
       result = cfstring2rbstr(ref);
     } else if (CFGetTypeID(ref) == CFDateGetTypeID()) {
@@ -82,18 +71,19 @@ VALUE convert2rb_type(CFTypeRef ref) {
   return result;
 }
 
-CFTypeRef convert2cf_type(VALUE obj) {
-  CFTypeRef result = nil;
+static CFTypeRef convert2cf_type(VALUE obj) {
+  CFTypeRef result = NULL;
   double double_result;
   int int_result;
   long long_result;
   int i, len;
   VALUE tmp[1];
   CFAbsoluteTime time;
+  CFMutableArrayRef array_result;
 
   switch (TYPE(obj)) {
     case T_NIL:
-      result = nil;
+      result = NULL;
       break;
     case T_TRUE:
       result = kCFBooleanTrue;
@@ -129,29 +119,28 @@ CFTypeRef convert2cf_type(VALUE obj) {
       break;
     case T_ARRAY:
       len = RARRAY(obj)->len;
-      CFTypeRef *values = (CFTypeRef *)malloc(sizeof(CFTypeRef) * len);
+      array_result = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
       for (i = 0; i < len; i++) {
         tmp[0] = INT2NUM(i);
-        values[i] = convert2cf_type(rb_ary_aref(1, tmp, obj));
+        CFArrayAppendValue(array_result, convert2cf_type(rb_ary_aref(1, tmp, obj)));
       }
-      result = CFArrayCreate(kCFAllocatorDefault, (const void **)values, len, nil);
-      free(values);
+      result = array_result;
+      break;
+    default:
+      rb_raise(rb_eTypeError, "not valid value");
       break;
   }
   return result;
 }
 
-void set_search_scope(MDQueryRef query, VALUE scopeDirectories) {
+static void set_search_scope(MDQueryRef query, VALUE scopeDirectories) {
   int i;
   int len = RARRAY(scopeDirectories)->len;
-  CFStringRef *scopes = (CFStringRef *)malloc(sizeof(CFStringRef) * len);
+  CFMutableArrayRef scopesRef = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
   for (i=0; i<len; i++) {
-    scopes[i] = rbstr2cfstring(rb_ary_pop(scopeDirectories));
+    CFArrayAppendValue(scopesRef, rbstr2cfstring(rb_ary_pop(scopeDirectories)));
   }
 
-  CFArrayRef scopesRef = CFArrayCreate(kCFAllocatorDefault, (const void **)scopes, len, nil);
-  free(scopes);
-
   MDQuerySetSearchScope(query, scopesRef, 0);
   RELEASE_IF_NOT_NULL(scopesRef);
 }
@@ -163,33 +152,56 @@ VALUE method_search(VALUE self, VALUE queryString, VALUE scopeDirectories) {
   MDItemRef item;
 
   CFStringRef qs = rbstr2cfstring(queryString);
-  MDQueryRef query = MDQueryCreate(kCFAllocatorDefault, qs, nil, nil);
+  MDQueryRef query = MDQueryCreate(kCFAllocatorDefault, qs, NULL, NULL);
   RELEASE_IF_NOT_NULL(qs);
-
   if (query) {
     set_search_scope(query, scopeDirectories);
     if (MDQueryExecute(query, kMDQuerySynchronous)) {
       result = rb_ary_new();
       for(i = 0; i < MDQueryGetResultCount(query); ++i) {
         item = (MDItemRef) MDQueryGetResultAtIndex(query, i);
-        path = MDItemCopyAttribute(item, kMDItemPath);
-        rb_ary_push(result, cfstring2rbstr(path));
+        if (item) {
+          path = MDItemCopyAttribute(item, kMDItemPath);
+          rb_ary_push(result, cfstring2rbstr(path));
+          RELEASE_IF_NOT_NULL(path);
+        }
       }
     }
-    RELEASE_IF_NOT_NULL(path);
     RELEASE_IF_NOT_NULL(query);
   }
 
   return result;
 }
 
+static MDItemRef createMDItemByPath(VALUE path) {
+  CFStringRef pathRef = rbstr2cfstring(path);
+  MDItemRef mdi = MDItemCreate(kCFAllocatorDefault, pathRef);
+  RELEASE_IF_NOT_NULL(pathRef);
+  if (!mdi) {
+    rb_raise(rb_eTypeError, "Could not find MDItem by given path");
+  }
+  return mdi;
+}
+
+static int each_attribute(VALUE name, VALUE value, MDItemRef mdi) {
+  CFStringRef nameRef = rbstr2cfstring(name);
+  CFTypeRef valueRef = convert2cf_type(value);
+
+  if(!MDItemSetAttribute(mdi, nameRef, valueRef)) {
+    printf("set %s failed\n", StringValuePtr(name));
+  }
+
+  RELEASE_IF_NOT_NULL(valueRef);
+  RELEASE_IF_NOT_NULL(nameRef);
+}
+
+
 VALUE method_attributes(VALUE self, VALUE path) {
   int i;
   CFStringRef attrNameRef;
   CFTypeRef attrValueRef;
-  CFStringRef pathRef = rbstr2cfstring(path);
-  MDItemRef mdi = MDItemCreate(kCFAllocatorDefault, pathRef);
-  RELEASE_IF_NOT_NULL(pathRef);
+  MDItemRef mdi = createMDItemByPath(path);
+
   CFArrayRef attrNamesRef = MDItemCopyAttributeNames(mdi);
   VALUE result = rb_hash_new();
   for (i = 0; i < CFArrayGetCount(attrNamesRef); i++) {
@@ -206,7 +218,7 @@ VALUE method_attributes(VALUE self, VALUE path) {
 }
 
 VALUE method_get_attribute(VALUE self, VALUE path, VALUE name) {
-  MDItemRef mdi = MDItemCreate(kCFAllocatorDefault, rbstr2cfstring(path));
+  MDItemRef mdi = createMDItemByPath(path);
   CFStringRef nameRef = rbstr2cfstring(name);
   CFTypeRef valueRef = MDItemCopyAttribute(mdi, nameRef);
 
@@ -220,17 +232,34 @@ VALUE method_get_attribute(VALUE self, VALUE path, VALUE name) {
 }
 
 VALUE method_set_attribute(VALUE self, VALUE path, VALUE name, VALUE value) {
-  MDItemRef item = MDItemCreate(kCFAllocatorDefault, rbstr2cfstring(path));
+  MDItemRef mdi = createMDItemByPath(path);
   CFStringRef nameRef = rbstr2cfstring(name);
   CFTypeRef valueRef = convert2cf_type(value);
 
-  MDItemSetAttribute(item, nameRef, valueRef);
+  if(!MDItemSetAttribute(mdi, nameRef, valueRef)) {
+    printf("set %s failed\n", StringValuePtr(name));
+  }
 
   RELEASE_IF_NOT_NULL(valueRef);
   RELEASE_IF_NOT_NULL(nameRef);
-  RELEASE_IF_NOT_NULL(item);
+  RELEASE_IF_NOT_NULL(mdi);
 
   return Qtrue;
 }
 
+VALUE method_set_attributes(VALUE self, VALUE path, VALUE attributes) {
+  MDItemRef mdi = createMDItemByPath(path);
+  rb_hash_foreach(attributes, each_attribute, (VALUE) mdi);
+  RELEASE_IF_NOT_NULL(mdi);
+}
 
+void Init_spotlight (void)
+{
+  VALUE Spotlight = rb_define_module("Spotlight");
+  VALUE SpotlightIntern = rb_define_module_under(Spotlight, "Intern");
+  rb_define_module_function(SpotlightIntern, "search", method_search, 2);
+  rb_define_module_function(SpotlightIntern, "attributes", method_attributes, 1);
+  rb_define_module_function(SpotlightIntern, "set_attribute", method_set_attribute, 3);
+  rb_define_module_function(SpotlightIntern, "get_attribute", method_get_attribute, 2);
+  rb_define_module_function(SpotlightIntern, "set_attributes", method_set_attributes, 2);
+}

data/lib/spotlight.rb

@@ -1,14 +1,14 @@
 require 'spotlight/spotlight'
 
 module Spotlight
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   def self.search(query_string, *scope_directories)
     Intern.search(query_string, scope_directories).collect {|path| MDItem.new(path)}
   end
 
   class MDItem
-    VALID_ATTRIBUTE_VALUE_TYPE = [String, Time, Fixnum, Bignum, Float, Array]
+    VALID_ATTRIBUTE_VALUE_TYPE = [String, Time, Fixnum, Bignum, Float, Array, NilClass]
 
     class InvalidAttributeValueTypeError < StandardError
     end
@@ -20,6 +20,9 @@ module Spotlight
     def attributes
       Intern.attributes(@path)
     end
+    def attributes=(attributes)
+      Intern.set_attributes(@path, attributes)
+    end
     def [](attr_name)
       Intern.get_attribute(@path, attr_name)
     end

data/mac-spotlight.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mac-spotlight}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Li Xiao"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-05-09}
   s.description = %q{Spotlight - Ruby interface to Mac OSX Spotlight}
   s.email = %q{iam@li-xiao.com}
   s.extensions = ["ext/spotlight/extconf.rb"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers", "--charset", "UTF-8"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{mac-spotlight}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Spotlight - Ruby interface to Mac OSX Spotlight}
   s.test_files = ["test/test_spotlight.rb"]
 

data/test/test_spotlight.rb

@@ -23,6 +23,14 @@ class TestSpotlight < Test::Unit::TestCase
     assert_equal [@item], Spotlight.search("kMDItemNow == #{time_now}", @dir)
   end
 
+  def test_search_with_multi_attribute
+    @item['kMDItemAttr1'] = 1
+    @item['kMDItemAttr2'] = 2
+    assert_equal [], Spotlight.search("kMDItemAttr1 == 2 && kMDItemAttr2 == 3", @dir)
+    assert_equal [], Spotlight.search("kMDItemAttr1 == 1 && kMDItemAttr2 == 3", @dir)
+    assert_equal [@item], Spotlight.search("kMDItemAttr1 == 1 && kMDItemAttr2 == 2", @dir)
+  end
+
   def test_attributes
     assert_equal "test_file.txt", @item.attributes['kMDItemDisplayName']
   end
@@ -36,9 +44,11 @@ class TestSpotlight < Test::Unit::TestCase
   def test_get_attribute
     assert_equal "test_file.txt", @item['kMDItemDisplayName']
     assert_equal ["public.plain-text", "public.text", "public.data", "public.item", "public.content"], @item['kMDItemContentTypeTree']
+    assert_nil @item['kMDItemNotExist']
   end
 
   def test_set_attribute
+    assert_attribute_set('kMDItemTestNilType', nil)
     assert_attribute_set('kMDItemTestStringType', "Time.now: #{Time.now}")
     assert_attribute_set('kMDItemTestLongType', Time.now.to_i)
     assert_attribute_set('kMDItemTestIntType', Time.now.to_i.to_s[-3..-1].to_i)
@@ -47,6 +57,14 @@ class TestSpotlight < Test::Unit::TestCase
     assert_attribute_set('kMDItemTestArrayTypeWithLong', [123456789])
   end
 
+  def test_set_attributes
+    attributes = {'TimeNow' => "Time.now: #{Time.now}", 'SomeThing' => Time.now.to_i}
+    @item.attributes = attributes
+    attributes.each do |key, value|
+      assert_equal value, @item.reload[key]
+    end
+  end
+
   def test_set_date_attribute
     assert_attribute_set('kMDItemTestDateType', Time.now)
   end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mac-spotlight
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Li Xiao
@@ -14,45 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2010-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+    version: 
 description: Spotlight - Ruby interface to Mac OSX Spotlight
 email: iam@li-xiao.com
 executables: []
@@ -96,21 +85,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
       version: "1.2"
+  version: 
 requirements: []
 
 rubyforge_project: mac-spotlight
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Spotlight - Ruby interface to Mac OSX Spotlight