hammock 0.4.0 → 0.4.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.4.2 2009-10-27
+Check rendered_or_redirected? on XHR requests as well as normal ones.
+Fix #ajaxinate to handle multiple entities.
+
+
+== 0.4.1 2009-10-27
+Updated Rakefile and gemspec to use jeweler.
+
+
 == 0.4 2009-10-05
 Fix #link_class_for to handle multiple entities.
 Use SELECT DISTINCT in #suggest to eliminate duplicates caused by JOINs.

data/Rakefile

@@ -7,6 +7,8 @@ begin
     gemspec.email = "ben@hoskings.net"
     gemspec.homepage = "http://github.com/benhoskings/hammock"
     gemspec.authors = ["Ben Hoskings"]
+    gemspec.add_dependency 'rails', '~> 2.3.0'
+    gemspec.add_dependency 'benhoskings-ambitious-activerecord', '~> 0.1.3.7'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.2

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = ""
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-10-22}
+  s.date = %q{2009-10-27}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [
@@ -81,9 +81,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, ["~> 2.3.0"])
+      s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
     else
+      s.add_dependency(%q<rails>, ["~> 2.3.0"])
+      s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
     end
   else
+    s.add_dependency(%q<rails>, ["~> 2.3.0"])
+    s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
   end
 end
 

data/lib/hammock/monkey_patches/active_record.rb

@@ -99,11 +99,11 @@ module Hammock
           record
         end
       end
-
-      def find_or_create_with! find_attributes, create_attributes = {}, adjust_attributes = false
-        record = find_or_new_with find_attributes, create_attributes, adjust_attributes
-        record.save ? record : raise("Save failed. #{record.errors.inspect}")
-      end
+      
+      # def find_or_create_with! find_attributes, create_attributes = {}, adjust_attributes = false)
+      #   record = find_or_new_with find_attributes, create_attributes, adjust_attributes
+      #   record.valid? ? record : raise("Save failed. #{record.errors.inspect}")
+      # end
 
     end
 

data/lib/hammock/restful_rendering.rb

@@ -13,12 +13,12 @@ module Hammock
       private
 
       def render_or_redirect_after result
-        if request.xhr?
+        if rendered_or_redirected?
+          log "Already rendered or redirected."
+        elsif request.xhr?
           render_for_safe_actions result, :editable => true, :edit => false
         else
-          if rendered_or_redirected?
-            log "Already rendered or redirected."
-          elsif postsave_render result
+          if postsave_render result
             # rendered - no redirect
           elsif result
             render_http_success

data/lib/hammock/scope.rb

@@ -28,10 +28,10 @@ module Hammock
         resource = entities.last
         route = route_for verb, *entities
         if route.safe? && !resource.indexable_by(current_user)
-          # dlog "#{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)
-          # dlog "#{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
           # dlog "#{requester_name} can #{verb} #{resource.name.pluralize}."
@@ -45,11 +45,11 @@ module Hammock
         route = route_for verb, *entities
         if route.verb.in?(:save, :create) && record.new_record?
           returning record.createable_by?(current_user) ? :ok : :unauthed do |result|
-            # dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
+            dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
           end
         else
           returning record_in_scope?(route, record) ? :ok : :not_found do |result|
-            # dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
+            dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
           end
         end
       end

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.4.0'
+  VERSION = '0.4.2'
   IncludeTarget = ActionController::Base
 
   def self.included base # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 +10:00
+date: 2009-10-27 00:00:00 +11:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: benhoskings-ambitious-activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.1.3.7
+    version: 
 description: ""
 email: ben@hoskings.net
 executables: []