dao 3.1.0 → 3.1.1

data/README

@@ -106,6 +106,7 @@ READING
   http://java.sun.com/blueprints/corej2eepatterns/Patterns/DataAccessObject.html
   http://www.paperplanes.de/2010/5/7/activerecord_callbacks_ruined_my_life.html
   http://google-styleguide.googlecode.com/svn/trunk/jsoncstyleguide.xml
+  http://pragdave.blogs.pragprog.com/pragdave/2007/03/the_radar_archi.html
 
 INSTALL
   gem 'dao', :path => File.expand_path('..') ### Gemfile

data/a.rb

@@ -1,25 +1,80 @@
-Api =
-  Dao.api do
-    call('/users/:user_id/comments/:comment_id') do
-      p route
-      p path
-      p params
+##
+#
+  require 'dao'
+  require 'rubygems'
+  gem 'activesupport', '>= 3.0.7'
+  require 'active_support'
+  require 'active_support/dependencies'
+
+##
+#
+  leak =
+    lambda do
+      Api =
+        Dao.api do
+          1000.times do |i|
+            call("/foobar-#{ i }") do
+            end
+          end
+        end
+
+      api = Api.new
+
+      result = api.call('/foobar-1')
+      p result
+
+      ActiveSupport::Dependencies.unloadable(Api)
+      ActiveSupport::Dependencies.remove_unloadable_constants!
     end
-  end
 
-api = Api.new
+##
+#
+  n = 10
+
+  leak.call()
+
+  GC.start
+  leak.call()
+  GC.start
+
+  p :before => Process.size
+
+
+  GC.start
+  leak.call()
+  GC.start
+
+  p :after => Process.size
+
+
+
 
-result = api.call('/users/1/comments/2')
-puts result.form.input(:user_id)
-puts result.form.input(:comment_id)
-puts
 
-result = api.call('/users/comments', :user_id => 1, :comment_id => 2)
-puts result.form.input(:user_id)
-puts result.form.input(:comment_id)
-puts
 
-result = api.call('/users/:user_id/comments/:comment_id', :user_id => 1, :comment_id => 2)
-puts result.form.input(:user_id)
-puts result.form.input(:comment_id)
-puts
+
+
+
+
+
+
+
+##
+#
+  BEGIN {
+
+    module Process
+      def self.size pid = Process.pid 
+        stdout = `ps wwwux -p #{ pid }`.split(%r/\n/)
+        vsize, rsize = stdout.last.split(%r/\s+/)[4,2]
+      end
+
+      def self.vsize
+        size.first
+      end
+
+      def self.rsize
+        size.last
+      end
+    end
+
+  }

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "3.1.0"
+  spec.version = "3.1.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -69,6 +69,7 @@ Gem::Specification::new do |spec|
  "test",
  "test/dao_test.rb",
  "test/helper.rb",
+ "test/leak.rb",
  "test/testing.rb",
  "test/units"]
 

data/lib/dao.rb

@@ -10,7 +10,7 @@
 # dao libs
 #
   module Dao
-    Version = '3.1.0' unless defined?(Version)
+    Version = '3.1.1' unless defined?(Version)
 
     def version
       Dao::Version
@@ -96,10 +96,3 @@
   unless defined?(D)
     D = Dao
   end
-
-  if defined?(Rails.env)
-    unless Rails.env.production?
-      unloadable(Dao)
-      unloadable(D)
-    end
-  end

data/lib/dao/api/context.rb

@@ -1,6 +1,6 @@
 module Dao
   class Context
-    Attrs = %w( api route path interface method args status errors params result data form validations )
+    Attrs = %w( api route path interface args status errors params result data form validations )
 
     Attrs.each{|a| attr_accessor(a)}
 
@@ -19,8 +19,12 @@ module Dao
       params = result.params
       params.update(parsed_params)
 
-      method = interface.method.bind(api)
-      args = [params, result].slice(0, method.arity)
+      args =
+        if interface.arity < 1
+          [params, result]
+        else
+          [params, result].slice(0, interface.arity)
+        end
 
     # build the context
     #
@@ -29,7 +33,6 @@ module Dao
       context.interface = interface
       context.route = route
       context.path = path
-      context.method = method
       context.args = args
       context.status = Status.default
       context.errors = Errors.new
@@ -56,8 +59,10 @@ module Dao
       context
     end
 
+    include InstanceExec
+
     def call
-      method.call(*args)
+      api.instance_exec(*args, &interface)
     end
   end
 end

data/lib/dao/api/interfaces.rb

@@ -3,8 +3,16 @@ module Dao
   # class methods
   #
     class << Api
-      def interfaces
-        @interfaces ||= Map.new
+      def unload!
+        state.clear
+      end
+
+      def state
+        @state ||= {
+          :interfaces => {},
+          :blocks => {},
+          :docs => []
+        }
       end
 
       def interface(path, &block)
@@ -13,24 +21,22 @@ module Dao
 
         route = routes.add(path) if Route.like?(path)
 
-        method =
-          module_eval{ 
-            define_method(path + '/interface', &block)
-            instance_method(path + '/interface')
-          }
-
-        interface = Interface.new(
+        interface = Interface.new({
           'api' => api,
           'path' => path,
           'route' => route,
-          'method' => method,
+          'block' => block,
           'doc' => docs.pop
-        )
+        })
 
         interfaces[path] = interface
       end
       alias_method('call', 'interface')
 
+      def interfaces
+        state[:interfaces]
+      end
+
       def description(string)
         doc(:description => Dao.unindent(string))
       end
@@ -48,7 +54,7 @@ module Dao
       end
 
       def docs
-        @docs ||= []
+        state[:docs]
       end
 
       def index
@@ -89,6 +95,8 @@ module Dao
         if Route.like?(path)
           route = Route.new(path)
           path = route.path_for(params)
+        else
+          route = path
         end
       end
 

data/lib/dao/interface.rb

@@ -1,6 +1,6 @@
 module Dao
   class Interface
-    Attrs = %w( api path route method doc )
+    Attrs = %w( api path route block doc )
     Attrs.each{|attr| attr_accessor(attr)}
 
     def initialize(options = {})
@@ -12,5 +12,17 @@ module Dao
         send("#{ key }=", val)
       end
     end
+
+    def arity
+      block.arity
+    end
+
+    def call(*args)
+      block.call(*args)
+    end
+
+    def to_proc
+      block
+    end
   end
 end

data/lib/dao/rails.rb

@@ -1,5 +1,14 @@
 if defined?(Rails)
+
   module Dao
+  ## support unloadable
+  #
+    def Api.before_remove_const
+      unload!
+    end
+
+  ##
+  #
     class Engine < Rails::Engine
       GEM_DIR = File.expand_path(__FILE__ + '/../../../')
       ROOT_DIR = File.join(GEM_DIR, 'lib/dao/rails')
@@ -10,10 +19,6 @@ if defined?(Rails)
 
       ### config.autoload_paths << APP_DIR
       ### $LOAD_PATH.push(File.join(Rails.root.to_s, 'app'))
-      #config.after_initialize do
-        #unloadable(Dao)
-      #end
-       
 
     # yes yes, this should probably be somewhere else...
     #

data/lib/dao/rails/lib/generators/dao/templates/api_controller.rb

@@ -24,9 +24,8 @@ protected
   def respond_with(object, options = {})
     json = json_for(object)
 
-    status = object.status if object.respond_to?(:status)
+    status = object.status rescue (options[:status] || 200)
     status = status.code if status.respond_to?(:code)
-    status = options[:status] || 200 unless status
 
     respond_to do |wants|
       wants.json{ render :json => json, :status => status }
@@ -50,6 +49,10 @@ protected
     @path
   end
 
+##
+# you'll likely want to customize this for you app as it makes a few
+# assumptions about how to find and authenticate users
+#
   def setup_api
     if white_listed?(path)
       @api = Api.new

data/test/leak.rb

@@ -0,0 +1,86 @@
+##
+#
+  require 'rubygems'
+  #gem 'activesupport', '>= 3.0.7'
+  #require 'active_support'
+  #require 'active_support/dependencies'
+
+  require 'rails/all'
+  require 'dao'
+
+##
+#
+  gc =
+    lambda do
+      10.times{ GC.start }
+    end
+
+  leak =
+    lambda do
+      Api =
+        Dao.api do
+          1000.times do |i|
+            call("/foobar-#{ i }") do
+            end
+          end
+        end
+
+      api = Api.new
+
+      result = api.call('/foobar-1')
+      result.route || abort(result.inspect)
+
+      ActiveSupport::Dependencies.unloadable(Api)
+      ActiveSupport::Dependencies.remove_unloadable_constants!
+      gc.call()
+    end
+
+##
+#
+  n = 10
+
+paths = 0
+ObjectSpace.each_object(Dao::Path){ paths += 1}
+p 'paths' => paths
+
+  leak.call()
+  before = Process.size
+
+paths = 0
+ObjectSpace.each_object(Dao::Path){ paths += 1}
+p 'paths' => paths
+
+  leak.call()
+  after = Process.size
+
+paths = 0
+ObjectSpace.each_object(Dao::Path){ paths += 1}
+p 'paths' => paths
+
+  delta = [after.first - before.first, after.last - before.last]
+
+  p :before => before 
+  p :after => after 
+  p :delta => delta
+
+
+##
+#
+  BEGIN {
+
+    module Process
+      def self.size pid = Process.pid 
+        stdout = `ps wwwux -p #{ pid }`.split(%r/\n/)
+        vsize, rsize = stdout.last.split(%r/\s+/)[4,2].map{|i| i.to_i}
+      end
+
+      def self.vsize
+        size.first.to_i
+      end
+
+      def self.rsize
+        size.last.to_i
+      end
+    end
+
+  }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dao
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -06:00
+date: 2011-06-07 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -78,6 +78,7 @@ files:
 - lib/dao/validations/common.rb
 - test/dao_test.rb
 - test/helper.rb
+- test/leak.rb
 - test/testing.rb
 has_rdoc: true
 homepage: https://github.com/ahoward/dao