sort_it_out 1.0.0 → 1.1.0

data/.gitignore

@@ -1,5 +1,4 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/.rvmrc

@@ -0,0 +1,2 @@
+rvm use ruby-1.8.7-p302@sort_it_out --create
+rvm info

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in sort_it_out.gemspec
+gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :version => 2, :all_on_start => true, :all_after_pass => false, :cli => '--color --format doc' do
+  watch( %r{^spec/.+_spec\.rb$} )
+  watch( %r{^lib/(.+)\.rb$} )     { |m| "spec/#{m[1]}_spec.rb" }
+  watch( 'spec/spec_helper.rb' )  { "spec" }
+end

data/Rakefile

@@ -1,49 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "sort_it_out"
-    gem.summary = %Q{Easily apply sorting to your Rails controller actions.}
-    gem.description = %Q{Easily apply sorting to your Rails controller actions.}
-    gem.email = "jason@lookforwardenterprises.com"
-    gem.homepage = "http://github.com/midas/sort_it_out"
-    gem.authors = ["Jason Harrelson"]
-    gem.add_development_dependency "rspec"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "sort_it_out #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/lib/sort_it_out.rb

@@ -1,10 +1,12 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'sort_it_out/sortable.rb'
+require "sort_it_out/version"
+require 'sort_it_out/railtie' if /3\.\d+\.\d+.*/.match( Rails.version )
 
 module SortItOut
-  VERSION = '1.0.0'
+
+  autoload :Sortable, 'sort_it_out/sortable'
+
 end
 
-ActionController::Base.send( :include, SortItOut::Sortable ) if defined?( ActionController::Base )
+if /2\.\d+\.\d+.*/.match( Rails.version )
+  ActionController::Base.send( :include, SortItOut::Sortable ) if defined?( ActionController::Base )
+end

data/lib/sort_it_out/railtie.rb

@@ -0,0 +1,13 @@
+require 'rails'
+
+module SortItOut
+
+  class Railtie < ::Rails::Railtie
+
+    initializer "sort_it_out.initialize" do
+      ActionController::Base.send :include, SortItOut::Sortable
+    end
+
+  end
+
+end

data/lib/sort_it_out/sortable.rb

@@ -1,4 +1,5 @@
 module SortItOut
+
   module Sortable
 
     def self.included( base )
@@ -6,18 +7,21 @@ module SortItOut
     end
 
     module ActMethods
+
       def sortable( options={} )
         unless included_modules.include? InstanceMethods
           include InstanceMethods
           before_filter :resolve_sort
-          class_inheritable_accessor :options
+          class_attribute :options
         end
 
         self.options = options
       end
+
     end
 
     module InstanceMethods
+
       def resolve_sort
         order = params[:order]
         unless order
@@ -33,7 +37,7 @@ module SortItOut
         @order = order.nil? ? "" : resolve_order_clause( order, params[:direction] )
       end
 
-      protected
+    protected
 
       def resolve_order_clause( order, dir="ASC" )
         translated = self.options[:map][order.to_sym] unless self.options[:map].nil?
@@ -46,7 +50,9 @@ module SortItOut
           return "#{order.to_s} #{dir}"
         end
       end
+
     end
 
   end
-end
+
+end

data/lib/sort_it_out/version.rb

@@ -0,0 +1,3 @@
+module SortItOut
+  VERSION = "1.1.0"
+end

data/sort_it_out.gemspec

@@ -1,57 +1,35 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sort_it_out/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{sort_it_out}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jason Harrelson"]
-  s.date = %q{2010-09-30}
+  s.name        = "sort_it_out"
+  s.version     = SortItOut::VERSION
+  s.authors     = ["C. Jason Harrelson"]
+  s.email       = ["jason@lookforwardenterprises.com"]
+  s.homepage    = "https://github.com/midas/sort_it_out"
+  s.summary     = %q{Easily apply sorting to your Rails controller actions.}
   s.description = %q{Easily apply sorting to your Rails controller actions.}
-  s.email = %q{jason@lookforwardenterprises.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "Histroy.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/sort_it_out.rb",
-     "lib/sort_it_out/sortable.rb",
-     "script/console",
-     "sort_it_out.gemspec",
-     "spec/sort_it_out_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/midas/sort_it_out}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Easily apply sorting to your Rails controller actions.}
-  s.test_files = [
-    "spec/sort_it_out_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "sort_it_out"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
+  %w(
+    gem-dandy
+    rspec
+    ruby-debug
+    guard
+    rb-fsevent
+    growl
+    guard-rspec
+    rake
+  ).each do |development_dependency|
+    s.add_development_dependency development_dependency
   end
-end
 
+  # s.add_runtime_dependency "rest-client"
+end

data/spec/spec_helper.rb

@@ -1,9 +1,23 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'bundler/setup'
+
 require 'sort_it_out'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+
+  config.mock_with :rspec
+
+end
+
+class Hash
+
+  # for excluding keys
+  def except(*exclusions)
+    self.reject { |key, value| exclusions.include? key.to_sym }
+  end
+
+  # for overriding keys
+  def with(overrides = {})
+    self.merge overrides
+  end
+
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: sort_it_out
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
-- Jason Harrelson
+- C. Jason Harrelson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -05:00
+date: 2012-01-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: gem-dandy
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,36 +32,135 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rb-fsevent
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: growl
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: Easily apply sorting to your Rails controller actions.
-email: jason@lookforwardenterprises.com
+email: 
+- jason@lookforwardenterprises.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
-- Histroy.txt
+- .rvmrc
+- Gemfile
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/sort_it_out.rb
+- lib/sort_it_out/railtie.rb
 - lib/sort_it_out/sortable.rb
-- script/console
+- lib/sort_it_out/version.rb
 - sort_it_out.gemspec
-- spec/sort_it_out_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/midas/sort_it_out
+homepage: https://github.com/midas/sort_it_out
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,11 +183,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: sort_it_out
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Easily apply sorting to your Rails controller actions.
 test_files: 
-- spec/sort_it_out_spec.rb
 - spec/spec_helper.rb

data/Histroy.txt

@@ -1,19 +0,0 @@
-= 1.0.0 2010-09-30
-
-* Add default sort direction specification.
-
-
-= 0.9.2 2009-11-15
-
-* Added ability yo specify default sort as a string that is a SQL fragment.
-
-
-= 0.9.1 2009-11-15
-
-* Fixed bug when there is no mapping specified for sortable.
-
-
-= 0.9.0 2009-11-15
-
-* Ported from a lib in a project to this Gem.
-* No tests yet.

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/sort_it_out.rb'}"
-puts "Loading sort_it_out gem"
-exec "#{irb} #{libs} --simple-prompt"

data/spec/sort_it_out_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "SortItOut" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end