togostanza 1.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cebb5d9a634d56c3ccfee2e9566cce3446d13c0
-  data.tar.gz: 5871e598ffd60ae73012ea2c0df2cb6a8dbe0027
+  metadata.gz: a3a84fadcce286880cf1905ef4ba2468e9ab0838
+  data.tar.gz: 20df3090d324e8a82b9aafb556eb6cd9b0844e6f
 SHA512:
-  metadata.gz: 9eb67b26e503a04f8e064689ba248ca84cc5cf3bd9a69fbb5ae2a27d0bfddeba220d386e5041ba692ca326ad058c4da40cdc152de0917d54cebef5ea3ef55310
-  data.tar.gz: 1b066ab9948b46112481517e2e221b2deee2a8937490cd2c7fe17659e80ddf511c2c9e5c70ff0f53a9be2658e7daef781af0ad41c96d6a612d4c8422b733b3c3
+  metadata.gz: 671db4dce5c8235e401c5e0b40014f5eafb3172133a729d05ca2a80197c2332f3a90dfc4456eb4801048031762d539d21ddb2ad2ed0261cd76dd9aa0384306e0
+  data.tar.gz: 34f60db878f722079c567fe7f510829ba226dfac48dd3359694d579638b2a6fe3ae10db9f63eab5af0e1e52b14a9c33edca53f90475fe6a17f2e5a066354115a

data/lib/togostanza/application.rb

@@ -21,6 +21,10 @@ module TogoStanza
       end
     end
 
+    before do
+      @server_url = request.url.gsub(request.path_info, '')
+    end
+
     get '/' do
       haml :index
     end
@@ -30,7 +34,7 @@ module TogoStanza
         "@context" => {
           stanza: "http://togostanza.org/resource/stanza#"
         },
-        "stanza:stanzas" => Stanza.all.map {|stanza| stanza.new.metadata }.compact
+        "stanza:stanzas" => Stanza.all.map {|stanza| stanza.new.metadata(@server_url) }.compact
       }
 
       json metadata
@@ -53,13 +57,13 @@ module TogoStanza
     get '/:id/help' do |id|
       stanza = Stanza.find(id).new
 
-      haml :help, locals: {stanza: stanza.metadata}
+      haml :help, locals: {stanza: stanza.metadata(@server_url)}
     end
 
     get '/:id/metadata.json' do |id|
       @stanza = Stanza.find(id).new
 
-      json @stanza.metadata
+      json @stanza.metadata(@server_url)
     end
   end
 end

data/lib/togostanza/stanza/base.rb

@@ -213,14 +213,40 @@ module TogoStanza::Stanza
       Tilt.new(path).render(context)
     end
 
-    def metadata
+    def metadata(server_url)
       path = File.join(root, 'metadata.json')
 
       if File.exist?(path)
-        JSON.load(open(path))
+        orig = JSON.load(open(path))
+        stanza_uri = "#{server_url}/#{orig['id']}"
+
+        usage_attrs = orig['parameter'].map {|hash|
+          "#{hash['key']}=\"#{hash['example']}\""
+        }.push("data-stanza=\"#{stanza_uri}\"").join(' ')
+
+        append_prefix_to_hash_keys(orig.merge(usage: "<div #{usage_attrs}></div>"), 'stanza').merge('@id' => stanza_uri)
       else
         nil
       end
     end
+
+    private
+
+    def append_prefix_to_hash_keys(hash, prefix)
+      hash.each_with_object({}) do |(key, value), new_hash|
+        new_hash["#{prefix}:#{key}"] = expand_values(value, prefix)
+      end
+    end
+
+    def expand_values(value, prefix)
+      case value
+      when Hash
+        append_prefix_to_hash_keys(value, prefix)
+      when Array
+        value.map {|v| expand_values(v, prefix) }
+      else
+        value
+      end
+    end
   end
 end

data/lib/togostanza/version.rb

@@ -1,3 +1,3 @@
 module TogoStanza
-  VERSION = '1.5.0'
+  VERSION = '2.0.0'
 end

data/spec/dummy/foo_stanza/metadata.json

@@ -1,24 +1,23 @@
 {
-  "@id": "http://togogenome.org/stanza/foo",
-  "stanza:label": "Foo Stanza",
-  "stanza:definition": "This is Foo Stanza.",
-  "stanza:parameter": [
-    { "stanza:key": "name",
-      "stanza:example": "alice",
-      "stanza:description": "Name",
-      "stanza:required": true
+  "id": "foo",
+  "label": "Foo Stanza",
+  "definition": "This is Foo Stanza.",
+  "parameter": [
+    { "key": "name",
+      "example": "alice",
+      "description": "Name",
+      "required": true
     }
   ],
-  "stanza:usage": "<div data-stanza=\"http://togogenome.org/stanza/foo\" data-stanza-name=\"alice\"></div>",
-  "stanza:type": "Stanza",
-  "stanza:context": "Gene",
-  "stanza:display": "Table",
-  "stanza:provider": "DBCLS",
-  "stanza:license": "CC-BY",
-  "stanza:author": "author name",
-  "stanza:address": "name@example.org",
-  "stanza:contributor": [ "Taro Stanza", "Hanako Stanza" ],
-  "stanza:version": "1",
-  "stanza:created": "2015-02-27",
-  "stanza:updated": "2015-02-27"
+  "type": "Stanza",
+  "context": "Gene",
+  "display": "Table",
+  "provider": "DBCLS",
+  "license": "CC-BY",
+  "author": "author name",
+  "address": "name@example.org",
+  "contributor": [ "Taro Stanza", "Hanako Stanza" ],
+  "version": "1",
+  "created": "2015-02-27",
+  "updated": "2015-02-27"
 }

data/spec/features/metadata_spec.rb

@@ -26,6 +26,7 @@ describe 'Metadata' do
       json = JSON.parse(page.body)
 
       json.should include('stanza:label' => 'Foo Stanza')
+      json.should include('@id' => "http://www.example.com/foo")
     end
   end
 end

data/templates/stanza/metadata.json.erb

@@ -1,18 +1,23 @@
 {
-  "@id": "http://togogenome.org/stanza/<%= stanza_id %>",
-  "stanza:label": "",
-  "stanza:definition": "",
-  "stanza:parameter": [
+  "id": "<%= stanza_id %>",
+  "label": "",
+  "definition": "",
+  "parameter": [
+    {
+      "key": "",
+      "example": "",
+      "description": "",
+      "required": true
+    }
   ],
-  "stanza:usage": "<div data-stanza=\"http://togogenome.org/stanza/<%= stanza_id %>\"></div>",
-  "stanza:type": "Stanza",
-  "stanza:context": "",
-  "stanza:display": "",
-  "stanza:provider": "provider of this stanza",
-  "stanza:license": "",
-  "stanza:author": "author name",
-  "stanza:address": "name@example.org",
-  "stanza:contributor": [],
-  "stanza:created": "<%= Date.today %>",
-  "stanza:updated": "<%= Date.today %>"
+  "type": "Stanza",
+  "context": "",
+  "display": "",
+  "provider": "provider of this stanza",
+  "license": "",
+  "author": "author name",
+  "address": "name@example.org",
+  "contributor": [],
+  "created": "<%= Date.today %>",
+  "updated": "<%= Date.today %>"
 }

data/togostanza.gemspec

@@ -27,12 +27,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'sprockets', '~> 3.4'
   spec.add_runtime_dependency 'thor', '~> 0.19'
 
-  spec.add_development_dependency 'appraisal', '~> 0'
-  spec.add_development_dependency 'bundler', '~> 0'
-  spec.add_development_dependency 'capybara', '~> 0'
-  spec.add_development_dependency 'rake', '~> 0'
-  spec.add_development_dependency 'rspec', '~> 0'
-  spec.add_development_dependency 'rspec-its', '~> 0'
+  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.required_ruby_version = '>= 1.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: togostanza
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Keita Urashima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,84 +156,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 description: 
 email:
 - ursm@esm.co.jp
@@ -351,3 +351,4 @@ test_files:
 - spec/lib/togostanza/stanza/base_spec.rb
 - spec/lib/togostanza/stanza/grouping_spec.rb
 - spec/spec_helper.rb
+has_rdoc: