ontopia-topicmaps 0.0.1-java → 0.0.2-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5966ec6b70b10968e7311f649c1b018bc429033a
+  data.tar.gz: cc2cff4490ff724db07d64745a3ffcff0e33628b
+SHA512:
+  metadata.gz: 21c036850b417905985b1fe9c950f18dd4d58aa7a5aff34ac18f85a001c00d4e139c887421c3fead9d568d44e813b134e5d9b2074194321c7b86053781c214f3
+  data.tar.gz: 2ae4bf7f7623e394e828ee62aecc8c8a413fe635b31a7f308dd2b7008cabb3728a8135f59df5851c5aa19bfb550995c1498ecaf339ea4a576fcf506b09c1449a

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for ontopia-topicmaps
 
+== 0.0.2 [2013-07-25]
+
+* Added Ontopia::Topicmaps::Topicmap#query_maps.
+* Added Ontopia::Topicmaps::Topicmap#extract_query_projection.
+* Changed stringifier usage (breaking backwards-compatibility).
+
 == 0.0.1 [2013-07-19]
 
 * Birthday :-)

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ontopia-topicmaps version 0.0.1
+This documentation refers to ontopia-topicmaps version 0.0.2
 
 
 == DESCRIPTION
@@ -21,6 +21,7 @@ Documentation:: http://blackwinter.github.com/ontopia-topicmaps
 Source code::   http://github.com/blackwinter/ontopia-topicmaps
 RubyGem::       http://rubygems.org/gems/ontopia-topicmaps
 Ontopia::       http://ontopia.net/
+Demo::          http://ixtrieve.fh-koeln.de/ghn
 
 
 == AUTHORS

data/lib/ontopia/topicmaps/packages.rb

@@ -28,6 +28,7 @@ module Ontopia
 
       PACKAGES = {
         'net.ontopia.infoset.impl.basic'    => %w[URIFragmentLocator],
+        'net.ontopia.topicmaps.core'        => %w[TopicIF TypedIF],
         'net.ontopia.topicmaps.query.utils' => %w[QueryWrapper RowMapperIF],
         'net.ontopia.topicmaps.utils'       => %w[TopicStringifiers],
         'net.ontopia.topicmaps.utils.ctm'   => %w[CTMTopicMapReader],

data/lib/ontopia/topicmaps/stringifiers.rb

@@ -28,12 +28,37 @@ module Ontopia
 
       NO_VALUE = '[No ID]'.freeze
 
-      Topicmaps.init(self, :StringifierIF) {
+      Topicmaps.register_stringifier(self, :id) {
         URIFragmentLocator.field_accessor :fragment
       }
 
       def to_string(object)
-        (id = object.get_item_identifiers.first) ? id.fragment : NO_VALUE
+        case object
+          when TopicIF            then to_string(object.get_item_identifiers.first)
+          when TypedIF            then to_string(object.get_type)
+          when URIFragmentLocator then object.fragment
+          else                         NO_VALUE
+        end
+      end
+
+    end
+
+    class AnyNameStringifier
+
+      NO_VALUE = '[No Name]'.freeze
+
+      Topicmaps.register_stringifier(self, :name)
+
+      def initialize
+        @topic_str = Topicmaps.topic_stringifier
+      end
+
+      def to_string(object)
+        case object
+          when TopicIF then @topic_str[object]
+          when TypedIF then to_string(object.get_type)
+          else              NO_VALUE
+        end
       end
 
     end

data/lib/ontopia/topicmaps/topicmap.rb

@@ -50,6 +50,17 @@ select count($TOPIC) from
         EOT
       }
 
+      QUERY_PROJECTION_RE = %r{\bselect\s+(.+)\s+from\b}i
+
+      class << self
+
+        def extract_query_projection(query)
+          projection = query[QUERY_PROJECTION_RE, 1]
+          projection.delete('$,').split if projection
+        end
+
+      end
+
       def initialize(file)
         Topicmaps.setup_classpath
 
@@ -68,20 +79,29 @@ select count($TOPIC) from
 
       def query(query = nil, declarations = nil, str = nil)
         str = Topicmaps.stringifier(str || :default)
-        res = query_for_list(query, declarations, &block_given? ?
-          lambda { |i,| yield(i, str) } : lambda { |i,| str.to_string(i) }).to_a
+
+        query_for_list(query, declarations, &block_given? ?
+          lambda { |i,| yield(i, str) } : lambda { |i,| str[i] }).to_a
+      end
+
+      def query_maps(query = nil, declarations = nil)
+        query_wrapper(declarations).query_for_maps(query_string(query)).to_a
       end
 
       def topics(value_str = nil, key_str = nil)
         hash, key_str = {}, Topicmaps.stringifier(key_str || :id)
 
         query(:all_topics, nil, value_str) { |i, str|
-          hash[key_str.to_string(i)] = str.to_string(i)
+          hash[key_str[i]] = str[i]
         }
 
         hash
       end
 
+      def extract_query_projection(query)
+        self.class.extract_query_projection(query)
+      end
+
       private
 
       def read(file, reader = nil)
@@ -93,16 +113,22 @@ select count($TOPIC) from
         raise "Error reading topic map: #{err}"
       end
 
-      def query_for_list(query, declarations, &block)
-        args = [QUERY.has_key?(query ||= :all_topics) ? QUERY[query] :
-          query.is_a?(Symbol) ? raise("No such query: #{query}") : query]
-
-        args << RowMapper.new(&block) if block
+      def query_string(query)
+        QUERY.has_key?(query ||= :all_topics) ? QUERY[query] :
+          query.is_a?(Symbol) ? raise("No such query: #{query}") : query
+      end
 
+      def query_wrapper(declarations = nil)
         qw = QueryWrapper.new(tm)
         qw.set_declarations(declarations) if declarations
+        qw
+      end
+
+      def query_for_list(query, declarations = nil, &block)
+        args = [query_string(query)]
+        args << RowMapper.new(&block) if block
 
-        qw.query_for_list(*args)
+        query_wrapper(declarations).query_for_list(*args)
       rescue OntopiaRuntimeException => err
         raise "Query error: #{err}"
       end

data/lib/ontopia/topicmaps/version.rb

@@ -28,7 +28,7 @@ module Ontopia
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 1
+      TINY  = 2
 
       class << self
 

data/lib/ontopia/topicmaps.rb

@@ -50,16 +50,12 @@ module Ontopia
         @default_stringifier ||= name_stringifier
       end
 
-      def name_stringifier
-        self::TopicStringifiers.get_default_stringifier
-      end
-
-      def id_stringifier
-        IdStringifier.new
-      end
-
       def stringifier(str)
-        str.is_a?(Symbol) ? send("#{str}_stringifier") : str
+        case str
+          when self::StringifierIF then str.method(:to_string)
+          when Symbol              then send("#{str}_stringifier")
+          else                          str
+        end
       end
 
       def count(file, *args)
@@ -70,6 +66,10 @@ module Ontopia
         Topicmap.new(file).query(*args, &block)
       end
 
+      def query_maps(file, *args)
+        Topicmap.new(file).query_maps(*args)
+      end
+
       def topics(file, *args)
         Topicmap.new(file).topics(*args)
       end
@@ -103,9 +103,27 @@ module Ontopia
         klass ? Topicmaps.init[klass] = [modules, block] : @init
       end
 
+      def define_stringifier(name)
+        define_singleton_method(attr = "#{name}_stringifier") {
+          singleton_class.send(:attr_reader, attr)
+          instance_variable_set("@#{attr}", stringifier(yield))
+        }
+      end
+
+      def register_stringifier(klass, name)
+        init(klass, :StringifierIF) {
+          Topicmaps.define_stringifier(name) { new }
+          yield if block_given?
+        }
+      end
+
     end
 
-    init(self)
+    init(self) {
+      define_stringifier(:topic) {
+        self::TopicStringifiers.get_default_stringifier
+      }
+    }
 
   end
 end

data/spec/ontopia/topicmaps/topicmap_spec.rb

@@ -0,0 +1,37 @@
+describe Ontopia::Topicmaps::Topicmap do
+
+  describe '::extract_query_projection' do
+
+    example do
+      Ontopia::Topicmaps::Topicmap.extract_query_projection(
+        Ontopia::Topicmaps::Topicmap::QUERY[:all_topics]
+      ).should == %w[TOPIC]
+    end
+
+    example do
+      Ontopia::Topicmaps::Topicmap.extract_query_projection(
+        Ontopia::Topicmaps::Topicmap::QUERY[:count_all_topics]
+      ).should == %w[count(TOPIC)]
+    end
+
+    example do
+      Ontopia::Topicmaps::Topicmap.extract_query_projection(
+        'select $FOO, $BAR from $BAZ?'
+      ).should == %w[FOO BAR]
+    end
+
+    example do
+      Ontopia::Topicmaps::Topicmap.extract_query_projection(
+        'SELECT $BAR, $FOO FrOm $BAZ?'
+      ).should == %w[BAR FOO]
+    end
+
+    example do
+      Ontopia::Topicmaps::Topicmap.extract_query_projection(
+        '$FOO, $BAR'
+      ).should be_nil
+    end
+
+  end
+
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ontopia-topicmaps
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.1
+  version: 0.0.2
 platform: java
 authors:
 - Jens Wille
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies: []
 description: Query topic maps with Ontopia.
 email: jens.wille@gmail.com
@@ -33,19 +32,21 @@ files:
 - spec/data/ItalianOpera.ltm
 - spec/data/JillsMusic.xtm
 - spec/data/ghn.xtm
+- spec/ontopia/topicmaps/topicmap_spec.rb
 - spec/ontopia/topicmaps_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/blackwinter/ontopia-topicmaps
 licenses:
 - AGPL
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options:
 - --charset
 - UTF-8
 - --line-numbers
 - --all
 - --title
-- ontopia-topicmaps Application documentation (v0.0.1)
+- ontopia-topicmaps Application documentation (v0.0.2)
 - --main
 - README
 require_paths:
@@ -55,17 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.5
+signing_key: 
+specification_version: 4
 summary: Query topic maps with Ontopia.
 test_files: []