togostanza 2.1.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ed521c80421e670146190ee2dc76f21892a276c
-  data.tar.gz: ac17011321f4687ce34769ec0326c1409c1fd943
+SHA256:
+  metadata.gz: bf722b9085f88b0a7424bcaac13ce4081aaa500bc5dc47d14340bce047f94d5b
+  data.tar.gz: 29281c56272fb78bd3890c979059e611469f67521900b396b6ab682b16f6942e
 SHA512:
-  metadata.gz: 023bb275b5958afe4d3da43d0774264fc64b7c351f51fd37f88ccf2c59568059c846e6a346bae93a3eade712b938104a50ae36c8fdb966993997061e60d0f1eb
-  data.tar.gz: 310b33f4d2e9ed33b763d0bd71e81d7eae67f7d1543151df5dd680a3ce9b921709baa59f82f743fb622c5b176aa541371fa44d820fd23203a5a703d41e1a61e8
+  metadata.gz: a8be169ab78bf527c6aecfbcf1456071c0813cedcebcdcd971b512300e887d3bd7589f23f0d14d6b42375a6207d0404c7a26f4f57f212044f0562bee9dae4bf0
+  data.tar.gz: 4f935735930e994f4c8ecda4e8052d23b3c7e963658726d70c457b7475e06187f952e08f11a724fd6eb95524f191075ba2baf1d3c86eab7a42cd60cb9d75c178

data/.travis.yml

@@ -2,14 +2,15 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.5
+  - 2.6
+  - 2.7
 
 gemfile:
-  - gemfiles/activesupport_3.x.gemfile
-  - gemfiles/activesupport_4.x.gemfile
+  - gemfiles/activesupport_5.x.gemfile
+  - gemfiles/activesupport_6.x.gemfile
 
+before_install: gem update bundler
 bundler_args: --without production
 
 notifications:

data/Appraisals

@@ -1,7 +1,7 @@
-appraise 'activesupport-3.x' do
-  gem 'activesupport', '~> 3.0'
+appraise 'activesupport-5.x' do
+  gem 'activesupport', '~> 5.0'
 end
 
-appraise 'activesupport-4.x' do
-  gem 'activesupport', '~> 4.0'
+appraise 'activesupport-6.x' do
+  gem 'activesupport', '~> 6.0'
 end

data/gemfiles/{activesupport_3.x.gemfile → activesupport_5.x.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 3.0"
+gem "activesupport", "~> 5.0"
 
-gemspec :path=>"../"
+gemspec path: "../"

data/gemfiles/activesupport_5.x.gemfile.lock

@@ -0,0 +1,137 @@
+PATH
+  remote: ..
+  specs:
+    togostanza (2.1.3)
+      activesupport (>= 5)
+      flavour_saver
+      haml
+      hashie
+      parallel
+      sinatra
+      sinatra-contrib
+      sparql-client
+      sprockets (~> 3.4)
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    backports (3.15.0)
+    capybara (3.30.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    ffi (1.12.1)
+    flavour_saver (0.3.9)
+      rltk (~> 2.2.0)
+      tilt
+    haml (5.1.2)
+      temple (>= 0.8.0)
+      tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (4.0.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    link_header (0.0.8)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    multi_json (1.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    net-http-persistent (3.1.0)
+      connection_pool (~> 2.2)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.1)
+    public_suffix (4.0.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rake (13.0.1)
+    rdf (3.1.1)
+      hamster (~> 3.0)
+      link_header (~> 0.0, >= 0.0.8)
+    regexp_parser (1.6.0)
+    rltk (2.2.1)
+      ffi (>= 1.0.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    ruby2_keywords (0.0.2)
+    sinatra (2.0.8.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.8.1)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.8.1)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.8.1)
+      sinatra (= 2.0.8.1)
+      tilt (~> 2.0)
+    sparql-client (3.1.0)
+      net-http-persistent (~> 3.1)
+      rdf (~> 3.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    temple (0.8.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 5.0)
+  appraisal
+  bundler
+  capybara
+  rake
+  rspec
+  rspec-its
+  togostanza!
+
+BUNDLED WITH
+   2.1.2

data/gemfiles/{activesupport_4.x.gemfile → activesupport_6.x.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.0"
+gem "activesupport", "~> 6.0"
 
-gemspec :path=>"../"
+gemspec path: "../"

data/gemfiles/activesupport_6.x.gemfile.lock

@@ -0,0 +1,139 @@
+PATH
+  remote: ..
+  specs:
+    togostanza (2.1.3)
+      activesupport (>= 5)
+      flavour_saver
+      haml
+      hashie
+      parallel
+      sinatra
+      sinatra-contrib
+      sparql-client
+      sprockets (~> 3.4)
+      thor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    backports (3.15.0)
+    capybara (3.30.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    ffi (1.12.1)
+    flavour_saver (0.3.9)
+      rltk (~> 2.2.0)
+      tilt
+    haml (5.1.2)
+      temple (>= 0.8.0)
+      tilt
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (4.0.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    link_header (0.0.8)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    multi_json (1.14.1)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    net-http-persistent (3.1.0)
+      connection_pool (~> 2.2)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.19.1)
+    public_suffix (4.0.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rake (13.0.1)
+    rdf (3.1.1)
+      hamster (~> 3.0)
+      link_header (~> 0.0, >= 0.0.8)
+    regexp_parser (1.6.0)
+    rltk (2.2.1)
+      ffi (>= 1.0.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    ruby2_keywords (0.0.2)
+    sinatra (2.0.8.1)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.8.1)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.8.1)
+      backports (>= 2.8.2)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.8.1)
+      sinatra (= 2.0.8.1)
+      tilt (~> 2.0)
+    sparql-client (3.1.0)
+      net-http-persistent (~> 3.1)
+      rdf (~> 3.1)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    temple (0.8.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 6.0)
+  appraisal
+  bundler
+  capybara
+  rake
+  rspec
+  rspec-its
+  togostanza!
+
+BUNDLED WITH
+   2.1.2

data/lib/togostanza/cli.rb

@@ -140,7 +140,6 @@ module TogoStanza
       def replace_description
         name1_chopped = chop_slash(name1)
         name2_chopped = chop_slash(name2)
-
         gsub_file("#{files_name(name1_chopped)}/#{files_name(name1_chopped)}.gemspec", files_name(name1_chopped), files_name(name2_chopped))
         gsub_file("#{files_name(name1_chopped)}/lib/#{files_name(name1_chopped)}.rb", classes_name(name1_chopped), classes_name(name2_chopped))
 
@@ -198,6 +197,59 @@ module TogoStanza
       end
     end
 
+    class GenspecUpdater < Thor::Group
+      include Thor::Actions
+      include Thor::Shell
+
+      argument :name, type: :string
+
+      def self.source_root
+        File.expand_path('../../../templates/stanza', __FILE__)
+      end
+
+      def check_exist
+        unless File.exist?("#{file_name}")
+          say("This provider doesn't have #{file_name}")
+          exit
+        end
+        unless File.exist?("#{file_name}/metadata.json")
+          template 'metadata.json.erb', "#{file_name}/metadata.json"
+          say("metadata.json has just made.")
+        end
+      end
+
+      def replace_description
+        unless File.read("#{file_name}/#{file_name}.gemspec").include?("require\s'json'")
+          insert_into_file("#{file_name}/#{file_name}.gemspec", "\nrequire\s'json'\n", :after=>"$LOAD_PATH.unshift(lib)\sunless\s$LOAD_PATH.include?(lib)\n")
+          insert_into_file("#{file_name}/#{file_name}.gemspec", "metadata\s=\sopen('./metadata.json')\sdo\s|io|\n", :after=>"\nrequire\s'json'\n")
+          insert_into_file("#{file_name}/#{file_name}.gemspec", "\s\sJSON.load\(io\)\nend\n", :after=>"metadata\s=\sopen('./metadata.json')\sdo\s|io|\n")
+        end
+        gsub_file("#{file_name}/#{file_name}.gemspec", /spec\.authors.*\n/, "spec.authors       = Array(metadata['author'])\n")
+        gsub_file("#{file_name}/#{file_name}.gemspec", /spec\.email.*\n/, "spec.email         = Array(metadata['address'])\n")
+        gsub_file("#{file_name}/#{file_name}.gemspec", /spec\.summary.*\n/, "spec.summary       = metadata['label']\n")
+        gsub_file("#{file_name}/#{file_name}.gemspec", /spec\.description.*\n/, "spec.description   = metadata['definition']\n")
+        gsub_file("#{file_name}/#{file_name}.gemspec", /spec\.license.*\n/, "spec.license       = metadata['license']\n")
+      end
+
+      private
+
+      def chop_slash
+        if name[-1] == '/'
+          name.chop
+        else
+          name
+        end
+      end
+
+      def stanza_id
+        chop_slash.underscore.sub(/_stanza$/, '')
+      end
+
+      def file_name
+        stanza_id + '_stanza'
+      end
+    end
+
     class NameRegister < Thor::Group
       include Thor::Actions
 
@@ -238,6 +290,10 @@ module TogoStanza
       register StanzaRemover, 'remove', 'remove NAME', 'Remove the stanza'
     end
 
+    class Stanza < Thor
+      register GenspecUpdater, 'genspec_update', 'genspec_update NAME', 'Update genspec format for togostanza ver 2.0.0'
+    end
+
     class Root < Thor
       register NameRegister, 'name' , 'name NAME' , 'register your name'
     end

data/lib/togostanza/stanza/base.rb

@@ -15,7 +15,7 @@ FS.register_helper :download_csv do
   <<-HTML.strip_heredoc.html_safe
     <script>$(function() {
       #{init_download_script}
-      $("div#stanza_buttons").append("<a id='download_csv' href='#'><i class='fa fa-file-o'></i> CSV</a>");
+      $("div#stanza_buttons").append("<a id='download_csv' download='stanza.csv' href='#'><i class='fa fa-file-o'></i> CSV</a>");
 
       var csv = '';
       var tables = $('body > table');
@@ -51,10 +51,9 @@ FS.register_helper :download_csv do
         }
       }
 
-      $("#download_csv").on("click",function(){
-        window.open('data:text/plain;' + (window.btoa?'base64,'+btoa(csv):csv));
+      document.querySelector('#download_csv').addEventListener('click', (e) => {
+        e.target.href = 'data:text/plain;charset=UTF-8' + (window.btoa ? ';base64,' + btoa(csv) : ',' + csv);
       });
-
     });
     </script>
   HTML
@@ -66,11 +65,11 @@ FS.register_helper :download_json do
   <<-HTML.strip_heredoc.html_safe
     <script>$(function() {
       #{init_download_script}
-      $("div#stanza_buttons").append("<a id='download_json' href='#'><i class='fa fa-file-o'></i> JSON</a>");
-      var json_str = JSON.stringify(#{json}, "", "\t");
+      $("div#stanza_buttons").append("<a id='download_json' download='stanza.json' href='#'><i class='fa fa-file-o'></i> JSON</a>");
+      var json_str = JSON.stringify(#{json}, null, '\t');
 
-      $("#download_json").on("click",function(){
-        window.open('data:application/json;' + (window.btoa?'base64,'+btoa(json_str):json_str));
+      document.querySelector('#download_json').addEventListener('click', (e) => {
+        e.target.href = 'data:application/json;charset=UTF-8' + (window.btoa ? ';base64,' + btoa(json_str) : ',' + json_str);
       });
     });
     </script>
@@ -81,9 +80,9 @@ FS.register_helper :download_svg do
   <<-HTML.strip_heredoc.html_safe
     <script>$(function() {
       #{init_download_script}
-      $("div#stanza_buttons").append("<a id='download_svg' href='#'><i class='fa fa-file-o'></i> SVG</a>");
+      $("div#stanza_buttons").append("<a id='download_svg' download='stanza.svg' href='#'><i class='fa fa-file-o'></i> SVG</a>");
 
-      $("#download_svg").on("click",function(){
+      document.querySelector('#download_svg').addEventListener('click', (e) => {
         var svg = $("svg");
         if (svg[0]) {
           if (!svg.attr("xmlns")) {
@@ -94,13 +93,12 @@ FS.register_helper :download_svg do
           }
 
           var svgText = svg.wrap('<div>').parent().html();
-          window.open('data:image/svg+xml;' + (window.btoa?'base64,'+btoa(svgText):svgText));
+          e.target.href = 'data:image/svg+xml' + (window.btoa ? ';base64,' + btoa(svgText) : ',' + svgText);
         } else {
           // TODO...
           console.log("Can't open svg file");
         }
       });
-
     });
     </script>
   HTML
@@ -116,30 +114,29 @@ FS.register_helper :download_image do
 
     <script>$(function() {
       #{init_download_script}
-      $("div#stanza_buttons").append("<a id='download_image' href='#'><i class='fa fa-file-o'></i> IMAGE</a>");
+      $("div#stanza_buttons").append("<a id='download_image' download='stanza.png' href='#'><i class='fa fa-file-o'></i> IMAGE</a>");
 
       $("body").append("<div style='display: none;'><canvas id='drawarea'></canvas></div>");
 
-      $("#download_image").on("click",function(){
+      document.querySelector('#download_image').addEventListener('click', (e) => {
         var svg = $("svg");
         if (svg[0]) {
           var svgText = svg.wrap('<div>').parent().html();
-          canvg('drawarea', svgText, {renderCallback: function(){
+          canvg('drawarea', svgText, { 
+            renderCallback: function() {
               var canvas = $("#drawarea")[0];
 
               canvas.toBlob(function(blob) {
                 var blob_url = window.URL.createObjectURL(blob);
-                window.open(blob_url);
+                e.target.href = blob_url;
               }, "image/png");
             }
           });
-
         } else {
           // TODO...
           console.log("Can't open image file");
         }
       });
-
     });
     </script>
   HTML
@@ -158,13 +155,6 @@ module TogoStanza::Stanza
   autoload :Grouping,      'togostanza/stanza/grouping'
   autoload :Querying,      'togostanza/stanza/querying'
 
-  class Context < Hashie::Mash
-    def respond_to_missing?(*)
-      # XXX It looks ugly, but we need use not pre-defined properties
-      true
-    end
-  end
-
   class Base
     extend ExpressionMap::Macro
     include Querying
@@ -200,7 +190,7 @@ module TogoStanza::Stanza
     attr_reader :params
 
     def context
-      Context.new(properties.resolve_all_in_parallel(self, params))
+      Hashie::Mash.new(properties.resolve_all_in_parallel(self, params))
     end
 
     def resource(name)
@@ -221,6 +211,9 @@ module TogoStanza::Stanza
         stanza_uri = "#{server_url}/#{orig['id']}"
 
         usage_attrs = orig['parameter'].map {|hash|
+          unless hash['key'].start_with?("data-stanza-") then
+            hash['key'] = "data-stanza-" <<  hash['key']
+          end
           "#{hash['key']}=\"#{hash['example']}\""
         }.push("data-stanza=\"#{stanza_uri}\"").join(' ')
 

data/lib/togostanza/stanza/querying.rb

@@ -7,7 +7,7 @@ module TogoStanza::Stanza
       togogenome: 'http://togogenome.org/sparql'
     }
 
-    def query(endpoint, text_or_filename)
+    def query(endpoint, text_or_filename, **options)
       path = File.join(root, 'sparql', text_or_filename)
 
       if File.exist?(path)
@@ -15,15 +15,15 @@ module TogoStanza::Stanza
         text_or_filename = Tilt.new(path).render(data)
       end
 
-      client = SPARQL::Client.new(MAPPINGS[endpoint] || endpoint, :method => "get")
+      client = SPARQL::Client.new(MAPPINGS[endpoint] || endpoint, method: 'get')
 
-      #Rails.logger.debug "SPARQL QUERY: \n#{sparql}"
-
-      client.query(text_or_filename).map {|binding|
+      result = client.query(text_or_filename, **{content_type: 'application/sparql-results+json'}.merge(options)).map {|binding|
         binding.each_with_object({}) {|(name, term), hash|
           hash[name] = term.to_s
         }
       }
+      client.close
+      result
     end
   end
 end

data/lib/togostanza/version.rb

@@ -1,3 +1,3 @@
 module TogoStanza
-  VERSION = '2.1.1'
+  VERSION = '2.2.2'
 end

data/spec/features/api_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'API' do
+describe 'API', type: :feature do
   it 'should return properties as JSON' do
     visit '/foo.json?name=nsgc'
 

data/spec/features/help_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Help' do
+describe 'Help', type: :feature do
   it 'should display FooStanza help' do
     visit '/foo/help'
     page.should have_css('h1', text: 'Foo')

data/spec/features/listing_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Listing' do
+describe 'Listing', type: :feature do
   before do
     visit '/'
   end

data/spec/features/metadata_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Metadata' do
+describe 'Metadata', type: :feature do
   describe '/metadata.json' do
     before do
       # 実行順により base_spec で作られた Classオブジェクトが返って来て意図通りのテストにならないため

data/spec/features/rendering_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Rendering' do
+describe 'Rendering', type: :feature do
   it 'should render FooStanza correctly' do
     visit '/foo'
     page.should have_content('hello from foo')

data/spec/features/resource_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Resource' do
+describe 'Resource', type: :feature do
   before do
     visit '/foo/resources/foo_resource'
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV['RACK_ENV'] ||= 'test'
 
 require 'rspec/its'
-require 'capybara'
+require 'capybara/rspec'
 
 require_relative 'dummy/app'
 
@@ -14,8 +14,6 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
-
-  config.include Capybara::DSL
 end
 
 Capybara.app = DummyApp

data/templates/stanza/gemspec.erb

@@ -9,12 +9,12 @@ end
 Gem::Specification.new do |spec|
   spec.name          = '<%= file_name %>'
   spec.version       = '0.0.1'
-  spec.authors       = Array(metadata["stanza:author"])
-  spec.email         = Array(metadata["stanza:address"])
-  spec.summary       = metadata["stanza:label"]
-  spec.description   = metadata["stanza:definition"]
+  spec.authors       = Array(metadata["author"])
+  spec.email         = Array(metadata["address"])
+  spec.summary       = metadata["label"]
+  spec.description   = metadata["definition"]
   spec.homepage      = ''
-  spec.license       = metadata["stanza:license"]
+  spec.license       = metadata["license"]
 
   spec.files         = Dir.glob('**/*')
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/togostanza.gemspec

@@ -16,23 +16,23 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.2'
-  spec.add_runtime_dependency 'flavour_saver', '~> 0.3'
-  spec.add_runtime_dependency 'haml', '~> 4.0'
-  spec.add_runtime_dependency 'hashie', '~> 3.4'
-  spec.add_runtime_dependency 'parallel', '~> 1.6'
-  spec.add_runtime_dependency 'sinatra', '~> 1.4'
-  spec.add_runtime_dependency 'sinatra-contrib', '~> 1.4'
-  spec.add_runtime_dependency 'sparql-client', '~> 1.1'
+  spec.add_runtime_dependency 'activesupport', '>= 5'
+  spec.add_runtime_dependency 'flavour_saver'
+  spec.add_runtime_dependency 'haml'
+  spec.add_runtime_dependency 'hashie'
+  spec.add_runtime_dependency 'parallel'
+  spec.add_runtime_dependency 'sinatra'
+  spec.add_runtime_dependency 'sinatra-contrib'
+  spec.add_runtime_dependency 'sparql-client'
   spec.add_runtime_dependency 'sprockets', '~> 3.4'
-  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'thor'
 
-  spec.add_development_dependency 'appraisal', '~> 0.5'
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'capybara', '~> 2.2'
-  spec.add_development_dependency 'rake', '~> 0.9'
-  spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'appraisal'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-its'
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.5.0'
 end

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: togostanza
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: flavour_saver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sparql-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -140,100 +140,100 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 description: 
 email:
 - ursm@esm.co.jp
@@ -258,10 +258,10 @@ files:
 - assets/stanza.css
 - assets/stanza.js
 - bin/togostanza
-- gemfiles/activesupport_3.x.gemfile
-- gemfiles/activesupport_3.x.gemfile.lock
-- gemfiles/activesupport_4.x.gemfile
-- gemfiles/activesupport_4.x.gemfile.lock
+- gemfiles/activesupport_5.x.gemfile
+- gemfiles/activesupport_5.x.gemfile.lock
+- gemfiles/activesupport_6.x.gemfile
+- gemfiles/activesupport_6.x.gemfile.lock
 - lib/togostanza.rb
 - lib/togostanza/application.rb
 - lib/togostanza/cli.rb
@@ -318,15 +318,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Development tools of TogoStanza
@@ -351,4 +350,3 @@ test_files:
 - spec/lib/togostanza/stanza/base_spec.rb
 - spec/lib/togostanza/stanza/grouping_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/gemfiles/activesupport_3.x.gemfile.lock

@@ -1,104 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    togostanza (1.0.3)
-      activesupport
-      flavour_saver
-      haml
-      hashie
-      parallel
-      redcarpet
-      sinatra
-      sinatra-contrib
-      sparql-client
-      sprockets
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
-      bundler
-      rake
-    backports (3.6.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    diff-lcs (1.2.4)
-    ffi (1.9.3)
-    flavour_saver (0.3.1)
-      rltk (~> 2.2.0)
-      tilt
-    haml (4.0.5)
-      tilt
-    hashie (2.0.5)
-    hike (1.2.3)
-    i18n (0.6.1)
-    json (1.8.1)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    multi_json (1.7.7)
-    net-http-persistent (2.9.4)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    parallel (0.9.2)
-    rack (1.5.2)
-    rack-protection (1.5.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.1.0)
-    rdf (1.1.2.1)
-    redcarpet (3.1.0)
-    rltk (2.2.1)
-      ffi (>= 1.0.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    sparql-client (1.1.1)
-      json (>= 1.8)
-      net-http-persistent (>= 1.4)
-      rdf (>= 1.1)
-    sprockets (2.10.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3.0)
-  appraisal
-  bundler
-  capybara
-  rake
-  rspec
-  togostanza!

data/gemfiles/activesupport_4.x.gemfile.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    togostanza (1.0.3)
-      activesupport
-      flavour_saver
-      haml
-      hashie
-      parallel
-      redcarpet
-      sinatra
-      sinatra-contrib
-      sparql-client
-      sprockets
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    appraisal (0.5.2)
-      bundler
-      rake
-    atomic (1.1.10)
-    backports (3.6.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    diff-lcs (1.2.4)
-    ffi (1.9.3)
-    flavour_saver (0.3.1)
-      rltk (~> 2.2.0)
-      tilt
-    haml (4.0.5)
-      tilt
-    hashie (2.0.5)
-    hike (1.2.3)
-    i18n (0.6.4)
-    json (1.8.1)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    minitest (4.7.5)
-    multi_json (1.7.7)
-    net-http-persistent (2.9.4)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    parallel (0.9.2)
-    rack (1.5.2)
-    rack-protection (1.5.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (10.1.0)
-    rdf (1.1.2.1)
-    redcarpet (3.1.0)
-    rltk (2.2.1)
-      ffi (>= 1.0.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    sparql-client (1.1.1)
-      json (>= 1.8)
-      net-http-persistent (>= 1.4)
-      rdf (>= 1.1)
-    sprockets (2.10.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    tzinfo (0.3.37)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 4.0)
-  appraisal
-  bundler
-  capybara
-  rake
-  rspec
-  togostanza!