rdf-smart 0.0.152 → 0.0.153

data/ext/rsm.c

@@ -218,108 +218,107 @@ VALUE rsm_execute(VALUE self, VALUE query) {
 
   world = rasqal_new_world();
 
-//  if(!world || rasqal_world_open(world)) {
-//    rb_raise(rb_eRuntimeError, "rasqal_world init failed");
-//  }
-  // raptor_world_ptr = rasqal_world_get_raptor(world);
+  if(!world || rasqal_world_open(world)) {
+    rb_raise(rb_eRuntimeError, "rasqal_world init failed");
+  }
+  raptor_world_ptr = rasqal_world_get_raptor(world);
+
+  /* #{{{ Data_Graphs*/
+  for (i = 0; i < RARRAY_LEN(prsm_obj->data_sources); i++) {
+    const char* data_source = RSTRING_PTR(RARRAY_PTR(prsm_obj->data_sources)[i]);
+    rasqal_data_graph *dg = NULL;
+    unsigned int type;
+
+    type = RASQAL_DATA_GRAPH_BACKGROUND;
+
+    if(!access((const char*)data_source, R_OK)) {
+      unsigned char* source_uri_string;
+      raptor_uri* source_uri;
+      raptor_uri* graph_name = NULL;
+
+      source_uri_string = raptor_uri_filename_to_uri_string((const char*)data_source);
+      source_uri = raptor_new_uri(raptor_world_ptr, source_uri_string);
+      raptor_free_memory(source_uri_string);
+
+      
+      if(source_uri)
+        dg = rasqal_new_data_graph_from_uri(world,
+                                            source_uri,
+                                            graph_name,
+                                            type,
+                                            NULL, data_graph_parser_name,
+                                            NULL);
+
+      if(source_uri)
+        raptor_free_uri(source_uri);
+    } else {
+      raptor_uri* source_uri;
+      raptor_uri* graph_name = NULL;
+
+      source_uri = raptor_new_uri(raptor_world_ptr,
+                                  (const unsigned char*)data_source);
+      
+      if(source_uri)
+        dg = rasqal_new_data_graph_from_uri(world,
+                                            source_uri,
+                                            graph_name,
+                                            type,
+                                            NULL, data_graph_parser_name,
+                                            NULL);
+
+      if(source_uri)
+        raptor_free_uri(source_uri);
+    }
+    
+    if(!dg) {
+      rb_raise(rb_eRuntimeError, "booboo");
+    }
+    
+    if(!data_graphs) {
+      data_graphs = raptor_new_sequence((raptor_data_free_handler)rasqal_free_data_graph,
+                                        NULL);
+
+      if(!data_graphs) {
+        rb_raise(rb_eRuntimeError, "Failed to create data graphs sequence");
+      }
+    }
+
+    raptor_sequence_push(data_graphs, dg);
+  }
+/* #}}} */
+
+  if (!(rq = rsm_roqet_init_query(world, "sparql", query_string,data_graphs)))
+    goto tidy_query;
+
+  results = rasqal_query_execute(rq);
+
+  if(!results) {
+    fprintf(stderr, "Query execution failed\n");
+    goto tidy_query;
+  }
+
+  if(rasqal_query_results_is_bindings(results) || rasqal_query_results_is_boolean(results)) {
+    rsm_print_formatted_query_results(world, results, raptor_world_ptr, "json", &output, &len);
+  } else if(rasqal_query_results_is_graph(results)) {
+    rsm_print_graph_result(rq, results, raptor_world_ptr, "json", &output, &len);
+  } else {
+    rb_raise(rb_eRuntimeError, "Query returned unknown result format");
+  }
+
+  rasqal_free_query_results(results);
   
-//  /* #{{{ Data_Graphs*/
-//  for (i = 0; i < RARRAY_LEN(prsm_obj->data_sources); i++) {
-//    const char* data_source = RSTRING_PTR(RARRAY_PTR(prsm_obj->data_sources)[i]);
-//    rasqal_data_graph *dg = NULL;
-//    unsigned int type;
-//
-//    type = RASQAL_DATA_GRAPH_BACKGROUND;
-//
-//    if(!access((const char*)data_source, R_OK)) {
-//      unsigned char* source_uri_string;
-//      raptor_uri* source_uri;
-//      raptor_uri* graph_name = NULL;
-//
-//      source_uri_string = raptor_uri_filename_to_uri_string((const char*)data_source);
-//      source_uri = raptor_new_uri(raptor_world_ptr, source_uri_string);
-//      raptor_free_memory(source_uri_string);
-//
-//      
-//      if(source_uri)
-//        dg = rasqal_new_data_graph_from_uri(world,
-//                                            source_uri,
-//                                            graph_name,
-//                                            type,
-//                                            NULL, data_graph_parser_name,
-//                                            NULL);
-//
-//      if(source_uri)
-//        raptor_free_uri(source_uri);
-//    } else {
-//      raptor_uri* source_uri;
-//      raptor_uri* graph_name = NULL;
-//
-//      source_uri = raptor_new_uri(raptor_world_ptr,
-//                                  (const unsigned char*)data_source);
-//      
-//      if(source_uri)
-//        dg = rasqal_new_data_graph_from_uri(world,
-//                                            source_uri,
-//                                            graph_name,
-//                                            type,
-//                                            NULL, data_graph_parser_name,
-//                                            NULL);
-//
-//      if(source_uri)
-//        raptor_free_uri(source_uri);
-//    }
-//    
-//    if(!dg) {
-//      rb_raise(rb_eRuntimeError, "booboo");
-//    }
-//    
-//    if(!data_graphs) {
-//      data_graphs = raptor_new_sequence((raptor_data_free_handler)rasqal_free_data_graph,
-//                                        NULL);
-//
-//      if(!data_graphs) {
-//        rb_raise(rb_eRuntimeError, "Failed to create data graphs sequence");
-//      }
-//    }
-//
-//    raptor_sequence_push(data_graphs, dg);
-//  }
-///* #}}} */
-//
-//  if (!(rq = rsm_roqet_init_query(world, "sparql", query_string,data_graphs)))
-//    goto tidy_query;
-//
-//  results = rasqal_query_execute(rq);
-//
-//  if(!results) {
-//    fprintf(stderr, "Query execution failed\n");
-//    goto tidy_query;
-//  }
-//
-//  if(rasqal_query_results_is_bindings(results) || rasqal_query_results_is_boolean(results)) {
-//    //rsm_print_formatted_query_results(world, results, raptor_world_ptr, "json", &output, &len);
-//  } else if(rasqal_query_results_is_graph(results)) {
-//    //rsm_print_graph_result(rq, results, raptor_world_ptr, "json", &output, &len);
-//  } else {
-//    rb_raise(rb_eRuntimeError, "Query returned unknown result format");
-//  }
-//
-//  rasqal_free_query_results(results);
-//  
-//  tidy_query:
-//    if(data_graphs) raptor_free_sequence(data_graphs);
-//    if(rq) rasqal_free_query(rq);
+  tidy_query:
+    if(data_graphs) raptor_free_sequence(data_graphs);
+    if(rq) rasqal_free_query(rq);
     rasqal_free_world(world);
-//
-//    //routput = rb_str_new(output,len);
-//    //enc = rb_enc_find_index("UTF-8");
-//    //rb_enc_associate_index(routput, enc);
-//
-//    free(output);
-//
-//    //return routput;
-    return Qnil;
+
+    routput = rb_str_new(output,len);
+    enc = rb_enc_find_index("UTF-8");
+    rb_enc_associate_index(routput, enc);
+
+    free(output);
+
+    return routput;
 }
 
 VALUE rsm_data_sources(VALUE self) {

data/rdf-smart.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rdf-smart'
-  s.version = '0.0.152'
+  s.version = '0.0.153'
   s.date = '2014-06-17'
   s.summary ="RDF.rb segfaults. A lot. We don't. RDF.rb has lots of features. We don't."
   s.description ="Minimal sparql support for ruby. Basically the roqet tool from http://librdf.org, with always guessing input type, and always json output."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-smart
 version: !ruby/object:Gem::Version
-  version: 0.0.152
+  version: 0.0.153
   prerelease: 
 platform: ruby
 authors:
@@ -22,12 +22,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/extconf.h
-- ext/rsm.o
 - ext/smart.so
 - ext/rsm.h
 - ext/rsm.c
-- ext/Makefile
 - ext/extconf.rb
 - ext/mkmf.log
 - lib/rdf/smart.rb

data/ext/Makefile

@@ -1,220 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
-ECHO = $(ECHO1:0=@echo)
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /usr/include/ruby-1.9.1
-hdrdir = /usr/include/ruby-1.9.1
-arch_hdrdir = /usr/include/ruby-1.9.1/$(arch)
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/usr
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
-vendordir = $(DESTDIR)/usr/lib/ruby/vendor_ruby
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(prefix)/share/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(prefix)/share/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
-includedir = $(prefix)/include
-localstatedir = $(DESTDIR)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(DESTDIR)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(prefix)/lib/ruby1.9.1
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitearchdir = $(sitelibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-
-NULLCMD = :
-
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-
-RUBY_EXTCONF_H = extconf.h
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3
-debugflags = -ggdb
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
-CFLAGS   = -fPIC  -DRSM_VERSION=\"0.0.152\" -std=c99 -I/usr/include/rasqal -I/usr/include/raptor2  -g -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -fno-strict-aliasing -fPIC $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -D_FORTIFY_SOURCE=2 $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -fno-strict-aliasing
-ldflags  =  -lrasqal -lraptor2  -L. -Wl,-Bsymbolic-functions -Wl,-z,relro -L/build/buildd/ruby1.9.1-1.9.3.484/debian/lib -rdynamic -Wl,-export-dynamic
-dldflags =  
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -shared
-LDSHAREDXX = $(CXX) -shared
-AR = ar
-EXEEXT = 
-
-RUBY_BASE_NAME = ruby
-RUBY_INSTALL_NAME = ruby1.9.1
-RUBY_SO_NAME = ruby-1.9.1
-arch = x86_64-linux
-sitearch = $(arch)
-ruby_version = 1.9.1
-ruby = /usr/bin/ruby1.9.1
-RUBY = $(ruby)
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir --ignore-fail-on-non-empty -p
-MAKEDIRS = /bin/mkdir -p
-INSTALL = /usr/bin/install -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir) /usr/lib
-LIBPATH =  -L. -L$(libdir) -L/usr/lib
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = /rdf
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lrasqal -lraptor2  -lpthread -lrt -ldl -lcrypt -lm   -lc
-SRCS = rsm.c
-OBJS = rsm.o
-TARGET = smart
-TARGET_NAME = smart
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).so
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).so 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean: clean distclean-so distclean-rb-default distclean-rb
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	-$(Q)$(MAKEDIRS) $(@D)
-	$(INSTALL_PROG) $(DLLIB) $(@D)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-pre-install-rb-default:
-	$(ECHO) installing default smart libraries
-./.RUBYARCHDIR.time:
-	$(Q) $(MAKEDIRS) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	$(ECHO) linking shared-object rdf/$(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)

data/ext/extconf.h

@@ -1,3 +0,0 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#endif