hammock 0.3.10.4 → 0.3.11

data/History.txt

@@ -1,3 +1,11 @@
+== 0.3.11 2009-08-19
+Removed some old debug logging.
+Added String#quote_for_shell.
+Added &=' to the name-part of the String#valid_email? regex.
+Added after[_failed]_find_on_create callback definitions, and calls within #find_record_on_create.
+Renamed Account to User in log message.
+
+
 == 0.3.10.4 2009-07-29
 Temporary fix: re-fetch records in find_record_on_create to avoid readonly errors.
 

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.3.10.4"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-08-19}
   s.description = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.
 
 
@@ -24,7 +24,7 @@ It makes more sense when you see how it works though. There's a screencast comin
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hammock}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner}
 
   if s.respond_to? :specification_version then

data/lib/hammock/callbacks.rb

@@ -9,18 +9,20 @@ module Hammock
         include ActiveSupport::Callbacks
 
         define_hammock_callbacks *%w[
-          before_find      during_find     after_failed_find
+          before_find       during_find     after_failed_find
+                                            after_find_on_create
+                                            after_failed_find_on_create
 
-          before_index     before_show
-          before_modify    before_new      before_edit
+          before_index      before_show
+          before_modify     before_new      before_edit
 
-          before_save      after_save      after_failed_save
-          before_create    after_create    after_failed_create
-          before_update    after_update    after_failed_update
-          before_destroy   after_destroy
-          before_undestroy after_undestroy
+          before_save       after_save      after_failed_save
+          before_create     after_create    after_failed_create
+          before_update     after_update    after_failed_update
+          before_destroy    after_destroy
+          before_undestroy  after_undestroy
 
-          before_suggest   after_suggest
+          before_suggest    after_suggest
         ]
       }
     end

data/lib/hammock/logging.rb

@@ -18,7 +18,7 @@ module Hammock
           request.remote_ip.colorize('green'),
           (@current_site.subdomain unless @current_site.nil?),
           (request.session_options[:id].nil? ? 'nil' : ('...' + request.session_options[:id][-8, 8])),
-          (current_user.nil? ? "unauthed" : "Account<#{current_user.id}> #{current_user.name}").colorize('green'),
+          (current_user.nil? ? "unauthed" : "User<#{current_user.id}> #{current_user.name}").colorize('green'),
           response.status,
           log_hit_request_info,
           log_hit_route_info

data/lib/hammock/monkey_patches/string.rb

@@ -60,6 +60,10 @@ module Hammock
         "#{self}'#{'s' unless ends_with?('s')}"
       end
 
+      def quote_for_shell
+        %Q{"#{gsub('"', '\"')}"}
+      end
+
       # TODO any more to add?
       NamePrefixes = %w[de den la von].freeze
 
@@ -133,7 +137,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\-\+\=\&\'\_\.]{2,})\@([a-z0-9\-]+\.)*([a-z0-9\-]{2,}\.)([a-z0-9\-]{2,})$/ =~ self
       end
 
       def clean_email!

data/lib/hammock/restful_actions.rb

@@ -131,8 +131,11 @@ module Hammock
         if findable_on_create?
           if record = mdl.ambition_context.within(current_nest_scope).find(:first, :conditions => params_for(mdl.symbolize))
             log "Suitable #{record.class}<#{record.id}> already exists."
-            assign_entity mdl.resource.find record.id
+            returning assign_entity mdl.resource.find record.id do
+              callback :after_find_on_create
+            end
           else
+            callback :after_failed_find_on_create
             log "Couldn't find a suitable #{mdl}, proceeding with creation."
           end
         end

data/lib/hammock/route_node.rb

@@ -92,9 +92,7 @@ module Hammock
 
     def nesting_scope_segment_for params
       raise "The root of the route map isn't associated with a resource." if root?
-      puts "is this undefined? #{resource.accessible_attributes_on_create.inspect}"
       value = params.delete resource.param_key
-      puts "resource.select {|r| r.#{resource.routing_attribute} == value }"
       eval "resource.select {|r| r.#{resource.routing_attribute} == value }"
     end
 
@@ -103,7 +101,6 @@ module Hammock
     end
 
     def add entity, options, path_steps = nil
-      # puts "add(#{entity.inspect}, #{options.inspect}, #{path_steps.inspect})"
       if path_steps.nil?
         path_steps = (options[:path_prefix] || '').split('/').squash.discard {|i| i.starts_with? ':' }.map(&:to_sym)
         add entity, options, path_steps
@@ -134,19 +131,14 @@ module Hammock
     end
 
     def determine_routing_parent
-      # puts "\ndetermine_routing_parent: #{mdl}:"
       if parent.nil? || parent.resource.nil?
         # puts "Resource for #{mdl} has either no parent or no resource - not nestable."
         nil
       else
-        # puts "reflections: #{resource.reflections.keys.inspect}"
         scannable_reflections = resource.nestable_reflections
-        # puts "scannable reflections: #{scannable_reflections.keys.inspect}"
         valid_reflections = scannable_reflections.selekt {|k,v|
-          # puts "#{v.klass}<#{v.object_id}> == #{parent.resource}<#{parent.resource.object_id}> #=> #{v.klass == parent.resource}"
           v.klass == parent.resource
         }
-        # puts "valid reflections: #{valid_reflections.keys.inspect}"
 
         if valid_reflections.keys.length < 1
           raise "The routing table specifies that #{mdl} is nested within #{parent.mdl}, but there is no ActiveRecord association linking #{resource} to #{parent.resource}. Example: 'belongs_to :#{parent.resource.base_model}' in the #{resource} model."

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.3.10.4'
+  VERSION = '0.3.11'
   IncludeTarget = ActionController::Base
 
   def self.included base # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.3.10.4
+  version: 0.3.11
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 +10:00
+date: 2009-08-19 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hammock
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner