fontconfig 0.0.1 → 0.0.2

data/ext/fontconfig/fc_config.c

@@ -312,12 +312,25 @@ static VALUE rb_config_get_application_fonts(VALUE self){
   return config_get_fonts(self, FcSetApplication);
 }
 
+// FcFontSort -- Return list of matching fonts
+static VALUE rb_config_font_sort(int argc, VALUE *argv, VALUE self){
+  VALUE pattern, trim;
+  rb_scan_args(argc, argv, "11", &pattern, &trim);
+  //charset - ignored.
+  if(!RTEST(pattern) || !is_fc_pattern(pattern)){
+    rb_raise(rb_eArgError, "pattern must be Fonconfig::Pattern");
+  }
+  FcResult res;
+  FcFontSet* set = FcFontSort(CONFIG_UNWRAP(self), pattern_unwrap(pattern), RTEST(trim), 0, &res);
+  return font_set_wrap(set);
+}
 
 void Init_fontconfig_config(){
   rb_cFcConfig = rb_define_class_under(rb_cFontconfig, "Config", rb_cObject);
   rb_define_singleton_method(rb_cFcConfig, "new", rb_config_new, -1);
   rb_define_method(rb_cFcConfig, "parse_and_load", rb_config_parse_and_load, -1);
   rb_define_singleton_method(rb_cFcConfig, "filename", rb_config_filename, 1);
+  rb_define_singleton_method(rb_cFontconfig, "current_config", rb_config_get_current, 0);
   rb_define_singleton_method(rb_cFcConfig, "get_current", rb_config_get_current, 0);
   rb_define_method(rb_cFcConfig, "set_current!", rb_config_set_current, 0);
   rb_define_method(rb_cFcConfig, "up_to_date?", rb_config_up_to_date_p, 0);
@@ -348,10 +361,7 @@ void Init_fontconfig_config(){
   symScan = ID2SYM(rb_intern("scan"));
   rb_define_method(rb_cFcConfig, "substitute", rb_config_substitute, -1);
   rb_define_method(rb_cFcConfig, "substitute_with_pat", rb_config_substitute_with_pat, -1);
-
+  rb_define_method(rb_cFcConfig, "font_sort", rb_config_font_sort, -1);
 
 // FcConfigGetBlanks -- Get config blanks
-// FcFontSort -- Return list of matching fonts
-
-// FcConfigGetCache -- DEPRECATED used to return per-user cache filename
 }

data/ext/fontconfig/fc_internal.h

@@ -0,0 +1,47 @@
+//fontconfig internal
+
+
+
+struct _FcPattern {
+    int       num;
+    int       size;
+    intptr_t  elts_offset;
+    // FcRef     ref;
+    int ref_here_dot_not_use;
+};
+
+typedef int FcObject;
+
+typedef enum _FcValueBinding {
+    FcValueBindingWeak, FcValueBindingStrong, FcValueBindingSame
+} FcValueBinding;
+
+typedef struct _FcValueList {
+    struct _FcValueList *next;
+    FcValue   value;
+    FcValueBinding  binding;
+} FcValueList, *FcValueListPtr;
+
+typedef struct _FcPatternElt {
+    FcObject    object;
+    FcValueList   *values;
+} FcPatternElt;
+
+#define FcOffsetToPtr(b,o,t)  ((t *) ((intptr_t) (b) + (o)))
+#define FcEncodedOffsetMember(s,m,t) FcOffsetToPtr(s,FcOffsetDecode((s)->m), t)
+#define FcIsEncodedOffset(p)  ((((intptr_t) (p)) & 1) != 0)
+#define FcPointerMember(s,m,t)  (FcIsEncodedOffset((s)->m) ? \
+         FcEncodedOffsetMember (s,m,t) : \
+         (s)->m)
+#define FcOffsetMember(s,m,t)     FcOffsetToPtr(s,(s)->m,t)
+#define FcPatternElts(p)  FcOffsetMember(p,elts_offset,FcPatternElt)
+#define FcPatternEltValues(pe)  FcPointerMember(pe,values,FcValueList)
+
+const char *
+FcObjectName (FcObject object);
+FcObject
+FcObjectFromName (const char * name);
+FcPatternElt *
+FcPatternObjectFindElt (const FcPattern *p, FcObject object);
+
+#define FcValueListNext(vl) FcPointerMember(vl,next,FcValueList)

data/ext/fontconfig/fc_pattern.c

@@ -96,6 +96,8 @@ static VALUE rb_pattern_add(int argc, VALUE *argv, VALUE self){
     case T_TRUE: val.type = FcTypeBool; val.u.b = 1; break;
     case T_FALSE: val.type = FcTypeBool; val.u.b = 0; break;
     case T_OBJECT:
+    case T_DATA:
+      
       //TODO: increment object references?
       // ...
       //  FcTypeMatrix: //    m               FcMatrix *
@@ -143,7 +145,7 @@ static VALUE rb_pattern_get(VALUE self, VALUE object, VALUE id){
   FcResult res = FcPatternGet(PATTERN_UNWRAP(self), RSTRING_PTR(object), FIX2INT(id), &val);
   if(res == FcResultMatch){
     VALUE r_res = fc_value_to_value(&val);
-    // FcValueDestroy(val); // gives malloc error
+    // no need to free, ptr to internal mem
     return r_res;
   }
   if(res == FcResultNoMatch || res == FcResultNoId){
@@ -172,12 +174,63 @@ static VALUE rb_pattern_remove(VALUE self, VALUE object, VALUE id){
   return res? Qtrue : Qfalse;
 }
 
-rb_pattern_default_substitute(VALUE self){
+static VALUE rb_pattern_default_substitute(VALUE self){
   FcDefaultSubstitute(PATTERN_UNWRAP(self));
   return self;
 }
 
 
+#include "fc_internal.h"
+
+static VALUE rb_pattern_each_key(VALUE self){
+  FcPattern* p = PATTERN_UNWRAP(self);
+  int i;
+  FcPatternElt* e;
+  for (i = 0; i < p->num; i++){
+    e = &FcPatternElts(p)[i];
+    //FIXME: return as symbols?
+    rb_yield(rb_str_new2(FcObjectName(e->object)));
+  }
+  return self;
+}
+
+static VALUE rb_pattern_has_key_p(VALUE self, VALUE key){
+  FcPattern* p = PATTERN_UNWRAP(self);
+  FcPatternElt* e = FcPatternObjectFindElt(p, FcObjectFromName (StringValuePtr(key)));
+  if(e){
+    return Qtrue;
+  }
+  return Qfalse;
+}
+
+static VALUE rb_pattern_get_keys(VALUE self){
+  FcPattern* p = PATTERN_UNWRAP(self);
+  VALUE res = rb_ary_new();
+  int i;
+  FcPatternElt* e;
+  for (i = 0; i < p->num; i++){
+    e = &FcPatternElts(p)[i];
+    rb_ary_push(res, rb_str_new2(FcObjectName(e->object)));
+    // FcValueListPrint (FcPatternEltValues(e));
+  }
+  return res;
+}
+
+static VALUE rb_pattern_each_key_value(VALUE self, VALUE key){
+  FcPattern* p = PATTERN_UNWRAP(self);
+  FcPatternElt* e = FcPatternObjectFindElt(p, FcObjectFromName (StringValuePtr(key)));
+  FcValueListPtr l;
+  if(e){
+    for (l = FcPatternEltValues(e); l; l = FcValueListNext(l)){
+      // FcValueCanonicalize(&l->value); - re allocates value pointers, do not need this
+      rb_yield(fc_value_to_value(&l->value));
+    }
+  }
+  return self;
+}
+
+
+
 void Init_fontconfig_pattern(){
   rb_cFcPattern = rb_define_class_under(rb_cFontconfig, "Pattern", rb_cObject);
   rb_define_singleton_method(rb_cFcPattern, "new", rb_pattern_new, -1);
@@ -199,4 +252,9 @@ void Init_fontconfig_pattern(){
   rb_define_method(rb_cFcPattern, "debug_print", rb_pattern_debugprint, 0);
   rb_define_method(rb_cFcPattern, "default_substitute!", rb_pattern_default_substitute, 0);
 
+  rb_define_method(rb_cFcPattern, "keys", rb_pattern_get_keys, 0);
+  rb_define_method(rb_cFcPattern, "each_key", rb_pattern_each_key, 0);
+  rb_define_method(rb_cFcPattern, "each_value", rb_pattern_each_key_value, 1);
+  rb_define_method(rb_cFcPattern, "has_key?", rb_pattern_has_key_p, 1);
+
 }

data/lib/fontconfig.rb

@@ -23,10 +23,67 @@ module Fontconfig
       def delete!
         @pattern.delete(@key)
       end
+
+      def each &blk
+        @pattern.each_value @key, &blk
+      end
+
+      include Enumerable
     end
 
     def [](key)
+      key = key.to_s
+      return nil unless has_key?(key)
       return Proxy.new(self, key)
     end
+
+    def inspect
+      "#<#{self.class.name} #{self.format('%{=fcmatch}')}>"
+    end
+
+    alias :each :each_key
+    include Enumerable
+
+    def config_substitute! config=Fontconfig.current_config, kind=:font
+      #kind - :pattern, :font, :scan
+      unless config.substitute(self)
+        raise "cannot perform substitutions on pattern"
+      end
+      self
+    end
+
+    def prepare! config=Fontconfig.current_config, kind=:font
+      @prepared = true
+      config_substitute! config, kind
+      default_substitute!
+      self
+    end
+
+    def match config=Fontconfig.current_config
+      raise "unprepared pattern match" unless @prepared
+      config.font_match self
+    end
+
+    def filename
+      self[:filename].first
+    end
+  end
+
+
+  def self.pattern *args
+    Pattern.new *args
+  end
+
+  def self.prepared_pattern *args
+    self.pattern(*args).prepare!
+  end
+
+  def self.match *args
+    pat = if args.first.is_a? Pattern
+      args.first
+    else
+      self.prepared_pattern *args
+    end
+    current_config.font_match pat
   end
 end

data/lib/fontconfig/version.rb

@@ -1,3 +1,3 @@
 module Fontconfig
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/base_spec.rb

@@ -13,4 +13,8 @@ describe Fontconfig do
     subject.library_version.must_be :>, 0
   end
 
+  it "current_config" do
+    subject.current_config.must_be_instance_of Fontconfig::Config
+  end
+
 end

data/spec/pattern_spec.rb

@@ -46,6 +46,42 @@ describe Fontconfig::Pattern do
       subject["familylang"][0].must_equal "en"
     end
 
+    describe "advanced" do
+      let(:key_type){ String }
+
+      it "each_key" do
+        n = 0
+        subject.each_key{|k|
+          k.must_be_kind_of key_type
+          n+=1
+        }
+        n.must_be :>, 0
+      end
+
+      it "each is each_key" do
+        subject.each{|k|
+        }
+        subject.to_a.sort.must_equal subject.keys.sort
+      end
+
+      it "keys" do
+        keys = subject.keys
+        keys.must_be_kind_of Array
+        keys.size.must_be :>,0
+        keys.each{|k|
+          k.must_be_kind_of key_type
+        }
+      end
+
+      it "each value for key" do
+        n = 0
+        subject.each_value("family"){|k|
+          n+=1
+        }
+        n.must_be :>, 0
+      end
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontconfig
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -91,6 +91,7 @@ files:
 - ext/fontconfig/extconf.rb
 - ext/fontconfig/fc_config.c
 - ext/fontconfig/fc_fontset.c
+- ext/fontconfig/fc_internal.h
 - ext/fontconfig/fc_objectset.c
 - ext/fontconfig/fc_pattern.c
 - ext/fontconfig/fontconfig.c
@@ -115,18 +116,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3843724065432744597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3843724065432744597
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -139,3 +134,4 @@ test_files:
 - spec/object_set_spec.rb
 - spec/pattern_spec.rb
 - spec/test_helper.rb
+has_rdoc: