url_field 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,3 @@
+Thursday, 3rd December 2009
+- - - - - - - - - - -
+- added support for multiple fields

data/README.textile

@@ -26,6 +26,16 @@ Https? That works too (but one way only)
 
 h2. Extra
 
+h3. Multiple fields
+
+If you have multiple url_fields in a single model, just pass them as arguments to the url_field method, eg:
+
+<pre><code>class Company < ActiveRecord::Base
+  url_field :website, :support_website, :more_info_website
+end</code></pre>
+
+h3. Access the correctly formed URL at any time
+
 If you want access to the correctly formatted URL at any time (for example if you're passing it to URI.parse, before you save your model), you can prefix your URL field method name with "cleaned_" eg. "cleaned_website" if your field name was website:
 
 <pre><code>class Company < ActiveRecord::Base
@@ -34,8 +44,7 @@ end
 
 @company = Company.new
 @company.website = "www.example.com"
-@company.cleaned_website # => "http://www.example.com"
-</code></pre>
+@company.cleaned_website # => "http://www.example.com"</code></pre>
 
 h2. Install
 

data/Rakefile

@@ -19,21 +19,23 @@ PKG_FILES = FileList[
   'spec/**/*'
 ]
 
-spec = Gem::Specification.new do |s|
-  s.name = "url_field"
-  s.version = "0.0.1"
-  s.author = "Paul Campbell"
-  s.email = "paul@rslw.com"
-  s.homepage = "http://www.github.com/paulca/url_field"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "A simple ActiveRecord plugin to correctly format a URL in the database whether the user enters 'http://' or not"
-  s.files = PKG_FILES.to_a
-  s.require_path = "lib"
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README.textile"]
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "url_field"
+    s.version = "0.0.2"
+    s.author = "Paul Campbell"
+    s.email = "paul@rslw.com"
+    s.homepage = "http://www.github.com/paulca/url_field"
+    s.platform = Gem::Platform::RUBY
+    s.summary = "A simple ActiveRecord plugin to correctly format a URL in the database whether the user enters 'http://' or not"
+    s.files = PKG_FILES.to_a
+    s.require_path = "lib"
+    s.has_rdoc = false
+    s.extra_rdoc_files = ["README.textile"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Turn this plugin into a gem.'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+Jeweler::GemcutterTasks.new

data/lib/url_field.rb

@@ -4,22 +4,28 @@ module UrlField
   end
 
   module UrlFieldMethod
-    def url_field(field)
+    def url_field(*args)
 
-      before_save :clean_url_field
+      args.each do |field_name|
+        before_validation :"clean_#{field_name}_url_field"                    # before_save :clean_url_url_field
+      end
 
       class_eval do        
         
-        define_method(:clean_url_field) do
-          self.send("#{field}=", send("cleaned_#{field}"))
+        args.each do |field_name|
+          define_method(:"clean_#{field_name}_url_field") do              # def clean_url_url_field
+            self.send("#{field_name}=", send("cleaned_#{field_name}"))    #   self.url = cleaned_url
+          end                                                             # end
         end
         
         private
-        
-        define_method("cleaned_#{field}") do
-          return nil if send(field).nil? or send(field).blank?
-          return "http://#{send(field)}" unless send(field).match(/https?:\/\/.*$/)
-          send(field)
+
+        args.each do |field_name|
+          define_method("cleaned_#{field_name}") do
+            return nil if send(field_name).nil? or send(field_name).blank?
+            return "http://#{send(field_name)}" unless send(field_name).match(/https?:\/\/.*$/)
+            send(field_name)
+          end
         end
       end
     end

data/rails/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), "..", "lib", "url_field")

data/spec/database.yml

@@ -0,0 +1,21 @@
+sqlite:
+  :adapter: sqlite
+  :database: spec/url_field.sqlite.db
+
+sqlite3:
+  :adapter: sqlite3
+  :database: spec/url_field.sqlite3.db
+
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: url_field_test
+  :min_messages: ERROR
+
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: root
+  :password: password
+  :database: url_field_test

data/spec/debug.log

@@ -0,0 +1,77 @@
+# Logfile created on Thu Dec 03 23:32:32 +0000 2009 by /
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (79.6ms)   CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "url" varchar(255), "other_url" varchar(255), "another_url" varchar(255)) 
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (5.0ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (13.5ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM "schema_migrations"
+  SQL (1.1ms)   INSERT INTO "schema_migrations" (version) VALUES ('0')
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (2.4ms)   DROP TABLE "test_models"
+  SQL (2.9ms)   CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "url" varchar(255), "other_url" varchar(255), "another_url" varchar(255)) 
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.4ms)   SELECT version FROM "schema_migrations"
+  TestModel Create (0.5ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.3ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (0.3ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  TestModel Create (0.5ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (3.1ms)   DROP TABLE "test_models"
+  SQL (2.9ms)   CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "url" varchar(255), "other_url" varchar(255), "another_url" varchar(255)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM "schema_migrations"
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.5ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.3ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (4.3ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (11.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  TestModel Create (0.5ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, 'http://www.example.com')
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES('http://www.example.com', NULL, NULL)
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (1.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (3.1ms)   DROP TABLE "test_models"
+  SQL (2.6ms)   CREATE TABLE "test_models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "url" varchar(255), "other_url" varchar(255), "another_url" varchar(255)) 
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM "schema_migrations"
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, NULL)
+  TestModel Create (0.9ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'http://www.example.com', NULL)
+  TestModel Create (0.3ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, 'https://www.example.com', NULL)
+  TestModel Create (0.5ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES(NULL, NULL, 'http://www.example.com')
+  TestModel Create (0.4ms)   INSERT INTO "test_models" ("another_url", "url", "other_url") VALUES('http://www.example.com', NULL, NULL)

data/spec/schema.rb

@@ -0,0 +1,7 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :test_models, :force => true do |t|
+    t.string :url
+    t.string :other_url
+    t.string :another_url
+  end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,35 @@ rescue LoadError
   puts "You need to install rspec in your base app"
   exit
 end
-
+ 
 plugin_spec_dir = File.dirname(__FILE__)
 ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log")
-
+ 
+def load_schema
+  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ 
+  db_adapter = ENV['DB']
+ 
+  # no db passed, try one of these fine config-free DBs before bombing.
+  db_adapter ||=
+    begin
+      require 'rubygems'
+      require 'sqlite'
+      'sqlite'
+    rescue MissingSourceFile
+      begin
+        require 'sqlite3'
+        'sqlite3'
+      rescue MissingSourceFile
+      end
+    end
+ 
+  if db_adapter.nil?
+    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
+  end
+ 
+  ActiveRecord::Base.establish_connection(config[db_adapter])
+  load(File.dirname(__FILE__) + "/schema.rb")
+  require File.dirname(__FILE__) + '/../rails/init.rb'
+end

data/spec/url_field_spec.rb

@@ -3,55 +3,68 @@ require File.dirname(__FILE__) + '/spec_helper'
 require File.dirname(__FILE__) + '/../lib/url_field'
 
 class TestModel < ActiveRecord::Base
-  url_field :shortcode_url
-
-  def self.table_name
-    'boojas'
-  end
+  url_field :url, :other_url, :another_url
 end
 
 describe TestModel do
+  
+  load_schema
+  
   before do
     @test_model = TestModel.new
   end
   
   it "should leave well enough alone" do
     @test_model.save
-    @test_model.shortcode_url.should be_nil
+    @test_model.url.should be_nil
   end
   
   it "should REALLY leave well enough alone" do
-    @test_model.shortcode_url = ""
+    @test_model.url = ""
     @test_model.save
-    @test_model.shortcode_url.should be_nil
+    @test_model.url.should be_nil
   end
   
   it "should add http://" do
-    @test_model.shortcode_url = "www.example.com"
+    @test_model.url = "www.example.com"
     @test_model.save
-    @test_model.shortcode_url.should == "http://www.example.com"
+    @test_model.url.should == "http://www.example.com"
   end
   
   it "should ignore http://" do
-    @test_model.shortcode_url = "http://www.example.com"
+    @test_model.url = "http://www.example.com"
     @test_model.save
-    @test_model.shortcode_url.should == "http://www.example.com"
+    @test_model.url.should == "http://www.example.com"
   end
   
   it "should allow https://" do
-    @test_model.shortcode_url = "https://www.example.com"
+    @test_model.url = "https://www.example.com"
     @test_model.save
-    @test_model.shortcode_url.should == "https://www.example.com"
+    @test_model.url.should == "https://www.example.com"
   end
 
   it "should ignore https://" do
-    @test_model.shortcode_url = "https://www.example.com"
+    @test_model.url = "https://www.example.com"
     @test_model.save
-    @test_model.shortcode_url.should == "https://www.example.com"
+    @test_model.url.should == "https://www.example.com"
   end
   
   it "should expose the cleaned method" do
-    @test_model.shortcode_url = "www.example.com"
-    @test_model.cleaned_shortcode_url.should == "http://www.example.com"
+    @test_model.url = "www.example.com"
+    @test_model.cleaned_url.should == "http://www.example.com"
+  end
+  
+  it "should work for other_url" do
+    @test_model.other_url = "www.example.com"
+    @test_model.cleaned_other_url.should == "http://www.example.com"
+    @test_model.save
+    @test_model.other_url.should == "http://www.example.com"
+  end
+  
+  it "should work for another_url" do
+    @test_model.another_url = "www.example.com"
+    @test_model.cleaned_another_url.should == "http://www.example.com"
+    @test_model.save
+    @test_model.another_url.should == "http://www.example.com"
   end
 end

data/url_field.gemspec

@@ -0,0 +1,52 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{url_field}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Paul Campbell"]
+  s.date = %q{2009-12-04}
+  s.email = %q{paul@rslw.com}
+  s.extra_rdoc_files = [
+    "README.textile"
+  ]
+  s.files = [
+    "CHANGELOG",
+     "README.textile",
+     "Rakefile",
+     "init.rb",
+     "lib/url_field.rb",
+     "rails/init.rb",
+     "spec/database.yml",
+     "spec/debug.log",
+     "spec/schema.rb",
+     "spec/spec_helper.rb",
+     "spec/url_field_spec.rb",
+     "url_field.gemspec"
+  ]
+  s.homepage = %q{http://www.github.com/paulca/url_field}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A simple ActiveRecord plugin to correctly format a URL in the database whether the user enters 'http://' or not}
+  s.test_files = [
+    "spec/schema.rb",
+     "spec/spec_helper.rb",
+     "spec/url_field_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: url_field
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paul Campbell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +01:00
+date: 2009-12-04 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -22,19 +22,25 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- CHANGELOG
+- README.textile
+- Rakefile
 - init.rb
 - lib/url_field.rb
-- Rakefile
-- README.textile
+- rails/init.rb
+- spec/database.yml
+- spec/debug.log
+- spec/schema.rb
 - spec/spec_helper.rb
 - spec/url_field_spec.rb
+- url_field.gemspec
 has_rdoc: true
 homepage: http://www.github.com/paulca/url_field
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -52,9 +58,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A simple ActiveRecord plugin to correctly format a URL in the database whether the user enters 'http://' or not
-test_files: []
-
+test_files: 
+- spec/schema.rb
+- spec/spec_helper.rb
+- spec/url_field_spec.rb