benhoskings-hammock 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.3.1 2009-05-26
+Check for a specific scope for the current action before checking for a default-named scope.
+Commented ambition query logging.
+Moved index rendering to restful_rendering.
+Wrap pending -> success notification within obj null test.
+
+
 == 0.3.0 2009-05-25
 Updated ajax_link, ajaxinate and related methods to accept explicit args instead of a splatted list - this makes it a lot easier to handle different amounts of entities.
 Only do obj replacement in jquery_xhr callback if it's set.

data/hammock.gemspec

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

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

data/lib/hammock/ajaxinate.rb

@@ -84,8 +84,10 @@ module Hammock
                 ),
                 function(response, textStatus) {
                   #{response_action}
-                  if (obj) obj.children('.spinner').hide();
-                  #{"if ('success' == textStatus) obj.children('.success').show().fadeOut(4000);" if opts[:spinner] != :pending}
+                  if (obj) {
+                    obj.children('.spinner').hide();
+                    #{"if ('success' == textStatus) obj.children('.success').show().fadeOut(4000);" if opts[:spinner] != :pending}
+                  }
                   eval("#{clean_snippet opts[:after]}");
                 }
               );

data/lib/hammock/restful_actions.rb

@@ -6,14 +6,7 @@ module Hammock
       #
       # Lists the current resource's records that are visible within the current index scope, defined by +index_scope+ and +index_scope_for+ on the current model.
       def index
-        if tasks_for_index
-          respond_to do |format|
-            format.html
-            format.xml { render :xml => @records.kick }
-            format.json { render :json => @records.kick }
-            format.yaml { render :text => @records.kick.to_yaml }
-          end
-        end
+        render_for_index if tasks_for_index
       end
 
       # The +new+ action. (GET, safe, idempotent)

data/lib/hammock/restful_rendering.rb

@@ -28,6 +28,15 @@ module Hammock
         end
       end
 
+      def render_for_index
+        respond_to do |format|
+          format.html
+          format.xml { render :xml => @records.kick }
+          format.json { render :json => @records.kick }
+          format.yaml { render :text => @records.kick.to_yaml }
+        end
+      end
+
       def render_for_safe_actions result = true, opts = {}
         if request.xhr?
           if params[:attribute]

data/lib/hammock/restful_support.rb

@@ -77,7 +77,7 @@ module Hammock
         elsif record_or_records.is_a? ActiveRecord::Base
           instance_variable_set "@#{mdl_name}", (@record = record_or_records)
         elsif record_or_records.is_a? Ambition::Context
-          log "Unkicked query: #{record_or_records.to_hash.inspect}"
+          # log "Unkicked query: #{record_or_records.to_hash.inspect}"
           instance_variable_set "@#{mdl_name.pluralize}", (@records = record_or_records)
         elsif record_or_records.is_a? Array
           instance_variable_set "@#{mdl_name.pluralize}", (@records = record_or_records)

data/lib/hammock/scope.rb

@@ -116,10 +116,10 @@ module Hammock
       end
 
       def account_verb_scope?
-        mdl.has_account_scope? scope_name_for_action
+        mdl.has_account_scope?(action_name) || mdl.has_account_scope?(scope_name_for_action)
       end
       def public_verb_scope?
-        mdl.has_public_scope? scope_name_for_action
+        mdl.has_public_scope?(action_name) || mdl.has_public_scope?(scope_name_for_action)
       end
 
     end

metadata

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