hammock 0.2.14 → 0.2.15

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.15 2009-04-15
+Switched from #in? to #include? for non-literal args, since it splats into a nested array and breaks.
+Moved implied verbs from RouteStep#implied_verb? to a constant.
+partitioned_scope now uses an empty_scope when the resource doesn't match.
+Added String#/ to wrap File.join beautifully (thanks merb).
+
+
 == 0.2.14 2009-04-08
 On escort(:unauthed), redirect to login for public GETs when an authed scope exists.
 

data/hammock.gemspec

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

@@ -105,7 +105,11 @@ module Hammock
       end
       
       def partitioned_scope account
-        lambda {|record| record.id == account.id }
+        if account.is_a? self
+          lambda {|record| record.id == account.id }
+        else
+          empty_scope
+        end
       end
 
       def empty_scope

data/lib/hammock/constants.rb

@@ -3,6 +3,7 @@ module Hammock
 
   module Constants
     
+    ImpliedVerbs = [:index, :create, :show, :update, :destroy]
     ImpliedUnsafeActions = [:new, :edit, :destroy]
     
   end

data/lib/hammock/monkey_patches/string.rb

@@ -47,6 +47,15 @@ module Hammock
         ends_with?(str) ? self : self + str
       end
 
+      # Return +self+ joined to other using File#join. This allows paths to be constructed
+      # with a nice syntax; for example, the following two expressions are equivalent.
+      #
+      # File.join RAILS_ROOT, 'views', controller_name, 'index.html.haml'
+      # RAILS_ROOT / 'views' / controller_name / 'index.html.haml'
+      def / other
+        File.join self, other
+      end
+
       def possessive
         "#{self}'#{'s' unless ends_with?('s')}"
       end

data/lib/hammock/restful_support.rb

@@ -137,7 +137,7 @@ module Hammock
       end
 
       def safe_verb_and_implication?
-        request.get? && !action_name.to_s.in?(Hammock::Constants::ImpliedUnsafeActions)
+        request.get? && !Hammock::Constants::ImpliedUnsafeActions.include?(action_name.to_sym)
       end
 
       def set_editing

data/lib/hammock/route_step.rb

@@ -60,13 +60,13 @@ module Hammock
     def delete?; :delete == http_method end
 
     def safe?
-      get? && !verb.in?(Hammock::Constants::ImpliedUnsafeActions)
+      get? && !Hammock::Constants::ImpliedUnsafeActions.include?(verb)
     end
 
     private
 
     def implied_verb? verb
-      verb.in? :index, :create, :show, :update, :destroy
+      Hammock::Constants::ImpliedVerbs.include? verb
     end
 
     def raise_unless_setup_while_trying_to task

data/lib/hammock/scope.rb

@@ -84,7 +84,7 @@ module Hammock
       end
 
       def current_scope
-        dlog "#{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?
@@ -92,7 +92,7 @@ module Hammock
         else
           # 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}"
+          # 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.14'
+  VERSION = '0.2.15'
 
   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.14
+  version: 0.2.15
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +10:00
+date: 2009-04-15 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency