slugtastic 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 704240d3d16bf9fe3471f748b594694e451ad2fd
-  data.tar.gz: 158d286f398fcfa33234fc99356b8e4728816a0c
+  metadata.gz: fedfdd70757c326282c3afa06061ff5219db0ad2
+  data.tar.gz: c6c87146a76046a04381be4c0b4552262a131065
 SHA512:
-  metadata.gz: 93063ba1a143540d6ce7db8552c4e29031475dd0be8bac1833dcf3a0644a30404e9f27f16969d35a561806d1edb86e7bd7f6ea5abd1c14513c40d2c01b10a660
-  data.tar.gz: cfaf954291e13b2d8e9cc9a0cc080711189cc8dcaa23aa4f8a77ff7a3b1c54b5893ca365818427073bc3aad8163bf98c77991010530ff7780da108a3cfef5892
+  metadata.gz: e6817d70b75343f27d0cb41ec3c1b795b07deb31c5b3446ac2971aceb7533e808b17d9f98ffa5a1670f9619b8646ac568f7b94dfb6474eca820d1f7b88acd449
+  data.tar.gz: c6e05d16648c4b4bd631cc560541ab7eb100c0888d8617fcc6435a651c808b75aa5c0d191e59fd5c793eeb40dabbe8dacce508b6362afcdf0ae527aeb05b4cc1

data/.rubocop.yml

@@ -0,0 +1,16 @@
+Metrics/LineLength:
+  Max: 120
+
+Documentation:
+  Enabled: false
+
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'bin/**/*'
+    - !ruby/regexp /old_and_unused\.rb$/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slugtastic (1.2.1)
+    slugtastic (1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -12,17 +12,22 @@ GEM
       i18n (~> 0.5.0)
     activesupport (3.0.20)
     builder (2.1.2)
-    diff-lcs (1.1.3)
-    i18n (0.5.0)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    diff-lcs (1.2.5)
+    i18n (0.5.4)
+    rake (11.1.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     supermodel (0.1.6)
       activemodel (~> 3.0.0)
 
@@ -30,7 +35,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake
-  rspec
+  rake (~> 11.1)
+  rspec (~> 3.4)
   slugtastic!
-  supermodel
+  supermodel (~> 0)
+
+BUNDLED WITH
+   1.11.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Dan Barber
+Copyright (c) 2015 Dan Barber
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,14 +1,17 @@
-# Slugtastic [![Build Status](https://secure.travis-ci.org/danbee/slugtastic.png?branch=master)](http://travis-ci.org/danbee/slugtastic)
+# Slugtastic
 
-Simple gem for autogenerating permalink style slugs for your ActiveRecord models.
+[![Codeship Status for danbee/slugtastic](https://codeship.com/projects/7a08ef30-0518-0132-d4b6-223503fac7d3/status?branch=master)](https://codeship.com/projects/30797)
+
+[![Gem Version](https://badge.fury.io/rb/slugtastic.svg)](https://badge.fury.io/rb/slugtastic)
+
+Simple gem for autogenerating permalink style slugs for your ActiveRecord
+models.
 
 ## Requirements
 
-* Ruby 1.9.2 or 1.9.3
+* Ruby 2.0.0+
 * Rails 3.1 or higher.
 
-It should work with Rails 3.0 but it hasn't been tested.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -27,9 +30,11 @@ Or install it yourself as:
 
 Usage is very simple. Just add the following to your model:
 
-    has_slug :slug, :from => :title
+    slug :slug, from: :title
 
-This will generate a slug string from the title atrribute and store it in the slug attribute unless the slug already contains a string. The slug is generated pre-validation so you can still use `validates_presence_of :slug`.
+This will generate a slug string from the title attribute and store it in the
+slug attribute unless the slug already contains a string. The slug is generated
+pre-validation so you can still use `validates_presence_of :slug`.
 
 There are no extra options at present.
 

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/slugtastic/model_additions.rb

@@ -1,6 +1,5 @@
 module Slugtastic
   module ModelAdditions
-
     # To generate a slug from another value, call <tt>has_slug</tt> in any
     # ActiveRecord model and pass in the name of the slug attribute.
     # By default the slug will be generated from the <tt>title</tt> attribute, but
@@ -9,12 +8,20 @@ module Slugtastic
     #   class Article < ActiveRecord::Base
     #     has_slug :slug, :from => :title
     #   end
-    def has_slug name, options = {}
-      options.reverse_merge!({ :from => :title })
-      before_validation do |record|
-        send("#{name}=", Slugtastic.generate_slug(send(options[:from]), options[:delimiter])) if send(name).nil? or send(name).blank?
+    #
+    def slug(name, options = {})
+      options.reverse_merge!(from: :title)
+      before_validation do
+        if send(name).nil? || send(name).blank?
+          send("#{name}=", Slugtastic.generate_slug(send(options[:from]), options[:delimiter]))
+        end
       end
     end
 
+    def has_slug(name, options = {})
+      $stderr.puts '[deprecated] Slugtastic: `has_slug` has been renamed `slug` and will likely '\
+                   'be removed in a future version.'
+      slug(name, options)
+    end
   end
 end

data/lib/slugtastic/railtie.rb

@@ -1,6 +1,6 @@
 module Slugtastic
   class Railtie < Rails::Railtie
-    initializer "slugtastic.model_additions" do
+    initializer 'slugtastic.model_additions' do
       ActiveSupport.on_load :active_record do
         extend ModelAdditions
       end

data/lib/slugtastic/version.rb

@@ -1,3 +1,3 @@
 module Slugtastic
-  VERSION = "1.2.1"
+  VERSION = '1.3.1'.freeze
 end

data/lib/slugtastic.rb

@@ -1,14 +1,12 @@
-require "slugtastic/version"
-require "slugtastic/model_additions"
-require "slugtastic/railtie" if defined? Rails
+require 'slugtastic/version'
+require 'slugtastic/model_additions'
+require 'slugtastic/railtie' if defined? Rails
 
 module Slugtastic
   def self.generate_slug(string, delimiter = nil)
     return if string.nil?
     slug = string.parameterize
-    if delimiter
-      slug.gsub!("-", delimiter)
-    end
+    slug.gsub!('-', delimiter) if delimiter
     slug
   end
 end

data/slugtastic.gemspec

@@ -4,9 +4,10 @@ require File.expand_path('../lib/slugtastic/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Dan Barber"]
   gem.email         = ["danbee@gmail.com"]
+  gem.licenses      = ['MIT']
   gem.description   = %q{A simple slug string generator for ActiveRecord. Will populate a slug attribute from another attribute.}
   gem.summary       = %q{A simple slug string generator for ActiveRecord.}
-  gem.homepage      = ""
+  gem.homepage      = "http://danbarber.me/slugtastic"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Slugtastic::VERSION
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "supermodel"
+  gem.add_development_dependency "rake", "~> 11.1"
+  gem.add_development_dependency "rspec", "~> 3.4"
+  gem.add_development_dependency "supermodel", "~> 0"
 end

data/spec/slugtastic/model_additions_spec.rb

@@ -8,38 +8,47 @@ end
 
 class Model < BaseModel
   attr_accessor :slug, :name
-  has_slug :slug, from: :name
+  slug :slug, from: :name
 end
 
 class ModelDefault < BaseModel
   attr_accessor :slug, :title
-  has_slug :slug
+  slug :slug
 end
 
 class ModelDelimiter < BaseModel
   attr_accessor :slug, :title
-  has_slug :slug, delimiter: "_"
+  slug :slug, delimiter: '_'
+end
+
+class ModelAlias < BaseModel
+  attr_accessor :slug, :title
+  has_slug :slug
 end
 
 describe Slugtastic::ModelAdditions do
-  it "generates a slug from the name" do
-    Model.create!(:name => "A Simple Name").slug.should eq "a-simple-name"
+  it 'generates a slug from the name' do
+    expect(Model.create!(name: 'A Simple Name').slug).to eq 'a-simple-name'
   end
 
-  it "defaults to generating the slug from title" do
-    ModelDefault.create!(:title => "A Simple Title").slug.should eq "a-simple-title"
+  it 'defaults to generating the slug from title' do
+    expect(ModelDefault.create!(title: 'A Simple Title').slug).to eq 'a-simple-title'
   end
 
-  it "generates a slug from the title with delimiter substitutions" do
-    ModelDelimiter.create!(:title => "A Simple Title").slug.should eq "a_simple_title"
+  it 'generates a slug from the title with delimiter substitutions' do
+    expect(ModelDelimiter.create!(title: 'A Simple Title').slug).to eq 'a_simple_title'
   end
 
   it "doesn't regenerate the slug if it already exists" do
-    model = Model.create!(:name => "A Simple Name")
-    model.slug.should eq "a-simple-name"
+    model = Model.create!(name: 'A Simple Name')
+    expect(model.slug).to eq 'a-simple-name'
 
-    model.title = "A new title"
+    model.title = 'A new title'
     model.save
-    model.slug.should eq "a-simple-name"
+    expect(model.slug).to eq 'a-simple-name'
+  end
+
+  it 'aliases slug to has_slug for backwards compatibility' do
+    expect(ModelAlias.create!(title: 'A Simple Title').slug).to eq 'a-simple-title'
   end
 end

data/spec/slugtastic_spec.rb

@@ -2,34 +2,34 @@
 require 'spec_helper'
 
 describe Slugtastic do
-  describe ".generate_slug" do
-    it "returns empty if the input string is empty" do
-      Slugtastic.generate_slug("").should eq ""
+  describe '.generate_slug' do
+    it 'returns empty if the input string is empty' do
+      expect(Slugtastic.generate_slug('')).to eq ''
     end
 
-    it "generates a slug from a simple string" do
-      Slugtastic.generate_slug("A simple string.").should eq "a-simple-string"
+    it 'generates a slug from a simple string' do
+      expect(Slugtastic.generate_slug('A simple string.')).to eq 'a-simple-string'
     end
 
-    it "substitutes hyphens for delimiter if specified" do
-      Slugtastic.generate_slug("A simple string.", "_").should eq "a_simple_string"
+    it 'substitutes hyphens for delimiter if specified' do
+      expect(Slugtastic.generate_slug('A simple string.', '_')).to eq 'a_simple_string'
     end
 
-    it "generates a slug from a string with numbers" do
-      Slugtastic.generate_slug("Slugtastic was built in 2012.").should eq "slugtastic-was-built-in-2012"
+    it 'generates a slug from a string with numbers' do
+      expect(Slugtastic.generate_slug('Slugtastic was built in 2012.')).to eq 'slugtastic-was-built-in-2012'
     end
 
-    it "handles strings with hypens in them" do
-      Slugtastic.generate_slug("A string - with Hyphens").should eq "a-string-with-hyphens"
+    it 'handles strings with hypens in them' do
+      expect(Slugtastic.generate_slug('A string - with Hyphens')).to eq 'a-string-with-hyphens'
     end
 
-    it "handles strings with other characters in them" do
-      Slugtastic.generate_slug("A string, with /All sorts!").should eq "a-string-with-all-sorts"
+    it 'handles strings with other characters in them' do
+      expect(Slugtastic.generate_slug('A string, with /All sorts!')).to eq 'a-string-with-all-sorts'
     end
 
-    it "handles basic transliteration" do
-      Slugtastic.generate_slug("Un été À la maison.").should eq "un-ete-a-la-maison"
-      Slugtastic.generate_slug("Ātri brūna lapsa").should eq "atri-bruna-lapsa"
+    it 'handles basic transliteration' do
+      expect(Slugtastic.generate_slug('Un été À la maison.')).to eq 'un-ete-a-la-maison'
+      expect(Slugtastic.generate_slug('Ātri brūna lapsa')).to eq 'atri-bruna-lapsa'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,2 @@
-require "slugtastic"
-require "supermodel"
+require 'slugtastic'
+require 'supermodel'

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: slugtastic
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Dan Barber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: supermodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple slug string generator for ActiveRecord. Will populate a slug
@@ -60,9 +60,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -77,8 +78,9 @@ files:
 - spec/slugtastic/model_additions_spec.rb
 - spec/slugtastic_spec.rb
 - spec/spec_helper.rb
-homepage: ''
-licenses: []
+homepage: http://danbarber.me/slugtastic
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -86,17 +88,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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple slug string generator for ActiveRecord.