hammock 0.3.1 → 0.3.2

data/History.txt

@@ -1,8 +1,12 @@
-== 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.2 2009-05-28
+Accidentally pushed 0.3.1 in an unknown state - bumped to 0.3.2 to be safe.
+
+
+== 0.3.1 2009-05-28
+Added Hammock.load_models, along with call in draw_with_hammock_route_map_init.
+Refactored Hammock.included out into load_hammock_components and related methods, and made them all private.
+Only extract record_attributes from records - not resources too.
+Fixed http status entry in log_hit.
 
 
 == 0.3.0 2009-05-25

data/hammock.gemspec

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

@@ -16,30 +16,25 @@ module Hammock
         ajax_link verb, record, opts.merge(:class => [opts[:class], 'button'].squash.join(' '))
       end
 
-      def ajax_link verb, entities, opts
-        entities = [entities] unless entities.is_a?(Array)
-
-        if can_verb_entity?(verb, entities.last)
-          route = ajaxinate verb, entities, opts
+      def ajax_link verb, record, opts = {}
+        if can_verb_entity?(verb, record)
+          route = ajaxinate verb, record, opts
 
           content_tag :a,
             opts[:text] || route.verb.to_s.capitalize,
-            :class => [opts[:class], link_class_for(route.verb, entities)].squash.join(' '),
+            :class => [opts[:class], link_class_for(route.verb, record)].squash.join(' '),
             :href => route.path,
             :onclick => 'return false;',
             :style => opts[:style]
         end
       end
 
-      def ajaxinate verb, entities, opts = {}
-        entities = [entities] unless entities.is_a?(Array)
-        entity = entities.last
-
-        record_attributes = entity.is_a?(ActiveRecord::Base) ? {entity.base_model => entity.unsaved_attributes} : {}
-        link_params = {entity.base_model => (opts.delete(:record) || {}) }.merge(opts[:params] || {})
-        route = route_for verb, *entities
+      def ajaxinate verb, record, opts = {}
+        record_attributes = record.is_a?(ActiveRecord::Base) ? {record.base_model => record.unsaved_attributes} : {}
+        link_params = {record.base_model => (opts.delete(:record) || {}) }.merge(opts[:params] || {})
+        route = route_for verb, record
         attribute = link_params[:attribute]
-        link_class = link_class_for route.verb, entities, attribute
+        link_class = link_class_for route.verb, record, attribute
 
         link_params[:_method] = route.http_method
         link_params[:format] = opts[:format].to_s unless opts[:format].blank?
@@ -49,7 +44,7 @@ module Hammock
         elsif attribute.blank?
           "jQuery('form').serializeHash()"
         else
-          "{ '#{entity.base_model}[#{attribute}]': $('.#{link_class}').val() }"
+          "{ '#{record.base_model}[#{attribute}]': $('.#{link_class}').val() }"
         end
 
         response_action = case link_params[:format].to_s
@@ -84,10 +79,8 @@ 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]}");
                 }
               );
@@ -122,7 +115,7 @@ module Hammock
         when 'js'
           "eval(data);"
         else
-          "if (typeof(obj) != 'undefined') { obj.replaceWith(data); }"
+          "obj.replaceWith(data);"
         end
 
         %Q{
@@ -148,8 +141,8 @@ module Hammock
 
       private
 
-      def link_class_for verb, entitites, attribute = nil
-        [verb, entitites.map(&:description), attribute].flatten.compact.join '_'
+      def link_class_for verb, record, attribute = nil
+        [verb, record.description, attribute].compact.join('_')
       end
 
       def clean_snippet snippet

data/lib/hammock/logging.rb

@@ -19,7 +19,7 @@ module Hammock
           (@current_site.subdomain unless @current_site.nil?),
           (request.session_options[:id].nil? ? 'nil' : ('...' + request.session_options[:id][-8, 8])),
           (current_user.nil? ? "unauthed" : "Account<#{current_user.id}> #{current_user.name}").colorize('green'),
-          headers['Status'],
+          response.status,
           log_hit_request_info,
           log_hit_route_info
         ].squash.join(' | ')

data/lib/hammock/restful_actions.rb

@@ -6,7 +6,14 @@ 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
-        render_for_index if tasks_for_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
       end
 
       # The +new+ action. (GET, safe, idempotent)

data/lib/hammock/restful_rendering.rb

@@ -28,15 +28,6 @@ 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/route_drawing_hooks.rb

@@ -13,6 +13,7 @@ module Hammock
     module Methods
 
       def draw_with_hammock_route_map_init &block
+        Hammock.load_models
         ActionController::Routing::Routes.send :initialize_hammock_route_map
         draw_without_hammock_route_map_init &block
       end

data/lib/hammock/scope.rb

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

data/lib/hammock.rb

@@ -4,15 +4,47 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
   def self.included base # :nodoc:
     puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"
+    load_hammock_components base
+  end
+
+  def self.loaded_from_gem?
+    File.dirname(__FILE__)[`gem env gemdir`.chomp]
+  end
+
+  # Trigger a load of every model by trying to access the class we expect in
+  # each file within app/models. This ensures ActiveRecord::Base.subclasses
+  # and related methods always return the full set of models they should.
+  def self.load_models
+    Dir.glob(RAILS_ROOT / 'app/models/**/*.rb').each {|model_file|
+      klass = File.basename(model_file, '.rb').classify
+      begin
+        Object.const_get klass
+        puts "Loaded #{klass} from #{model_file}."
+      rescue
+        puts "Couldn't load #{klass} from #{model_file}."
+      end
+    }
+  end
 
+
+  private
+
+  def self.load_hammock_components base
+    require_hammock_components
+    mixin_hammock_components base
+  end
+
+  def self.require_hammock_components
     Dir.glob("#{File.dirname __FILE__}/hammock/**/*.rb").each {|dep|
       require dep
     }
+  end
 
+  def self.mixin_hammock_components base
     Hammock.constants.map {|constant_name|
       Hammock.const_get constant_name
     }.select {|constant|
@@ -25,9 +57,6 @@ module Hammock
     }
   end
 
-  def self.loaded_from_gem?
-    File.dirname(__FILE__)[`gem env gemdir`.chomp]
-  end
 end
 
 # This is done in init.rb when Hammock is loaded as a plugin.

metadata

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