slugworth 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77159f292434b785943b273df3105db32acb74c
-  data.tar.gz: 9b5ba418ef641c443d65812907b537ea54c5b11b
+  metadata.gz: 29c5a2617fdb5cb5bfebeb4545eeb25e19833dba
+  data.tar.gz: 4667dd9a4eab4e2934a22694fe730bb239da6f60
 SHA512:
-  metadata.gz: 75f31bc79dc40409230b3350c377ff04f90430d21ec0b0161300a8c3816408f65b715cae1b6d499629a51bfa6a70c9b1f673af7ac4aec2afd91a133cfaa8573d
-  data.tar.gz: bbd860dbb13e3f4abe7a9584d19616334ead8a062226041633536e2090eefdfa4e71fe2161779a7ce3f63d537df0997d16128816d314575088dfccdf125fb28e
+  metadata.gz: 2695d24b686191d58b56ffd5e04e2083b5cc059be663fc6a5a433a096de361a9a060b339f8f67471dcae66439bc5004026a02b69ad502a9cfed69544f0c34473
+  data.tar.gz: 112887759a1197cbc69e74e06597cb5ae5f062a4143b31a09c31ac9883f2334d2610d22ae4553201c9eed94928e66459f7aefb27a26a96a68eafe32a106ba97b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.1
+
+- Bug fix for slug generation on a slug attribute that is nil
+
 ## 1.2.0
 
 - Uniqueness scoping for a slug

data/README.md

@@ -1,8 +1,8 @@
 ![Slugworth](http://f.cl.ly/items/3T1K3g040S0u2l0G0d3V/slugworth_header.png)
 
-[![Gem Version](https://badge.fury.io/rb/slugworth.png)](http://badge.fury.io/rb/sluggle)
-[![Build Status](https://travis-ci.org/mattpolito/slugworth.png?branch=master)](https://travis-ci.org/mattpolito/slugworth)
-[![Code Climate](https://codeclimate.com/github/mattpolito/slugworth.png)](https://codeclimate.com/github/mattpolito/slugworth)
+[![Gem Version](http://img.shields.io/gem/v/slugworth.svg?style=flat)](http://badge.fury.io/rb/slugworth)
+[![Build Status](http://img.shields.io/travis/mattpolito/slugworth/master.svg?style=flat)](https://travis-ci.org/mattpolito/slugworth)
+[![Code Climate](http://img.shields.io/codeclimate/github/mattpolito/slugworth.svg?style=flat)](https://codeclimate.com/github/mattpolito/slugworth)
 
 Simple slug functionality for your ActiveRecord objects
 
@@ -41,12 +41,12 @@ class User < ActiveRecord::Base
 end
 ```
 
-After you `include` the `Slugworth` module, all you need to do is declare what method will be used to create the slug. The method passed to `slugged_with` will then be paramterized.
+After you `include` the `Slugworth` module, all you need to do is declare what method will be used to create the slug. The method passed to `slugged_with` will then be parameterized.
 
 This provides most of the default slug functionality you would need.
 
 * Finders `.find_by_slug` & `.find_by_slug!` are provided. This will, of course, do what you expect and find a single record by the slug attribute provided.
-* `#to_param` has been defined as a paramaterized version of the attribute declared to `slugged_with`.
+* `#to_param` has been defined as a parameterized version of the attribute declared to `slugged_with`.
 * Validations stating that `slug` is present and unique in the database.
 
 ### Scoping uniqueness

data/lib/slugworth.rb

@@ -5,15 +5,15 @@ module Slugworth
 
   included do
     cattr_accessor :slug_attribute, :slug_scope, :slug_incremental, :slug_updatable
-    before_validation(:add_slug)
+    before_validation(:add_slug, if: :slug_attribute_value)
   end
 
   module ClassMethods
-    def slugged_with(slug_attribute, opts={})
-      self.slug_attribute = slug_attribute
-      self.slug_scope = opts.delete(:scope)
+    def slugged_with(slug_attribute, opts = {})
+      self.slug_attribute   = slug_attribute
+      self.slug_scope       = opts.delete(:scope)
       self.slug_incremental = opts.delete(:incremental)
-      self.slug_updatable = opts.delete(:updatable)
+      self.slug_updatable   = opts.delete(:updatable)
       validates_uniqueness_of :slug, scope: slug_scope
     end
 
@@ -29,6 +29,7 @@ module Slugworth
   def to_param; slug; end
 
   private
+
   def add_slug
     self.slug = processed_slug if generate_slug?
   end
@@ -37,12 +38,16 @@ module Slugworth
     !slug.present? || slug_updatable && changes[slug_attribute].present?
   end
 
+  def slug_attribute_value
+    public_send(slug_attribute)
+  end
+
   def processed_slug
-    slug_incremental ?  process_incremental_slug : parameterized_slug
+    slug_incremental ? process_incremental_slug : parameterized_slug
   end
 
   def parameterized_slug
-    public_send(slug_attribute).parameterize
+    slug_attribute_value.parameterize
   end
 
   def process_incremental_slug

data/lib/slugworth/version.rb

@@ -1,3 +1,3 @@
 module Slugworth
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/lib/slugworth_shared_examples.rb

@@ -1,11 +1,17 @@
 shared_examples_for :has_slug_functionality do
   describe "#slug" do
     context "when no slug is set" do
-      specify 'slug is generated' do
+      specify 'slug is generated with slug attribute' do
         obj = described_class.new(described_class.slug_attribute => 'Generated slug')
         obj.valid?
         expect(obj.slug).to eq('generated-slug')
       end
+
+      specify 'slug is not generated with no slug attribute' do
+        obj = described_class.new
+        obj.valid?
+        expect(obj.slug).to be_nil
+      end
     end
 
     context "when the slug is set" do

data/slugworth.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'slugworth/version'
+require "slugworth/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "slugworth"
@@ -17,13 +17,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = ">= 1.9.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.13"
-  spec.add_development_dependency 'activerecord', '~> 4.0.0'
+  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency "activerecord", "~> 4.0.0"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "database_cleaner", '~> 1.0.1'
+  spec.add_development_dependency "database_cleaner", "~> 1.0.1"
   spec.add_development_dependency "sqlite3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slugworth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matt Polito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easy slug functionality