pretty_slugs 0.0.3 → 0.0.4

data/Gemfile

@@ -6,3 +6,10 @@ gem 'activerecord', ">= 3.0.0", "~> 3.2"
 gem 'activesupport', ">= 3.0.0", "~> 3.2"
 gem 'railties', ">= 3.0.0", "~> 3.2"
 gem 'rake'
+group :development do
+  gem 'sqlite3'
+  gem 'minitest'
+  gem 'minitest-matchers'
+  gem 'guard-minitest'
+  gem 'pry'
+end

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/(.*)\/?test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
+
+  # with Minitest::Spec
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+
+  # Rails 3.2
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+  
+  # Rails
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+end

data/lib/pretty_slugs/version.rb

@@ -1,3 +1,3 @@
 module PrettySlugs
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/pretty_slugs.rb

@@ -1,15 +1,21 @@
-require "pretty_slugs/version"
+# require "pretty_slugs/version"
+require 'active_support/concern'
+require 'active_record'
 
 module PrettySlugs
   extend ActiveSupport::Concern
   included do
-    attr_accessor :slug
+    attr_accessible :slug
     
     after_commit lambda {
       action = transaction_include_action?(:create) ? "create" : transaction_include_action?(:destroy) ? "destroy" : "save"
       case action
       when "destroy"
         remove_slug
+      when "create"
+        check_slug_existence
+      when "save"
+        check_slug_existence
       end
     }
     
@@ -46,6 +52,9 @@ module PrettySlugs
     end
     
     def slug=(val)
+      # the function of to_slug(val) means that if I try to store a 
+      # custom slug, it will make sure it is slug-worthy, lowercase, underscored, etc...
+      @slugstorage = to_slug(val) and return if self.new_record?
       check_slug_existence
       if val != nil && val != ""
         slug = val
@@ -65,7 +74,7 @@ module PrettySlugs
     def generate_slug
       inc = 1
       slug = self.to_slug
-      while !Slug.find_by_sluggable_id_and_sluggable_class(self.id, self.class.to_s).nil?
+      while !Slug.find_by_slug_and_sluggable_class(slug, self.class.to_s).nil?
         slug += "-#{inc}"
         inc += 1
       end
@@ -95,6 +104,7 @@ module PrettySlugs
     end
     
     def to_slug(val=nil)
+      return @slugstorage if @slugstorage 
       word = self[self.respond_to?("name") ? "name" : "title"] rescue self["id"]
       word = self["id"].to_s if word.nil?
 

data/test/lib/pretty_slugs/test_pretty_slugs.rb

@@ -0,0 +1,91 @@
+require_relative '../../test_helper'
+require 'active_record'
+
+class Page < ActiveRecord::Base
+  include PrettySlugs
+  attr_accessible :name, :title, :body
+end
+
+
+describe PrettySlugs do
+
+  before do
+    Page.destroy_all
+    PrettySlugs::Slug.destroy_all
+    @tim = Page.new(:name => "Timothy Johnson", :title => "Rails Peanut", :body => "Tim is a poser")
+    @timothy = Page.new(:name => "Timothy Johnson", :title => "Poop", :body => "sdfsf sd")
+    @joe = Page.new(:name => "Joe Ruoto", :slug => "joey_r", :title => "the man")
+  end
+
+  it "must be defined" do
+    PrettySlugs.wont_be_nil
+  end
+
+  it "must have a Page" do
+    Page.wont_be_nil
+  end
+
+
+  it "Page and Active Record save and retrieval work correctly" do
+    @tim.save
+    Page.first.name.must_equal "Timothy Johnson"
+  end
+
+  it "must create a slug on saving the parent model" do
+    @tim.save
+    Page.find("timothy_johnson").must_equal @tim
+  end
+
+  it "must create a slug on a saved Page" do
+    @tim.save
+    @tim.slug.must_equal "timothy_johnson"
+    Page.find("timothy_johnson").must_equal @tim
+  end
+
+  it "must not create a slug on non-saved Page" do
+    @tim.slug.must_equal ''
+  end
+
+  it "must create a new slug when a previous one is similar" do
+    @tim.save
+    @timothy.save
+    @tim.slug.must_equal 'timothy_johnson'
+    @timothy.slug.must_equal 'timothy_johnson-1'
+    Page.find("timothy_johnson").must_equal @tim
+    Page.find("timothy_johnson-1").must_equal @timothy
+  end
+
+  it "must assign a manual slug correctly" do
+    @joe.save
+    @joe.slug.must_equal "joey_r"
+    Page.find("joey_r").must_equal @joe
+  end
+
+  it "must assign a manual slug after saving correctly" do
+    @joe.save
+    @joe.slug = "jimminy"
+    @joe.save
+    @joe.slug.must_equal "jimminy"
+    Page.find("jimminy").must_equal @joe
+  end
+
+  it "must automatically create a slug, and allow overriding" do 
+    @tim.save
+    Page.find("timothy_johnson").must_equal @tim
+    @tim.slug = "timmy"
+    @tim.save
+    Page.find("timothy_johnson").must_be_nil
+    Page.find("timmy").must_equal @tim
+  end
+
+  it "must handle case-sensitive slugs just like matching slugs" do
+    @jon = Page.new(:name => "Jon Teimann", :slug => "jon")
+    @jont = Page.new(:name => "Jon Teimann", :slug => "Jon")
+    @jon.save
+    @jont.save
+    Page.find("jon").must_equal @jon
+    Page.find("jon-1").must_equal @jont
+    @jont.slug.must_equal "jon-1"
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+
+require "minitest/matchers"
+require 'minitest/autorun'
+require 'minitest/pride'
+require File.expand_path('../../lib/pretty_slugs.rb', __FILE__)
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", 
+                                       :database => ':memory:')
+
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :pages, :force => true do |t|
+    t.string :name
+    t.string :title
+    t.string :body
+  end
+
+  create_table :pretty_slugs, :force => true do |t|
+    t.string :slug, null: false
+    t.integer :sluggable_id, null: false
+    t.string :sluggable_class, null: false
+    t.timestamps
+  end
+  
+  add_index :pretty_slugs, :sluggable_id
+  add_index :pretty_slugs, [:slug, :sluggable_class]
+  add_index :pretty_slugs, :sluggable_class
+  
+end

metadata

@@ -1,37 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pretty_slugs
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Kevin Hopkins
 - Timothy Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-01 00:00:00 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Pretty Slugs for Rails models
-email: 
+email:
 - kevin@h-pk-ns.com
 - timothy@wearefound.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -40,38 +31,33 @@ files:
 - lib/pretty_slugs/migration.rb
 - lib/pretty_slugs/version.rb
 - pretty_slugs.gemspec
-homepage: ""
+- test/lib/pretty_slugs/test_pretty_slugs.rb
+- test/test_helper.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Pretty Slugs stores sluggified strings for rails models in an extensible way
-test_files: []
-
+summary: Pretty Slugs stores sluggified strings for rails models in an extensible
+  way
+test_files:
+- test/lib/pretty_slugs/test_pretty_slugs.rb
+- test/test_helper.rb