benhoskings-hammock 0.3.8 → 0.3.9

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.9 2009-06-18
+Improved logging in find_record_on_create.
+Enabled :indicate_current support in #hamlink_to, using RouteStep#matches?.
+Added RouteStep#matches?, to check if the receiving RouteStep represents the given request.
+
+
 == 0.3.8 2009-06-05
 Added LambdaAlias dep to RouteDrawingHooks, for Hammock.load_models.
 Added LambdaComposition component.

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-06-05}
+  s.date = %q{2009-06-18}
   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.
 
 
@@ -19,7 +19,7 @@ Hammock inspects your routes and resources to generate a routing tree for each r
 It makes more sense when you see how it works though. There's a screencast coming soon.}
   s.email = ["ben@hoskings.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "misc/scaffold.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "hammock.gemspec", "lib/hammock.rb", "lib/hammock/ajaxinate.rb", "lib/hammock/callback.rb", "lib/hammock/callbacks.rb", "lib/hammock/canned_scopes.rb", "lib/hammock/constants.rb", "lib/hammock/controller_attributes.rb", "lib/hammock/export_scope.rb", "lib/hammock/hamlink_to.rb", "lib/hammock/javascript_buffer.rb", "lib/hammock/logging.rb", "lib/hammock/model_attributes.rb", "lib/hammock/model_logging.rb", "lib/hammock/monkey_patches/action_pack.rb", "lib/hammock/monkey_patches/active_record.rb", "lib/hammock/monkey_patches/array.rb", "lib/hammock/monkey_patches/hash.rb", "lib/hammock/monkey_patches/logger.rb", "lib/hammock/monkey_patches/module.rb", "lib/hammock/monkey_patches/numeric.rb", "lib/hammock/monkey_patches/object.rb", "lib/hammock/monkey_patches/route_set.rb", "lib/hammock/monkey_patches/string.rb", "lib/hammock/overrides.rb", "lib/hammock/resource_mapping_hooks.rb", "lib/hammock/resource_retrieval.rb", "lib/hammock/restful_actions.rb", "lib/hammock/restful_rendering.rb", "lib/hammock/restful_support.rb", "lib/hammock/route_drawing_hooks.rb", "lib/hammock/route_for.rb", "lib/hammock/route_node.rb", "lib/hammock/route_step.rb", "lib/hammock/scope.rb", "lib/hammock/suggest.rb", "lib/hammock/utils.rb", "misc/scaffold.txt", "misc/template.rb", "tasks/hammock_tasks.rake", "test/hammock_test.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "hammock.gemspec", "init.rb", "lib/hammock.rb", "lib/hammock/ajaxinate.rb", "lib/hammock/callback.rb", "lib/hammock/callbacks.rb", "lib/hammock/canned_scopes.rb", "lib/hammock/constants.rb", "lib/hammock/controller_attributes.rb", "lib/hammock/export_scope.rb", "lib/hammock/hamlink_to.rb", "lib/hammock/javascript_buffer.rb", "lib/hammock/lambda_alias.rb", "lib/hammock/lambda_composition.rb", "lib/hammock/logging.rb", "lib/hammock/model_attributes.rb", "lib/hammock/model_logging.rb", "lib/hammock/monkey_patches/action_pack.rb", "lib/hammock/monkey_patches/active_record.rb", "lib/hammock/monkey_patches/array.rb", "lib/hammock/monkey_patches/hash.rb", "lib/hammock/monkey_patches/logger.rb", "lib/hammock/monkey_patches/module.rb", "lib/hammock/monkey_patches/numeric.rb", "lib/hammock/monkey_patches/object.rb", "lib/hammock/monkey_patches/route_set.rb", "lib/hammock/monkey_patches/string.rb", "lib/hammock/mutex.rb", "lib/hammock/overrides.rb", "lib/hammock/resource_mapping_hooks.rb", "lib/hammock/resource_retrieval.rb", "lib/hammock/restful_actions.rb", "lib/hammock/restful_rendering.rb", "lib/hammock/restful_support.rb", "lib/hammock/route_drawing_hooks.rb", "lib/hammock/route_for.rb", "lib/hammock/route_node.rb", "lib/hammock/route_step.rb", "lib/hammock/scope.rb", "lib/hammock/suggest.rb", "lib/hammock/utils.rb", "misc/scaffold.txt", "misc/template.rb", "tasks/hammock_tasks.rake", "test/hammock_test.rb"]
   s.homepage = %q{http://github.com/benhoskings/hammock}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -34,18 +34,18 @@ It makes more sense when you see how it works though. There's a screencast comin
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 2.2"])
       s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
-      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_development_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<rails>, ["~> 2.2"])
       s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
-      s.add_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_dependency(%q<newgem>, [">= 1.4.1"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 2.2"])
     s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
-    s.add_dependency(%q<newgem>, [">= 1.3.0"])
+    s.add_dependency(%q<newgem>, [">= 1.4.1"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/init.rb

@@ -0,0 +1,3 @@
+# 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

data/lib/hammock.rb

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

data/lib/hammock/hamlink_to.rb

@@ -24,7 +24,7 @@ module Hammock
         if can_verb_entity?(verb, entity)
           route = route_for *args.push(opts.dragnet(:nest, :format))
 
-          # opts[:class] = ['current', opts[:class]].squash.join(' ') if opts[:indicate_current] && (route == controller.current_route)
+          opts[:class] = ['current', opts[:class]].squash.join(' ') if opts[:indicate_current] && route.matches?(request)
           opts[:class] = [link_class_for(route.verb, entity), opts[:class]].squash.join(' ')
 
           text = opts.delete(:text) || opts.delete(:text_or_else)

data/lib/hammock/lambda_alias.rb

@@ -0,0 +1,12 @@
+module Hammock
+  module LambdaAlias
+    MixInto = Kernel
+
+    def self.included base # :nodoc:
+      base.class_eval {
+        alias :L :lambda
+      }
+    end
+
+  end
+end

data/lib/hammock/lambda_composition.rb

@@ -0,0 +1,26 @@
+module Hammock
+  module LambdaComposition
+    MixInto = Proc
+
+    def self.included base # :nodoc:
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+
+      def self.compose f, g
+        L{|*args| f[g[*args]] }
+      end
+
+    end
+
+    module InstanceMethods
+
+      def * g
+        Proc.compose self, g
+      end
+
+    end
+  end
+end

data/lib/hammock/mutex.rb

@@ -0,0 +1,45 @@
+module Hammock
+  module Mutex
+    MixInto = ActiveRecord::Base
+
+    def self.included base # :nodoc:
+      base.send :include, InstanceMethods
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+    end
+
+    module InstanceMethods
+
+      # Yield to the block after obtaining a column lock on +self+.
+      #
+      # The column lock is obtained by trying to set the given column to the
+      # current time. Since the check is done within UPDATE conditions and not
+      # a separate SELECT, it is atomic.
+      #
+      # After +block+ returns, the column is reset to NULL, at which point
+      # the lock can be obtained by other calls to +#mutex+. The NULL update is
+      # done within an +ensure+ block, so an exception within +block+ won't
+      # cause a stuck mutex.
+      #
+      # Example:
+      #     @photo.mutex(:regenerating_thumbnails_at) { <some operation> }
+      def mutex column, &block
+        L{
+          sleep 1 and redo if self.class.update_all(
+            ["#{connection.quote_column_name(column)} = ?", Time.now],
+            ["#{connection.quote_column_name(self.class.primary_key)} = ? AND #{connection.quote_column_name(column)} IS NULL", id]
+          ).zero?
+          yield
+        }.call
+      ensure
+        self.class.update_all(
+          ["#{connection.quote_column_name(column)} = ?", nil],
+          ["#{connection.quote_column_name(self.class.primary_key)} = ?", id]
+        )
+      end
+
+    end
+  end
+end

data/lib/hammock/restful_actions.rb

@@ -130,10 +130,10 @@ module Hammock
       def find_record_on_create
         if findable_on_create?
           if record = mdl.ambition_context.within(current_nest_scope).find(:first, :conditions => params_for(mdl.symbolize))
-            log "suitable record already exists: #{record}"
+            log "Suitable #{record.class}<#{record.id}> already exists."
             assign_entity record
           else
-            log "couldn't find a suitable record, proceeding with creation."
+            log "Couldn't find a suitable #{mdl}, proceeding with creation."
           end
         end
       end

data/lib/hammock/route_step.rb

@@ -31,6 +31,11 @@ module Hammock
       !@entity.nil?
     end
 
+    def matches? request
+      (path == request.path) &&
+      (http_method == request.method)
+    end
+
     def path params = nil
       raise_unless_setup_while_trying_to 'render a path'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benhoskings-hammock
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -71,6 +71,7 @@ files:
 - README.rdoc
 - Rakefile
 - hammock.gemspec
+- init.rb
 - lib/hammock.rb
 - lib/hammock/ajaxinate.rb
 - lib/hammock/callback.rb
@@ -81,6 +82,8 @@ files:
 - lib/hammock/export_scope.rb
 - lib/hammock/hamlink_to.rb
 - lib/hammock/javascript_buffer.rb
+- lib/hammock/lambda_alias.rb
+- lib/hammock/lambda_composition.rb
 - lib/hammock/logging.rb
 - lib/hammock/model_attributes.rb
 - lib/hammock/model_logging.rb
@@ -94,6 +97,7 @@ files:
 - lib/hammock/monkey_patches/object.rb
 - lib/hammock/monkey_patches/route_set.rb
 - lib/hammock/monkey_patches/string.rb
+- lib/hammock/mutex.rb
 - lib/hammock/overrides.rb
 - lib/hammock/resource_mapping_hooks.rb
 - lib/hammock/resource_retrieval.rb