hammock 0.5.11 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.6.0

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.5.11"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2010-05-12}
+  s.date = %q{2010-08-02}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "hammock.gemspec",
-     "init.rb",
      "lib/hammock.rb",
      "lib/hammock/ajaxinate.rb",
      "lib/hammock/callback.rb",
@@ -75,14 +74,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/benhoskings/hammock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Radically RESTful Rails.}
 
   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
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 2.3.0"])
       s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
     else

data/lib/hammock.rb

@@ -1,10 +1,7 @@
-gem 'benhoskings-ambition'
-gem 'benhoskings-ambitious-activerecord'
-require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.5.11'
+  VERSION = '0.6.0'
   IncludeTarget = ActionController::Base
 
   def self.included base # :nodoc:
@@ -72,5 +69,4 @@ module Hammock
 
 end
 
-# This is done in init.rb when Hammock is loaded as a plugin.
-Hammock::IncludeTarget.send :include, Hammock if Hammock.loaded_from_gem?
+Hammock::IncludeTarget.send :include, Hammock

data/lib/hammock/hamlink_to.rb

@@ -35,7 +35,9 @@ module Hammock
 
           link_to(text || route.verb,
             route.path(opts.delete(:params)),
-            opts.merge(:method => (route.http_method unless route.get?))
+            opts.merge(
+              :method => (route.http_method unless route.get?)
+            ).dragnet(:method, :class, :id)
           )
         else
           opts[:else] || opts[:text_or_else]

data/lib/hammock/monkey_patches/string.rb

@@ -148,7 +148,7 @@ module Hammock
 
       # Returns true if the string represents a valid email address.
       def valid_email?
-        /^([a-z0-9\-\+\=\&\'\_\.]{2,})\@([a-z0-9\-]+\.)*([a-z0-9\-]{2,}\.)([a-z0-9\-]{2,})$/ =~ self
+        /^[a-z0-9\-\+\=\&\'\_\.]+\@([a-z0-9\-]+\.)*[a-z0-9\-]{2,}\.[a-z0-9\-]{2,}$/ =~ self
       end
 
       def clean_email!

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 11
-  version: 0.5.11
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 +10:00
+date: 2010-08-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: benhoskings-ambitious-activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 69
         segments: 
         - 0
         - 1
@@ -64,7 +69,6 @@ files:
 - Rakefile
 - VERSION
 - hammock.gemspec
-- init.rb
 - lib/hammock.rb
 - lib/hammock/ajaxinate.rb
 - lib/hammock/callback.rb
@@ -120,23 +124,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Radically RESTful Rails.

data/init.rb

@@ -1,3 +0,0 @@
-# This loads hammock when it's present as a plugin.
-# As a gem, it's loaded from lib/hammock.rb.
-Hammock::IncludeTarget.send :include, Hammock