sort_order 0.1.1 → 0.1.2

data/features/sort_order.feature

@@ -10,6 +10,9 @@ Scenario: Sort Order
   When I output the columns as sql (current only)
   Then I should get the following string: users.first_name ASC
 
+  When I output the columns as sql (current only without table)
+  Then I should get the following string: first_name ASC
+
   When I output each as a parameter
   Then I should get the following list: first_name 1, last_name 1, email 0
 

data/features/step_definitions/sort_order_steps.rb

@@ -12,7 +12,9 @@ When /^I output (.+) as (.+)$/ do |item, format|
   when ['the columns', 'sql']
     @sort_order.to_sql
   when ['the columns', 'sql (current only)']
-    @sort_order.to_sql(:current => true)    
+    @sort_order.to_sql(:current => true)   
+  when ['the columns', 'sql (current only without table)']
+    @sort_order.to_sql(:current => true, :table => false)
   when ['the columns', 'parameters']
     @sort_order.to_params
   when ['the columns', 'parameters (current only)']

data/lib/sort_order.rb

@@ -1,5 +1,5 @@
 module SortOrder
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   def self.new *cols
     Columns.new *cols

data/lib/sort_order/column.rb

@@ -20,7 +20,7 @@ module SortOrder
     end
   
     def to_sql(options = {})
-      "#{field} #{direction.to_sql(options[:flip])}"
+      "#{options[:table] == false ? field.name : field } #{direction.to_sql(options[:flip])}"
     end
 
     def to_param(options = {})

data/lib/sort_order/columns.rb

@@ -18,8 +18,8 @@ module SortOrder
       @current ||= first
     end
 
-    def current=(token)
-      @current = merge(token)
+    def current=(token=nil)
+      @current = merge(token) if token.present?
     end
   
     def current?(other)
@@ -44,9 +44,6 @@ module SortOrder
       if old_col = find(new_col.name)
         old_col.direction = new_col.direction
         return old_col
-      else
-        self << new_col
-        return new_col
       end
     end
 

data/lib/sort_order/view_helper.rb

@@ -6,7 +6,7 @@ module SortOrder
       column = sort_order.find(name.to_s)
       column = sort_order.current if sort_order.current?(column)
       label ||= column.label
-      link_to label, {:order => column.to_param(:flip => true)}
+      link_to label, {:order => column.to_param(:flip => true)}, :rel => column.to_param(:flip => true), :class => "flip-column flip-column-#{column.direction.to_param(true)}"
     end
 
   end

data/sort_order.gemspec

@@ -0,0 +1,81 @@
+## This is the rakegem gemspec template. Make sure you read and understand
+## all of the comments. Some sections require modification, and others can
+## be deleted if you don't need them. Once you understand the contents of
+## this file, feel free to delete any comments that begin with two hash marks.
+## You can find comprehensive Gem::Specification documentation, at
+## http://docs.rubygems.org/read/chapter/20
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'sort_order'
+  s.version           = '0.1.2'
+  s.date              = '2010-05-24'
+  s.rubyforge_project = 'sort_order'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "Manipulate column sort orders."
+  s.description = "Manipulate column sort orders..."
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["Alex Neill"]
+  s.email    = 'alex@rawnet.com'
+  # s.homepage = 'http://rawnet.github.com/sort_order'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## This sections is only necessary if you have C extensions.
+  # s.require_paths << 'ext'
+  # s.extensions = %w[ext/extconf.rb]
+
+  ## If your gem includes any executables, list them here.
+  # s.executables = ["name"]
+  # s.default_executable = 'name'
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
+  # s.rdoc_options = ["--charset=UTF-8"]
+  # s.extra_rdoc_files = %w[README LICENSE]
+
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  # s.add_dependency('DEPNAME', [">= 1.1.0", "< 2.0.0"])
+
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  # s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
+
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    features/sort_order.feature
+    features/step_definitions/sort_order_steps.rb
+    features/support/env.rb
+    init.rb
+    lib/sort_order.rb
+    lib/sort_order/column.rb
+    lib/sort_order/column/direction.rb
+    lib/sort_order/column/field.rb
+    lib/sort_order/columns.rb
+    lib/sort_order/controller_helper.rb
+    lib/sort_order/view_helper.rb
+    rails/init.rb
+    sort_order.gemspec
+  ]
+  # = MANIFEST =
+
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  # s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alex Neill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +01:00
+date: 2010-05-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/sort_order/controller_helper.rb
 - lib/sort_order/view_helper.rb
 - rails/init.rb
+- sort_order.gemspec
 has_rdoc: true
 homepage: 
 licenses: []