hammock 0.2.11.4 → 0.2.12

data/History.txt

@@ -1,3 +1,13 @@
+== 0.2.12 2009-03-31
+Added loading message.
+Moved require for hammock components within Hammock.included.
+Commented debugging output in #determine_routing_parent.
+Removed InstanceMethods and ClassMethods internal modules from RestfulActions, to explicitly include it more cleanly in ApplicationController.
+Fix the loading code to achieve the same load whether hammock is installed as a plugin or a gem.
+Send toplevel loading include to ActionController::Base instead of reopening ApplicationController.
+Replaced escort_for_40[34] with render_for_status, which chooses the first available from controller partial, shared partial, static page and uses the correct HTTP status code.
+
+
 == 0.2.11.4 2009-03-25
 Don't encodeURIComponent() the authenticity_token, as it's not required and breaks non-alphanumeric chars.
 

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.11.4"
+  s.version = "0.2.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-03-25}
+  s.date = %q{2009-03-31}
   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.   Hammock enforces RESTful resource access by abstracting actions away from the controller in favour of a clean, model-like callback system.  Hammock tackles the hard and soft sides of security at once with a scoping security system on your models. Specify who can verb what resources under what conditions once, and everything else - the actual security, link generation, index filtering - just happens.  Hammock inspects your routes and resources to generate a routing tree for each resource. Parent resources in a nested route are handled transparently at every point - record retrieval, creation, and linking.  It makes more sense when you see how it works though, so check out the screencast!}
   s.email = ["ben@hoskings.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "misc/scaffold.txt"]

data/lib/hammock/resource_retrieval.rb

@@ -69,11 +69,12 @@ module Hammock
         elsif :readonly == reason
           escort_for_read_only
         elsif :unauthed == reason
-          escort_for_403
+          # TODO Write a 403 partial.
+          render_for_status 404
         elsif current_user.nil? && account_verb_scope?
           escort_for_login
         else
-          escort_for_404
+          render_for_status 404
         end
         false
       end
@@ -99,18 +100,15 @@ module Hammock
         # render :partial => 'login/account', :status => 401 # unauthorized
         redirect_to returning_login_path
       end
-      def escort_for_404
-        if partial_exists? 'shared/status_404'
-          render :partial => 'shared/status_404', :layout => true
-        else
-          render :file => File.join(RAILS_ROOT, 'public/404.html'), :status => 404
-        end
-      end
-      def escort_for_403
-        if partial_exists? 'shared/status_404'
-          render :partial => 'shared/status_404', :layout => true
+
+      def render_for_status code
+        log code
+        if partial_exists? "#{controller_name}/status_#{code}"
+          render :partial => "#{controller_name}/status_#{code}", :layout => true, :status => code
+        elsif partial_exists? "shared/status_#{code}"
+          render :partial => "shared/status_#{code}", :layout => true, :status => code
         else
-          render :file => File.join(RAILS_ROOT, 'public/404.html'), :status => 403
+          render :file => File.join(RAILS_ROOT, "public/#{code}.html"), :status => code
         end
       end
 

data/lib/hammock/restful_actions.rb

@@ -1,14 +1,6 @@
 module Hammock
   module RestfulActions
-    def self.included base # :nodoc:
-      base.send :include, InstanceMethods
-      base.send :extend, ClassMethods
-    end
-
-    module ClassMethods
-    end
-
-    module InstanceMethods
+    MixInto = ApplicationController
 
       # The +index+ action. (GET, safe, idempotent)
       #
@@ -167,6 +159,5 @@ module Hammock
         @record.save
       end
 
-    end
   end
 end

data/lib/hammock/route_node.rb

@@ -118,22 +118,26 @@ module Hammock
     end
 
     def determine_routing_parent
-      puts "\ndetermine_routing_parent: #{mdl}:"
+      # puts "\ndetermine_routing_parent: #{mdl}:"
       if parent.nil? || parent.resource.nil?
-        puts "Resource for #{mdl} has either no parent or no resource - not nestable."
+        # puts "Resource for #{mdl} has either no parent or no resource - not nestable."
         nil
       else
-        puts "reflections: #{resource.reflections.keys.inspect}"
-        puts "nestable_routing_resources: #{resource.nestable_routing_resources.inspect}"
+        # puts "reflections: #{resource.reflections.keys.inspect}"
         scannable_reflections = resource.nestable_routing_resources.nil? ? resource.reflections : resource.reflections.dragnet(*resource.nestable_routing_resources)
-        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}"
+        # 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."
         elsif valid_reflections.keys.length > 1
           raise "#{resource} defines more than one association to #{parent.resource} (#{valid_reflections.keys.map(&:to_s).join(', ')}). That's fine, but you need to use #{resource}.nest_within to specify the one Hammock should nest scopes through. For example, 'nest_within #{valid_reflections.keys.first.inspect}' in the #{resource} model."
+        # else
+          # puts "Routing #{mdl} within #{valid_reflections.keys.first} (chose from #{scannable_reflections.inspect})"
         end
 
         valid_reflections.keys.first

data/lib/hammock.rb

@@ -3,14 +3,16 @@ gem 'benhoskings-ambitious-activerecord'
 require 'ambition'
 require 'ambition/adapters/active_record'
 
-Dir.glob("#{File.dirname __FILE__}/hammock/**/*.rb").each {|dep|
-  require dep
-} if defined?(RAILS_ROOT) # Loading Hammock components under 'rake package' fails.
-
 module Hammock
-  VERSION = '0.2.11.4'
+  VERSION = '0.2.12'
 
   def self.included base # :nodoc:
+    puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"
+
+    Dir.glob("#{File.dirname __FILE__}/hammock/**/*.rb").each {|dep|
+      require dep
+    }
+
     Hammock.constants.map {|constant_name|
       Hammock.const_get constant_name
     }.select {|constant|
@@ -22,8 +24,11 @@ module Hammock
       target.send :include, mod
     }
   end
-end
 
-class ApplicationController < ActionController::Base
-  include Hammock
+  def self.loaded_from_gem?
+    File.dirname(__FILE__)[`gem env gemdir`.chomp]
+  end
 end
+
+# This is done in init.rb when Hammock is loaded as a plugin.
+ActionController::Base.send :include, Hammock if Hammock.loaded_from_gem?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.2.11.4
+  version: 0.2.12
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-25 00:00:00 +10:00
+date: 2009-03-31 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency