Merge pull request #84 from sevenwire/hotfix/modernize

Hotfix/Modernize

Author: brandonarbini

Gemfile.lock

@@ -1,27 +1,35 @@
 PATH
   remote: .
   specs:
-    forgery (0.6.0)
+    forgery (0.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+    diff-lcs (1.3)
+    rake (12.3.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler (~> 1.16.0)
   forgery!
   rake
   rspec
+
+BUNDLED WITH
+   1.16.0

forgery.gemspec

@@ -1,23 +1,23 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "forgery/version"
+
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'forgery/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = "forgery"
+  spec.name        = 'forgery'
   spec.version     = Forgery::VERSION
-  spec.authors     = ["Nathan Sutton", "Brandon Arbini", "Kamil Kieliszczyk"]
-  spec.email       = ["[email protected]", "[email protected]", "[email protected]"]
-  spec.homepage    = "http://github.com/sevenwire/forgery"
-  spec.summary     = "Easy and customizable generation of forged data."
-  spec.description = "Easy and customizable generation of forged data. Can be used as a gem or a rails plugin. Includes rails generators for creating your own forgeries."
+  spec.authors     = ['Nathan Sutton', 'Brandon Arbini', 'Kamil Kieliszczyk']
+  spec.email       = ['[email protected]', '[email protected]', '[email protected]']
+  spec.homepage    = 'http://github.com/sevenwire/forgery'
+  spec.summary     = 'Easy and customizable generation of forged data.'
+  spec.description = 'Easy and customizable generation of forged data. Can be used as a gem or a rails plugin. Includes rails generators for creating your own forgeries.'
 
   spec.platform = Gem::Platform::RUBY
-  spec.required_rubygems_version = ">= 1.3.6"
-  spec.rubyforge_project = "forgery"
+  spec.required_rubygems_version = '>= 1.3.6'
+  spec.rubyforge_project = 'forgery'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = `git ls-files spec`.split($/)
-  spec.require_paths = %w(lib)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.test_files    = `git ls-files spec`.split($INPUT_RECORD_SEPARATOR)
+  spec.require_paths = %w[lib]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency 'bundler', '~> 1.16.0'
 end

lib/forgery/version.rb

@@ -1,3 +1,3 @@
 class Forgery
-  VERSION = "0.6.0"
+  VERSION = '0.7.0'.freeze
 end

spec/extensions/range_spec.rb

@@ -2,32 +2,32 @@
 require 'timeout'
 
 describe Range do
-  it "should get a random number out of the range" do
+  it 'should get a random number out of the range' do
     range = Forgery::Extend(0..9)
     10.times { expect(range).to include(range.random) }
   end
 
-  it "should not take a long time when the range is huge" do
-    expect {
-      Timeout.timeout(1){Forgery::Extend(1234567890..12345678901234567890).random}
-    }.not_to raise_error
+  it 'should not take a long time when the range is huge' do
+    expect do
+      Timeout.timeout(1) { Forgery::Extend(1_234_567_890..12_345_678_901_234_567_890).random }
+    end.not_to raise_error
   end
 
-  it "should return nil for a random number from a reverse range" do
+  it 'should return nil for a random number from a reverse range' do
     10.times { expect(Forgery::Extend(9..0).random).to be_nil }
   end
 
-  it "should get a random string our of the range" do
-    range = Forgery::Extend("a".."z")
+  it 'should get a random string our of the range' do
+    range = Forgery::Extend('a'..'z')
     10.times { expect(range).to include(range.random) }
   end
 
-  it "should return nil if the maximum is less than the minimum" do
-    expect(Forgery::Extend("z".."a").random).to be_nil
+  it 'should return nil if the maximum is less than the minimum' do
+    expect(Forgery::Extend('z'..'a').random).to be_nil
   end
 
-  it "should not return the maximum at excluded range" do
-    Random.should_receive(:rand).with(0...9).and_return(8)
-    Forgery::Extend(0...9).random.should_not be_equal 9
+  it 'should not return the maximum at excluded range' do
+    expect(Random).to receive(:rand).with(0...9).and_return(8)
+    expect(Forgery::Extend(0...9).random).to_not eq(9)
   end
 end

spec/forgery_spec.rb

@@ -2,7 +2,7 @@
 require 'pathname'
 
 describe Forgery do
-  it "should load a dictionary when it is requested" do
+  it 'should load a dictionary when it is requested' do
     Forgery.dictionaries.reset!
 
     expect(Forgery.dictionaries).not_to be_loaded(:colors)
@@ -12,7 +12,7 @@
     expect(Forgery.dictionaries).to be_loaded(:colors)
   end
 
-  it "should load formats when it is requested" do
+  it 'should load formats when it is requested' do
     Forgery.formats.reset!
 
     expect(Forgery.formats).not_to be_loaded(:phone)
@@ -22,42 +22,42 @@
     expect(Forgery.formats).to be_loaded(:phone)
   end
 
-  it "should accept a symbol and return the appropriate forgery class" do
+  it 'should accept a symbol and return the appropriate forgery class' do
     expect(Forgery(:address)).to eq(Forgery::Address)
     expect(Forgery(:basic)).to eq(Forgery::Basic)
     expect(Forgery(:internet)).to eq(Forgery::Internet)
   end
 
-  it "should accept two symbols, finding the right class and calling the appropriate method" do
+  it 'should accept two symbols, finding the right class and calling the appropriate method' do
     expect(Forgery::Address).to receive(:street_name)
     Forgery(:address, :street_name)
 
     expect(Forgery::Name).to receive(:full_name)
     Forgery(:name, :full_name)
   end
 
-  it "should accept two symbols and arguments, passing them along to the appropriate method" do
+  it 'should accept two symbols and arguments, passing them along to the appropriate method' do
     expect(Forgery::LoremIpsum).to receive(:text).with(:sentences, 2)
     Forgery(:lorem_ipsum, :text, :sentences, 2)
   end
 
-  it "should return the rails root path as a string if Rails.root is defined" do
+  it 'should return the rails root path as a string if Rails.root is defined' do
     Rails = Object.new
     allow(Rails).to receive(:root).and_return(Pathname.new('/path/from/rails/dot/root'))
     expect(Forgery.rails_root).to eq('/path/from/rails/dot/root')
     Object.instance_eval { remove_const(:Rails) }
   end
 
-  it "should return nil when Rails.root and Rails.root are not defined" do
+  it 'should return nil when Rails.root and Rails.root are not defined' do
     expect(Forgery.rails_root).to be_nil
   end
 
-  it "should not be a rails environment when there is not a rails_root" do
-    expect(Forgery.rails?).to be_false
+  it 'should not be a rails environment when there is not a rails_root' do
+    expect(Forgery.rails?).to be false
   end
 
-  it "should be a rails environment when there is a rails_root" do
+  it 'should be a rails environment when there is a rails_root' do
     allow(Forgery).to receive(:rails?).and_return(true)
-    expect(Forgery.rails?).to be_true
+    expect(Forgery.rails?).to be true
   end
 end