nakajima-sinatras-hat 0.1.0 → 0.1.1

data/lib/sinatras-hat/maker.rb

@@ -36,11 +36,9 @@ module Sinatra
         request.error(404) unless only.include?(action)
         protect!(request) if protect.include?(action)
         
-        logger.info ">> #{request.env['REQUEST_METHOD']} #{request.env['PATH_INFO']}"
-        logger.info "   action: #{action.to_s.upcase}"
-        logger.info "   params: #{request.params.inspect}"
-        
-        instance_exec(request, &self.class.actions[action][:fn])
+        log_with_benchmark(request, action) do
+          instance_exec(request, &self.class.actions[action][:fn])
+        end
       end
       
       def after(action)
@@ -92,7 +90,7 @@ module Sinatra
       end
       
       def prefix
-        @prefix ||= options[:prefix] || model.plural
+        options[:prefix] ||= model.plural
       end
       
       def parents
@@ -105,7 +103,7 @@ module Sinatra
       
       def options
         @options ||= {
-          :only => Set.new([:index, :show, :new, :create, :edit, :update, :destroy]),
+          :only => Set.new(Maker.actions.keys),
           :parent => nil,
           :finder => proc { |model, params| model.all },
           :record => proc { |model, params| model.find_by_id(params[:id]) },
@@ -139,6 +137,23 @@ module Sinatra
       
       private
       
+      def log_with_benchmark(request, action)
+        msg = [ ]
+        msg << "#{request.env['REQUEST_METHOD']} #{request.env['PATH_INFO']}"
+        msg << "Params: #{request.params.inspect}"
+        msg << "Action: #{action.to_s.upcase}"
+        
+        logger.info ">> " + msg.join(' | ')
+        
+        result = nil
+        
+        t = Benchmark.realtime { result = yield }
+        
+        logger.info "   Request finished in #{t} sec."
+        
+        result
+      end
+      
       def resource
         @resource ||= Resource.new(self)
       end

data/lib/sinatras-hat/resource.rb

@@ -11,7 +11,7 @@ module Sinatra
         suffix = suffix.dup
         
         path = resources.inject("") do |memo, maker|
-          memo += fragment(record, maker)
+          memo += fragment(maker, record)
         end
         
         suffix.gsub!('/:id', "/#{record.id}") if record
@@ -21,7 +21,7 @@ module Sinatra
       
       private
       
-      def fragment(record, maker)
+      def fragment(maker, record)
         @maker.eql?(maker) ?
           "/#{maker.prefix}" :
           "/#{maker.prefix}/" + interpolate(maker, record)

data/lib/sinatras-hat/responder.rb

@@ -6,41 +6,6 @@ module Sinatra
     class Responder
       delegate :model, :to => :maker
       
-      DEFAULTS = {
-        :show => {
-          :success => proc { |data| render(:show) },
-          :failure => proc { |data| redirect('/') }
-        },
-        
-        :index => {
-          :success => proc { |data| render(:index) },
-          :failure => proc { |data| redirect('/') }
-        },
-        
-        :create => {
-          :success => proc { |data| redirect(data) },
-          :failure => proc { |data| render(:new) }
-        },
-        
-        :new => {
-          :success => proc { |data| render(:new) },
-          :failure => proc { |data| redirect('/') }
-        },
-        
-        :edit => {
-          :success => proc { |data| render(:edit) }
-        },
-        
-        :destroy => {
-          :success => proc { |data| redirect(resource_path('/')) }
-        },
-        
-        :update => {
-          :success => proc { |data| redirect(data) },
-          :failure => proc { |data| render(:edit) }
-        }
-      }
-      
       attr_reader :maker
       
       def initialize(maker)
@@ -48,7 +13,40 @@ module Sinatra
       end
       
       def defaults
-        @defaults ||= DEFAULTS.dup
+        @defaults ||= {
+          :show => {
+            :success => proc { |data| render(:show) },
+            :failure => proc { |data| redirect('/') }
+          },
+
+          :index => {
+            :success => proc { |data| render(:index) },
+            :failure => proc { |data| redirect('/') }
+          },
+
+          :create => {
+            :success => proc { |data| redirect(data) },
+            :failure => proc { |data| render(:new) }
+          },
+
+          :new => {
+            :success => proc { |data| render(:new) },
+            :failure => proc { |data| redirect('/') }
+          },
+
+          :edit => {
+            :success => proc { |data| render(:edit) }
+          },
+
+          :destroy => {
+            :success => proc { |data| redirect(resource_path('/')) }
+          },
+
+          :update => {
+            :success => proc { |data| redirect(data) },
+            :failure => proc { |data| render(:edit) }
+          }
+        }
       end
       
       def success(name, request, data)

data/lib/sinatras-hat.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__))
 
 require 'rubygems'
+require 'benchmark'
 require 'sinatra/base'
 require 'extlib'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-sinatras-hat
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pat Nakajima