ontopia-tldr 0.0.3-java → 0.0.4-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f25716bfe89707993d1498989312a968e04b38cd
+  data.tar.gz: c74e1bc02d3e370aa88394258e9ccf43c420a4a8
+SHA512:
+  metadata.gz: 16d540e6f6a34e3fc57085507ad11ff3cf664502b35f3b1e85032427dd0b5cc91abad9099142c26826441d8f344ff51abbdf07300d89414105cf5ccf5a10eed5
+  data.tar.gz: 5cf994d53a391e326c034805b620af60a474c0b048c11254859650f95977b97b23138873931d5f1b69b6cf8401afaf8d6b33cc02179cdcc736992817743c4b91

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for ontopia-tldr
 
+== 0.0.4 [2014-04-15]
+
+* Internal refactoring.
+
 == 0.0.3 [2013-10-24]
 
 * Fixed sample link display.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ontopia-tldr version 0.0.3
+This documentation refers to ontopia-tldr version 0.0.4
 
 
 == DESCRIPTION
@@ -45,7 +45,7 @@ Assuming the following directory layout:
     |
     +-- tldr.xtm
     |
-    +-- tmp/
+    `-- tmp/
 
 Place your database and topic map files there and adjust their paths in the
 <tt>config.ru</tt> file. The <tt>tmp/</tt> directory is used by Passenger
@@ -58,7 +58,7 @@ the paths according to your environment):
 
   /var/www
     |
-    +-- tldr -> /usr/local/jruby/lib/ruby/gems/shared/current/ontopia-tldr/lib/ontopia/tldr/public
+    `-- tldr -> /usr/local/jruby/lib/ruby/gems/shared/current/ontopia-tldr/lib/ontopia/tldr/public
 
 Then put the following snippet in Apache's VirtualHost configuration:
 
@@ -82,10 +82,9 @@ Ontopia::TLDR requires JRuby[http://jruby.org]. It has been tested with jruby
 
 == LINKS
 
-<b></b>
-Documentation:: http://blackwinter.github.com/ontopia-tldr
-Source code::   http://github.com/blackwinter/ontopia-tldr
-RubyGem::       http://rubygems.org/gems/ontopia-tldr
+Documentation:: https://blackwinter.github.io/ontopia-tldr/
+Source code::   https://github.com/blackwinter/ontopia-tldr
+RubyGem::       https://rubygems.org/gems/ontopia-tldr
 Ontopia::       http://ontopia.net/
 Demo::          http://ixtrieve.fh-koeln.de/ghn
 
@@ -97,7 +96,7 @@ Demo::          http://ixtrieve.fh-koeln.de/ghn
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2013 Jens Wille
+Copyright (C) 2013-2014 Jens Wille
 
 ontopia-tldr is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/Rakefile

@@ -10,10 +10,10 @@ begin
       :summary      => %q{Tolog Document Retrieval with Ontopia.},
       :author       => %q{Jens Wille},
       :email        => %q{jens.wille@gmail.com},
-      :license      => %q{AGPL},
+      :license      => %q{AGPL-3.0},
       :homepage     => :blackwinter,
       :platform     => 'java',
-      :dependencies => %w[json ontopia-topicmaps ruby-nuggets sinatra],
+      :dependencies => %w[midos ontopia-topicmaps sinatra-bells],
       :extra_files  => FileList['*.sample', 'lib/ontopia/tldr/{public,views}/*'].to_a
     }
   }}

data/lib/ontopia/tldr.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # ontopia-tldr -- Tolog Document Retrieval with Ontopia.                      #
 #                                                                             #
-# Copyright (C) 2013 Jens Wille                                               #
+# Copyright (C) 2013-2014 Jens Wille                                          #
 #                                                                             #
 # ontopia-tldr is free software: you can redistribute it and/or modify it     #
 # under the terms of the GNU Affero General Public License as published by    #
@@ -24,66 +24,46 @@
 #++
 
 require 'json'
-require 'sinatra/base'
-require 'nuggets/midos'
+require 'midos'
+require 'sinatra/bells'
 require 'ontopia/topicmaps'
 
 module Ontopia
-  class TLDR < Sinatra::Base
 
-    class << self
+  class TLDR < Sinatra::Bells
 
-      private
+    set_root __FILE__
 
-      def jget(*a, &b)
-        jroute(:get, *a, &b)
-      end
-
-      def jpost(*a, &b)
-        jroute(:post, *a, &b)
-      end
-
-      def jroute(m, r, t, &b)
-        e = 'json'; e.prepend('.') unless r.end_with?('/')
-        send(m, "#{r}#{e}")         { instance_eval(&b); do_json }
-        send(m, r, provides: :html) { instance_eval(&b); erb(t) }
-        send(m, r, provides: :json) { instance_eval(&b); do_json }
-      end
-
-    end
-
-    set :root, __FILE__.chomp('.rb')
+    set :default_render, { json: :render_json }
 
     set :otm do
-      @__otm__ ||= Ontopia::Topicmaps::Topicmap.new(settings.xtm_file).tap {
+      Ontopia::Topicmaps::Topicmap.new(settings.xtm_file).tap {
         Ontopia::Topicmaps.default_stringifier = :id
       }
     end
 
     set :dbm do
-      @__dbm__ ||= begin
-        dbm, topic_keys = {}, settings.topic_keys
+      {}.tap { |dbm|
+        topic_keys = settings.topic_keys
 
         topic_index = Hash.new { |h, k| h[k] = {} }
         dbm.define_singleton_method(:topic_index) { topic_index }
 
-        Nuggets::Midos::Parser.parse_file(settings.dbm_file, settings.dbm_opts) { |id, doc|
+        Midos::Reader.parse_file(settings.dbm_file, settings.dbm_opts) { |id, doc|
           unless (topics = doc.values_at(*topic_keys).compact).empty?
             dbm[id] = doc
             topics.flatten.each { |topic| topic_index[topic][id] = doc }
           end
         }
-
-        dbm
-      end
+      }
     end
 
     set :topics do
-      @__topics__ ||= settings.otm.topics(:name)
+      settings.otm.topics(:name)
     end
 
     set :topic_index do
-      @__topic_index__ ||= settings.dbm.topic_index
+      settings.dbm.topic_index
     end
 
     set :document_keys, %w[]
@@ -93,7 +73,7 @@ module Ontopia
 
     set :xtm_file, File.expand_path('../tldr.xtm', __FILE__)
     set :dbm_file, File.expand_path('../tldr.dbm', __FILE__)
-    set :dbm_opts, { encoding: 'utf-8', vs: '|' }
+    set :dbm_opts, { encoding: 'utf-8' }
 
     set :tolog, <<-EOT
 import "http://psi.ontopia.net/tolog/string/" as s
@@ -184,8 +164,6 @@ select $TYPE, $TOPIC from
       EOT
     }
 
-    helpers ERB::Util
-
     not_found do
       @error = 'Not found!'
       erb ''
@@ -195,7 +173,7 @@ select $TYPE, $TOPIC from
       erb :index
     end
 
-    jpost '/', :index do
+    post '/', render: :index do
       @query = params[:q]
       @rules = params[:r] || ''
       @param = params[:p] || TITLE_TOPIC
@@ -214,15 +192,15 @@ select $TYPE, $TOPIC from
     end
 
     get '/xtm' do
-      do_file(settings.xtm_file, 'xml')
+      send_file(settings.xtm_file, 'xml')
     end
 
-    jget '/topics', :topics do
+    get '/topics', render: :topics do
       @title = "Topics (#{settings.topics.size})"
       @topics, @filter = settings.topics.keys, :topics
     end
 
-    jget '/topic/:i', :topic do
+    get '/topic/:i', render: :topic do
       @title = topic_to_s(@topic = params[:i])
       not_found unless settings.topics.include?(@topic)
 
@@ -235,25 +213,23 @@ select $TYPE, $TOPIC from
     end
 
     get '/dbm' do
-      do_file(settings.dbm_file, 'txt')
+      send_file(settings.dbm_file, 'txt')
     end
 
-    jget '/documents', :documents do
+    get '/documents', render: :documents do
       @title = "Documents (#{settings.dbm.size})"
       @documents, @filter = settings.dbm, :documents
     end
 
-    jget '/document/:i', :document do
+    get '/document/:i', render: :document do
       @title = "##{@id = params[:i].to_i}"
       not_found unless @document = settings.dbm[@id]
     end
 
     private
 
-    def do_json
-      content_type :json
-
-      JSON.fast_generate({
+    def to_render_hash
+      super(
         d: @document || @documents,
         e: @error,
         i: @id,
@@ -264,11 +240,7 @@ select $TYPE, $TOPIC from
         r: @rules,
         t: @topic || @topics,
         y: @types
-      }.delete_if { |_, v| !v })
-    end
-
-    def do_file(file, type)
-      File.readable?(file) ? send_file(file, type: type) : not_found
+      )
     end
 
     def get_topics(query = @query, param = @param, rules = @rules)
@@ -344,11 +316,11 @@ select $TYPE, $TOPIC from
     end
 
     def link_to_topic(topic, text = topic_to_s(topic))
-      _a(text, href: url("/topic/#{h(topic)}"))
+      link_to(text, :topic, topic)
     end
 
     def link_to_document(id, doc)
-      _a(doc_to_s(id, doc), href: url("/document/#{h(id)}"))
+      link_to(doc_to_s(id, doc), :document, id)
     end
 
     def sample_link(name)
@@ -357,31 +329,8 @@ select $TYPE, $TOPIC from
       end
     end
 
-    def _a(*args)
-      _tag(:a, *args)
-    end
-
-    def _ul(list, *args)
-      _tag(:ul, *args) { |t| list.each { |*i| t << yield(*i) } }
-    end
-
-    def _li(*args)
-      _tag(:li, *args)
-    end
-
-    def _tag(name, *args)
-      a = args.pop.map { |k, v| %Q{#{h(k)}="#{h(v)}"} } if args.last.is_a?(Hash)
-
-      t = ["<#{name}#{a.unshift(nil).join(' ') if a}>"]
-
-      args.each { |s| t << s }
-      yield t if block_given?
-
-      t << "</#{name}>"
-      t.join
-    end
-
   end
+
 end
 
 require_relative 'tldr/version'

data/lib/ontopia/tldr/version.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # ontopia-tldr -- Tolog Document Retrieval with Ontopia.                      #
 #                                                                             #
-# Copyright (C) 2013 Jens Wille                                               #
+# Copyright (C) 2013-2014 Jens Wille                                          #
 #                                                                             #
 # ontopia-tldr is free software: you can redistribute it and/or modify it     #
 # under the terms of the GNU Affero General Public License as published by    #
@@ -28,7 +28,7 @@ module Ontopia
 
       MAJOR = 0
       MINOR = 0
-      TINY  = 3
+      TINY  = 4
 
       class << self
 

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ontopia-tldr
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.3
+  version: 0.0.4
 platform: java
 authors:
 - Jens Wille
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: midos
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: ontopia-topicmaps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ontopia-topicmaps
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: sinatra-bells
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tolog Document Retrieval with Ontopia.
 email: jens.wille@gmail.com
 executables: []
@@ -84,58 +89,57 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
+- COPYING
+- ChangeLog
+- README
+- Rakefile
+- config.ru.sample
 - lib/ontopia-tldr.rb
 - lib/ontopia/tldr.rb
-- lib/ontopia/tldr/version.rb
-- config.ru.sample
 - lib/ontopia/tldr/public/site.css
 - lib/ontopia/tldr/public/site.js
+- lib/ontopia/tldr/version.rb
 - lib/ontopia/tldr/views/document.erb
 - lib/ontopia/tldr/views/documents.erb
 - lib/ontopia/tldr/views/index.erb
 - lib/ontopia/tldr/views/layout.erb
 - lib/ontopia/tldr/views/topic.erb
 - lib/ontopia/tldr/views/topics.erb
-- COPYING
-- ChangeLog
-- README
-- Rakefile
 homepage: http://github.com/blackwinter/ontopia-tldr
 licenses:
-- AGPL
+- AGPL-3.0
+metadata: {}
 post_install_message: |2+
 
-  ontopia-tldr-0.0.3 [2013-10-24]:
+  ontopia-tldr-0.0.4 [2014-04-15]:
 
-  * Fixed sample link display.
+  * Internal refactoring.
 
 rdoc_options:
-- --charset
+- "--title"
+- ontopia-tldr Application documentation (v0.0.4)
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --title
-- ontopia-tldr Application documentation (v0.0.3)
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !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.2.2
+signing_key: 
+specification_version: 4
 summary: Tolog Document Retrieval with Ontopia.
 test_files: []