simple_slug 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d858815acb25626bd487c3a08d1550cdf39c3895
-  data.tar.gz: 18a66060a237cb85e5f901566305e6b5e6698dff
+  metadata.gz: a288220a77771ee9ef0b7578d6831e83dfa9e8fe
+  data.tar.gz: 9ecf9b7e5d4cabc46e09aff7dc2738533eb04029
 SHA512:
-  metadata.gz: 8b2edc684abb85fa503c0b214488428a4ebd5684cd62a79424e703f486e52b805fe41aa0d44dfa9e7fdde2a215f56d95295d0bee822710b21410b5bb7f9761e1
-  data.tar.gz: 2258496ff4fb76de5a69cd08f5d9dd14036875817eb473f0ac9d84abb35efd146877a42ca5fa62270dfa5da521559ba827c51b2ff06eecb1fa16edc4f5607f10
+  metadata.gz: 8980a48ed1d7db74e82f1baf19ba7d2b2fed3380123b9cd44028771adbbb14346b8e7b7031c8bd5d25d03da136afe5458b4f5dab380352f4a01d7189aed31b6f
+  data.tar.gz: 680168768188b1fd55f03010a2b660269347f72b1d38b5cda9dd5ec1a1fdfd0ffdcb0d5e049b71c6dee06076fd045976a80e5ba40522517dce319995c2791115

data/lib/simple_slug/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlug
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/simple_slug.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.0'
-  spec.add_dependency 'i18n', '~> 0.6.0'
+  spec.add_dependency 'i18n', '~> 0.6'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

data/spec/simple_slug/base_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe SimpleSlug do
   context 'defaults' do
     it 'slug column' do
-      SimpleSlug.slug_column.should == 'slug'
+      expect(SimpleSlug.slug_column).to eq 'slug'
     end
 
     it 'excludes' do
-      SimpleSlug.excludes.should include('new', 'edit')
+      expect(SimpleSlug.excludes).to include('new', 'edit')
     end
 
     it 'exclude regexps' do
-      SimpleSlug.exclude_regexp.should == /\A\d+\z/
+     expect( SimpleSlug.exclude_regexp).to eq /\A\d+\z/
     end
   end
 end

data/spec/simple_slug/history_spec.rb

@@ -7,21 +7,21 @@ end
 describe 'slug history' do
   describe 'history records handling' do
     before do
-      SlugHistoryRspecModel.any_instance.stub(:simple_slug_exists?).and_return(false)
+      expect_any_instance_of(SlugHistoryRspecModel).to receive(:simple_slug_exists?).and_return(false)
     end
 
     it 'create' do
       relation = double
-      ::SimpleSlug::HistorySlug.should_receive(:where).once.ordered.with(sluggable_type: 'SlugHistoryRspecModel', sluggable_id: 1, slug: 'hello').and_return(relation)
-      relation.should_receive(:first_or_create)
+      expect(::SimpleSlug::HistorySlug).to receive(:where).once.ordered.with(sluggable_type: 'SlugHistoryRspecModel', sluggable_id: 1, slug: 'hello').and_return(relation)
+      expect(relation).to receive(:first_or_create)
       SlugHistoryRspecModel.create(id: 1, name: 'Hello')
     end
 
     it 'cleanup' do
       relation = double
-      relation.stub(:first_or_create)
-      ::SimpleSlug::HistorySlug.stub(:where).and_return(relation)
-      relation.should_receive(:delete_all)
+      expect(relation).to receive(:first_or_create)
+      allow(::SimpleSlug::HistorySlug).to receive(:where).and_return(relation)
+      expect(relation).to receive(:delete_all)
       SlugHistoryRspecModel.create(name: 'Hello', id: 1).destroy
     end
   end
@@ -29,24 +29,24 @@ describe 'slug history' do
   describe 'conflicts' do
     it 'history slug exists' do
       record = SlugGenerationRspecModel.new(name: 'Hi')
-      record.stub(:simple_slug_base_exists?).and_return(false)
-      record.should_receive(:simple_slug_history_exists?).once.ordered.and_return(true)
-      record.should_receive(:simple_slug_history_exists?).once.ordered.and_return(false)
+      allow(record).to receive(:simple_slug_base_exists?).and_return(false)
+      expect(record).to receive(:simple_slug_history_exists?).once.ordered.and_return(true)
+      expect(record).to receive(:simple_slug_history_exists?).once.ordered.and_return(false)
       record.save
-      record.slug.should start_with('hi--')
+      expect(record.slug).to start_with('hi--')
     end
   end
 
   describe '#friendly_find' do
     before do
-      SlugHistoryRspecModel.stub(:find_by)
+      allow(SlugHistoryRspecModel).to receive(:find_by)
     end
 
     it 'find from history' do
       record = double('history')
-      record.stub(:sluggable_id).and_return(1)
-      ::SimpleSlug::HistorySlug.should_receive(:find_by!).with(slug: 'title').and_return(record)
-      SlugHistoryRspecModel.should_receive(:find).with(1).and_return(record)
+      allow(record).to receive(:sluggable_id).and_return(1)
+      expect(::SimpleSlug::HistorySlug).to receive(:find_by!).with(slug: 'title').and_return(record)
+      expect(SlugHistoryRspecModel).to receive(:find).with(1).and_return(record)
       SlugHistoryRspecModel.friendly_find('title')
     end
   end

data/spec/simple_slug/model_addition_spec.rb

@@ -7,71 +7,71 @@ end
 describe SimpleSlug::ModelAddition do
   describe 'slug generation' do
     before do
-      SlugGenerationRspecModel.any_instance.stub(:simple_slug_exists?).and_return(false)
+      allow_any_instance_of(SlugGenerationRspecModel). to receive(:simple_slug_exists?).and_return(false)
     end
 
     it 'after save' do
-      SlugGenerationRspecModel.create(name: 'Hello').slug.should == 'hello'
+      expect(SlugGenerationRspecModel.create(name: 'Hello').slug).to eq 'hello'
     end
 
     it 'skip excludes' do
-      SlugGenerationRspecModel.new(name: 'new').should_not be_valid
+      expect(SlugGenerationRspecModel.new(name: 'new')).not_to be_valid
     end
 
     it 'skip integers' do
-      SlugGenerationRspecModel.new(name: '123').should_not be_valid
+      expect(SlugGenerationRspecModel.new(name: '123')).not_to be_valid
     end
 
     it 'skip slug generation' do
-      SlugGenerationRspecModel.any_instance.stub(:should_generate_new_slug?).and_return(false)
-      SlugGenerationRspecModel.create(name: 'Hello').slug.should be_blank
+      allow_any_instance_of(SlugGenerationRspecModel).to receive(:should_generate_new_slug?).and_return(false)
+      expect(SlugGenerationRspecModel.create(name: 'Hello').slug).to be_blank
     end
   end
 
   describe 'resolve conflicts' do
     it 'duplicate slug' do
       record = SlugGenerationRspecModel.new(name: 'Hi')
-      record.should_receive(:simple_slug_exists?).once.ordered.with('hi').and_return(true)
-      record.should_receive(:simple_slug_exists?).once.ordered.with(/hi--\d+/).and_return(false)
+      expect(record).to receive(:simple_slug_exists?).once.ordered.with('hi').and_return(true)
+      expect(record).to receive(:simple_slug_exists?).once.ordered.with(/hi--\d+/).and_return(false)
       record.save
-      record.slug.should start_with('hi--')
+      expect(record.slug).to start_with('hi--')
     end
 
     it 'numeric slug' do
       record = SlugGenerationRspecModel.new(name: '123')
-      record.should_receive(:simple_slug_exists?).with('_123').and_return(false)
+      expect(record).to receive(:simple_slug_exists?).with('_123').and_return(false)
       record.save
-      record.slug.should == '_123'
+      expect(record.slug).to eq '_123'
     end
   end
 
   describe '#to_param' do
     before do
-      SlugGenerationRspecModel.any_instance.stub(:simple_slug_exists?).and_return(false)
+      allow_any_instance_of(SlugGenerationRspecModel).to receive(:simple_slug_exists?).and_return(false)
     end
 
     it 'slug if exists' do
-      SlugGenerationRspecModel.create(name: 'Hello').to_param.should == 'hello'
+      expect(SlugGenerationRspecModel.create(name: 'Hello').to_param).to eq 'hello'
     end
 
     it 'id without slug' do
-      SlugGenerationRspecModel.create(id: 1).to_param.should == '1'
+      expect(SlugGenerationRspecModel.create(id: 1).to_param).to eq '1'
     end
   end
 
   describe '#friendly_find' do
     it '#find if integer like' do
-      SlugGenerationRspecModel.should_receive(:find).with(1)
+      expect(SlugGenerationRspecModel).to receive(:find).with(1)
       SlugGenerationRspecModel.friendly_find(1)
     end
 
     it '#find if numeric string' do
-      SlugGenerationRspecModel.should_receive(:find).with('1')
+      expect(SlugGenerationRspecModel).to receive(:find).with('1')
       SlugGenerationRspecModel.friendly_find('1')
     end
 
     it 'find by slug' do
-      SlugGenerationRspecModel.should_receive(:find_by!).with('slug' => 'title').and_return(double)
+      expect(SlugGenerationRspecModel).to receive(:find_by!).with('slug' => 'title').and_return(double)
       SlugGenerationRspecModel.friendly_find('title')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slug
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Friendly url generator with history.