respect rubygems guidelines

garethson · Aug 4, 2013 · a6a5c59 · a6a5c59
1 parent 526f700
commit a6a5c59
Show file tree

Hide file tree

Showing 35 changed files with 64 additions and 145 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,18 @@
-.DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+.rbenv-version
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1 @@
+gemspec
diff --git a/README.rdoc b/README.rdoc
@@ -1,14 +1,13 @@
 = WiceGrid
 
-Version:: 3.2.2
+Version:: 3.3.0
 Author::  Yuri Leikind
 Sources:: https://github.com/leikind/wice_grid/
-Examples online:: http://grid.leikind.org
+Examples online:: http://wicegrid.herokuapp.com
 News:: http://leikind.org/pages/wicegrid/
 Email::   "Yuri Leikind" <yuri.leikind at gmail dot com>
 
-
-FOR RAILS 3.0.X AND 3.1.X USE VERSION 3.0.4.
+FOR RAILS 3 USE VERSION 3.x
 FOR RAILS 2 USE VERSION 0.6 (https://github.com/leikind/wice_grid/tree/master).
 
 
@@ -49,7 +48,7 @@ WiceGrid is known to work with MySQL and Postgres.
 === Examples
 
 This tutorial is accompanied by a sample application with WiceGrid examples which you
-can browse online ( http://grid.leikind.org ),
+can browse online ( http://wicegrid.herokuapp.com ),
 or just view the code ( https://github.com/leikind/wice_grid_testbed ).
 
 

diff --git a/Rakefile b/Rakefile
@@ -1,16 +1,9 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-desc 'Default: run unit tests.'
-task :default => :test
+RSpec::Core::RakeTask.new
 
-desc 'Test the wice_grid plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+task :default => :rdoc
 
 desc 'Generate documentation for the wice_grid plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
@@ -23,22 +16,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'git'
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "wice_grid"
-    gem.summary = %Q{Rails Grid Plugin}
-    gem.description = %Q{A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters }
-    gem.email = "yuri.leikind@gmail.com"
-    gem.homepage = "http://github.com/leikind/wice_grid"
-    gem.authors = ["Yuri Leikind"]
-    gem.add_dependency "kaminari", ">= 0.13.0"
-    # 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: gem install jeweler"
-end
-
diff --git a/VERSION b/VERSION
diff --git a/lib/active_record_column_wrapper.rb → lib/wice/active_record_column_wrapper.rb b/lib/active_record_column_wrapper.rb → lib/wice/active_record_column_wrapper.rb
diff --git a/lib/columns.rb → lib/wice/columns.rb b/lib/columns.rb → lib/wice/columns.rb
@@ -49,7 +49,7 @@ def build_table_of_processors(prefix)
 
       def require_columns
         Wice::Columns::COLUMN_PROCESSOR_INDEX.values.uniq do |column_source_file|
-          require "columns/#{column_source_file}.rb"
+          require "wice/columns/#{column_source_file}.rb"
         end
       end
 

diff --git a/lib/columns/column_action.rb → lib/wice/columns/column_action.rb b/lib/columns/column_action.rb → lib/wice/columns/column_action.rb
diff --git a/lib/columns/column_boolean.rb → lib/wice/columns/column_boolean.rb b/lib/columns/column_boolean.rb → lib/wice/columns/column_boolean.rb
diff --git a/lib/columns/column_custom_dropdown.rb → lib/wice/columns/column_custom_dropdown.rb b/lib/columns/column_custom_dropdown.rb → lib/wice/columns/column_custom_dropdown.rb
diff --git a/lib/columns/column_date.rb → lib/wice/columns/column_date.rb b/lib/columns/column_date.rb → lib/wice/columns/column_date.rb
diff --git a/lib/columns/column_datetime.rb → lib/wice/columns/column_datetime.rb b/lib/columns/column_datetime.rb → lib/wice/columns/column_datetime.rb
diff --git a/lib/columns/column_float.rb → lib/wice/columns/column_float.rb b/lib/columns/column_float.rb → lib/wice/columns/column_float.rb
diff --git a/lib/columns/column_integer.rb → lib/wice/columns/column_integer.rb b/lib/columns/column_integer.rb → lib/wice/columns/column_integer.rb
diff --git a/lib/columns/column_processor_index.rb → lib/wice/columns/column_processor_index.rb b/lib/columns/column_processor_index.rb → lib/wice/columns/column_processor_index.rb
diff --git a/lib/columns/column_range.rb → lib/wice/columns/column_range.rb b/lib/columns/column_range.rb → lib/wice/columns/column_range.rb
diff --git a/lib/columns/column_string.rb → lib/wice/columns/column_string.rb b/lib/columns/column_string.rb → lib/wice/columns/column_string.rb
diff --git a/lib/grid_output_buffer.rb → lib/wice/grid_output_buffer.rb b/lib/grid_output_buffer.rb → lib/wice/grid_output_buffer.rb
diff --git a/lib/grid_renderer.rb → lib/wice/grid_renderer.rb b/lib/grid_renderer.rb → lib/wice/grid_renderer.rb
diff --git a/lib/helpers/js_calendar_helpers.rb → lib/wice/helpers/js_calendar_helpers.rb b/lib/helpers/js_calendar_helpers.rb → lib/wice/helpers/js_calendar_helpers.rb
diff --git a/lib/helpers/wice_grid_misc_view_helpers.rb → ...ce/helpers/wice_grid_misc_view_helpers.rb b/lib/helpers/wice_grid_misc_view_helpers.rb → ...ce/helpers/wice_grid_misc_view_helpers.rb
diff --git a/...e_grid_serialized_queries_view_helpers.rb → ...e_grid_serialized_queries_view_helpers.rb b/...e_grid_serialized_queries_view_helpers.rb → ...e_grid_serialized_queries_view_helpers.rb
diff --git a/lib/helpers/wice_grid_view_helpers.rb → lib/wice/helpers/wice_grid_view_helpers.rb b/lib/helpers/wice_grid_view_helpers.rb → lib/wice/helpers/wice_grid_view_helpers.rb
diff --git a/lib/kaminari_monkey_patching.rb → lib/wice/kaminari_monkey_patching.rb b/lib/kaminari_monkey_patching.rb → lib/wice/kaminari_monkey_patching.rb
diff --git a/lib/table_column_matrix.rb → lib/wice/table_column_matrix.rb b/lib/table_column_matrix.rb → lib/wice/table_column_matrix.rb
diff --git a/lib/wice_grid_controller.rb → lib/wice/wice_grid_controller.rb b/lib/wice_grid_controller.rb → lib/wice/wice_grid_controller.rb
diff --git a/lib/wice_grid_core_ext.rb → lib/wice/wice_grid_core_ext.rb b/lib/wice_grid_core_ext.rb → lib/wice/wice_grid_core_ext.rb
diff --git a/lib/wice_grid_misc.rb → lib/wice/wice_grid_misc.rb b/lib/wice_grid_misc.rb → lib/wice/wice_grid_misc.rb
diff --git a/...ice_grid_serialized_queries_controller.rb → ...ice_grid_serialized_queries_controller.rb b/...ice_grid_serialized_queries_controller.rb → ...ice_grid_serialized_queries_controller.rb
diff --git a/lib/wice_grid_serialized_query.rb → lib/wice/wice_grid_serialized_query.rb b/lib/wice_grid_serialized_query.rb → lib/wice/wice_grid_serialized_query.rb
diff --git a/lib/wice_grid_spreadsheet.rb → lib/wice/wice_grid_spreadsheet.rb b/lib/wice_grid_spreadsheet.rb → lib/wice/wice_grid_spreadsheet.rb
diff --git a/lib/wice_grid.rb b/lib/wice_grid.rb
@@ -1,21 +1,21 @@
 # encoding: UTF-8
 
-require 'wice_grid_misc.rb'
-require 'wice_grid_core_ext.rb'
-require 'grid_renderer.rb'
-require 'table_column_matrix.rb'
-require 'active_record_column_wrapper.rb'
-require 'helpers/wice_grid_view_helpers.rb'
-require 'helpers/wice_grid_misc_view_helpers.rb'
-require 'helpers/wice_grid_serialized_queries_view_helpers.rb'
-require 'helpers/wice_grid_view_helpers.rb'
-require 'helpers/js_calendar_helpers.rb'
-require 'grid_output_buffer.rb'
-require 'wice_grid_controller.rb'
-require 'wice_grid_spreadsheet.rb'
-require 'wice_grid_serialized_queries_controller.rb'
-require 'columns/column_processor_index.rb'
-require 'columns.rb'
+require 'wice/wice_grid_misc.rb'
+require 'wice/wice_grid_core_ext.rb'
+require 'wice/grid_renderer.rb'
+require 'wice/table_column_matrix.rb'
+require 'wice/active_record_column_wrapper.rb'
+require 'wice/helpers/wice_grid_view_helpers.rb'
+require 'wice/helpers/wice_grid_misc_view_helpers.rb'
+require 'wice/helpers/wice_grid_serialized_queries_view_helpers.rb'
+require 'wice/helpers/wice_grid_view_helpers.rb'
+require 'wice/helpers/js_calendar_helpers.rb'
+require 'wice/grid_output_buffer.rb'
+require 'wice/wice_grid_controller.rb'
+require 'wice/wice_grid_spreadsheet.rb'
+require 'wice/wice_grid_serialized_queries_controller.rb'
+require 'wice/columns/column_processor_index.rb'
+require 'wice/columns.rb'
 require 'kaminari.rb'
 
 
@@ -46,10 +46,10 @@ class WiceGridEngine < ::Rails::Engine #:nodoc:
         end
 
         Columns.load_column_processors
-        require 'wice_grid_serialized_query.rb'
+        require 'wice/wice_grid_serialized_query.rb'
 
         # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
-        require 'kaminari_monkey_patching.rb'
+        require 'wice/kaminari_monkey_patching.rb'
       end
     end
   end

diff --git a/RELEASE_NOTES_3.2.pre1.rdoc → release_notes/RELEASE_NOTES_3.2.pre1.rdoc b/RELEASE_NOTES_3.2.pre1.rdoc → release_notes/RELEASE_NOTES_3.2.pre1.rdoc
diff --git a/RELEASE_NOTES_3.2.pre2.rdoc → release_notes/RELEASE_NOTES_3.2.pre2.rdoc b/RELEASE_NOTES_3.2.pre2.rdoc → release_notes/RELEASE_NOTES_3.2.pre2.rdoc
diff --git a/wice_grid.gemspec b/wice_grid.gemspec
@@ -1,101 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = "wice_grid"
-  s.version = "3.2.2"
+  s.name          = 'wice_grid'
+  s.version       = '3.2.2'
+  s.homepage      = 'https://github.com/leikind/wice_grid'
+  s.date          = '2013-08-04'
+  s.summary       = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
+  s.description   = 'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, '  +
+                    'just like one does when rendering a collection via a simple table (and this is what differentiates WiceGrid ' +
+                    'from various scaffolding solutions), but automate implementation of filters, ordering, paginations, CSV '     +
+                    'export, and so on. Ruby blocks provide an elegant means for this.'
+  s.authors       = ['Yuri Leikind']
+  s.email         = 'yuri.leikind@gmail.com'
+  s.files         = `git ls-files`.split($/)
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yuri Leikind"]
-  s.date = "2013-05-03"
-  s.description = "A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters "
-  s.email = "yuri.leikind@gmail.com"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "CHANGELOG",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "RELEASE_NOTES_3.2.pre1.rdoc",
-    "RELEASE_NOTES_3.2.pre2.rdoc",
-    "Rakefile",
-    "SAVED_QUERIES_HOWTO.rdoc",
-    "VERSION",
-    "app/views/kaminari/wice_grid/_gap.html.erb",
-    "app/views/kaminari/wice_grid/_next_page.html.erb",
-    "app/views/kaminari/wice_grid/_page.html.erb",
-    "app/views/kaminari/wice_grid/_paginator.html.erb",
-    "app/views/kaminari/wice_grid/_prev_page.html.erb",
-    "lib/active_record_column_wrapper.rb",
-    "lib/columns.rb",
-    "lib/columns/column_action.rb",
-    "lib/columns/column_boolean.rb",
-    "lib/columns/column_custom_dropdown.rb",
-    "lib/columns/column_date.rb",
-    "lib/columns/column_datetime.rb",
-    "lib/columns/column_float.rb",
-    "lib/columns/column_integer.rb",
-    "lib/columns/column_processor_index.rb",
-    "lib/columns/column_range.rb",
-    "lib/columns/column_string.rb",
-    "lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb",
-    "lib/generators/wice_grid/install_generator.rb",
-    "lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb",
-    "lib/generators/wice_grid/templates/wice_grid.css.scss",
-    "lib/generators/wice_grid/templates/wice_grid.yml",
-    "lib/generators/wice_grid/templates/wice_grid_config.rb",
-    "lib/grid_output_buffer.rb",
-    "lib/grid_renderer.rb",
-    "lib/helpers/js_calendar_helpers.rb",
-    "lib/helpers/wice_grid_misc_view_helpers.rb",
-    "lib/helpers/wice_grid_serialized_queries_view_helpers.rb",
-    "lib/helpers/wice_grid_view_helpers.rb",
-    "lib/kaminari_monkey_patching.rb",
-    "lib/table_column_matrix.rb",
-    "lib/wice_grid.rb",
-    "lib/wice_grid_controller.rb",
-    "lib/wice_grid_core_ext.rb",
-    "lib/wice_grid_misc.rb",
-    "lib/wice_grid_serialized_queries_controller.rb",
-    "lib/wice_grid_serialized_query.rb",
-    "lib/wice_grid_spreadsheet.rb",
-    "test/readme.txt",
-    "vendor/assets/images/icons/grid/arrow_down.gif",
-    "vendor/assets/images/icons/grid/arrow_up.gif",
-    "vendor/assets/images/icons/grid/calendar_view_month.png",
-    "vendor/assets/images/icons/grid/collapse.gif",
-    "vendor/assets/images/icons/grid/delete.png",
-    "vendor/assets/images/icons/grid/expand.gif",
-    "vendor/assets/images/icons/grid/page_white_excel.png",
-    "vendor/assets/images/icons/grid/page_white_find.png",
-    "vendor/assets/images/icons/grid/table.png",
-    "vendor/assets/images/icons/grid/table_refresh.png",
-    "vendor/assets/images/icons/grid/tick_all.png",
-    "vendor/assets/images/icons/grid/untick_all.png",
-    "vendor/assets/javascripts/wice_grid.js",
-    "vendor/assets/javascripts/wice_grid_init.js.coffee",
-    "vendor/assets/javascripts/wice_grid_processor.js.coffee",
-    "vendor/assets/javascripts/wice_grid_saved_queries_init.js.coffee",
-    "wice_grid.gemspec"
-  ]
-  s.homepage = "http://github.com/leikind/wice_grid"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Rails Grid Plugin"
+  kaminary         = 'kaminari'
+  kaminary_version = '>= 0.13.0'
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<kaminari>, [">= 0.13.0"])
+      s.add_runtime_dependency(kaminary, [kaminary_version])
     else
-      s.add_dependency(%q<kaminari>, [">= 0.13.0"])
+      s.add_dependency(kaminari, [kaminary_version])
     end
   else
-    s.add_dependency(%q<kaminari>, [">= 0.13.0"])
+    s.add_dependency(kaminari, [kaminary_version])
   end
-end
 
+end