benhoskings-hammock 0.3.5 → 0.3.7

data/History.txt

@@ -1,3 +1,14 @@
+== 0.3.7 2009-06-05
+Rewrote hammock loading code to use nestable dependencies instead of the LoadFirst constant.
+Replaced Hammock::Aliases with the Hammock:LambdaAlias component.
+
+
+== 0.3.6 2009-06-04
+Call initialize_for_load after requiring components, so Hammock::Aliases is defined.
+Replaced MixInto reference with more appropriate base reference in Hammock::ActiveRecord.included.
+Added exception message to model const_get error message.
+
+
 == 0.3.5 2009-06-03
 Converted README back to rdoc, for rubyforge rake tasks.
 

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.3.5"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-06-03}
+  s.date = %q{2009-06-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.
 
 
@@ -20,12 +20,11 @@ It makes more sense when you see how it works though. There's a screencast comin
   s.email = ["ben@hoskings.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "misc/scaffold.txt"]
   s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "hammock.gemspec", "lib/hammock.rb", "lib/hammock/ajaxinate.rb", "lib/hammock/callback.rb", "lib/hammock/callbacks.rb", "lib/hammock/canned_scopes.rb", "lib/hammock/constants.rb", "lib/hammock/controller_attributes.rb", "lib/hammock/export_scope.rb", "lib/hammock/hamlink_to.rb", "lib/hammock/javascript_buffer.rb", "lib/hammock/logging.rb", "lib/hammock/model_attributes.rb", "lib/hammock/model_logging.rb", "lib/hammock/monkey_patches/action_pack.rb", "lib/hammock/monkey_patches/active_record.rb", "lib/hammock/monkey_patches/array.rb", "lib/hammock/monkey_patches/hash.rb", "lib/hammock/monkey_patches/logger.rb", "lib/hammock/monkey_patches/module.rb", "lib/hammock/monkey_patches/numeric.rb", "lib/hammock/monkey_patches/object.rb", "lib/hammock/monkey_patches/route_set.rb", "lib/hammock/monkey_patches/string.rb", "lib/hammock/overrides.rb", "lib/hammock/resource_mapping_hooks.rb", "lib/hammock/resource_retrieval.rb", "lib/hammock/restful_actions.rb", "lib/hammock/restful_rendering.rb", "lib/hammock/restful_support.rb", "lib/hammock/route_drawing_hooks.rb", "lib/hammock/route_for.rb", "lib/hammock/route_node.rb", "lib/hammock/route_step.rb", "lib/hammock/scope.rb", "lib/hammock/suggest.rb", "lib/hammock/utils.rb", "misc/scaffold.txt", "misc/template.rb", "tasks/hammock_tasks.rake", "test/hammock_test.rb"]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/benhoskings/hammock}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hammock}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner}
 
   if s.respond_to? :specification_version then

data/lib/hammock.rb

@@ -4,12 +4,12 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.3.5'
+  VERSION = '0.3.7'
+  IncludeTarget = ActionController::Base
 
   def self.included base # :nodoc:
-    puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"
-    initialize_for_load
-    load_hammock_components base
+    puts "Loading Hammock #{Hammock::VERSION} from #{loaded_from_gem? ? 'gem' : 'plugin'}"
+    load_hammock_components
   end
 
   def self.loaded_from_gem?
@@ -33,13 +33,9 @@ module Hammock
 
   private
 
-  def self.initialize_for_load
-    Hammock::Aliases.alias_lambda
-  end
-
-  def self.load_hammock_components base
+  def self.load_hammock_components
     require_hammock_components
-    mixin_hammock_components base
+    mixin_hammock_components
   end
 
   def self.require_hammock_components
@@ -48,20 +44,31 @@ module Hammock
     }
   end
 
-  def self.mixin_hammock_components base
-    Hammock.constants.map {|constant_name|
-      Hammock.const_get constant_name
-    }.select {|constant|
-      constant.is_a?(Module) && !constant.is_a?(Class)
-    }.partition {|mod|
-      mod.constants.include?('LoadFirst') && mod::LoadFirst
-    }.flatten.each {|mod|
-      target = mod.constants.include?('MixInto') ? mod::MixInto : base
-      target.send :include, mod
-    }
+  def self.mixin_hammock_components
+    Hammock.constants.each &method(:mixin_hammock_component)
+  end
+
+  def self.mixin_hammock_component mod
+    (get_constant_from(mod, :Deps) || []).each &method(:mixin_hammock_component)
+    do_module_mixin module_for mod
+  end
+
+  def self.do_module_mixin mod
+    (get_constant_from(mod, :MixInto) || IncludeTarget).send :include, mod unless mod.nil?
+  end
+
+  def self.module_for obj
+    const = obj.is_a?(Module) ? obj : const_get(obj)
+    const if const.is_a?(Module) && !const.is_a?(Class)
+  end
+
+  def self.get_constant_from module_name, constant_name
+    unless (mod = module_for module_name).nil?
+      mod.const_get constant_name.to_s if mod.constants.include?(constant_name.to_s)
+    end
   end
 
 end
 
 # This is done in init.rb when Hammock is loaded as a plugin.
-ActionController::Base.send :include, Hammock if Hammock.loaded_from_gem?
+Hammock::IncludeTarget.send :include, Hammock if Hammock.loaded_from_gem?

data/lib/hammock/callbacks.rb

@@ -1,6 +1,5 @@
 module Hammock
   module Callbacks
-    LoadFirst = true
 
     def self.included base # :nodoc:
       base.send :include, InstanceMethods

data/lib/hammock/constants.rb

@@ -2,9 +2,9 @@ module Hammock
   PleaseFileABug = "Ack, that shouldn't have happened. Please email the full stacktrace to <ben@hoskings.net>, so the problem you uncovered can be addressed. Thanks!"
 
   module Constants
-    
+
     ImpliedVerbs = [:index, :create, :show, :update, :destroy]
     ImpliedUnsafeActions = [:new, :edit, :destroy]
-    
+
   end
 end

data/lib/hammock/monkey_patches/active_record.rb

@@ -7,7 +7,7 @@ module Hammock
       base.send :extend, ClassMethods # TODO maybe include in the metaclass instead of extending the class?
 
       %w[before_undestroy after_undestroy].each {|callback_name|
-        MixInto.define_callbacks callback_name
+        base.define_callbacks callback_name
         # base.send :define_method, callback_name, lambda { }
       }
       base.class_eval {

data/lib/hammock/monkey_patches/module.rb

@@ -1,7 +1,6 @@
 module Hammock
   module ModulePatches
     MixInto = Module
-    LoadFirst = true
 
     def self.included base # :nodoc:
       base.send :include, InstanceMethods

data/lib/hammock/resource_mapping_hooks.rb

@@ -1,6 +1,7 @@
 module Hammock
   module ResourceMappingHooks
     MixInto = ActionController::Resources
+    Deps = [ModulePatches]
 
     def self.included base # :nodoc:
       base.send :include, Methods

data/lib/hammock/restful_support.rb

@@ -1,5 +1,7 @@
 module Hammock
   module RestfulSupport
+    Deps = [Callbacks]
+
     def self.included base # :nodoc:
       base.send :include, InstanceMethods
       base.send :extend, ClassMethods
@@ -19,7 +21,7 @@ module Hammock
       def mdl
         @hammock_cached_mdl ||= Object.const_get to_s.sub('Controller', '').classify
       rescue
-        log "No such model '#{to_s.sub('Controller', '').classify}'."
+        log "Error loading '#{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".

data/lib/hammock/route_drawing_hooks.rb

@@ -1,6 +1,7 @@
 module Hammock
   module RouteDrawingHooks
     MixInto = ActionController::Routing::RouteSet
+    Deps = [ModulePatches]
 
     def self.included base # :nodoc:
       base.send :include, Methods

data/misc/template.rb

@@ -1,8 +1,7 @@
 module Hammock
   module Lol
     MixInto = Lol::Lul
-    # LoadFirst = false
-    
+
     def self.included base # :nodoc:
       base.send :include, InstanceMethods
       base.send :extend, ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benhoskings-hammock
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,7 @@ files:
 - misc/template.rb
 - tasks/hammock_tasks.rake
 - test/hammock_test.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/benhoskings/hammock
 post_install_message: 
 rdoc_options: