benhoskings-hammock 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.8 2009-03-10
+Renamed @current_account to current_user.
+Removed AC::Base#nestable_by declaration in favour of the new approach involving AC::Base#route_by and #nest_within, along with the corresponding reader.
+Added #set_new_or_deleted_before_save controller method, and before_create and before_undestroy hooks.
+Revert "Removed unneeded param to specify the finder method in retrieve_record." - the param was actually needed for #find_deleted_record.
+
+
 == 0.2.7 2009-03-05
 
 hamlink_to with implied verbs no longer raises in route_for.

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-03-05}
+  s.date = %q{2009-03-10}
   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.rb

@@ -8,7 +8,7 @@ Dir.glob("#{File.dirname __FILE__}/hammock/**/*.rb").each {|dep|
 } if defined?(RAILS_ROOT) # Loading Hammock components under 'rake package' fails.
 
 module Hammock
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 
   def self.included base # :nodoc:
     Hammock.constants.map {|constant_name|

data/lib/hammock/controller_attributes.rb

@@ -6,16 +6,6 @@ module Hammock
     end
 
     module ClassMethods
-
-      # Specifies parent resources that can appear above this one in the route, and will be applied as an extra scope condition whenever present.
-      #
-      # Supplied as a hash of parameter names to attribute names. For example, given the route <tt>/accounts/7/posts/31</tt>,
-      #     nestable_by :account_id => :creator_id
-      # Would add an extra scope condition requiring that <tt>@post.creator_id</tt> == <tt>params[:account_id]</tt>.
-      def nestable_by resources
-        write_inheritable_attribute :nestable_by, resources
-      end
-
       # When +inline_create+ is specified for a controller, the +index+ page will have the ability to directly create new resources, just as the +new+ page normally can.
       #
       # To use +inline_create+, refactor the relevant contents of your +new+ view into a partial and render it in an appropriate place within the +index+ view.
@@ -37,10 +27,6 @@ module Hammock
 
       private
 
-      def nestable_resources
-        self.class.read_inheritable_attribute(:nestable_by) || {}
-      end
-
       def inline_createable_resource?
         self.class.read_inheritable_attribute :inline_create
       end

data/lib/hammock/logging.rb

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

data/lib/hammock/resource_retrieval.rb

@@ -15,10 +15,10 @@ module Hammock
         find_record :find_with_deleted
       end
 
-      def find_record
+      def find_record finder = :find
         result = if !callback(:before_find)
           # callbacks failed
-        elsif (record = retrieve_record).nil?
+        elsif (record = retrieve_record(finder)).nil?
           log "#{mdl}<#{params[:id]}> doesn't exist within #{requester_name.possessive} #{action_name} scope."
           :not_found
         elsif :ok != (verbability = can_verb_record?(action_name.to_sym, record))
@@ -44,11 +44,11 @@ module Hammock
         end
       end
 
-      def retrieve_record
+      def retrieve_record finder
         if (scope = current_scope).nil?
 
         else
-          record = scope.send :find, :first, :conditions => {mdl.routing_attribute => params[:id]}
+          record = scope.send finder, :first, :conditions => {mdl.routing_attribute => params[:id]}
           record || required_callback(:after_failed_find)
         end
       end
@@ -66,7 +66,7 @@ module Hammock
           escort_for_read_only
         elsif :unauthed == reason
           escort_for_403
-        elsif @current_account.nil? && account_verb_scope?
+        elsif current_user.nil? && account_verb_scope?
           escort_for_login
         else
           escort_for_404

data/lib/hammock/restful_support.rb

@@ -9,6 +9,8 @@ module Hammock
         # TODO Investigate the usefulness of this.
         # before_destroy :set_editing
         before_create :set_creator_id_if_appropriate
+        before_create :set_new_or_deleted_before_save
+        before_undestroy :set_new_or_deleted_before_save
         helper_method :mdl, :mdl_name, :editing?, :nested_within?, :partial_exists?
       }
     end
@@ -97,7 +99,7 @@ module Hammock
       def make_createable resource = mdl
         if !(new_record = make_new_record(resource))
           log "Couldn't create a new #{resource.base_model} with the given nesting level and parameters."
-        elsif !new_record.createable_by?(@current_account)
+        elsif !new_record.createable_by?(current_user)
           log "#{requester_name} can't create #{new_record.resource_name}."
         else
           new_record
@@ -133,13 +135,17 @@ module Hammock
         @editing = @record
       end
 
+      def set_new_or_deleted_before_save
+        @record.set_new_or_deleted_before_save
+      end
+
       # TODO process /^creating_\w+_id$/ as well
       def set_creator_id_if_appropriate
         if @record.respond_to?(:creator_id=)
-          if @current_account.nil?
-            log "Warning: @#{@record.base_model}.creator_id isn't being set, since @current_account was nil."
+          if current_user.nil?
+            log "Warning: @#{@record.base_model}.creator_id isn't being set, since current_user was nil."
           else
-            @record.creator_id = @current_account.id
+            @record.creator_id = current_user.id
           end
         end
       end

data/lib/hammock/scope.rb

@@ -26,7 +26,7 @@ module Hammock
       def can_verb_resource? verb, resource
         raise "The verb at #{call_point} must be supplied as a Symbol." unless verb.nil? || verb.is_a?(Symbol)
         route = route_for verb, resource
-        if route.safe? && !resource.indexable_by(@current_account)
+        if route.safe? && !resource.indexable_by(current_user)
           log "#{requester_name} can't index #{resource.name.pluralize}. #{describe_call_point 4}"
           :not_found
         elsif !route.safe? && !make_createable(resource)
@@ -42,17 +42,17 @@ module Hammock
         raise "The verb at #{call_point} must be supplied as a Symbol." unless verb.nil? || verb.is_a?(Symbol)
         route = route_for verb, record
         if route.verb.in?(:save, :create) && record.new_record?
-          if !record.createable_by?(@current_account)
+          if !record.createable_by?(current_user)
             log "#{requester_name} can't create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
             :unauthed
           else
             :ok
           end
         else
-          if !record.readable_by?(@current_account)
+          if !record.readable_by?(current_user)
             log "#{requester_name} can't see #{record.class}<#{record.id}>. #{describe_call_point 4}"
             :not_found
-          elsif !route.safe? && !record.writeable_by?(@current_account)
+          elsif !route.safe? && !record.writeable_by?(current_user)
             log "#{requester_name} can't #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
             :read_only
           else
@@ -63,11 +63,11 @@ module Hammock
       end
 
       def current_verb_scope
-        if @current_account && (scope_name = account_verb_scope?)
+        if current_user && (scope_name = account_verb_scope?)
           # log "got an account_verb_scope #{scope_name}."
-          mdl.send scope_name, @current_account
+          mdl.send scope_name, current_user
         elsif !(scope_name = public_verb_scope?)
-          log "No #{@current_account.nil? ? 'public' : 'account'} #{scope_name_for_action} scope available for #{mdl}.#{' May be available after login.' if account_verb_scope?}"
+          log "No #{current_user.nil? ? 'public' : 'account'} #{scope_name_for_action} scope available for #{mdl}.#{' May be available after login.' if account_verb_scope?}"
           nil
         else
           # log "got a #{scope_name} public_verb_scope."
@@ -112,7 +112,7 @@ module Hammock
       end
 
       def requester_name
-        @current_account.nil? ? 'Anonymous' : "#{@current_account.class}<#{@current_account.id}>"
+        current_user.nil? ? 'Anonymous' : "#{current_user.class}<#{current_user.id}>"
       end
 
       def account_verb_scope?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benhoskings-hammock
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency