neuron 0.0.3 → 0.0.4

data/lib/neuron/navigation.rb

@@ -23,7 +23,8 @@ module Neuron
       end
 
       def page_title(title = nil, options = {})
-        options = {default: navigation_title}.merge(default_options).merge(options)
+        options = default_options.merge(options)
+        options = options.merge(default: navigation_title(title, options))
         @page_title ||= title || view.t('.title', options)
       end
 
@@ -49,7 +50,7 @@ module Neuron
       # @param [String, nil] title title to set
       # @param [Hash] options options to {I18n#translate} if building default title
       def page_title(title = nil, options = {})
-        neuron_title.page_title(title, options)
+        neuron_title.page_title(title, options).html_safe
       end
 
       def navigation_title(title = nil, options = {})

data/lib/neuron/resources.rb

@@ -43,34 +43,33 @@ module Neuron
       # @param [Hash] html_options html options hash
       # @option options [Symbol, String] :by the name of the columnt to sort by
       # @option options [String] :as the text used in link, defaults to human_method_name of :by
-      # @option options [String] :params hash with additional params which will be added to generated url
+      # @option options [String] :url url options when order link does not correspond to current collection_path
       def order(options = {}, html_options = {})
+        options[:class] ||= resource_class
         options[:by] = options[:by].to_sym
-        options[:as] ||= human(resource_class, options[:by])
+        options[:as] ||= human(options[:class], options[:by])
         asc_orders  = Array(params[:ascending]).map(&:to_sym)
         desc_orders = Array(params[:descending]).map(&:to_sym)
         ascending = asc_orders.include?(options[:by])
         selected  = ascending || desc_orders.include?(options[:by])
         new_scope = ascending ? :descending : :ascending
-        url_options = params.dup.merge(ascending: asc_orders, descending: desc_orders)
+        url_options = {page: params[:page]}
+        url_options[new_scope] = [options[:by]]
 
         if selected
           css_classes = html_options[:class] ? html_options[:class].split(/\s+/) : []
           if ascending # selected
             options[:as] = "▲ #{options[:as]}"
             css_classes << 'ascending'
-            url_options[:ascending] = url_options[:ascending] - [options[:by]]
           else # descending selected
             options[:as] = "&#9660;&nbsp;#{options[:as]}"
             css_classes << 'descending'
-            url_options[:descending] = url_options[:descending] - [options[:by]]
           end
           html_options[:class] = css_classes.join(' ')
         end
-        url_options[new_scope] += [options[:by]]
-        url_options[:ascending] = url_options[:ascending].uniq
-        url_options[:descending] = url_options[:descending].uniq
-        link_to(options[:as].html_safe, collection_path(url_options.deep_merge(options[:params] || {})), html_options)
+        url = options[:url] ? url_for(options[:url].merge(url_options)) : collection_path(url_options)
+
+        link_to(options[:as].html_safe, url, html_options)
       end
 
       def collection_title(collection = nil, tag = :h1)
@@ -113,7 +112,9 @@ module Neuron
               result << if collection.any?
                           collection_list(collection)
                         else
-                          content_tag(:p, t(:no_entries, :scope => [:resources, :collection, :no_entries], :default => [controller_i18n_scope.to_sym, :all]))
+                          content_tag(:p, t(:no_entries,
+                                            scope: [:resources, :collection, :no_entries],
+                                            default: [controller_i18n_scope.to_sym, :all]))
                         end
             end
           end
@@ -124,9 +125,9 @@ module Neuron
         resource ||= self.resource
         action = action_name.to_sym
         ''.html_safe.tap do |result|
-          result << title(t("navigation.#{controller_i18n_scope}.#{action}",
-                            resource: link_to(resource, canonical_path(resource)),
-                            default: resource.to_s).html_safe)
+          result << title(nil,
+                          resource: link_to(resource, canonical_path(resource)),
+                          default:  resource.to_s)
           if (action == :show) && can?(:update, resource)
             result << content_tag(:sup,
               link_to(t(:edit,

data/lib/neuron/version.rb

@@ -1,3 +1,3 @@
 module Neuron
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neuron
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: