From de7cabe0af99d0b6c3e043fc6dd55b7077726b52 Mon Sep 17 00:00:00 2001 From: "Marlin W. Pierce" Date: Sun, 13 Jan 2019 09:41:00 -0500 Subject: [PATCH 1/2] Resolve marlinpierce/jquery-datatables-rails#2, Resolve rweng/jquery-datatables-rails#231, Update dependencies to sassy-rails. --- jquery-datatables-rails.gemspec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/jquery-datatables-rails.gemspec b/jquery-datatables-rails.gemspec index a5b4f3f..9a216ec 100755 --- a/jquery-datatables-rails.gemspec +++ b/jquery-datatables-rails.gemspec @@ -5,11 +5,20 @@ require "jquery/datatables/rails/version" Gem::Specification.new do |s| s.name = "jquery-datatables-rails" s.version = Jquery::Datatables::Rails::VERSION - s.authors = ["Robin Wenglewski"] - s.email = ["robin@wenglewski.de"] - s.homepage = "https://github.com/rweng/jquery-datatables-rails" + s.authors = ["Marlin W. Pierce"] + s.email = ["marlin_pierce_2000@yahoo.com"] + s.homepage = "https://github.com/marlinpierce/jquery-datatables-rails" s.summary = %q{jquery datatables for rails} - s.description = %q{} + s.description = <<-HEREDOC + This gem gathers components for datatables for rails. + + Datatables is a jquery javascript library for efficient rendering of tables of data fetched from a web service. + This gem does the following: + + - Includes the javascript, stylesheets, and other files from database and installs them in the rails asset pipeline. + - Has dependencies to collect the gems needed to use datatables with rails. + - Provides rails generators for datatables and datatables plugins. + HEREDOC s.license = 'MIT' s.files = `git ls-files`.split("\n") @@ -18,8 +27,8 @@ Gem::Specification.new do |s| s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - s.add_dependency "jquery-rails" - s.add_dependency "sass-rails" + s.add_dependency "jquery-rails", '~> 4.3' + s.add_dependency "sassc-rails", '~> 2.0' s.add_dependency 'railties', '>= 3.1' s.add_dependency 'actionpack', '>= 3.1' s.add_development_dependency 'rake' From aa2067269fd1304dfed2547589d8e24366bc4941 Mon Sep 17 00:00:00 2001 From: "Marlin W. Pierce" Date: Sun, 13 Jan 2019 09:53:51 -0500 Subject: [PATCH 2/2] Resolve marlinpierce/jquery-datatables-rails#1, Update README for initial fork. --- Readme.md | 19 +++++++++++++++---- lib/jquery/datatables/rails/version.rb | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Readme.md b/Readme.md index b2ac9af..8e7e34b 100755 --- a/Readme.md +++ b/Readme.md @@ -3,7 +3,17 @@ [![Gem Version](https://badge.fury.io/rb/jquery-datatables-rails.svg)](http://badge.fury.io/rb/jquery-datatables-rails) This gem packages the jQuery [DataTables](http://datatables.net/) plugin for easy use with the Rails 3.1+ asset pipleine. -It provides all the basic DataTables files, and a few of the extras. +It gathers components for datatables for rails. + +Datatables is a jquery javascript library for efficient rendering of tables of data fetched from a web service. +This gem does the following: + +- Includes the javascript, stylesheets, and other files from database and installs them in the rails asset pipeline. +- Has dependencies to collect the gems needed to use datatables with rails. +- Provides rails generators for datatables and datatables plugins. + +This repo is a fork of the official gem repo. + # Important @@ -15,15 +25,16 @@ If you encounter any errors, please fork the repository, update the plugin files ## Upgrade Notes -1 - For people upgrading to 3.x.x who are using the responsive extension. -Due to an error displaying the plus icon in a recent version of this gem, the responsive code has now changed and uses the DataTables responsive extension instead. This requires some changes to your responsive configuration. See the Responsive Installation section below and follow the link. +### From rweng/jquery-datatables-rails gem + +This version requires no changes to migrate from the `rweng/jquery-datatables-rails` version `3.4.0` gem ## General Installation 1 - Add to your Gemfile: ```ruby -gem 'jquery-datatables-rails', '~> 3.4.0' +gem 'jquery-datatables-rails', '~> 3.5.0', :github => 'marlinpierce/jquery-datatables-rails', :branch => 'master-3.5' ``` 2 - Install the gem: diff --git a/lib/jquery/datatables/rails/version.rb b/lib/jquery/datatables/rails/version.rb index eb8a7bf..5f3790a 100755 --- a/lib/jquery/datatables/rails/version.rb +++ b/lib/jquery/datatables/rails/version.rb @@ -1,7 +1,7 @@ module Jquery module Datatables module Rails - VERSION = "3.4.0" + VERSION = "3.5.0" end end end