url_attributes 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72fddb96602914d4b5919991d53951949012f68b
-  data.tar.gz: 2a8d960c781033dd6bb95aa28b49c5fb09bcb1c5
+  metadata.gz: f2b9ac4bb2330e36f9a6ce629b265c2926793569
+  data.tar.gz: e78f758a61bc52cc6f65810e7a42e9e3e2efe0bf
 SHA512:
-  metadata.gz: 16c66826858d8116aefb25d0037fe5d02fe0d33d8fb9766bd08b8e9b10a5f1588f3ea4139ffbf481fab5dcaf6c6978dd2c8def635508dc3b80fed65434cff046
-  data.tar.gz: f7aecd99cc47f80508c12f37d07be214db148d208a7cd51cc08145786ff1483a8a61a7cbbd43ad15839b081a5e951121d69ceeb89c45f75b311967528c6b5e7d
+  metadata.gz: cb761cd88a6478fa89114448792aa47c928eb61806d57965e75eb939070c85eaf65e2740e46efbc1d6690a670156c044dd60df0db9d66d640e445154b9577b7f
+  data.tar.gz: b3ba4110e2e2a08f22d375c8e55895c2e09dfb6c4626c8f8ddaaaf0412bd2bcf4addeb82f91d1c9a51c413a88e6c2c15d03b6f079e32de68187b742915536fef

data/README.md

@@ -24,8 +24,17 @@ then call the class method `url_attribute` in your model like this:
 This does two things:
 
 1. It adds a validation to `link` that 
-2. Before save, it strips trailing whitespace from the link and adds `"http://"` to the beginning
-   if it (or `"https://"`) is not already there.
+2. Before save, it strips trailing whitespace from the link and adds
+   `"http://"` to the beginning if it (or `"https://"`) is not already there.
+
+If you want the logic to run somewhere other than `before_save`, pass a
+`:before` option with the name of another `before_` callback:
+
+    class MyAwesomeModel < ActiveRecord::Base
+
+      url_attribute :link, before: :validation
+
+    end
 
 ## Matcher
 

data/lib/url_attributes/extensions/active_record.rb

@@ -13,17 +13,20 @@
 module URLAttributes
   module ActiveRecord
 
-    def url_attribute(attribute_name, opts={})
+    def url_attribute(attribute_name, before: :save)
       validates attribute_name, :url => true, :if => "#{attribute_name}.present?"
 
+      callback_method = :"before_#{before}"
+        
       # Add "http://" to the URL if it's not already there.
-      before_save do |record|
+      send(callback_method) do |record|
         url = record[attribute_name]
         if url.present? && !(url =~ /\A\s*https?:\/\//)
           url = "http://#{url.try(:strip)}"
         end
         record[attribute_name] = url
       end
+
     end
 
   end

data/lib/url_attributes/rspec/have_url_attribute.rb

@@ -1,4 +1,4 @@
-if Rails.env.test? && defined?(RSpec)
+if defined?(RSpec)
   RSpec::Matchers.define :have_url_attribute do |attribute_name|
     # This matcher is an ugly piece of shit
     match do |model|

data/lib/url_attributes/version.rb

@@ -1,3 +1,3 @@
 module URLAttributes
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/dummy/app/models/model.rb

@@ -1,3 +1,5 @@
 class Model < ActiveRecord::Base
   url_attribute :url
+
+  url_attribute :other_url, before: :validation
 end

data/spec/dummy/db/migrate/20150105143321_add_other_url_to_model.rb

@@ -0,0 +1,5 @@
+class AddOtherUrlToModel < ActiveRecord::Migration
+  def change
+    add_column :models, :other_url, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,12 +11,13 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141124095718) do
+ActiveRecord::Schema.define(version: 20150105143321) do
 
   create_table "models", force: true do |t|
     t.string   "url"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "other_url"
   end
 
 end

data/spec/url_attributes_spec.rb

@@ -65,4 +65,13 @@ describe "ActiveRecord::Base#url_attribute" do
       end
     end
   end
+
+  context "when passed a 'before' option" do
+    it "runs the callbacks on the given validation instead of before_save" do
+      model.other_url = "    example.com/example     "
+      model.run_callbacks :validation
+      expect(model.other_url).to eq "http://example.com/example"
+    end
+  end
+
 end

data/url_attributes.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = ["georgejulianmillo@gmail.com"]
   s.summary       = "Simple URL attributes for ActiveRecord"
   s.description   = "Validate and sanitize URLs in ActiveRecord"
-  s.homepage      = 'http://github.com/georgemillo/url_attributes'
+  s.homepage      = 'http://github.com/headstock/url_attributes'
   s.license       = "MIT"
 
   s.files         = `git ls-files -z`.split("\x0")
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.required_ruby_version = ">= 2.0.0"
+
   s.add_dependency "rails", ">= 4.0.0"
 
   s.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: url_attributes
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - George Millo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +114,6 @@ files:
 - lib/url_attributes/url_validator.rb
 - lib/url_attributes/version.rb
 - spec/dummy/.gitignore
-- spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -153,6 +152,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20141124095718_create_models.rb
+- spec/dummy/db/migrate/20150105143321_add_other_url_to_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.keep
@@ -169,7 +169,7 @@ files:
 - spec/spec_helper.rb
 - spec/url_attributes_spec.rb
 - url_attributes.gemspec
-homepage: http://github.com/georgemillo/url_attributes
+homepage: http://github.com/headstock/url_attributes
 licenses:
 - MIT
 metadata: {}
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,13 +189,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Simple URL attributes for ActiveRecord
 test_files:
 - spec/dummy/.gitignore
-- spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -234,6 +233,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/migrate/20141124095718_create_models.rb
+- spec/dummy/db/migrate/20150105143321_add_other_url_to_model.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/lib/assets/.keep
@@ -249,3 +249,4 @@ test_files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/url_attributes_spec.rb
+has_rdoc: 

data/spec/dummy/Gemfile

@@ -1,40 +0,0 @@
-source 'https://rubygems.org'
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.8'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer',  platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
-# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0',          group: :doc
-
-# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-gem 'spring',        group: :development
-
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-# Use debugger
-# gem 'debugger', group: [:development, :test]
-