togo 0.6.0 → 0.6.1

data/bin/togo-admin

@@ -28,6 +28,9 @@ OptionParser.new{|opt|
   end
 }.parse!
 
+require 'togo'
+require 'togo/admin'
+
 begin
   files_to_require.each{|f| require f}
   require 'togo-admin-config'
@@ -35,9 +38,6 @@ rescue LoadError => detail
   puts "Warning: #{detail}"
 end
 
-require 'togo'
-require 'togo/admin'
-
 config.merge!({
   :handler => Togo::Admin.handler,
   :reloader => Togo::TogoReloader

data/lib/togo/admin/admin.rb

@@ -1,4 +1,4 @@
-require 'helpers'
+require 'togo/admin/helpers'
 
 module Togo
   class Admin < Dispatch
@@ -6,13 +6,32 @@ module Togo
     include Helpers
 
     before do
-      @model = Togo.const_get(params[:model]) if params[:model]
+      if not logged_in? and request.path != '/login'
+        redirect "/login"
+      else
+        @model = Togo.const_get(params[:model]) if params[:model]
+      end
     end
 
     get '/' do
       redirect "/#{Togo.models.first}"
     end
 
+    get '/login' do
+      erb :login, :layout => false
+    end
+
+    post '/login' do
+      session[:user] = config[:auth_model].authenticate(params[:username], params[:password])
+      flash[:error] = "Invalid Username or Password" if not logged_in?
+      redirect '/'
+    end
+
+    get '/logout' do
+      session[:user] = nil
+      redirect '/'
+    end
+
     get '/:model' do
       @q = params[:q] || ''
       @p = (params[:p] || 1).to_i

data/lib/togo/admin/helpers.rb

@@ -1,22 +1,5 @@
 module Helpers
   
-  class FlashHash
-    def initialize
-      @h = {}
-      @c = {}
-    end
-    def [](key)
-      return @c[key] if @c.keys.include?(key)
-      @c[key] = @h.delete(key) if @h.keys.include?(key)
-    end
-    def []=(key,val)
-      @h[key] = val
-    end
-    def sweep!
-      @c = {}
-    end
-  end
-
   def hash_to_qs(h)
     return nil if h.blank?
     qs = h.keys.collect{|k|
@@ -54,4 +37,9 @@ module Helpers
     request.path =~ /#{name}/ ? 'active' : ''
   end
 
+  def logged_in?
+    return true if not config[:auth_model] or not config[:sessions]
+    config[:auth_model] and session[:user] and session[:user].authenticated?
+  end
+
 end

data/lib/togo/admin/public/css/login.css

@@ -0,0 +1,95 @@
+* {
+    outline: none;
+}
+.error {
+    background: #8A0000;
+    text-shadow: 0 1px 1px #710000;
+    border: 1px solid #a12f19;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    color: #FFF;
+}
+h3.error {
+    margin: 0 25px 10px 20px;
+    padding: 10px 0 10px 10px;
+    font-size: 14px;
+}
+body {
+    background: #efefef url(/img/login-bg.png) top left repeat-x;
+    font: 100% helvetica, arial, sans-serif;
+    margin: 0;
+    padding: 0;
+}
+#container {
+    background: #f5f5f5;
+    width: 400px;
+    margin: 100px auto;
+    border: 1px solid #d4d2d2;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+}
+#container h1 {
+    background: #586069 url(/img/bg-header.png) repeat-x top left;
+    font-size: 24px;
+    color: #FFF;
+    text-shadow: 1px 1px 1px #5e6a76;
+    font-weight: normal;
+    line-height: 60px;
+    margin: 0 0 20px 0;
+    padding: 0 20px;
+    -webkit-border-top-right-radius: 4px;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius: 4px;
+}
+#container form {
+    padding: 0 20px 20px 20px;
+}
+#container fieldset {
+    border: 0;
+    padding: 10px 20px 10px 0;
+}
+#container fieldset label {
+    font-size: 13px;
+    font-weight: bold;
+    color: #515151;
+    display: block;
+    padding-bottom: 10px;
+}
+#container fieldset label.inline {
+    display: inline;
+    font-weight: normal;
+}
+#container fieldset input[type=password],
+#container fieldset input[type=text] {
+    border: 1px solid #dedddd;
+    border-top: 2px solid #CCC;
+    border-left: 2px solid #CCC;
+    background: #f9f9f9;
+    padding: 7px;
+    width: 100%;
+    margin-right: 20px;
+    font-size: 13px;
+}
+#container fieldset input.placeholder {
+    color: #999;
+}
+#container form button {
+    border: 1px solid #549300;
+    background: #61a801 url(/img/button-bg-save.png) repeat-x top left;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    padding: 5px 10px;
+    font-size: 13px;
+    font-weight: bold;
+    text-shadow: 0 1px 1px #538A00;
+    color: #FFF;
+}
+#container form button:hover {
+    background: #69b802 url(/img/button-bg-save.png) repeat-x -30px left;
+    text-shadow: 0 1px 1px #538A00;
+    cursor: pointer;
+}
+#container fieldset.submit {
+    text-align: right;
+    padding: 0;
+}

data/lib/togo/admin/public/css/screen.css

@@ -46,6 +46,19 @@ h3.error {
     padding: 5px;
     font-size: 11px;
 }
+#header #system-menu ul {
+    margin: 0;
+    padding: 0;
+}
+#header #system-menu ul li {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+#header #system-menu ul li a {
+    color: #FFF;
+    text-decoration: none;
+}
 #model-select {
     font-size: 16px;
     position: absolute;

data/lib/togo/admin/public/js/login.js

@@ -0,0 +1,30 @@
+var login = (function() {
+
+    var clearDefaults = function(e) {
+        if (this.defaultValue == this.value) {
+            removeClass(this, 'placeholder');
+            this.value = '';
+            if (this.getAttribute('id') == 'password') {
+                this.setAttribute('type','password');
+            }
+        } else if (this.value == '') {
+            this.value = this.defaultValue;
+            addClass(this, 'placeholder');
+            if (this.getAttribute('type') == 'password') {
+                this.setAttribute('type', 'text');
+            }
+        }
+    };
+
+    var init = function() {
+        listen('focus', el('username'), clearDefaults);
+        listen('blur', el('username'), clearDefaults);
+        listen('focus', el('password'), clearDefaults);
+        listen('blur', el('password'), clearDefaults);
+    };
+
+    return {
+        init: init
+    };
+
+}());

data/lib/togo/admin/views/layout.erb

@@ -2,17 +2,23 @@
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <title>Togo Admin</title>
+    <title><%= config[:site_title] %></title>
     <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen" />
     <script type="text/javascript" src="/js/togo.js"></script>
   </head>
   <body id="<%= @body_id %>">
     <div id="container">
       <div id="header">
-        <h1>Togo Admin</h1>
-        <div id="system-menu">
-          <span>System Menu</span>
-        </div>
+        <h1><%= config[:site_title] %></h1>
+        <% if config[:system_menu] and config[:system_menu].is_a?(Array) %>
+          <div id="system-menu">
+            <ul>
+              <% config[:system_menu].each do |s| %>
+                <li><a href="<%= s[:url] %>"><%= s[:title] %></a></li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
       </div>
       <div id="content">
         <%= yield %>

data/lib/togo/admin/views/login.erb

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title><%= config[:site_title] %> - Login</title>
+    <link rel="stylesheet" href="/css/login.css" type="text/css" media="screen" />
+    <script type="text/javascript" src="/js/togo.js"></script>
+    <script type="text/javascript" src="/js/login.js"></script>
+  </head>
+  <body>
+    <div id="container">
+      <h1>Welcome! Please Log In.</h1>
+      <% if flash[:error] %>
+        <h3 class="error"><%= flash[:error] %></h3>
+      <% end %>
+      <form action="/login" method="post">
+        <fieldset>
+          <input type="text" name="username" value="Username" id="username" class="placeholder" />
+        </fieldset>
+        <fieldset>
+          <input type="text" name="password" value="Password" id="password" class="placeholder" />
+        </fieldset>
+        <fieldset class="submit">
+          <button type="submit">Log In</button>
+        </fieldset>
+      </form>
+      <script type="text/javascript">
+        login.init();
+      </script>
+    </div>
+    <img src="/img/shadow.png" alt="" style="display: block; margin: 0 auto;" />
+  </body>
+</html>

data/lib/togo/admin.rb

@@ -3,5 +3,6 @@ require 'togo/admin/admin'
 
 Togo::Admin.configure({
   :view_path => File.join($:.find{|p| p =~ /lib\/togo\/admin/},'views'),
-  :public_path => File.join($:.find{|p| p =~ /lib\/togo\/admin/},'public')
+  :public_path => File.join($:.find{|p| p =~ /lib\/togo\/admin/},'public'),
+  :site_title => "Togo Admin"
 })

data/lib/togo/dispatch/dispatch.rb

@@ -2,6 +2,24 @@ require 'rack'
 require 'erubis'
 
 module Togo
+
+  class FlashHash
+    def initialize
+      @h = {}
+      @c = {}
+    end
+    def [](key)
+      return @c[key] if @c.keys.include?(key)
+      @c[key] = @h.delete(key) if @h.keys.include?(key)
+    end
+    def []=(key,val)
+      @h[key] = val
+    end
+    def sweep!
+      @c = {}
+    end
+  end
+
   class Dispatch
 
     HANDLERS = %w(thin mongrel webrick)
@@ -45,12 +63,13 @@ module Togo
       else
         begin
           __before if defined? __before
-          @response.write(send(method))
+          @response.write(send(method)) unless [301, 302].include?(@response.status)
         rescue => detail
           @response.status = 500
-         @response.write(["Error: #{detail}",$!.backtrace.join("<br />\n")].join("<br />\n"))
+          @response.write(["Error: #{detail}",$!.backtrace.join("<br />\n")].join("<br />\n"))
         end
       end
+      flash.sweep!
     end
     
     def erb(content, opts = {}, &block)
@@ -74,6 +93,14 @@ module Togo
       ENV['RACK_ENV'] == name.to_sym
     end
 
+    def session
+      @request.session
+    end
+
+    def flash
+      session[:flash] ||= FlashHash.new
+    end
+
     def self.handler
       HANDLERS.each do |h|
         begin
@@ -84,6 +111,10 @@ module Togo
       puts "Could not find any handlers to run. Please be sure your requested handler is installed."
     end
 
+    def config
+      self.class.send(:config)
+    end
+
     class << self
       attr_accessor :routes, :config
       
@@ -147,6 +178,10 @@ module Togo
           end
         end
         builder.use Rack::Static, :urls => opts[:static_urls], :root => opts[:public_path]
+        if opts[:sessions] or opts[:auth_model]
+          builder.use Rack::Session::Cookie
+          opts[:sessions] = true
+        end
         builder.run new(opts)
         if opts[:standalone]
           opts[:handler].run(builder.to_app, :Port => opts[:port], :Host => opts[:host])

data/lib/togo/model/model.rb

@@ -125,16 +125,12 @@ module Togo
             when ::DataMapper::Associations::OneToMany::Relationship
               'has_n'
             when ::DataMapper::Property
-              class_variable_get(:@@inflector).demodulize(property.type || property.primitive || property.class).downcase # type seems to be deprecated in 1.0
+              class_variable_get(:@@inflector).demodulize(property.type || property.class).downcase # type seems to be deprecated in 1.0
             else
               'string'
           end
         end
 
-        def is_extended_type?(property)
-          
-        end
-
         def pick_properties(selection, args)
           if class_variable_get(:"@@#{selection}_properties").empty?
             args = shown_properties.map{|p| p.name} if args.empty?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: togo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -08:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 53
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 1
+        version: 0.10.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - LICENSE
 - lib/togo/admin/admin.rb
 - lib/togo/admin/helpers.rb
+- lib/togo/admin/public/css/login.css
 - lib/togo/admin/public/css/screen.css
 - lib/togo/admin/public/img/arrow-down.png
 - lib/togo/admin/public/img/arrows.png
@@ -76,15 +77,19 @@ files:
 - lib/togo/admin/public/img/button-bg-delete.png
 - lib/togo/admin/public/img/button-bg-save.png
 - lib/togo/admin/public/img/footer-bg.png
+- lib/togo/admin/public/img/login-bg.png
+- lib/togo/admin/public/img/shadow.png
 - lib/togo/admin/public/img/subhead-bg.png
 - lib/togo/admin/public/js/edit.js
 - lib/togo/admin/public/js/index.js
+- lib/togo/admin/public/js/login.js
 - lib/togo/admin/public/js/togo.js
 - lib/togo/admin/views/_paging.erb
 - lib/togo/admin/views/custom_title.erb
 - lib/togo/admin/views/edit.erb
 - lib/togo/admin/views/index.erb
 - lib/togo/admin/views/layout.erb
+- lib/togo/admin/views/login.erb
 - lib/togo/admin/views/new.erb
 - lib/togo/admin.rb
 - lib/togo/dispatch/dispatch.rb