dao 3.1.2 → 3.2.0

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "3.1.2"
+  spec.version = "3.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"

data/lib/dao.rb

@@ -10,7 +10,7 @@
 # dao libs
 #
   module Dao
-    Version = '3.1.2' unless defined?(Version)
+    Version = '3.2.0' unless defined?(Version)
 
     def version
       Dao::Version
@@ -18,7 +18,7 @@
 
     def dependencies
       {
-        'map'  => ['map'       , '~> 4.1.0'],
+        'map'  => ['map'       , '~> 4.2.0'],
         'tagz' => ['tagz'      , '~> 9.0.0'],
         'yajl' => ['yajl-ruby' , '~> 0.8.1']
       }

data/lib/dao/active_record.rb

@@ -42,26 +42,42 @@ if defined?(ActiveRecord)
           options = nil
         end
 
-      # search for options inside args...
+      # get base to_dao from class
       #
-        if options.nil?
-          last = args.last
-          options = Dao.map
-
-          if last.is_a?(Hash)
-            last = Dao.map(last)
-            keys = %w( include includes with )
-            if keys.any?{|key| last.has_key?(key)}
-              options.update(last)
-              args.pop
+        base = model.to_dao
+
+      # opts
+      # 
+        opts = %w( include includes with exclude excludes without )
+
+        extract_options =
+          proc do |array|
+            last = array.last
+            if last.is_a?(Hash)
+              last = Dao.map(last)
+              if opts.any?{|opt| last.has_key?(opt)}
+                array.pop
+                break(last)
+              end
             end
+            Map.new
           end
+
+      # handle case where options are bundled in args...
+      #
+        options ||= extract_options[args]
+
+      # use base options iff none provided
+      #
+        base_options = extract_options[base]
+        if options.blank? and !base_options.blank?
+          options = base_options
         end
 
-      # refine the list with includes iff passed as options
+      # refine the args with includes iff found in options
       #
         if options.has_key?(:include) or options.has_key?(:includes) or options.has_key?(:with)
-          args.replace(model.to_dao) if args.empty?
+          args.replace(base) if args.empty?
           args.push(options[:include]) if options[:include]
           args.push(options[:includes]) if options[:includes]
           args.push(options[:with]) if options[:with]
@@ -69,7 +85,8 @@ if defined?(ActiveRecord)
 
       # take passed in args or model defaults
       #
-        list = args.empty? ? model.to_dao : args
+        list = args.empty? ? base : args
+        list = column_names if list.empty?
 
       # okay - go!
       #
@@ -110,6 +127,18 @@ if defined?(ActiveRecord)
           map[:id] = map[:_id]
         end
 
+      # refine the map with excludes iff passed as options
+      #
+        if options.has_key?(:exclude) or options.has_key?(:excludes) or options.has_key?(:without)
+          [options[:exclude], options[:excludes], options[:without]].each do |paths|
+            paths = Array(paths)
+            next if paths.blank?
+            paths.each do |path|
+              map.rm(path)
+            end
+          end
+        end
+
         map
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dao
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: 
   segments: 
   - 3
-  - 1
   - 2
-  version: 3.1.2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -06:00
+date: 2011-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: []