effective_slugs 0.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3dfb5564879f29db8bf15459160f2e29a4307845
+  data.tar.gz: 4a995a792f311a2aa13675bcf71a364f21433272
+SHA512:
+  metadata.gz: a263b6aa15b529a7da2dbe4cc69c3e17b4f8f1113efd4bb34cced03322d717b40b809afc2721bdb7f4a2fc40f8461aefbe2458b53adda7dc9012fca92e2d11a2
+  data.tar.gz: 29f798fe97ebcb6ccbff2a05eab7fb75f3059465abf96e63a7b741e7525812639b20699c7661cfb4d86b4820d92a8a3b200bdb774d6d10cb68370fbfd48fc96d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Code and Effect Inc.
+Copyright 2014 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,6 @@
 # Effective Slugs
 
-Generates a URL-appropriate slug, as required, when saving a record.
+Automatically generate URL-appropriate slugs when saving a record. Rails 3 only.
 
 Also overrides ActiveRecord .find() methods to accept the slug, or an id as the parameter.
 
@@ -109,15 +109,16 @@ Post.where(:slug => 'my-first-post').first
 
 ## License
 
-MIT License.  Copyright Code and Effect Inc. http://www.codeandeffect.com
+MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
+
+Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
 
-You are not granted rights or licenses to the trademarks of Code and Effect
 
 ## Credits
 
 Some of the code in this gem was inspired by an old version of FriendlyId (https://github.com/FriendlyId/friendly_id)
 
-### Testing
+## Testing
 
 The test suite for this gem is unfortunately not yet complete.
 
@@ -126,3 +127,15 @@ Run tests by:
 ```ruby
 rake spec
 ```
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Bonus points for test coverage
+6. Create new Pull Request
+
+

data/app/models/concerns/acts_as_sluggable.rb

@@ -58,10 +58,9 @@ module ActsAsSluggable
   included do
     before_validation :set_slug, :if => proc { should_generate_new_slug? }
 
-    #attr_accessible :slug
     validates_presence_of :slug
     validates_exclusion_of :slug, :in => EffectiveSlugs.all_excluded_slugs
-    validates_format_of :slug, :with => /^[a-zA-Z0-9_\-]*[a-zA-Z][a-zA-Z0-9_\-]*$/, :message => 'only _ and - symbols allowed'
+    validates_format_of :slug, :with => /\A[a-zA-Z0-9_-]*\z/, :message => 'only _ and - symbols allowed'
 
     if @acts_as_sluggable_opts[:validation_scope]
       validates_uniqueness_of :slug, :scope => @acts_as_sluggable_opts[:validation_scope]
@@ -69,64 +68,6 @@ module ActsAsSluggable
       validates_uniqueness_of :slug
     end
 
-    class_eval do
-      class << self
-        alias relation_without_sluggable relation
-      end
-
-      def self.relation
-        @relation = nil unless @relation.class <= relation_class
-        @relation ||= relation_class.new(self, arel_table)
-      end
-
-      # Gets an anonymous subclass of the model's relation class.
-      # This should increase long term compatibility with any gems that also override finder methods
-      # The other idea would be to just return Class.new(ActiveRecord::Relation)
-
-      def self.relation_class
-        @relation_class ||= Class.new(relation_without_sluggable.class) do
-          alias_method :find_one_without_sluggable, :find_one
-          alias_method :exists_without_sluggable?, :exists?
-          include ActsAsSluggable::FinderMethods
-        end
-      end
-    end
-  end
-
-  module ClassMethods
-  end
-
-  # We inject these methods into the ActsAsSluggable.relation class, as below
-  # Allows us to use sluggable id's identically to numeric ids in Finders
-  # And lets all the pages_path() type stuff work
-  #
-  # This makes all these the same:
-  # Post.find(3) == Post.find('post-slug') == Post.find(post)
-  module FinderMethods
-    protected
-
-    # Find one can be passed 4, "my-slug" or <Object>
-    def find_one(id)
-      begin
-        if id.respond_to?(:slug)
-          where(:slug => id.slug).first
-        elsif id.kind_of?(String)
-          where(:slug => id).first
-        end || super
-      rescue => e
-        super
-      end
-    end
-
-    def exists?(id = false)
-      if id.respond_to?(:slug)
-        super :slug => id.slug
-      elsif id.kind_of?(String)
-        super :slug => id
-      else
-        super
-      end
-    end
   end
 
   def set_slug
@@ -160,7 +101,7 @@ module ActsAsSluggable
   end
 
   def to_param
-    slug.present? ? slug_was : id.to_s
+    (slug.present? rescue false) ? "#{id}-#{slug_was}" : super
   end
 
 end

data/lib/effective_slugs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveSlugs
-  VERSION = "0.1"
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,121 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: effective_slugs
 version: !ruby/object:Gem::Version
-  version: '0.1'
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Generates a URL-appropriate slug, as required, when saving a record.
-  Also overrides ActiveRecord .find() methods to accept the slug, or an id as the
-  parameter.
+        version: '3.2'
+description: Automatically generate URL-appropriate slugs when saving a record. Rails
+  3 only.
 email:
 - info@codeandeffect.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/models/concerns/acts_as_sluggable.rb
+- lib/effective_slugs.rb
 - lib/effective_slugs/engine.rb
 - lib/effective_slugs/version.rb
-- lib/effective_slugs.rb
 - lib/generators/effective_slugs/install_generator.rb
-- lib/generators/templates/effective_slugs.rb
 - lib/generators/templates/README
+- lib/generators/templates/effective_slugs.rb
 - lib/tasks/effective_slugs_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
+- spec/dummy/README.rdoc
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -131,46 +66,39 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
 - spec/dummy/script/rails
 - spec/effective_slugs_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
 homepage: https://github.com/code-and-effect/effective_slugs
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
-summary: Effectively create url-appropriate slugs for any object
+specification_version: 4
+summary: Automatically generate URL-appropriate slugs when saving a record. Rails
+  3 only.
 test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -193,11 +121,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -208,4 +132,3 @@ test_files:
 - spec/effective_slugs_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
-has_rdoc: 

data/spec/dummy/log/development.log

@@ -1,6 +0,0 @@
-Connecting to database specified by database.yml
-   (1.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.1ms)  SELECT version FROM "schema_migrations"
-Connecting to database specified by database.yml
-   (1.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
-   (0.1ms)  SELECT version FROM "schema_migrations"

data/spec/dummy/log/test.log

@@ -1,2 +0,0 @@
-Connecting to database specified by database.yml
-Connecting to database specified by database.yml