hammock 0.2.12 → 0.2.12.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.12.1 2009-04-01
+Changed #log to #dlog for unmatched scope logging and related chatter.
+
+
 == 0.2.12 2009-03-31
 Added loading message.
 Moved require for hammock components within Hammock.included.

data/hammock.gemspec

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

@@ -27,13 +27,13 @@ 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, resource
         if route.safe? && !resource.indexable_by(current_user)
-          log "#{requester_name} can't index #{resource.name.pluralize}. #{describe_call_point 4}"
+          dlog "#{requester_name} can't index #{resource.name.pluralize}. #{describe_call_point 4}"
           :not_found
         elsif !route.safe? && !make_createable(resource)
-          log "#{requester_name} can't #{verb} #{resource.name.pluralize}. #{describe_call_point 4}"
+          dlog "#{requester_name} can't #{verb} #{resource.name.pluralize}. #{describe_call_point 4}"
           :read_only
         else
-          # log "#{requester_name} can #{verb} #{resource.name.pluralize}."
+          # dlog "#{requester_name} can #{verb} #{resource.name.pluralize}."
           :ok
         end
       end
@@ -43,20 +43,20 @@ module Hammock
         route = route_for verb, record
         if route.verb.in?(:save, :create) && record.new_record?
           if !record.createable_by?(current_user)
-            log "#{requester_name} can't create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
+            dlog "#{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_user)
-            log "#{requester_name} can't see #{record.class}<#{record.id}>. #{describe_call_point 4}"
+            dlog "#{requester_name} can't see #{record.class}<#{record.id}>. #{describe_call_point 4}"
             :not_found
           elsif !route.safe? && !record.writeable_by?(current_user)
-            log "#{requester_name} can't #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
+            dlog "#{requester_name} can't #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
             :read_only
           else
-            # log "#{requester_name} can #{verb} #{record.class}<#{record.id}>."
+            # dlog "#{requester_name} can #{verb} #{record.class}<#{record.id}>."
             :ok
           end
         end
@@ -64,13 +64,13 @@ module Hammock
 
       def current_verb_scope
         if current_user && (scope_name = account_verb_scope?)
-          # log "got an account_verb_scope #{scope_name}."
+          # dlog "got an account_verb_scope #{scope_name}."
           mdl.send scope_name, current_user
         elsif !(scope_name = public_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."
+          # dlog "got a #{scope_name} public_verb_scope."
           mdl.send scope_name
         end
       end
@@ -84,15 +84,15 @@ module Hammock
       end
 
       def current_scope
-        log "#{current_hammock_resource.mdl}, #{current_hammock_resource.ancestry.map(&:mdl).inspect}"
+        dlog "#{current_hammock_resource.mdl}, #{current_hammock_resource.ancestry.map(&:mdl).inspect}"
         if (verb_scope = current_verb_scope).nil?
           nil
         elsif (resultant_scope = verb_scope.within(current_nest_scope, current_hammock_resource.routing_parent)).nil?
           nil
         else
-          # puts "nest: #{current_nest_scope.clauses.inspect}"
-          # puts "verb: #{current_verb_scope.clauses.inspect}"
-          puts "chained in (#{resultant_scope.owner}) current_scope: #{resultant_scope.clauses.inspect}"
+          # dlog "nest: #{current_nest_scope.clauses.inspect}"
+          # dlog "verb: #{current_verb_scope.clauses.inspect}"
+          dlog "chained in (#{resultant_scope.owner}) current_scope: #{resultant_scope.clauses.inspect}"
           resultant_scope = resultant_scope.chain(custom_scope) unless custom_scope.nil?
           resultant_scope.sort_by &mdl.sorter
         end

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.12'
+  VERSION = '0.2.12.1'
 
   def self.included base # :nodoc:
     puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"

metadata

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