rack_warden 0.0.9 → 0.0.10

data/lib/rack_warden/sinatra/respond_with.rb

@@ -0,0 +1,277 @@
+require 'rack_warden/sinatra/json'
+require 'sinatra/base'
+require 'erb'
+
+module RackWarden
+App.logger.debug "RW loading RespondWith"
+
+  #
+  # = Sinatra::RespondWith
+  #
+  # These extensions let Sinatra automatically choose what template to render or
+  # action to perform depending on the request's Accept header.
+  #
+  # Example:
+  #
+  #   # Without Sinatra::RespondWith
+  #   get '/' do
+  #     data = { :name => 'example' }
+  #     request.accept.each do |type|
+  #       case type.to_s
+  #       when 'text/html'
+  #         halt haml(:index, :locals => data)
+  #       when 'text/json'
+  #         halt data.to_json
+  #       when 'application/atom+xml'
+  #         halt nokogiri(:'index.atom', :locals => data)
+  #       when 'application/xml', 'text/xml'
+  #         halt nokogiri(:'index.xml', :locals => data)
+  #       when 'text/plain'
+  #         halt 'just an example'
+  #       end
+  #     end
+  #     error 406
+  #   end
+  #
+  #   # With Sinatra::RespondWith
+  #   get '/' do
+  #     respond_with :index, :name => 'example' do |f|
+  #       f.txt { 'just an example' }
+  #     end
+  #   end
+  #
+  # Both helper methods +respond_to+ and +respond_with+ let you define custom
+  # handlers like the one above for +text/plain+. +respond_with+ additionally
+  # takes a template name and/or an object to offer the following default
+  # behavior:
+  #
+  # * If a template name is given, search for a template called
+  #   +name.format.engine+ (+index.xml.nokogiri+ in the above example).
+  # * If a template name is given, search for a templated called +name.engine+
+  #   for engines known to result in the requested format (+index.haml+).
+  # * If a file extension associated with the mime type is known to Sinatra, and
+  #   the object responds to +to_extension+, call that method and use the result
+  #   (+data.to_json+).
+  #
+  # == Security
+  #
+  # Since methods are triggered based on client input, this can lead to security
+  # issues (but not as severe as those might appear in the first place: keep in
+  # mind that only known file extensions are used). You should limit
+  # the possible formats you serve.
+  #
+  # This is possible with the +provides+ condition:
+  #
+  #   get '/', :provides => [:html, :json, :xml, :atom] do
+  #     respond_with :index, :name => 'example'
+  #   end
+  #
+  # However, since you have to set +provides+ for every route, this extension
+  # adds an app global (class method) `respond_to`, that lets you define content
+  # types for all routes:
+  #
+  #   respond_to :html, :json, :xml, :atom
+  #   get('/a') { respond_with :index, :name => 'a' }
+  #   get('/b') { respond_with :index, :name => 'b' }
+  #
+  # == Custom Types
+  #
+  # Use the +on+ method for defining actions for custom types:
+  #
+  #   get '/' do
+  #     respond_to do |f|
+  #       f.xml { nokogiri :index }
+  #       f.on('application/custom') { custom_action }
+  #       f.on('text/*') { data.to_s }
+  #       f.on('*/*') { "matches everything" }
+  #     end
+  #   end
+  #
+  # Definition order does not matter.
+  module RespondWith
+    class Format
+      def initialize(app)
+        @app, @map, @generic, @default = app, {}, {}, nil
+      end
+
+      def on(type, &block)
+        # WBR
+        @app.logger.debug "RW respond_with.on type: #{type}"
+        @app.logger.debug "RW respond_with.on block: #{block}"
+        @app.logger.debug "RW respond_with.on @app.params: #{@app.params}"
+        @app.logger.debug "RW respond_with.on @app.settings.mime_types(type): #{@app.settings.mime_types(type)}"
+        
+        @app.settings.mime_types(type).each do |mime|
+          case mime
+          when '*/*'            then @default     = block
+          when /^([^\/]+)\/\*$/ then @generic[$1] = block
+          else                       @map[mime]   = block
+          end
+        end
+      end
+
+      def finish
+        yield self if block_given?
+        # WBR - adds format/extension of uri to front of mime-types.
+        # You must capture the format string in the params with your route declaration.
+        format_type = @app.settings.mime_types(@app.params['format'])[0]
+        @app.logger.debug "RW respond_with.finish format_type (WBR): #{format_type}, #{format_type.class}"
+        mime_type = format_type                   ||
+        	@app.content_type                       ||
+          @app.request.preferred_type(@map.keys)  ||
+          @app.request.preferred_type             ||
+          'text/html'
+        type = mime_type.split(/\s*;\s*/, 2).first
+        @app.logger.debug "RW respond_with.finish type: #{type}"
+        @app.logger.debug "RW respond_with.finish @map: #{@map}"
+        @app.logger.debug "RW respond_with.finish @default: #{@default}"
+        @app.logger.debug "RW respond_with.finish @generic: #{@generic}"
+        handlers = [@map[type], @generic[type[/^[^\/]+/]], @default].compact
+        handlers.each do |block|
+          if result = block.call(type)
+            @app.content_type mime_type
+            @app.halt result
+          end
+        end
+        @app.halt 406
+      end
+
+      def method_missing(method, *args, &block)
+        return super if args.any? or block.nil? or not @app.mime_type(method)
+        on(method, &block)
+      end
+    end
+
+    module Helpers
+      include Sinatra::JSON
+
+      def respond_with(template, object = nil, &block)
+        object, template = template, nil unless Symbol === template
+        format = Format.new(self)
+        format.on "*/*" do |type|
+          exts = settings.ext_map[type]
+          exts << :xml if type.end_with? '+xml'
+          # WBR - not necessary, since the hack of #finish method above.
+          #exts.unshift params[:format].to_sym if params[:format]
+          logger.debug "RW respond_with format: #{params[:format]}"
+          
+          logger.debug "RW respond_with exts: #{exts.inspect}"
+          if template
+            args = template_cache.fetch(type, template) { template_for(template, exts) }
+            if args.any?
+              locals = { :object => object }
+              locals.merge! object.to_hash if object.respond_to? :to_hash
+
+              renderer = args.first
+              options = args[1..-1] + [{:locals => locals}]
+
+              halt send(renderer, *options)
+            end
+          end
+          if object
+            exts.each do |ext|
+              halt json(object) if ext == :json
+              next unless object.respond_to? method = "to_#{ext}"
+              halt(*object.send(method))
+            end
+          end
+          false
+        end
+        format.finish(&block)
+      end
+
+      def respond_to(&block)
+        Format.new(self).finish(&block)
+      end
+
+      private
+
+      def template_for(name, exts)
+      	logger.debug "RW respond_with#template_for name, exts: #{name}, #{exts}"
+        # in production this is cached, so don't worry too much about runtime
+        possible = []
+        settings.template_engines[:all].each do |engine|
+          exts.each { |ext| possible << [engine, "#{name}.#{ext}"] }
+        end
+        exts.each do |ext|
+          settings.template_engines[ext].each { |e| possible << [e, name] }
+        end
+        logger.debug "RW respond_with#template_for possible: #{possible.inspect}"
+        possible.each do |engine, template|
+          # not exactly like Tilt[engine], but does not trigger a require
+          klass = Tilt.mappings[Tilt.normalize(engine)].first
+          logger.debug "RW respond_with#template_for klass : #{klass}"
+          find_template(settings.views, template, klass) do |file|
+          	#logger.debug "RW respond_with#template_for find_template file: #{file}"
+          	#logger.debug "RW respond_with#template_for find_template engine: #{engine.inspect}"
+          	#logger.debug "RW respond_with#template_for find_template template: #{template.inspect}"
+            next unless File.exist? file
+            return settings.rendering_method(engine) << template.to_sym
+          end
+        end
+        
+        [] # nil or false would not be cached
+      end
+    end
+
+    def remap_extensions
+      ext_map.clear
+      Rack::Mime::MIME_TYPES.each { |e,t| ext_map[t] << e[1..-1].to_sym }
+      ext_map['text/javascript'] << 'js'
+      ext_map['text/xml'] << 'xml'
+    end
+
+    def mime_type(*)
+      result = super
+      remap_extensions
+      result
+    end
+
+    def respond_to(*formats)
+      if formats.any?
+        @respond_to ||= []
+        @respond_to.concat formats
+      elsif @respond_to.nil? and superclass.respond_to? :respond_to
+        superclass.respond_to
+      else
+        @respond_to
+      end
+    end
+
+    def rendering_method(engine)
+      return [engine] if Sinatra::Templates.method_defined? engine
+      return [:mab] if engine.to_sym == :markaby
+      [:render, :engine]
+    end
+
+    private
+
+    def compile!(verb, path, block, options = {})
+      options[:provides] ||= respond_to if respond_to
+      super
+    end
+
+    ENGINES = {
+      :css  => [:less,  :sass, :scss],
+      :xml  => [:builder, :nokogiri],
+      :js   => [:coffee],
+      :json => [:yajl],
+      :html => [:erb, :erubis, :haml, :slim, :liquid, :radius, :mab, :markdown,
+        :textile, :rdoc],
+      :all  => Sinatra::Templates.instance_methods.map(&:to_sym) + [:mab] -
+        [:find_template, :markaby]
+    }
+
+    ENGINES.default = []
+
+    def self.registered(base)
+      base.set :ext_map, Hash.new { |h,k| h[k] = [] }
+      base.set :template_engines, ENGINES.dup
+      base.remap_extensions
+      base.helpers Helpers
+    end
+  end
+
+  #register RespondWith
+  #Delegator.delegate :respond_to
+end

data/lib/rack_warden/version.rb

@@ -1,3 +1,3 @@
 module RackWarden
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/rack_warden/views/rw_account_widget.html.erb

@@ -0,0 +1,8 @@
+<span class="rw-account-widget">
+	<% if logged_in? %>
+		Logged in as <b><a href="<%=url_for('/')%>"><%=current_user.username%></a></b> | 
+		<a href="<%=url_for('/logout')%>">Logout</a>
+	<% else %>
+		<a href="<%=url_for('/login')%>">Login</a>
+	<% end %>
+</span>

data/lib/rack_warden/views/rw_activation.email.erb

@@ -0,0 +1,3 @@
+Activate your new account with this link
+
+http://localhost:4567/auth/activate/<%=RackWarden::App.uri_encode(user.activation_code)%>

data/lib/rack_warden/views/rw_admin.html.erb

@@ -5,18 +5,20 @@
 	<table>
 		<thead>
 			<tr>
-				<th>Email</th>
-				<th>User</th>
 				<th>Id</th>
+				<th>User</th>
+				<th>Email</th>
+				<th>Activated</th>
 			</tr>
 		<tbody>
 			<% RackWarden::User.all(:limit=>100).each do |user| %>
 				<tr>
-					<td><%=user.email%></td>
-					<td><%=user.username%></td>
 					<td><%=user.id%></td>
+					<td><%=user.username%></td>
+					<td><%=user.email%></td>
+					<td><%=user.activated_at%></td>
 				</tr>
 			<% end %>
 		</tbody>
 	</table>
-</p>
+</p>

data/lib/rack_warden/views/rw_dbinfo.html.erb

@@ -3,7 +3,8 @@
 </p>
 
 <p>
-	<%= DataMapper.repository.adapter.select('select * from SQLITE_MASTER').to_yaml.gsub(/\n|\r/, '<br>').gsub(/  /, '&nbsp;&nbsp;') %>
-	<br><br>
-	<%= DataMapper.repository.adapter.to_yaml.gsub(/\n|\r/, '<br>') %>
-</p>
+	<%#= DataMapper.repository.adapter.select('select * from SQLITE_MASTER').to_yaml.to_html %>
+	<%#= DataMapper.repository.adapter.to_yaml.gsub(/\n|\r/, '<br>') %>
+	<%= DataMapper.repository(settings.repository_name).adapter.options.dup.tap{|o| o.delete(:password); o.delete('password')}.to_yaml.to_html %>
+</p>
+<br>

data/lib/rack_warden/views/rw_error.html.erb

@@ -0,0 +1 @@
+<h2>Oops! We encountered an error</h2>

data/lib/rack_warden/views/rw_flash_widget.html.erb

@@ -0,0 +1,12 @@
+<% if defined? :flash %>
+  <% if flash.rw_success %>
+    <div style="color:green;">
+      <%= flash.rw_success %>
+    </div>
+  <% end %>
+  <% if flash.rw_error %>
+    <div style="color:red;">
+      <%= flash.rw_error %>
+    </div>
+  <% end %>
+<% end %>

data/lib/rack_warden/views/rw_index.html.erb

@@ -1,3 +1,3 @@
 <p>
-	<h3>Warden authentication for rack based apps<h3>
+	<h4>Warden authentication for rack based apps<h3>
 </p>

data/lib/rack_warden/views/rw_layout.html.erb

@@ -4,38 +4,32 @@
     <title>Rack Warden</title>
 
     <style>
-    body {
-      margin: 10px auto;
-      width: 800px;
-    }
+	    body {
+	      margin: 10px auto;
+	      width: 800px;
+	    }
     </style>
     
     <script src='https://www.google.com/recaptcha/api.js'></script>
   </head>
   <body>
+  	<br>
     <h1>Rack Warden</h1>
 
     <p>
-			<a href="<%=url('/auth/login', false)%>">Log In</a> |
-			<a href="<%=url('/', false)%>">Home</a> |
-			<a href="<%=url('/auth/protected', false)%>">Test Protected Page</a> |
-			<a href="<%=url('/auth/logout', false)%>">Log Out</a>
+			<a href="<%=url('/', false)%>">Main Site</a> |
+			<a href="<%=url_for('/protected')%>">Test Protected Page</a> |
+			<%= erb :'rw_account_widget.html', :layout=>false %>
 		</p>
 
-    <% if flash(:rwarden)[:success] %>
-	    <div style="color:green;">
-	      <%= flash(:rwarden)[:success] %>
-	    </div>
-    <% end %>
-
-    <% if flash(:rwarden)[:error] %>
-	    <div style="color:red;">
-	      <%= flash(:rwarden)[:error] %>
-	    </div>
-    <% end %>
+		<%= erb :'rw_flash_widget.html', :layout=>false %>
 
 		<div id="content">
+			<br>
+			<br>
 	    <%= yield if block_given? %>
+	    <br>
+	    <br>
 		</div>
   </body>
 </html>

data/lib/rack_warden/views/rw_layout_admin.html.erb

@@ -1,12 +1,12 @@
 <!-- A partial layout for admin. -->
 <%# @section_title = "RackWarden Admin" %>
-<h2>RackWarden Admin</h2>
+<h2>Account Management</h2>
 <p>
-	<a href="<%=url('/auth/login', false)%>">Log In</a> |
-	<a href="<%=url('/auth', false)%>">Home</a> |
-	<a href="<%=url('/auth/admin', false)%>">User Accounts</a> |
-	<a href="<%=url('/auth/dbinfo', false)%>">Database Info</a> |
-	<a href="<%=url('/auth/logout', false)%>">Log Out</a>
+	<a href="<%=url_for('/')%>">RackWarden Home</a> |
+	<a href="<%=url_for('/admin')%>">User Accounts</a> |
+	<a href="<%=url_for('/dbinfo')%>">Database Info</a> |
+	<a href="<%=url_for('/sessinfo')%>">Session Info</a> |
+	<%=account_widget%>
 </p>
 
 <br>

data/lib/rack_warden/views/rw_login.html.erb

@@ -1,9 +1,22 @@
-<% @section_title = "Login" %>
-<form action="<%=url('/auth/login', false)%>" method="post">
-  <p>Username or Email <input type="text" name="user[username]" /></p>
-  <p>Password <input type="password" name="user[password]" /></p>
+<h3>Login</h3>
+<form action="<%=url_for('/login')%>" method="post" class="rw">
+	<style scoped="scoped">    
+	  .rw label {font-size: .95em; color: grey; display: block;}
+	  .rw input {font-size: 1.15em; margin-bottom: 20px; padding:7px;}
+	</style>
+	
+	<label for="user_username">Username or Email</label>
+	<input type="text" name="user[username]" id="user_username"/>
+
+  <label for="user_password">Password</label>
+  <input type="password" name="user[password]" id="user_password" />
+
+  <label for="user_remember_me">Remember me
+  	<input name="user[remember_me]" type="checkbox" value="1" id="user_remember_me" />
+  </label>
+
   <input type="submit" value="Log In" />
 	<% if settings.allow_public_signup %>
-		or <a href="<%=url('/auth/new', false)%>">Create a new account</a>
+		or <a href="<%=url_for('/new')%>">Create a new account</a>
 	<% end %>
 </form>