hammock 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2010-02-21}
+  s.date = %q{2010-05-12}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/benhoskings/hammock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Radically RESTful Rails.}
 
   if s.respond_to? :specification_version then

data/lib/hammock/logging.rb

@@ -64,6 +64,7 @@ module Hammock
       end
 
       def log_fail *args
+        opts = args.extract_options!
         log *(args << opts.merge(:skip => (opts[:skip] || 0) + 1))
         false
       end
@@ -84,7 +85,7 @@ module Hammock
           args.map(&:inspect).join(', ')
         end
 
-        msg.colorize!('on red') if opts[:error] || opts[:report]
+        msg = msg.colorize('on red') if opts[:error] || opts[:report]
 
         callpoint = caller[opts[:skip]].sub(rails_root.end_with('/'), '')
         entry = "#{callpoint}#{msg.blank? ? (opts[:report] ? ' <-- something broke here' : '.') : ' | '}#{msg}"

data/lib/hammock/monkey_patches/active_record.rb

@@ -19,7 +19,7 @@ module Hammock
     module ClassMethods
 
       def new_with attributes
-        default_attributes.merge(attributes).inject(new) {|record,(k,v)|
+        default_attributes.merge(attributes || {}).inject(new) {|record,(k,v)|
           record.send "#{k}=", v
           record
         }

data/lib/hammock/monkey_patches/hash.rb

@@ -22,11 +22,10 @@ module Hammock
       end
 
       def selekt &block
-        hsh = {}
-        each_pair {|k,v|
+        inject({}) {|hsh,(k,v)|
           hsh[k] = v if yield(k,v)
+          hsh
         }
-        hsh
       end
 
       # TODO remove in favour of #slice (in ActiveSupport).
@@ -53,6 +52,19 @@ module Hammock
         to_param_hash.to_json
       end
 
+      def reject_r &block
+        dup.reject_r! &block
+      end
+
+      def reject_r! &block
+        each_pair {|k,v|
+          if yield k, v
+            self.delete k
+          elsif v.is_a? Hash
+            self[k] = v.reject_r &block
+          end
+        }
+      end
     end
   end
 end

data/lib/hammock/restful_support.rb

@@ -19,14 +19,18 @@ 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
+        @hammock_cached_mdl ||= Object.const_get controller_ref.to_s.sub('Controller', '').classify
       rescue
         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".
       def mdl_name
-        @hammock_cached_mdl_name ||= to_s.sub('Controller', '').singularize.underscore
+        @hammock_cached_mdl_name ||= controller_ref.to_s.sub('Controller', '').singularize.underscore
+      end
+
+      def controller_ref
+        self
       end
 
     end
@@ -43,6 +47,10 @@ module Hammock
         self.class.mdl_name
       end
 
+      def controller_ref
+        self.class.controller_ref
+      end
+
       # Returns the node in the Hammock routing map corresponding to the (possibly nested) resource handling the current request.
       def current_hammock_resource
         nesting_resources = params.keys.map {|k| k.dup.chomp!('_id') }.compact.map(&:pluralize)
@@ -63,8 +71,8 @@ module Hammock
       # This is useful for concise nested parameter access. For example, if <tt>params[:account]</tt> is nil:
       #   params[:account][:email]      #=> NoMethodError: undefined method `[]' for nil:NilClass
       #   params_for(:account)[:email]  #=> nil
-      def params_for key
-        params[key] || {}
+      def params_for *keys
+        keys.inject(params) {|acc,key| acc[key] || {} }
       end
 
       def nested_params_for resource
@@ -97,7 +105,6 @@ module Hammock
           results.map {|records|
             records.first
           }.all? {|record|
-            log "nested record #{record.concise_inspect} assigned to @#{record.base_model}."
             add_nested_entity record
             instance_variable_set "@#{record.base_model}", record
           }

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,29 +14,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +11:00
+date: 2010-05-12 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: benhoskings-ambitious-activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
+        - 7
         version: 0.1.3.7
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: ""
 email: ben@hoskings.net
 executables: []
@@ -109,18 +123,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Radically RESTful Rails.