neuron 0.0.9 → 0.0.10

data/lib/neuron/resources.rb

@@ -20,6 +20,8 @@ module Neuron
       module ClassMethods
         def resources(options = {})
           options = Neuron::Resources.default_options.merge(options)
+          options[:order] = {}    if options[:order] == true
+          options[:paginate] = {} if options[:paginate] == true
 
           unless respond_to?(:resource_options)
             class_attribute :resource_options
@@ -30,15 +32,11 @@ module Neuron
           inherit_resources
           append_neuron_view_path_resolver
 
-          if options[:order] == true
-            order_scopes
-          elsif options[:order]
+          if options[:order]
             order_scopes(options[:order])
           end
 
-          if options[:paginate] == true
-            paginate_scope
-          elsif options[:paginate]
+          if options[:paginate]
             paginate_scope(options[:paginate])
           end
 
@@ -104,12 +102,14 @@ module Neuron
         options[:class] ||= resource_class
         options[:by] = options[:by].to_sym
         options[:as] ||= human(options[:class], options[:by])
-        html_options[:title] ||= 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
+        html_options[:title] ||= human(options[:class], options[:by])
+        html_options['data-order-by'] = options[:by]
+        html_options['data-order-direction']    = new_scope
         url_options = {page: params[:page]}
         url_options[new_scope] = [options[:by]]
 

data/lib/neuron/version.rb

@@ -1,3 +1,3 @@
 module Neuron
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/neuron/view.rb

@@ -52,6 +52,19 @@ module Neuron
       canonical_url(resource, options.merge(routing_type: :path))
     end
 
+    def canonical_link(resource = nil, options = {})
+      href = case resource
+             when Hash
+               url_for(resource)
+             when NilClass
+               request.request_uri.split('?').first
+             else
+               canonical_url(resource, options)
+             end
+      href = "#{request.protocol}#{request.host_with_port}#{href}" unless href =~ /^\w+:\/\//
+      tag(:link, rel: 'canonical', href: href)
+    end
+
     def view_name
       {create: 'new', update: 'edit'}[action_name] || action_name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neuron
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-19 00:00:00.000000000Z
+date: 2011-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &87579960 !ruby/object:Gem::Requirement
+  requirement: &81592100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87579960
+  version_requirements: *81592100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &87579580 !ruby/object:Gem::Requirement
+  requirement: &81591240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87579580
+  version_requirements: *81591240
 description: Code reused in many applications
 email:
 - al@semyonov.us
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -924094847
+      hash: 180076915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -924094847
+      hash: 180076915
 requirements: []
 rubyforge_project: neuron
 rubygems_version: 1.8.5