From 924b8a12fbb605df5f5eeb11492394077de017ce Mon Sep 17 00:00:00 2001 From: Koustubh Sinkar Date: Fri, 13 Jun 2014 10:39:34 +0530 Subject: [PATCH] Update the gemspec to the latest configuration --- .ruby-gemset | 1 + .ruby-version | 1 + .rvmrc | 1 - Gemfile | 24 ----- Gemfile.lock | 193 +++++++++++++++++++------------------ spec/config/config_spec.rb | 10 +- spec/spec_helper.rb | 22 ++--- will_filter.gemspec | 52 ++++++---- 8 files changed, 153 insertions(+), 151 deletions(-) create mode 100644 .ruby-gemset create mode 100644 .ruby-version delete mode 100644 .rvmrc diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 00000000..c5275306 --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +will_filter diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..77fee73a --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.9.3 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index 3606755e..00000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm use 1.9.2@will_filter --create diff --git a/Gemfile b/Gemfile index 4887b51b..afd2e3ed 100644 --- a/Gemfile +++ b/Gemfile @@ -2,27 +2,3 @@ source "http://rubygems.org" # Declare your gem's dependencies in will_filter.gemspec. gemspec - -gem 'bundler', ['>= 1.0.0'] - -gem 'jquery-rails' -gem 'jquery-ui-rails' -gem 'bootstrap-sass' -gem 'kaminari' - -group :development do - gem 'rspec' - gem 'rspec-rails' - gem 'pry' - gem 'sqlite3' - gem 'spork' - gem 'watchr' - gem 'rr' -end - -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - gem 'uglifier', '>= 1.0.3' -end - diff --git a/Gemfile.lock b/Gemfile.lock index 4674cb3f..1fb03eea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,142 +1,151 @@ PATH remote: . specs: - will_filter (3.1.9) - kaminari - rails (>= 3.2.3) + will_filter (3.1.11) + jquery-rails + jquery-ui-rails + kaminari (~> 0) + rails (~> 3.2.3) sass GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.3) - actionpack (= 3.2.3) - mail (~> 2.4.4) - actionpack (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + actionmailer (3.2.18) + actionpack (= 3.2.18) + mail (~> 2.5.4) + actionpack (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) + journey (~> 1.0.4) + rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.3) - activesupport (= 3.2.3) + sprockets (~> 2.2.1) + activemodel (3.2.18) + activesupport (= 3.2.18) builder (~> 3.0.0) - activerecord (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) + activerecord (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.3) - activemodel (= 3.2.3) - activesupport (= 3.2.3) - activesupport (3.2.3) - i18n (~> 0.6) + activeresource (3.2.18) + activemodel (= 3.2.18) + activesupport (= 3.2.18) + activesupport (3.2.18) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - arel (3.0.2) - bootstrap-sass (2.1.1.0) - builder (3.0.0) - coderay (1.0.6) + arel (3.0.3) + bootstrap-sass (3.1.1.1) + sass (~> 3.2) + builder (3.0.4) + coderay (1.1.0) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - diff-lcs (1.1.3) + coffee-script-source (1.7.0) + diff-lcs (1.2.5) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - hike (1.2.1) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (3.0.4) + execjs (2.2.0) + hike (1.2.3) + i18n (0.6.9) + journey (1.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.0.2) - jquery-rails - railties (>= 3.1.0) - json (1.6.6) - kaminari (0.13.0) + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (1.8.1) + kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - railties (>= 3.0.0) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - method_source (0.7.1) - mime-types (1.18) - multi_json (1.3.2) - polyglot (0.3.3) - pry (0.9.9) - coderay (~> 1.0.5) - method_source (~> 0.7.1) - slop (>= 2.4.4, < 3) - rack (1.4.1) + method_source (0.8.2) + mime-types (1.25.1) + multi_json (1.10.1) + polyglot (0.3.5) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.3) - actionmailer (= 3.2.3) - actionpack (= 3.2.3) - activerecord (= 3.2.3) - activeresource (= 3.2.3) - activesupport (= 3.2.3) + rails (3.2.18) + actionmailer (= 3.2.18) + actionpack (= 3.2.18) + activerecord (= 3.2.18) + activeresource (= 3.2.18) + activesupport (= 3.2.18) bundler (~> 1.0) - railties (= 3.2.3) - railties (3.2.3) - actionpack (= 3.2.3) - activesupport (= 3.2.3) + railties (= 3.2.18) + railties (3.2.18) + actionpack (= 3.2.18) + activesupport (= 3.2.18) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (10.3.2) + rdoc (3.12.2) json (~> 1.4) - rr (1.0.4) - rspec (2.9.0) - rspec-core (~> 2.9.0) - rspec-expectations (~> 2.9.0) - rspec-mocks (~> 2.9.0) - rspec-core (2.9.0) - rspec-expectations (2.9.1) - diff-lcs (~> 1.1.3) - rspec-mocks (2.9.0) - rspec-rails (2.9.0) + rr (1.1.2) + rspec (3.0.0) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-core (3.0.0) + rspec-support (~> 3.0.0) + rspec-expectations (3.0.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.0.0) + rspec-mocks (3.0.1) + rspec-support (~> 3.0.0) + rspec-rails (3.0.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec (~> 2.9.0) - sass (3.1.15) + rspec-core (~> 3.0.0) + rspec-expectations (~> 3.0.0) + rspec-mocks (~> 3.0.0) + rspec-support (~> 3.0.0) + rspec-support (3.0.0) + sass (3.3.8) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - slop (2.4.4) - spork (0.9.0) - sprockets (2.1.2) + shoulda-matchers (2.6.1) + activesupport (>= 3.0.0) + slop (3.5.0) + spork (0.9.2) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) - thor (0.14.6) - tilt (1.3.3) - treetop (1.4.10) + sqlite3 (1.3.9) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (2.1.2) + tzinfo (0.3.39) + uglifier (1.0.4) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + multi_json (>= 1.0.2) watchr (0.7) PLATFORMS @@ -144,18 +153,16 @@ PLATFORMS DEPENDENCIES bootstrap-sass - bundler (>= 1.0.0) + bundler (~> 1.3) coffee-rails (~> 3.2.1) - jquery-rails - jquery-ui-rails - kaminari pry rr rspec rspec-rails sass-rails (~> 3.2.3) + shoulda-matchers spork sqlite3 - uglifier (>= 1.0.3) + uglifier (~> 1.0.3) watchr will_filter! diff --git a/spec/config/config_spec.rb b/spec/config/config_spec.rb index ad62ce4b..a1d369d1 100644 --- a/spec/config/config_spec.rb +++ b/spec/config/config_spec.rb @@ -4,11 +4,11 @@ subject { WillFilter::Config } describe 'operator_order' do context 'by default' do - its(:config) {should_not == nil} - its(:containers) {should_not == nil} - its(:data_types) {should_not == nil} - its(:operators) {should_not == nil} - its(:operator_order) {should_not == nil} + its(:config) { should_not == nil } + its(:containers) { should_not == nil } + its(:data_types) { should_not == nil } + its(:operators) { should_not == nil } + its(:operator_order) { should_not == nil } end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7d48353b..0f97fd73 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,22 +2,22 @@ require 'pp' require 'spork' +require 'rspec/rails' +require 'shoulda/matchers' +require File.expand_path("../../test/dummy/config/environment.rb", __FILE__) Spork.prefork do - require File.expand_path("../../test/dummy/config/environment.rb", __FILE__) - require 'rspec/rails' + ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../') - ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../') + # Requires supporting ruby files with custom matchers and macros, etc, + # in spec/support/ and its subdirectories. + Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f } - # Requires supporting ruby files with custom matchers and macros, etc, - # in spec/support/ and its subdirectories. - Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f } - - RSpec.configure do |config| - config.use_transactional_fixtures = true - config.use_instantiated_fixtures = false - end + RSpec.configure do |config| + config.use_transactional_fixtures = true + config.use_instantiated_fixtures = false + end end diff --git a/will_filter.gemspec b/will_filter.gemspec index 89c47e50..f0f5e32d 100644 --- a/will_filter.gemspec +++ b/will_filter.gemspec @@ -1,26 +1,44 @@ -$:.push File.expand_path("../lib", __FILE__) +lib = File.expand_path("../lib", __FILE__) + +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) # Maintain your gem's version: require "will_filter/version" # Describe your gem and declare its dependencies: -Gem::Specification.new do |s| - s.name = "will_filter" - s.version = WillFilter::VERSION - s.authors = ["Michael Berkovich"] - s.email = ["theiceberk@gmail.com"] - s.homepage = "https://github.com/berk/will_filter" - s.summary = "A filtering engine plugin for Rails 3.1" - s.description = "will_filter is a powerful customizable framework for filtering active_record models." +Gem::Specification.new do |spec| + spec.name = "will_filter" + spec.version = WillFilter::VERSION + spec.authors = ["Michael Berkovich", "Koustubh Sinkar"] + spec.email = ["theiceberk@gmail.com", "ksinkar@gmail.com"] + spec.homepage = "https://github.com/berk/will_filter" + spec.summary = "A filtering engine plugin for Rails 4.x" + spec.description = "will_filter is a powerful customizable framework for filtering active_record models." + + spec.files = `git ls-files`.split("\n") + spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + spec.extra_rdoc_files = ['README.rdoc'] + spec.require_paths = ['lib'] - s.files = `git ls-files`.split("\n") - s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") - s.extra_rdoc_files = ['README.rdoc'] - s.require_paths = ['lib'] + spec.licenses = ['MIT'] - s.licenses = ['MIT'] + spec.add_development_dependency 'bundler', '~> 1.3' + spec.add_development_dependency 'rspec' + spec.add_development_dependency 'rspec-rails' + spec.add_development_dependency 'pry' + spec.add_development_dependency 'sqlite3' + spec.add_development_dependency 'spork' + spec.add_development_dependency 'watchr' + spec.add_development_dependency 'rr' + spec.add_development_dependency 'bootstrap-sass' + spec.add_development_dependency 'sass-rails', '~> 3.2.3' + spec.add_development_dependency 'coffee-rails', '~> 3.2.1' + spec.add_development_dependency 'uglifier', '~>1.0.3' + spec.add_development_dependency 'shoulda-matchers' - s.add_dependency 'rails', ['>= 3.2.3'] - s.add_dependency 'kaminari', ['>= 0'] - s.add_dependency 'sass', ['>= 0'] + spec.add_runtime_dependency 'rails', '~> 3.2.3' + spec.add_runtime_dependency 'jquery-rails' + spec.add_runtime_dependency 'jquery-ui-rails' + spec.add_runtime_dependency 'kaminari', '~> 0' + spec.add_runtime_dependency 'sass' end