sluggi 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecaade4de3ad956da896972e7506e70bbdad8fb1
-  data.tar.gz: c65446d72980b88825ea24cb7e698359bfa1bb59
+  metadata.gz: 72a92d30f09969e63089958da3e197a5ffa57146
+  data.tar.gz: f95fc4c7371e7c2f6ae64524e01a0372fc584163
 SHA512:
-  metadata.gz: 354149487f88bf268e4bb13edddd4a68dffbe025fb5fa4bc0cacb1780f0be4d69ff056007ef7d8605831b2e5207a23d9be3b067ce0f8222bad54bcba5d4e481b
-  data.tar.gz: 057eb42b298de8d0216766b717c38a22b0d80ac1f01cb58f2ac49ee29409b054660c7194c7a7e7b21b8a1b763c50d1542135fafcfcfe5122fc57845a743e7dd1
+  metadata.gz: fe12fe4a76145b87e21e9a093524213fa8666dc8c7e2a06e53900431c58ee34508876e90f7205dd374f443d7097dbb117ae93bf12a36e067cc3d806eb0b877ae
+  data.tar.gz: 090fb62d93291fa03f7b41ee6b76c9da9ad7d23ce48d946095aa1cfed185bd00e83920aa9bd28220e002994967245c3ee4ad6e872d601e13a8c703cfd9eea043

data/lib/sluggi/generators/sluggi_generator.rb

@@ -1,14 +1,13 @@
-require 'rails/generators'
-require 'rails/generators/active_record'
+require "rails/generators"
+require "rails/generators/active_record"
 
 # Copy the migration to create the slugs table.
 class SluggiGenerator < ActiveRecord::Generators::Base
-  argument :name, type: :string, default: 'required_but_not_used'
-  source_root File.expand_path('../../migrations', __FILE__)
+  argument :name, type: :string, default: "required_but_not_used"
+  source_root File.expand_path("../../migrations", __FILE__)
 
   # Copy the migration template to db/migrate.
   def copy_files
-    migration_template 'create_slugs.rb', 'db/migrate/create_slugs.rb'
+    migration_template "create_slugs.rb", "db/migrate/create_slugs.rb"
   end
-
 end

data/lib/sluggi/history.rb

@@ -4,8 +4,8 @@ module Sluggi
 
     included do
       has_many :slugs,
-        -> { order('slugs.id DESC') },
-        class_name: 'Sluggi::Slug',
+        -> { order("slugs.id DESC") },
+        class_name: "Sluggi::Slug",
         as: :sluggable,
         dependent: :destroy
 
@@ -16,7 +16,7 @@ module Sluggi
       def find_slug!(slug)
         object = where(slug: slug).first || find_slugs(slug).first.try(:sluggable)
         unless object.is_a?(self)
-          raise ActiveRecord::RecordNotFound, "Couldn't find #{self.name} with 'slug'='#{slug}'"
+          raise ActiveRecord::RecordNotFound, "Couldn't find #{name} with 'slug'='#{slug}'"
         end
         object
       end
@@ -30,7 +30,7 @@ module Sluggi
       end
     end
 
-  private
+    private
 
     def create_slug
       value = clean_slug(slug_value)
@@ -39,6 +39,5 @@ module Sluggi
       self.class.find_slugs(value).delete_all # revert to previous slug & put first
       slugs.create(slug: value)
     end
-
   end
 end

data/lib/sluggi/migrations/create_slugs.rb

@@ -1,12 +1,12 @@
 class CreateSlugs < ActiveRecord::Migration
   def change
     create_table :slugs do |t|
-      t.string   :slug,           null: false
-      t.integer  :sluggable_id,   null: false
-      t.string   :sluggable_type, null: false
+      t.string :slug, null: false
+      t.integer :sluggable_id, null: false
+      t.string :sluggable_type, null: false
       t.datetime :created_at
     end
-    
+
     add_index :slugs, [:slug, :sluggable_type], unique: true
     add_index :slugs, :sluggable_id
   end

data/lib/sluggi/model.rb

@@ -13,7 +13,7 @@ module Sluggi
       slug_was
     end
 
-  private
+    private
 
     def clean_slug(value)
       value.try :parameterize

data/lib/sluggi/version.rb

@@ -1,3 +1,3 @@
 module Sluggi
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sluggi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,12 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/sluggi.rb
 - lib/sluggi/generators/sluggi_generator.rb
 - lib/sluggi/history.rb
@@ -104,16 +100,6 @@ files:
 - lib/sluggi/validate_presence.rb
 - lib/sluggi/validate_uniqueness.rb
 - lib/sluggi/version.rb
-- sluggi.gemspec
-- test/generator_test.rb
-- test/history_test.rb
-- test/model_test.rb
-- test/slug_test.rb
-- test/slugged_test.rb
-- test/test_helper.rb
-- test/validate_presence_test.rb
-- test/validate_uniqueness_test.rb
-- test/validates_exclusion_of_test.rb
 homepage: https://github.com/neighborland/sluggi
 licenses:
 - MIT
@@ -134,17 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails Slug Generator
-test_files:
-- test/generator_test.rb
-- test/history_test.rb
-- test/model_test.rb
-- test/slug_test.rb
-- test/slugged_test.rb
-- test/test_helper.rb
-- test/validate_presence_test.rb
-- test/validate_uniqueness_test.rb
-- test/validates_exclusion_of_test.rb
+test_files: []
+has_rdoc: 

data/.gitignore

@@ -1,5 +0,0 @@
-.ruby-version
-Gemfile.lock
-coverage
-pkg
-tmp

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - 1.9.3

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/Rakefile

@@ -1,10 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-task default: [:test]
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.test_files = %w(test/**/*.rb)
-  t.verbose = false
-end

data/sluggi.gemspec

@@ -1,25 +0,0 @@
-require './lib/sluggi/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "sluggi"
-  spec.version       = Sluggi::VERSION
-  spec.authors       = ["Tee Parham"]
-  spec.email         = ["tee@neighborland.com"]
-  spec.summary       = %q{Rails Slug Generator}
-  spec.description   = %q{A Rails slug generator inspired by friendly_id}
-  spec.homepage      = "https://github.com/neighborland/sluggi"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.test_files    = spec.files.grep(%r{^(test)/})
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 1.9.3"
-
-  spec.add_dependency "activerecord", "~> 4.0"
-  spec.add_dependency "railties", "~> 4.0"
-
-  spec.add_development_dependency "rake", "~> 10.4"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "mocha", "~> 1.0"
-end

data/test/generator_test.rb

@@ -1,17 +0,0 @@
-require 'test_helper'
-require 'rails/generators/test_case'
-
-class GeneratorTest < Rails::Generators::TestCase
-  tests ::SluggiGenerator
-  destination File.expand_path("../../tmp", __FILE__)
-  setup :prepare_destination
-
-  test "generate a migration" do
-    begin
-      run_generator
-      assert_migration "db/migrate/create_slugs"
-    ensure
-      FileUtils.rm_rf self.destination_root
-    end
-  end
-end

data/test/history_test.rb

@@ -1,123 +0,0 @@
-require 'test_helper'
-
-class HistoryTest < MiniTest::Spec
-  class ::Cat < ActiveRecord::Base
-    include Sluggi::Slugged
-    include Sluggi::History
-
-    def slug_value
-      name
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  class ::Dog < ActiveRecord::Base
-    include Sluggi::Slugged
-    include Sluggi::History
-
-    def slug_value
-      name
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  class ::BigDog < ::Dog
-  end
-
-  class ::LittleDog < ::Dog
-  end
-
-  before do
-    Cat.delete_all
-    Sluggi::Slug.delete_all
-  end
-
-  describe ".find_slug!" do
-    it "finds current slug" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      assert_equal cat, Cat.find_slug!('tsim-tung-brother-cream')
-    end
-
-    it "finds both current and historical slug" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      cat.name = 'Cream Aberdeen'
-      cat.save!
-      assert_equal cat, Cat.find_slug!('tsim-tung-brother-cream')
-      assert_equal cat, Cat.find_slug!('cream-aberdeen')
-    end
-
-    it "raises when not found" do
-      assert_raises(ActiveRecord::RecordNotFound) do
-        Cat.find_slug! 'garfield'
-      end
-    end
-
-    it "finds STI classes" do
-      big_dog = BigDog.create(name: 'Snoop')
-      assert_equal big_dog, Dog.find_slug!('snoop')
-      assert_equal big_dog, BigDog.find_slug!('snoop')
-      error = assert_raises(ActiveRecord::RecordNotFound) do
-        LittleDog.find_slug!('snoop')
-      end
-      assert_equal "Couldn't find LittleDog with 'slug'='snoop'", error.message
-    end
-  end
-
-  describe ".slug_exists?" do
-    it "exists" do
-      Cat.create(name: 'Tsim Tung Brother Cream')
-      assert Cat.slug_exists?('tsim-tung-brother-cream')
-    end
-
-    it "does not exist" do
-      refute Cat.slug_exists?('tsim-tung-brother-cream')
-    end
-  end
-
-  describe ".find_slugs" do
-    it "is empty" do
-      assert_empty Cat.find_slugs('garfield')
-    end
-
-    it "finds historical slug" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      slugs = Cat.find_slugs('tsim-tung-brother-cream')
-      assert_equal 1, slugs.size
-      slug = slugs.first
-      assert_equal 'tsim-tung-brother-cream', slug.slug
-      assert_equal 'Cat', slug.sluggable_type
-      assert_equal cat.id, slug.sluggable_id
-    end
-  end
-
-  describe ".after_save" do
-    it "creates a slug when model is created" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      assert_equal 1, cat.slugs.size
-      assert_equal 'tsim-tung-brother-cream', cat.slugs.first.slug
-    end
-
-    it "creates a slug when model slug changes" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      cat.name = 'Cream Aberdeen'
-      cat.save!
-      assert_equal 2, cat.slugs.size
-      assert_equal ['cream-aberdeen', 'tsim-tung-brother-cream'], cat.slugs.map(&:slug)
-    end
-
-    it "does not create a slug when model slug is unchanged" do
-      cat = Cat.create(name: 'Tsim Tung Brother Cream')
-      cat.factoid = 'aka Cream Aberdeen'
-      cat.save!
-      assert_equal 1, cat.slugs.size
-      assert_equal 'tsim-tung-brother-cream', cat.slugs.first.slug
-    end
-  end
-
-end

data/test/model_test.rb

@@ -1,73 +0,0 @@
-require "test_helper"
-
-class ModelTest < MiniTest::Spec
-  class IncompleteCat < ActiveRecord::Base
-    self.table_name = 'cats'
-    include Sluggi::Model
-  end
-
-  class Cat < ActiveRecord::Base
-    include Sluggi::Model
-
-    def slug_value
-      name
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  class CandidateCat < ActiveRecord::Base
-    self.table_name = 'cats'
-    include Sluggi::Model
-
-    def slug_candidates
-      [nil, name]
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  it "raises when slug_value is not implemented" do
-    assert_raises(NotImplementedError) do
-      IncompleteCat.new.valid?
-    end
-  end
-
-  describe "#to_param" do
-    before do
-      Cat.delete_all
-      @cat = Cat.new(name: 'Tuxedo Stan')
-    end
-
-    it "is nil when new" do
-      assert_nil @cat.to_param
-    end
-
-    it "is the slug when persisted" do
-      @cat.save!
-      assert_equal 'tuxedo-stan', @cat.to_param
-    end
-
-    it "is the old slug when changed but not saved" do
-      @cat.save!
-      @cat.slug = 'ketzel'
-      assert_equal 'tuxedo-stan', @cat.to_param
-    end
-  end
-
-  it "sets slug from candidates on validation" do
-    cat = CandidateCat.new(name: 'Smokey')
-    assert cat.valid?
-    assert_equal 'smokey', cat.slug
-  end
-
-  it "sets slug on validation" do
-    cat = Cat.new(name: 'Prince Chunk')
-    assert cat.valid?
-    assert_equal 'prince-chunk', cat.slug
-  end
-end

data/test/slug_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-
-module Sluggi
-  class SlugTest < MiniTest::Spec
-    describe "validation" do
-      it "is not valid" do
-        slug = Slug.new
-        refute slug.valid?
-      end
-
-      it "is valid" do
-        slug = Slug.new(sluggable_type: 'Cat', sluggable_id: 1, slug: 'garfield')
-        assert slug.valid?
-      end
-    end
-
-    describe ".find_type" do
-      it "finds" do
-        slug = Slug.create(sluggable_type: 'Cat', sluggable_id: 1, slug: 'garfield')
-        assert_equal slug, Slug.find_type('garfield', 'Cat').first
-      end
-    end
-
-    describe "#to_param" do
-      it "is nil" do
-        assert_nil Slug.new.to_param
-      end
-
-      it "is slug" do
-        assert_equal 'meow', Slug.new(slug: 'meow').to_param
-      end
-    end
-
-  end
-end

data/test/slugged_test.rb

@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class SluggedTest < MiniTest::Spec
-  class Cat < ActiveRecord::Base
-    include Sluggi::Slugged
-
-    def slug_value
-      name
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  it "includes ValidatePresence" do
-    assert Cat.new.is_a? Sluggi::ValidatePresence
-  end
-
-  it "includes ValidateUniqueness" do
-    assert Cat.new.is_a? Sluggi::ValidateUniqueness
-  end
-
-  it "includes ValidateExclusionOf" do
-    assert Cat.new.is_a? Sluggi::ValidateExclusionOf
-  end
-
-  it "includes Model" do
-    assert Cat.new.is_a? Sluggi::Model
-  end
-end

data/test/test_helper.rb

@@ -1,48 +0,0 @@
-#require 'coveralls'
-#Coveralls.wear!
-
-require 'minitest/autorun'
-require 'active_support'
-require 'active_record'
-require 'sqlite3'
-require 'sluggi'
-require 'mocha/setup'
-
-ActiveRecord::Base.logger = Logger.new(STDERR) if ENV["VERBOSE"]
-
-ActiveRecord::Base.establish_connection(
-  adapter: "sqlite3",
-  database: ":memory:"
-)
-
-unless ActiveRecord::Base.connection.tables.include?('cats')
-  ActiveRecord::Schema.define do
-    create_table :cats do |t|
-      t.datetime :created_at
-      t.string :factoid
-      t.string :name
-      t.string :slug
-    end
-
-    create_table :slugs do |t|
-      t.string   :slug,         null: false
-      t.integer  :sluggable_id, null: false
-      t.string   :sluggable_type
-      t.datetime :created_at
-    end
-
-    create_table :dogs do |t|
-      t.datetime :created_at
-      t.string :type
-      t.string :name
-      t.string :slug
-    end
-  end
-end
-
-I18n.enforce_available_locales = true
-
-# suppress deprecation warning
-ActiveSupport.test_order = :random
-
-# Thanks to this List of Cats: http://en.wikipedia.org/wiki/List_of_cats

data/test/validate_presence_test.rb

@@ -1,12 +0,0 @@
-require "test_helper"
-
-class ValidatePresenceTest < MiniTest::Spec
-  class Cat < ActiveRecord::Base
-    include Sluggi::ValidatePresence
-  end
-
-  it "validates presence of slug" do
-    refute Cat.new(slug: '').valid?
-    assert Cat.new(slug: 'foo').valid?
-  end
-end

data/test/validate_uniqueness_test.rb

@@ -1,32 +0,0 @@
-require "test_helper"
-
-class ValidateUniquenessTest < MiniTest::Spec
-  class Cat < ActiveRecord::Base
-    include Sluggi::Model
-    include Sluggi::ValidateUniqueness
-
-    def slug_value
-      name
-    end
-
-    def slug_value_changed?
-      name_changed?
-    end
-  end
-
-  it "validates slug is unique" do
-    Cat.create(slug: "mrs-chippy")
-    cat = Cat.new(name: "Mrs. Chippy")
-    refute cat.valid?
-    assert_equal "has already been taken", cat.errors[:slug].first
-    assert_nil cat.to_param
-  end
-
-  it "does not validate uniqueness when slug is unchanged" do
-    cat = Cat.create(slug: "garfield")
-    cat.factoid = "factoid"
-    refute cat.slug_value_changed?
-    ActiveRecord::Validations::UniquenessValidator.any_instance.expects(:validate_each).never
-    assert cat.valid?
-  end
-end

data/test/validates_exclusion_of_test.rb

@@ -1,25 +0,0 @@
-require "test_helper"
-
-class ValidatesExclusionOfTest < MiniTest::Spec
-  class Cat < ActiveRecord::Base
-    include Sluggi::ValidateExclusionOf
-  end
-
-  describe ".reserved_slugs" do
-    %w(create login users).each do |word|
-      it "includes #{word}" do
-        assert_includes Cat.reserved_slugs, word
-      end
-    end
-
-    it "does not include valid slug" do
-      refute_includes Cat.reserved_slugs, 'something'
-    end
-  end
-
-  describe "validation" do
-    it "ensures slug is not a reserved word" do
-      refute Cat.new(slug: 'edit').valid?
-    end
-  end
-end