elskwid-munger 0.1.4.4 → 0.1.4.5

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 # Gem::manage_gems
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 spec = eval(File.new('munger.gemspec','r').read)
 
@@ -15,20 +15,13 @@ task :default => "pkg/#{spec.name}-#{spec.version}.gem" do
 end
 
 desc 'Run specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--format', 'specdoc', '--colour', '--diff']
-end
+RSpec::Core::RakeTask.new
 
 desc 'Generate coverage reports'
-Spec::Rake::SpecTask.new('spec:coverage') do |t|
+RSpec::Core::RakeTask.new('spec:coverage') do |t|
   t.rcov = true
 end
 
-desc 'Generate a nice HTML report of spec results'
-Spec::Rake::SpecTask.new('spec:report') do |t|
-  t.spec_opts = ['--format', 'html:report.html', '--diff']
-end
-
 task :doc => [:rdoc]
 namespace :doc do
   Rake::RDocTask.new do |rdoc|

data/lib/munger/render/sortable_html.rb

@@ -36,15 +36,18 @@ module Munger  #:nodoc:
               @report.columns.each do |column|
                 # TODO: Should be able to see if a column is 'sortable'
                 # Assume all columns are sortable here - for now.
-                sorted_state = 'unsorted'
-                direction = 'asc'
+                state = 'unsorted'
+                order = 'desc'
+                direction_class = ""
+
                 if [column.to_s, @report.column_data_field(column)].include?(@options[:sort])
-                  sorted_state = "sorted"
-                  direction = @options[:order] == 'asc' ? 'desc' : 'asc'
-                  direction_class = "sorted-#{direction}"
+                  state = "sorted"
+                  order = @options[:order] || 'asc'
+                  direction_class = "sorted-#{order}"
                 end
-                new_params = @options[:params].merge({'sort' => @report.column_data_field(column),'order' => direction})
-                x.th(:class => "columnTitle #{sorted_state} #{direction_class}" ) do 
+
+                new_params = @options[:params].merge({'sort' => @report.column_data_field(column),'order' => (order == 'asc' ? 'desc' : 'asc')})
+                x.th(:class => "columnTitle #{state} #{direction_class}") do 
                    # x << @report.column_title(column) 
                    x << "<a href=\"#{@options[:url]}?#{create_querystring(new_params)}\">#{@report.column_title(column)}</a>"
                  end

data/munger.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.platform  =  Gem::Platform::RUBY
     s.name      =  "elskwid-munger"
-    s.version   =  "0.1.4.4"
+    s.version   =  "0.1.4.5"
     s.authors   =  ['Scott Chacon', 'Brandon Mitchell', 'Don Morrison', 'Eric Lindvall']
     s.email     =  "elskwid@gmail.com"
     s.summary   =  "A reporting engine in Ruby - the elskwid fork!"

data/spec/munger/data_spec.rb

@@ -166,7 +166,7 @@ describe Munger::Data do
     array = @data.to_a([:name, :age])
     array.should be_a_kind_of(Array)
     array.first.size.should eql(2)
-    scotts = array.select { |a| a.include? ('Scott') }
+    scotts = array.select { |a| a.include?('Scott') }
     scotts.first.should include('Scott', 23)
   end
   

data/spec/munger/render_spec.rb

@@ -13,6 +13,16 @@ describe Munger::Render do
     html.should have_tag('table')
   end
   
+  it "should render sortable html" do
+    html = Munger::Render.to_sortable_html(@report, :sort => "name", :order => "asc", :url => "test")
+    html.should have_tag("table")
+    html.should have_tag("th.unsorted")
+    html.should have_tag("th.sorted")
+    html.should have_tag("th.sorted-asc")
+    html.should have_tag('a[@href="test?order=asc&sort=score"', /score/)
+    html.should have_tag('a[@href="test?order=desc&sort=name"', /name/)
+  end
+
   it "should render text" do
     text = Munger::Render.to_text(@report)
     text.should_not have_tag('table')
@@ -25,4 +35,4 @@ describe Munger::Render do
 
   it "should render pdf"
   
-end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/munger")
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'fileutils'
 require 'logger'
 require 'pp'
 require 'date'
 
-require 'rspec_hpricot_matchers'
-Spec::Runner.configure do |config|
-  config.include(RspecHpricotMatchers)
+require 'rspec-hpricot-matchers'
+RSpec.configure do |config|
+  config.include(HpricotSpec::Matchers)
 end
 
 module MungerSpecHelper

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: elskwid-munger
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 93
+  prerelease: 
   segments: 
   - 0
   - 1
   - 4
-  - 4
-  version: 0.1.4.4
+  - 5
+  version: 0.1.4.5
 platform: ruby
 authors: 
 - Scott Chacon
@@ -18,8 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -07:00
-default_executable: 
+date: 2012-01-08 00:00:00 Z
 dependencies: []
 
 description: 
@@ -57,7 +57,6 @@ files:
 - spec/munger/render/csv_spec.rb
 - spec/munger/render/html_spec.rb
 - spec/munger/render/text_spec.rb
-has_rdoc: true
 homepage: http://github.com/elskwid/munger
 licenses: []
 
@@ -67,23 +66,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A reporting engine in Ruby - the elskwid fork!