iqvoc 4.3.3 → 4.4.0

data/lib/iqvoc/configuration/label.rb

@@ -17,7 +17,6 @@ module Iqvoc
           base_class_name.constantize
         end
       end
-
     end
   end
 end

data/lib/iqvoc/configuration/sync.rb

@@ -10,10 +10,10 @@ module Iqvoc
         self.syncable_class_names = [Iqvoc::Concept.base_class_name]
 
         Iqvoc.config.register_settings({
-          "triplestore.url" => "http://example.org:8080",
-          "triplestore.username" => "",
-          "triplestore.password" => "",
-          "triplestore.autosync" => false
+          'triplestore.url' => 'http://example.org:8080',
+          'triplestore.username' => '',
+          'triplestore.password' => '',
+          'triplestore.autosync' => false
         })
       end
 
@@ -22,7 +22,6 @@ module Iqvoc
           self.syncable_class_names.map { |name| name.constantize }
         end
       end
-
     end
   end
 end

data/lib/iqvoc/controller_extensions.rb

@@ -5,20 +5,20 @@ module Iqvoc
     extend ActiveSupport::Concern
 
     included do
-      prepend_before_filter :set_locale
-      before_filter :ensure_extension
+      prepend_before_action :set_locale
+      before_action :ensure_extension
 
       helper :all
       helper_method :current_user_session, :current_user, :concept_widget_data, :collection_widget_data, :label_widget_data
 
-      rescue_from ActiveRecord::RecordNotFound, :with => :handle_not_found
-      rescue_from CanCan::AccessDenied, :with => :handle_access_denied
+      rescue_from ActiveRecord::RecordNotFound, with: :handle_not_found
+      rescue_from CanCan::AccessDenied, with: :handle_access_denied
     end
 
     protected
 
     def default_url_options(options = nil)
-      { :format => params[:format], :lang => I18n.locale }.
+      { format: params[:format], lang: I18n.locale }.
         merge(options || {})
     end
 
@@ -26,7 +26,7 @@ module Iqvoc
     def ensure_extension
       unless params[:format] || !request.get?
         flash.keep
-        redirect_to url_for(params.merge(:format => (request.format && request.format.symbol) || :html))
+        redirect_to url_for(params.merge(format: (request.format && request.format.symbol) || :html))
       end
     end
 
@@ -36,7 +36,7 @@ module Iqvoc
       @user_session = UserSession.new if @status == 401
       @return_url = request.fullpath
       respond_to do |format|
-        format.html { render :template => 'errors/access_denied', :status => @status }
+        format.html { render template: 'errors/access_denied', status: @status }
         format.any  { head @status }
       end
     end
@@ -46,7 +46,7 @@ module Iqvoc
       SearchResultsController.prepare_basic_variables(self)
 
       respond_to do |format|
-        format.html { render :template => 'errors/not_found', :status => 404 }
+        format.html { render template: 'errors/not_found', status: 404 }
         format.any  { head 404 }
       end
     end
@@ -61,8 +61,8 @@ module Iqvoc
 
     def concept_widget_data(concept, rank = nil)
       data = {
-        :id => concept.origin,
-        :name => (concept.pref_label && concept.pref_label.value.presence || ":#{concept.origin}") + (concept.additional_info ? " (#{concept.additional_info })" : "")
+        id: concept.origin,
+        name: (concept.pref_label && concept.pref_label.value.presence || ":#{concept.origin}") + (concept.additional_info ? " (#{concept.additional_info })" : '')
       }
       data[:rank] = rank if rank
       data
@@ -70,15 +70,15 @@ module Iqvoc
 
     def collection_widget_data(collection)
       {
-        :id => collection.origin,
-        :name => collection.pref_label.to_s
+        id: collection.origin,
+        name: collection.pref_label.to_s
       }
     end
 
     def label_widget_data(label)
       {
-        :id => label.origin,
-        :name => label.value
+        id: label.origin,
+        name: label.value
       }
     end
 
@@ -98,6 +98,5 @@ module Iqvoc
     def with_layout?
       !params[:layout]
     end
-
   end
 end

data/lib/iqvoc/deep_cloning.rb

@@ -16,7 +16,6 @@
 
 module Iqvoc
   module DeepCloning
-
     def self.included(base) #:nodoc:
       base.alias_method_chain :dup, :deep_cloning
     end
@@ -28,24 +27,24 @@ module Iqvoc
     # === Usage:
     #
     # ==== Cloning a model without an attribute
-    # pirate.clone :except => :name
+    # pirate.clone except: :name
     #
     # ==== Cloning a model without multiple attributes
-    # pirate.clone :except => [:name, :nick_name]
+    # pirate.clone except: [:name, :nick_name]
     # ==== Cloning one single association
-    # pirate.clone :include => :mateys
+    # pirate.clone include: :mateys
     #
     # ==== Cloning multiple associations
-    # pirate.clone :include => [:mateys, :treasures]
+    # pirate.clone include: [:mateys, :treasures]
     #
     # ==== Cloning really deep
-    # pirate.clone :include => {:treasures => :gold_pieces}
+    # pirate.clone include: {treasures: :gold_pieces}
     #
     # ==== Cloning really deep with multiple associations
-    # pirate.clone :include => [:mateys, {:treasures => :gold_pieces}]
+    # pirate.clone include: [:mateys, {treasures: :gold_pieces}]
     #
     # ==== Cloning multiple associations - but only the join table entries without cloning the associated objects themselves
-    # pirate.clone :include_association => [:matey_ids, :treasure_ids]
+    # pirate.clone include_association: [:matey_ids, :treasure_ids]
     #
     def dup_with_deep_cloning(options = {})
       kopy = dup_without_deep_cloning
@@ -68,7 +67,7 @@ module Iqvoc
             deep_associations = association[association.keys.first]
             association = association.keys.first
           end
-          opts = deep_associations.blank? ? {} : {:include => deep_associations}
+          opts = deep_associations.blank? ? {} : { include: deep_associations }
           association_reflection = self.class.reflect_on_association(association)
           cloned_object = case association_reflection.macro
           when :belongs_to, :has_one
@@ -87,6 +86,5 @@ module Iqvoc
 
       return kopy
     end
-
   end
 end

data/lib/iqvoc/environments/development.rb

@@ -2,7 +2,6 @@ require 'iqvoc'
 
 # inject template name
 class ActionView::TemplateRenderer
-
   def render_with_source_comment(context, options)
     res = render_without_source_comment(context, options)
     template = determine_template(options)
@@ -14,7 +13,6 @@ class ActionView::TemplateRenderer
     end
   end
   alias_method_chain :render, :source_comment
-
 end
 
 # inject partial name
@@ -33,7 +31,6 @@ class ActionView::PartialRenderer
 end
 
 module Iqvoc::Environments
-
   def self.setup_development(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
@@ -63,11 +60,14 @@ module Iqvoc::Environments
     # number of complex assets.
     config.assets.debug = true
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-  end
+    # Adds additional error checking when serving assets at runtime.
+    # Checks for improperly declared sprockets dependencies.
+    # Raises helpful error messages.
+    config.assets.raise_runtime_errors = true
+
+    # Raises error for missing translations
+    # config.action_view.raise_on_missing_translations = true
 
+    config.i18n.enforce_available_locales = true
+  end
 end

data/lib/iqvoc/environments/production.rb

@@ -1,7 +1,6 @@
 require 'iqvoc'
 
 module Iqvoc::Environments
-
   def self.setup_production(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
@@ -61,10 +60,6 @@ module Iqvoc::Environments
     # Enable serving of images, stylesheets, and JavaScripts from an asset server.
     # config.action_controller.asset_host = "http://assets.example.com"
 
-    # Precompile additional assets.
-    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-    config.assets.precompile += Iqvoc.core_assets
-
     # Ignore bad email addresses and do not raise email delivery errors.
     # Set this to true and configure the email server for immediate delivery to raise delivery errors.
     # config.action_mailer.raise_delivery_errors = false
@@ -82,11 +77,9 @@ module Iqvoc::Environments
     # Use default logging formatter so that PID and timestamp are not suppressed.
     config.log_formatter = ::Logger::Formatter.new
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-  end
+    # Do not dump schema after migrations.
+    config.active_record.dump_schema_after_migration = false
 
+    config.i18n.enforce_available_locales = true
+  end
 end

data/lib/iqvoc/environments/test.rb

@@ -1,7 +1,6 @@
 require 'iqvoc'
 
 module Iqvoc::Environments
-
   def self.setup_test(config)
     # Settings specified here will take precedence over those in config/application.rb.
 
@@ -18,7 +17,7 @@ module Iqvoc::Environments
 
     # Configure static asset server for tests with Cache-Control for performance.
     config.serve_static_assets  = true
-    config.static_cache_control = "public, max-age=3600"
+    config.static_cache_control = 'public, max-age=3600'
 
     # Show full error reports and disable caching.
     config.consider_all_requests_local       = true
@@ -38,11 +37,6 @@ module Iqvoc::Environments
     # Print deprecation notices to the stderr.
     config.active_support.deprecation = :stderr
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
+    config.i18n.enforce_available_locales = true
   end
-
 end

data/lib/iqvoc/inline_data_helper.rb

@@ -18,14 +18,13 @@ require 'csv'
 
 module Iqvoc
   module InlineDataHelper
-
     # delimiters for strings representing a list of values - XXX: lacks encapsulation
-    JOINER = ", "
+    JOINER = ', '
     SPLITTER = /[,\n] */
 
     CSV_OPTIONS = {
-      :col_sep => ", ",
-      :quote_char => '"'
+      col_sep: ', ',
+      quote_char: '"'
     }
 
     def self.parse_inline_values(inline_values)
@@ -42,6 +41,5 @@ module Iqvoc
     def self.generate_inline_values(values)
       values.to_csv(CSV_OPTIONS).strip
     end
-
   end
 end

data/lib/iqvoc/instance_configuration.rb

@@ -17,7 +17,6 @@
 require 'singleton'
 
 module Iqvoc
-
   # provides the interface to configuration settings
   class InstanceConfiguration
     include Singleton
@@ -26,7 +25,7 @@ module Iqvoc
 
     class UnregisteredSetting < ArgumentError
       def to_s
-        "A setting needs to be registered with register_setting before it can be used."
+        'A setting needs to be registered with register_setting before it can be used.'
       end
     end
 
@@ -80,9 +79,9 @@ module Iqvoc
 
       json = JSON.dump([value])[1..-2] # temporary array wrapper ensures valid JSON text
       if setting = ConfigurationSetting.find_by_key(key)
-        setting.update_attributes(:value => json)
+        setting.update_attributes(value: json)
       else
-        ConfigurationSetting.create(:key => key, :value => json)
+        ConfigurationSetting.create(key: key, value: json)
       end
 
       # update cache
@@ -114,13 +113,11 @@ module Iqvoc
     # checks whether value type is supported
     def self.validate_value(value) # TODO: compare type to default's? (cf. controller)
       if value == nil
-        raise TypeError, "nil values not supported"
+        raise TypeError, 'nil values not supported'
       end
       unless [TrueClass, FalseClass, String, Fixnum, Float, Array].include?(value.class)
-        raise TypeError, "complex values not supported"
+        raise TypeError, 'complex values not supported'
       end
     end
-
   end
-
 end

data/lib/iqvoc/maker.rb

@@ -1,6 +1,5 @@
 module Iqvoc
   module Maker
-
     # labels:
     # -
     #   value: <string>
@@ -27,31 +26,31 @@ module Iqvoc
       data = YAML.load(yml)
 
       labels = {}
-      data["labels"].each { |label| # XXX: use omap to simplify format (making `value` the key instead of an attribute)?
-        term = label.delete("value")
+      data['labels'].each { |label| # XXX: use omap to simplify format (making `value` the key instead of an attribute)?
+        term = label.delete('value')
 
-        components = label.delete("components").map { |term|
+        components = label.delete('components').map { |term|
           labels[term]
-        } if label["components"]
+        } if label['components']
 
         options = {
-          :inflectionals => label.delete("inflectionals"),
-          :components => components,
-          :label_attributes => label
+          inflectionals: label.delete('inflectionals'),
+          components: components,
+          label_attributes: label
         }
 
         labels[term] = self.label(term, options)
-      } if data["labels"]
+      } if data['labels']
 
       concepts = {}
-      data["concepts"].each { |concept| # XXX: use omap to simplify format (using a single pref_label as key)?
+      data['concepts'].each { |concept| # XXX: use omap to simplify format (using a single pref_label as key)?
         relations = {}
-        ["broader", "narrower"].each { |type| # TODO: missing related, support for poly-hierarchies
+        ['broader', 'narrower'].each { |type| # TODO: missing related, support for poly-hierarchies
           relations[type] = concepts[concept.delete(type)] if concept[type]
         }
 
         lbls = {} # TODO: rename
-        ["pref", "alt"].each { |type| # TODO: missing hidden
+        ['pref', 'alt'].each { |type| # TODO: missing hidden
           key = "#{type}_labels"
           lbls[type] = concept.delete(key).map { |term|
             labels[term]
@@ -59,20 +58,20 @@ module Iqvoc
         }
 
         options = {
-          :pref_labels => lbls["pref"],
-          :alt_labels => lbls["alt"],
-          :concept_attributes => concept
+          pref_labels: lbls['pref'],
+          alt_labels: lbls['alt'],
+          concept_attributes: concept
         }
 
         identifier = options[:pref_labels].first.value
         concepts[identifier] = self.concept(options)
         concepts[identifier].send(Iqvoc::Concept.broader_relation_class.name.to_relation_name).
-            create_with_reverse_relation(relations["broader"]) if relations["broader"]
+            create_with_reverse_relation(relations['broader']) if relations['broader']
         concepts[identifier].send(Iqvoc::Concept.broader_relation_class.narrower_class.name.to_relation_name).
-            create_with_reverse_relation(relations["narrower"]) if relations["narrower"]
-      } if data["concepts"]
+            create_with_reverse_relation(relations['narrower']) if relations['narrower']
+      } if data['concepts']
 
-      return { :concepts => concepts, :labels => labels }
+      return { concepts: concepts, labels: labels }
     end
 
     # optional arguments:
@@ -85,7 +84,7 @@ module Iqvoc
       alt_labels = options[:alt_labels] || []
 
       defaults = { # NB: must use strings, not symbols as keys due to YAML
-        "published_at" => 3.days.ago
+        'published_at' => 3.days.ago
       }
       attributes = defaults.merge(attributes)
 
@@ -94,12 +93,12 @@ module Iqvoc
       pref_labels.each { |term|
         label = term.is_a?(String) ? self.label(term) : term
         Iqvoc::Concept.pref_labeling_class.
-            create!(:owner => concept, :target => label)
+            create!(owner: concept, target: label)
       }
       alt_labels.each { |term|
         label = term.is_a?(String) ? self.label(term) : term
         Iqvoc::Concept.further_labeling_classes.first.first.
-            create!(:owner => concept, :target => label)
+            create!(owner: concept, target: label)
       }
 
       return concept
@@ -115,10 +114,10 @@ module Iqvoc
       components = options[:components] || []
 
       defaults = { # NB: must use strings, not symbols as keys due to YAML
-        :value => value, # intentionally not a string; symbol takes precedence
-        "origin" => Iqvoc::Origin.new(value).to_s,
-        "language" => Iqvoc::Concept.pref_labeling_languages.first,
-        "published_at" => 2.days.ago
+        value: value, # intentionally not a string; symbol takes precedence
+        'origin' => Iqvoc::Origin.new(value).to_s,
+        'language' => Iqvoc::Concept.pref_labeling_languages.first,
+        'published_at' => 2.days.ago
       }
       attributes = defaults.merge(attributes)
 
@@ -126,18 +125,17 @@ module Iqvoc
       label = klass.base_class.create!(attributes)
 
       inflectionals.each { |inf|
-        label.inflectionals.create!(:value => inf)
+        label.inflectionals.create!(value: inf)
       }
 
       if components.length > 0
         compound_form_contents = components.each_with_index.map { |label, i|
-          CompoundForm::Content::Base.new(:label => label, :order => i)
+          CompoundForm::Content::Base.new(label: label, order: i)
         }
-        label.compound_forms.create!(:compound_form_contents => compound_form_contents)
+        label.compound_forms.create!(compound_form_contents: compound_form_contents)
       end
 
       return label
     end
-
   end
 end