iqvoc 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2d49b763b438c0af1ef7b6c84b7c703f0a7710
-  data.tar.gz: 6b33d6fef2694cb17b3896e6ec6dff382f95d63a
+  metadata.gz: fe748701f343a235ed146e497547f4669a07d2aa
+  data.tar.gz: a76fbd2601fc477dd0f0f7252f4761fe2c997259
 SHA512:
-  metadata.gz: eb47c5803045f513ed1568c3a7c86ef44f7dde8aba215d169442f3be32cb4c94bbc10db6471451f1195e91ad61713d37aa1a281ba613e20dcc549bc93096390d
-  data.tar.gz: 024a5aae4e2f017f1c78374ef5369e84aa3468cd09dfbec1ecd63c9bfcba3ef0cf0aa049e4b305c4947fe3c6b2cde97142de0b5498f9c8909ee262c2d8e71437
+  metadata.gz: 55ee8b2a162e067453c1763995cc1cd1e2f6b89b050a5d0eeaafe400c5b082bb96762cb05ff7641dc91a6c99842af0af91a806df9459a7179ae02926b6acd427
+  data.tar.gz: d5febd044f1da68dcf60dac66c617808cd742ac05a43d206a3b88d2b693de25bc955e080a86fe0cb60ab2aa091324f0d9feb9774f76c9b3e8582d7d782390f24

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [4.1.2]
+
+  * Dumped Jbuilder (introduced in 4.1.1) to fix endless recursions happening in hierarchical views
+
 ## [4.1.1]
 
   * Removed duplicate triples from RDF export

data/Gemfile

@@ -36,10 +36,8 @@ gem 'json'
 gem 'rails_autolink'
 gem 'jruby-openssl', :platforms => :jruby
 gem 'simple_form'
-gem 'jbuilder'
 
 group :development do
-  gem 'heroku'
   gem 'view_marker'
   gem 'better_errors'
   gem 'binding_of_caller', :platform => :ruby

data/Gemfile.lock

@@ -78,7 +78,6 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.0)
     erubis (2.7.0)
-    excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.1.0)
@@ -88,14 +87,6 @@ GEM
       railties (>= 3.0.0)
     ffi (1.1.5)
     ffi (1.1.5-java)
-    heroku (2.31.2)
-      heroku-api (~> 0.3.4)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.7)
-      rest-client (~> 1.6.1)
-      rubyzip
-    heroku-api (0.3.5)
-      excon (~> 0.16.1)
     hike (1.2.1)
     hirb (0.7.1)
     hirb-unicode (0.0.5)
@@ -106,9 +97,6 @@ GEM
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jbuilder (1.3.0)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
     jdbc-mysql (5.1.13)
     jdbc-sqlite3 (3.7.2)
     journey (1.0.4)
@@ -119,12 +107,6 @@ GEM
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    launchy (2.1.2)
-      addressable (~> 2.3)
-    launchy (2.1.2-java)
-      addressable (~> 2.3)
-      ffi (~> 1.1.1)
-      spoon (~> 0.0.1)
     libv8 (3.3.10.4)
     mail (2.5.3)
       i18n (>= 0.4.0)
@@ -135,7 +117,6 @@ GEM
     minitest (3.4.0)
     multi_json (1.7.2)
     mysql2 (0.3.11)
-    netrc (0.7.7)
     nokogiri (1.5.6)
     nokogiri (1.5.6-java)
     parallel (0.6.4)
@@ -180,8 +161,6 @@ GEM
     rake (10.0.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
     rubyzip (0.9.9)
     sass (3.2.1)
     sass-rails (3.2.5)
@@ -197,7 +176,6 @@ GEM
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     slop (3.3.3)
-    spoon (0.0.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -247,11 +225,9 @@ DEPENDENCIES
   capybara-webkit (~> 0.14.2)
   database_cleaner
   factory_girl_rails
-  heroku
   hirb-unicode
   iq_rdf
   iq_triplestorage
-  jbuilder
   jruby-openssl
   json
   kaminari

data/README.md

@@ -26,17 +26,16 @@ iQvoc is built with state-of-the-art technology and can be easily customized acc
 ### Heroku
 
 You can easily setup your iQvoc instance in under 5 minutes, we wanted to make this process really easy.
-
-To run iQvoc on heroku do the following:
+In order to deploy to heroku you need to have an account and [heroku toolbelt](https://toolbelt.heroku.com) installed.
 
 ```
-bundle install
-bundle exec heroku create
-bundle exec rake heroku:config
-git push heroku master
-bundle exec heroku run rake db:migrate
-bundle exec heroku run rake db:seed
-bundle exec heroku restart
+$ bundle install
+$ heroku create
+$ bundle exec rake heroku:config
+$ git push heroku master
+$ heroku run rake db:migrate
+$ heroku run rake db:seed
+$ heroku restart
 ```
 
 `heroku open` opens your app in the browser.

data/app/controllers/concepts/hierarchical_controller.rb

@@ -54,7 +54,18 @@ class Concepts::HierarchicalController < ConceptsController
 
     respond_to do |format|
       format.html
-      format.json # Treeview data
+      format.json do # Treeview data
+        concepts = @concepts.select {|c| can? :read, c }.map do |c|
+          {
+            :id   => c.id,
+            :url  => concept_path(:id => c, :format => :html),
+            :text => CGI.escapeHTML(c.pref_label.to_s),
+            :hasChildren => (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
+            :additionalText => (" (#{c.additional_info})" if c.additional_info.present?)
+          }
+        end
+        render :json => concepts
+      end
     end
   end
 

data/iqvoc.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'simple_form'
   s.add_dependency 'sass-rails', '~> 3.2.5'
   s.add_dependency 'iq_triplestorage'
-  s.add_dependency 'jbuilder'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
     Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Robert Glaser
@@ -166,20 +166,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  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'
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -319,7 +305,6 @@ files:
 - app/views/concepts/expired/index.html.erb
 - app/views/concepts/hierarchical/_treeview.html.erb
 - app/views/concepts/hierarchical/index.html.erb
-- app/views/concepts/hierarchical/index.json.jbuilder
 - app/views/concepts/index.iqrdf
 - app/views/concepts/new.html.erb
 - app/views/concepts/notifications/_referenced_concepts.html.erb

data/app/views/concepts/hierarchical/index.json.jbuilder

@@ -1,15 +0,0 @@
-json.array! @concepts.select { |c| can? :read, c } do |concept|
-  json.id concept.id
-  json.url concept_path(:id => concept, :format => :html)
-  json.text CGI.escapeHTML(concept.pref_label.to_s)
-
-  if params[:broader]
-    json.hasChildren concept.broader_relations.any?
-  else
-    json.hasChildren concept.narrower_relations.any?
-  end
-
-  if concept.additional_info.present?
-    json.additionalText " (#{concept.additional_info})"
-  end
-end