hammock 0.2.23 → 0.2.24

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.24 2009-05-05
+Removed two unused methods from active_record patches.
+Renamed find_with_deleted to find_with_destroyed in #find_or_new_with, for acts_as_paranoid -> is_paranoid.
+public_scope and empty_scope now optionally accept an (ignored) account.
+Add exception handling to #mdl, to return nil on nonexistent model instead of raising.
+
+
 == 0.2.23 2009-05-04
 Removed is_paranoid dependency (it'll be in the Rails app for now).
 

data/hammock.gemspec

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

data/lib/hammock/canned_scopes.rb

@@ -87,7 +87,7 @@ module Hammock
         }
       end
 
-      def public_scope account
+      def public_scope account = nil
         if sqlite?
           lambda {|record| 1 }
         else
@@ -112,7 +112,7 @@ module Hammock
         end
       end
 
-      def empty_scope
+      def empty_scope account = nil
         if sqlite?
           lambda {|record| 0 } # TODO check what this should be
         else

data/lib/hammock/monkey_patches/active_record.rb

@@ -62,18 +62,13 @@ module Hammock
       def record?; false end
       def resource?; true end
 
-      def update_statement set_clause, where_clause
-        statement = "UPDATE #{table_name} SET #{set_clause} WHERE #{send :sanitize_sql_array, where_clause}"
-        connection.update statement
-      end
-
       def reset_cached_column_info
         reset_column_information
         subclasses.each &:reset_cached_column_info
       end
       
       def find_or_new_with(find_attributes, create_attributes = {})
-        finder = respond_to?(:find_with_deleted) ? :find_with_deleted : :find
+        finder = respond_to?(:find_with_destroyed) ? :find_with_destroyed : :find
 
         if record = send(finder, :first, :conditions => find_attributes.discard(:deleted_at))
           # Found the record, so we can return it, if:
@@ -81,7 +76,7 @@ module Hammock
           # (b) it can, but it's not actually deleted,
           # (c) it is deleted, but we want to find one that's deleted, or
           # (d) we don't want a deleted record, and undestruction succeeds.
-          if (finder != :find_with_deleted) || !record.deleted? || create_attributes[:deleted_at] || record.undestroy
+          if (finder != :find_with_destroyed) || !record.deleted? || create_attributes[:deleted_at] || record.restore
             record
           end
         else
@@ -153,20 +148,6 @@ module Hammock
         @new_or_deleted_before_save = new_record? || send_if_respond_to(:deleted?)
       end
 
-      def undestroy
-        unless new_record?
-          if frozen?
-            self.class.find_with_deleted(self.id).undestroy # Re-fetch ourselves and undestroy the thawed copy
-          else
-            # We can undestroy
-            return false if callback(:before_undestroy) == false
-            result = self.class.update_all ['deleted_at = ?', (self.deleted_at = nil)], ['id = ?', self.id]
-            callback(:after_undestroy)
-            self if result != false
-          end
-        end
-      end
-
       # Updates each given attribute to the current time.
       #
       # Assumes that each column can accept a +Time+ instance, i.e. that they're all +datetime+ columns or similar.

data/lib/hammock/restful_support.rb

@@ -20,6 +20,9 @@ module Hammock
       # The model this controller operates on. Defined as the singularized controller name. For example, for +GelatinousBlobsController+, this will return the +GelatinousBlob+ class.
       def mdl
         @hammock_cached_mdl ||= Object.const_get to_s.sub('Controller', '').classify
+      rescue
+        log "No such model '#{to_s.sub('Controller', '').classify}'."
+        nil
       end
       # The lowercase name of the model this controller operates on. For example, for +GelatinousBlobsController+, this will return "gelatinous_blob".
       def mdl_name

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.23'
+  VERSION = '0.2.24'
 
   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.23
+  version: 0.2.24
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 +10:00
+date: 2009-05-05 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency