basic_table_sorter 0.0.3.beta → 1.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db76dcc9dd75596012bba9f3d3dd4c0afbe11ebb
-  data.tar.gz: f612c2f0f9cc036be4f156c1430f8e0919dbf0cf
+  metadata.gz: c9b59c3eb7f6b4911cdb6028798850a477f55424
+  data.tar.gz: fb72202c66536cd6f253a11e1561b0351b0404a1
 SHA512:
-  metadata.gz: 1d70c381dff1c8743e3c8a7dc68a96fb53a926ae742c6850044a3b1902c299569c63a66018166ccadd78429bfd87bd255a31913fbbc5e555d1a4c90f4e456118
-  data.tar.gz: fc98d2bec5e1f01e3546f0e209d13b65f8bb292487603bee332058820c98dd703b555bdfce86b6775edf8a5644d72277dca177e904fe451ec1cbfa604185feac
+  metadata.gz: 8dacd8a70ae0ab2495039811d0084b48beffd1c84a2648b1595373ae4d679c834f7cc58adab92fd4782a196c84ed2e85366abd40c7062322eefc2ee086681552
+  data.tar.gz: 3dd7d7f134f2e59188a7031fc0b6490ab59adc223ac55a767236f9caee271072ddee13519e21d4415225b2f81a9ba9ab034067da9e906bbd8fded1ad009bb1fe

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in basic_table_sorter.gemspec
 gemspec
+
+gem 'transpec', require: false

data/Guardfile

@@ -1,9 +1,9 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-notification :notifysend
+notification :notifysend, t: 1000
 
-guard 'rspec' do
+guard :rspec, failed_mode: :none, notification: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb"}
   watch('spec/spec_helper.rb') { "spec" }

data/basic_table_sorter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "rspec", "~>2.13.0"
-  gem.add_development_dependency "actionpack", "~>4.0"
-  gem.add_development_dependency "guard-rspec", "~>3.0.1"
+  gem.add_development_dependency "rspec", "~>3.0.0"
+  gem.add_development_dependency "actionpack", "~>4.1.0"
+  gem.add_development_dependency "guard-rspec", "~>4.3.0"
 end

data/lib/basic_table_sorter/matchers.rb

@@ -1,5 +1,5 @@
 RSpec::Matchers.define :allow_sort_param do |controller, action, value|
   match do |sort_params_permission_service|
-    sort_params_permission_service.allowed_sort_param?(controller, action, value.to_s).should be_true
+    expect(sort_params_permission_service.allowed_sort_param?(controller, action, value.to_s)).to be_truthy
   end
 end

data/lib/basic_table_sorter/version.rb

@@ -1,3 +1,3 @@
 module BasicTableSorter
-  VERSION = "0.0.3.beta"
+  VERSION = "1.0.0.beta"
 end

data/spec/basic_table_sorter/controller_additions_spec.rb

@@ -4,7 +4,7 @@ describe 'ControllerAdditions' do
 
   before :each do
     @controller_class = Class.new
-    @controller_class.stub(:helper_method)
+    allow(@controller_class).to receive(:helper_method)
     @controller_class.send(:include, BasicTableSorter::ControllerAdditions)
     @controller = @controller_class.new
   end
@@ -13,7 +13,7 @@ describe 'ControllerAdditions' do
 
     it 'should provide table_sort_direction as helper method' do
       controller_class = Class.new
-      controller_class.should_receive(:helper_method).with(:table_sort_direction)
+      expect(controller_class).to receive(:helper_method).with(:table_sort_direction)
       controller = controller_class.new
       controller.singleton_class.send(:include, BasicTableSorter::ControllerAdditions)
     end
@@ -22,74 +22,73 @@ describe 'ControllerAdditions' do
   describe '#table_sort_direction' do
 
     it 'should return asc if params table_sort_direction does not exits' do
-      @controller.stub(:params).and_return({})
-      @controller.table_sort_direction.should eq 'asc'
+      allow(@controller).to receive(:params).and_return({})
+      expect(@controller.table_sort_direction).to eq 'asc'
     end
 
     it 'should return asc if params table_sort_direction is not asc or desc' do
-      @controller.stub(:params).and_return({table_sort_direction: 'test'})
-      @controller.table_sort_direction.should eq 'asc'
+      allow(@controller).to receive(:params).and_return({table_sort_direction: 'test'})
+      expect(@controller.table_sort_direction).to eq 'asc'
     end
 
     it 'should return desc if params table_sort_direction has value desc' do
-      @controller.stub(:params).and_return({table_sort_direction: 'desc'})
-      @controller.table_sort_direction.should eq 'desc'
+      allow(@controller).to receive(:params).and_return({table_sort_direction: 'desc'})
+      expect(@controller.table_sort_direction).to eq 'desc'
     end
   end
 
   describe '#custom_table_sort?' do
 
     it 'should return true if params has key table_sort' do
-      @controller.stub(:params).and_return({table_sort: 'test'})
-      @controller.custom_table_sort?.should be_true
+      allow(@controller).to receive(:params).and_return({table_sort: 'test'})
+      expect(@controller.custom_table_sort?).to be_truthy
     end
 
     it 'should return false if params has no key table_sort' do
-      @controller.stub(:params).and_return({})
-      @controller.custom_table_sort?.should be_false
+      allow(@controller).to receive(:params).and_return({})
+      expect(@controller.custom_table_sort?).to be_falsey
     end
   end
 
   describe '#table_sort_order' do
 
     it 'should return column with table sort direction as string' do
-      @controller.stub(:params).and_return({table_sort: 'last_name', table_sort_direction: 'desc'})
-      @controller.table_sort_order.should eq "last_name desc"
+      allow(@controller).to receive(:params).and_return({table_sort: 'last_name', table_sort_direction: 'desc'})
+      expect(@controller.table_sort_order).to eq "last_name desc"
     end
 
     it 'should return columns together with sort direction as string if multiple given' do
-      @controller.stub(:params).and_return({table_sort: ['last_name', 'first_name'], table_sort_direction: 'desc'})
-      @controller.table_sort_order.should eq "last_name desc, first_name desc"
+      allow(@controller).to receive(:params).and_return({table_sort: ['last_name', 'first_name'], table_sort_direction: 'desc'})
+      expect(@controller.table_sort_order).to eq "last_name desc, first_name desc"
     end
 
     it 'should return nil when no param :table_sort present' do
-      @controller.stub(:params).and_return({})
-      @controller.table_sort_order.should be_nil
+      allow(@controller).to receive(:params).and_return({})
+      expect(@controller.table_sort_order).to be_nil
     end
   end
 
   describe '#authorize_table_sort_params' do
 
     it 'should call allowed_sort_param? if param with value table_sort exits' do
-      @controller.stub(:params).and_return(controller: 'users', action: 'index', table_sort: 'last_name')
-      BasicTableSorterPermissionService.
-          any_instance.should_receive(:allowed_sort_param?).
+      allow(@controller).to receive(:params).and_return(controller: 'users', action: 'index', table_sort: 'last_name')
+      expect_any_instance_of(BasicTableSorterPermissionService).to receive(:allowed_sort_param?).
           with('users', 'index', 'last_name').
           and_return(true)
       @controller.authorize_table_sort_params
     end
 
     it 'should raise BasicTableSorter::TableSortParamNotAuthorized if allowed_sort_param? returns false' do
-      @controller.stub(:params).and_return(table_sort: 'last_name')
-      BasicTableSorterPermissionService.any_instance.stub(:allowed_sort_param?).and_return false
+      allow(@controller).to receive(:params).and_return(table_sort: 'last_name')
+      allow_any_instance_of(BasicTableSorterPermissionService).to receive(:allowed_sort_param?).and_return false
       expect {
         @controller.authorize_table_sort_params
       }.to raise_error BasicTableSorter::TableSortParamNotAuthorized,  "param table_sort = 'last_name' not allowed"
     end
 
     it 'should not call authorize_table_sort_params if params has no value table_sort' do
-      @controller.stub(:params).and_return({})
-      @controller.should_not_receive(:allowed_sort_param?)
+      allow(@controller).to receive(:params).and_return({})
+      expect(@controller).not_to receive(:allowed_sort_param?)
       @controller.authorize_table_sort_params
     end
   end

data/spec/basic_table_sorter/matchers_spec.rb

@@ -4,7 +4,7 @@ describe 'allow_sort_value' do
 
   it 'should delegate to allowed_sort_param?' do
     object = Object.new
-    object.should_receive(:allowed_sort_param?).once.with(:comments, :index, 'email').and_return(true)
-    object.should allow_sort_param(:comments, :index, :email)
+    expect(object).to receive(:allowed_sort_param?).once.with(:comments, :index, 'email').and_return(true)
+    expect(object).to allow_sort_param(:comments, :index, :email)
   end
 end

data/spec/basic_table_sorter/permission_service_additions_spec.rb

@@ -10,7 +10,7 @@ describe BasicTableSorter::PermissionServiceAdditions do
 
     it 'should extend included class with module ClassMethods' do
       clazz = Class.new
-      clazz.should_receive(:extend).with(BasicTableSorter::PermissionServiceAdditions::ClassMethods)
+      expect(clazz).to receive(:extend).with(BasicTableSorter::PermissionServiceAdditions::ClassMethods)
       clazz.send(:include, BasicTableSorter::PermissionServiceAdditions)
     end
   end
@@ -18,11 +18,11 @@ describe BasicTableSorter::PermissionServiceAdditions do
   describe '::create' do
 
     it 'should create a BasicTableSorterPermissionService instance object' do
-      @sort_params_permission_service.should be_an_instance_of(BasicTableSorterPermissionService)
+      expect(@sort_params_permission_service).to be_an_instance_of(BasicTableSorterPermissionService)
     end
 
     it 'should call configure_permissions' do
-      BasicTableSorterPermissionService.any_instance.should_receive(:configure_permissions)
+      expect_any_instance_of(BasicTableSorterPermissionService).to receive(:configure_permissions)
       BasicTableSorterPermissionService.create
     end
   end
@@ -31,21 +31,21 @@ describe BasicTableSorter::PermissionServiceAdditions do
 
     it 'should return false if @allowed_sort_values is nil' do
       @sort_params_permission_service.instance_variable_set(:@allowed_sort_values, nil)
-      @sort_params_permission_service.allowed_sort_param?(nil, nil, nil).should be_false
+      expect(@sort_params_permission_service.allowed_sort_param?(nil, nil, nil)).to be_falsey
     end
 
     it 'should return false if @allowed_sort_value does not have given value' do
       allowed_sort_values = {}
       allowed_sort_values[['customer', 'index']] = ['last_name']
       @sort_params_permission_service.instance_variable_set(:@allowed_sort_values, allowed_sort_values)
-      @sort_params_permission_service.allowed_sort_param?('customer', 'index', 'first_name').should be_false
+      expect(@sort_params_permission_service.allowed_sort_param?('customer', 'index', 'first_name')).to be_falsey
     end
 
     it 'should return true if @allowed_sort_value does have given value' do
       allowed_sort_values = {}
       allowed_sort_values[['customer', 'index']] = ['first_name']
       @sort_params_permission_service.instance_variable_set(:@allowed_sort_values, allowed_sort_values)
-      @sort_params_permission_service.allowed_sort_param?('customer', 'index', 'first_name').should be_true
+      expect(@sort_params_permission_service.allowed_sort_param?('customer', 'index', 'first_name')).to be_truthy
     end
   end
 
@@ -53,20 +53,20 @@ describe BasicTableSorter::PermissionServiceAdditions do
 
     it 'should insert value into @allow sort values' do
       @sort_params_permission_service.allow_sort_params('customer', 'index', 'last_name')
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']].should eq ['last_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']]).to eq ['last_name']
     end
 
     it 'should insert values into @allow sort values' do
       @sort_params_permission_service.allow_sort_params('customer', 'index', ['first_name', 'last_name'])
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']].should eq ['first_name', 'last_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']]).to eq ['first_name', 'last_name']
     end
 
     it 'should insert value for two keys' do
       @sort_params_permission_service.allow_sort_params(['customer', 'person'], ['index', 'edit'], 'first_name')
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']].should eq ['first_name']
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['person', 'index']].should eq ['first_name']
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'edit']].should eq ['first_name']
-      @sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['person', 'edit']].should eq ['first_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'index']]).to eq ['first_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['person', 'index']]).to eq ['first_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['customer', 'edit']]).to eq ['first_name']
+      expect(@sort_params_permission_service.instance_variable_get(:@allowed_sort_values)[['person', 'edit']]).to eq ['first_name']
     end
   end
 end

data/spec/basic_table_sorter/view_helpers_spec.rb

@@ -6,8 +6,8 @@ describe BasicTableSorter::ViewHelpers do
     helper_class = Class.new
     helper_class.send(:include, BasicTableSorter::ViewHelpers)
     helper_class.send(:include, ActionView::Helpers::TagHelper)
-    helper_class.any_instance.stub(:url_for).and_return('url_returned_by_url_for')
-    helper_class.any_instance.stub(:link_to)
+    allow_any_instance_of(helper_class).to receive(:url_for).and_return('url_returned_by_url_for')
+    allow_any_instance_of(helper_class).to receive(:link_to)
     helper_class.new
   end
 
@@ -16,41 +16,41 @@ describe BasicTableSorter::ViewHelpers do
     context 'column selected' do
 
       it 'should create link with title and icon' do
-        helper.stub(:params).and_return({table_sort: 'title'})
-        helper.stub(:table_sort_direction).and_return('asc')
+        allow(helper).to receive(:params).and_return({table_sort: 'title'})
+        allow(helper).to receive(:table_sort_direction).and_return('asc')
 
-        helper.should_receive(:link_to).with('url_returned_by_url_for', class: 'selected-column') do |&block|
-          block.call.should match /<span>Title<\/span><i class="icon-.*" \/>/
+        expect(helper).to receive(:link_to).with('url_returned_by_url_for', class: 'selected-column') do |&block|
+          expect(block.call).to match /<span>Title<\/span><i class="icon-.*" \/>/
         end
         helper.sortable(:title, 'Title')
       end
 
 
       it 'should call url_for with correct params' do
-        helper.stub(:params).and_return({table_sort: 'title'})
-        helper.stub(:table_sort_direction).and_return('asc')
+        allow(helper).to receive(:params).and_return({table_sort: 'title'})
+        allow(helper).to receive(:table_sort_direction).and_return('asc')
         expected_link_params = {table_sort: :title, table_sort_direction: 'desc'}
-        helper.should_receive(:url_for).with(expected_link_params)
+        expect(helper).to receive(:url_for).with(expected_link_params)
         helper.sortable(:title, 'Title')
       end
 
       context 'column sorted asc' do
 
         before :each do
-          helper.stub(:table_sort_direction).and_return('asc')
-          helper.stub(:params).and_return({controller: 'users', action: 'index', table_sort: 'name'})
+          allow(helper).to receive(:table_sort_direction).and_return('asc')
+          allow(helper).to receive(:params).and_return({controller: 'users', action: 'index', table_sort: 'name'})
         end
 
         it 'should have link to sort desc' do
-          helper.should_receive(:link_to).with('url_returned_by_url_for', {:class => "selected-column"})
+          expect(helper).to receive(:link_to).with('url_returned_by_url_for', {:class => "selected-column"})
           helper.sortable(:name, 'Name')
         end
 
         it 'should have icon-chevron-down' do
 
-          helper.should_receive(:link_to).with(any_args) do |&block|
-            block.call.should include('icon-chevron-down')
-          end.once
+          expect(helper).to receive(:link_to).with(any_args) { |&block|
+            expect(block.call).to include('icon-chevron-down')
+          }.once
 
           helper.sortable(:name, 'Name')
         end
@@ -59,20 +59,20 @@ describe BasicTableSorter::ViewHelpers do
       context 'column sorted desc' do
 
         before :each do
-          helper.stub(:table_sort_direction).and_return('desc')
-          helper.stub(:params).and_return({controller: 'users', action: 'index', table_sort: 'name'})
+          allow(helper).to receive(:table_sort_direction).and_return('desc')
+          allow(helper).to receive(:params).and_return({controller: 'users', action: 'index', table_sort: 'name'})
         end
 
         it 'should have link to sort asc' do
           expected_link_params = {:table_sort => :name, :table_sort_direction => "asc"}
-          helper.should_receive(:link_to).with('url_returned_by_url_for', {:class => "selected-column"})
+          expect(helper).to receive(:link_to).with('url_returned_by_url_for', {:class => "selected-column"})
           helper.sortable(:name, 'Name')
         end
 
         it 'should have icon-arrow-up' do
-          helper.should_receive(:link_to).with(any_args) do |&block|
-            block.call.should include('icon-chevron-up')
-          end.once
+          expect(helper).to receive(:link_to).with(any_args) { |&block|
+            expect(block.call).to include('icon-chevron-up')
+          }.once
 
           helper.sortable(:name, 'Name')
         end
@@ -82,23 +82,23 @@ describe BasicTableSorter::ViewHelpers do
     context 'column not selected' do
 
       it 'should return link with title' do
-        helper.stub(:params).and_return({table_sort: 'first_name'})
-        helper.should_receive(:link_to).with('Name', 'url_returned_by_url_for')
+        allow(helper).to receive(:params).and_return({table_sort: 'first_name'})
+        expect(helper).to receive(:link_to).with('Name', 'url_returned_by_url_for')
         helper.sortable(:last_name, 'Name')
       end
 
       it 'should call url_for with correct params' do
-        helper.stub(:params).and_return({table_sort: 'first_name'})
+        allow(helper).to receive(:params).and_return({table_sort: 'first_name'})
         expected_params = {table_sort: :last_name, table_sort_direction: 'asc'}
-        helper.should_receive(:url_for).with(expected_params)
+        expect(helper).to receive(:url_for).with(expected_params)
         helper.sortable(:last_name, 'Name')
       end
     end
 
     it 'should merge additional arguments before calling url for' do
-      helper.stub(:params).and_return({table_sort: 'title'})
+      allow(helper).to receive(:params).and_return({table_sort: 'title'})
       epected_params = {table_sort: :last_name, table_sort_direction: 'asc', extra_param: 'extra_param'}
-      helper.should_receive(:url_for).with(epected_params)
+      expect(helper).to receive(:url_for).with(epected_params)
       helper.sortable(:last_name, 'Name', extra_param: 'extra_param')
     end
   end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: basic_table_sorter
 version: !ruby/object:Gem::Version
-  version: 0.0.3.beta
+  version: 1.0.0.beta
 platform: ruby
 authors:
 - Daniel Grawunder, Christian Mierich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 4.3.0
 description: A Ruby on Rails basic table sorter gem
 email:
 - gramie.sw@gmail.com
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -91,17 +91,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: An easy to use basic table sorter for Ruby on Rails.