grat 0.0.6.2 → 0.0.7

data/Manifest

@@ -49,6 +49,7 @@ views/css/_mod_debug.sass
 views/css/_mod_skins.sass
 views/css/_template.sass
 views/css/_template_debug.sass
+views/delete.haml
 views/import_form.haml
 views/layout.haml
 views/list.haml

data/README

@@ -20,8 +20,17 @@ Use it like so:
   run Grat::Application
 4. rackup (or passenger, if you know how)
 
-5. http://localhost:9292/admin/ (or whatever host:port) to add content.
-6. http://localhost:9292/admin/mypage edits a page that will be available at http://localhost:9292/mypage
-7. http://localhost:9292/admin/__all for a list of all pages
-8. http://localhost:9292/admin/__export to get a json dump of all pages
-9. http://localhost:9292/admin/__import to import one of those dumps
+5. http://localhost:9292/__admin/edit/mypage edits a page that will be available at http://localhost:9292/mypage
+6. http://localhost:9292/__admin/all for a list of all pages
+7. http://localhost:9292/__admin/export to get a json dump of all pages
+8. http://localhost:9292/__admin/import to import one of those dumps
+
+9. Protect from writes by strangers with Rack::If
+   http://github.com/samsm/Rackif
+   
+   use Rack::If, :method => /(POST)|(PUT)|(DELETE)/ do
+     use Rack::Auth::Basic, "Grat protected" do |username, password|
+       'secret' == password
+     end
+   end
+   

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.6.2') do |p|
+Echoe.new('grat', '0.0.7') do |p|
   p.summary        = "Minimal CMS for Rack and MongoDB."
   p.description    = "Basic interface for making webpages with Haml and Erb. Supports nested templates."
   p.url            = "http://samsm.com/"

data/grat.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.6.2"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-11-13}
   s.description = %q{Basic interface for making webpages with Haml and Erb. Supports nested templates.}
   s.email = %q{samsm@samsm.com}
   s.extra_rdoc_files = ["README", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb", "public/gratfiles/application.js", "public/gratfiles/custom.css", "public/gratfiles/einars-js-beautify/HTML-Beautify.js", "public/gratfiles/einars-js-beautify/beautify-cl.js", "public/gratfiles/einars-js-beautify/beautify-tests.js", "public/gratfiles/einars-js-beautify/beautify.js", "public/gratfiles/einars-js-beautify/bin/beautify_js", "public/gratfiles/einars-js-beautify/index.html", "public/gratfiles/einars-js-beautify/javascriptobfuscator_unpacker.js", "public/gratfiles/einars-js-beautify/license.txt", "public/gratfiles/einars-js-beautify/sanitytest.js", "public/gratfiles/einars-js-beautify/unmaintained/bbedit/jsBeautify_BBED.scpt", "public/gratfiles/einars-js-beautify/unmaintained/c-sharp/JSBeautify.cs", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/make_opera_userscript.sh", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/opera_userscript.js", "public/gratfiles/favicon.ico", "public/gratfiles/jquery-combined.min.js", "public/gratfiles/js-beautifier.min.js", "public/gratfiles/oocss.min.css", "public/gratfiles/oocss/content.css", "public/gratfiles/oocss/grids.css", "public/gratfiles/oocss/grids_debug.css", "public/gratfiles/oocss/libraries.css", "public/gratfiles/oocss/mod.css", "public/gratfiles/oocss/mod_debug.css", "public/gratfiles/oocss/mod_skins.css", "public/gratfiles/oocss/talk.css", "public/gratfiles/oocss/talk_skins.css", "public/gratfiles/oocss/template.css", "public/gratfiles/oocss/template_debug.css", "views/content_form.haml", "views/css/_content.sass", "views/css/_custom.sass", "views/css/_grids.sass", "views/css/_grids_debug.sass", "views/css/_libraries.sass", "views/css/_mod.sass", "views/css/_mod_debug.sass", "views/css/_mod_skins.sass", "views/css/_template.sass", "views/css/_template_debug.sass", "views/import_form.haml", "views/layout.haml", "views/list.haml", "views/missing.haml", "grat.gemspec"]
+  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/hash_binding.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/system.rb", "public/gratfiles/application.js", "public/gratfiles/custom.css", "public/gratfiles/einars-js-beautify/HTML-Beautify.js", "public/gratfiles/einars-js-beautify/beautify-cl.js", "public/gratfiles/einars-js-beautify/beautify-tests.js", "public/gratfiles/einars-js-beautify/beautify.js", "public/gratfiles/einars-js-beautify/bin/beautify_js", "public/gratfiles/einars-js-beautify/index.html", "public/gratfiles/einars-js-beautify/javascriptobfuscator_unpacker.js", "public/gratfiles/einars-js-beautify/license.txt", "public/gratfiles/einars-js-beautify/sanitytest.js", "public/gratfiles/einars-js-beautify/unmaintained/bbedit/jsBeautify_BBED.scpt", "public/gratfiles/einars-js-beautify/unmaintained/c-sharp/JSBeautify.cs", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/make_opera_userscript.sh", "public/gratfiles/einars-js-beautify/unmaintained/opera-userscript/opera_userscript.js", "public/gratfiles/favicon.ico", "public/gratfiles/jquery-combined.min.js", "public/gratfiles/js-beautifier.min.js", "public/gratfiles/oocss.min.css", "public/gratfiles/oocss/content.css", "public/gratfiles/oocss/grids.css", "public/gratfiles/oocss/grids_debug.css", "public/gratfiles/oocss/libraries.css", "public/gratfiles/oocss/mod.css", "public/gratfiles/oocss/mod_debug.css", "public/gratfiles/oocss/mod_skins.css", "public/gratfiles/oocss/talk.css", "public/gratfiles/oocss/talk_skins.css", "public/gratfiles/oocss/template.css", "public/gratfiles/oocss/template_debug.css", "views/content_form.haml", "views/css/_content.sass", "views/css/_custom.sass", "views/css/_grids.sass", "views/css/_grids_debug.sass", "views/css/_libraries.sass", "views/css/_mod.sass", "views/css/_mod_debug.sass", "views/css/_mod_skins.sass", "views/css/_template.sass", "views/css/_template_debug.sass", "views/delete.haml", "views/import_form.haml", "views/layout.haml", "views/list.haml", "views/missing.haml", "grat.gemspec"]
   s.homepage = %q{http://samsm.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Grat", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/grat.rb

@@ -5,6 +5,7 @@ class Grat::Application < Sinatra::Base
   include Grat::System
   
   set :views, Grat.view_path
+  set :methodoverride, true
   
   # serve some static assets directly from gem
   get '/gratfiles/:filename' do
@@ -18,27 +19,27 @@ class Grat::Application < Sinatra::Base
     file_data
   end
   
-  get '/admin/__all' do
+  get '/__admin/all' do
     @pages = model.all
     @templates = templates
     haml :list
   end
   
-  get '/admin/__export' do
+  get '/__admin/export' do
     content_type('text/json')
     # Content-disposition: attachment; filename=fname.ext
     response['Content-disposition'] = "attachment; filename=grat-#{request.host}-export-at-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}.json"
     model.all.to_json
   end
   
-  get '/admin/__import' do
+  get '/__admin/import' do
     haml :import_form
   end
   
-  post '/admin/__import' do
+  post '/__admin/import' do
     json_text = file_import_text || params[:import][:text]
     @import_results = import(json_text, params[:import][:strategy])
-    redirect '/admin/__all'
+    redirect '/__admin/all'
   end
   
   # Rather inefficient at present.
@@ -75,13 +76,27 @@ class Grat::Application < Sinatra::Base
     end
   end
   
-  get '/admin/*' do
+  get '/__admin/edit/*' do
     haml :content_form
   end
   
-  post '/admin/*' do
+  get '/__admin/delete/*' do
+    haml :delete
+  end
+  
+  put '/*' do
+    content.update_attributes(focus_params)
+    redirect edit_path(content.url)
+  end
+  
+  delete '/*' do
+    content.destroy
+    redirect edit_path(content.url)
+  end
+  
+  post '/*' do
     content.update_attributes(focus_params)
-    redirect "/admin#{content.url}"
+    redirect edit_path(content.url)
   end
   
   get '/*' do
@@ -95,10 +110,22 @@ class Grat::Application < Sinatra::Base
     end
   end
   
+  not_found do
+    haml :missing
+  end
+  
+  def edit_path(url)
+    "/__admin/edit#{url}"
+  end
+  
+  def delete_path(url)
+    "/__admin/delete#{url}"
+  end
+  
   def combine_docs(text,template,vars)
     template.content_with(vars,text)
   end
-      
+  
   def haml(*args)
     require 'haml'
     super(*args)

data/views/content_form.haml

@@ -1,17 +1,17 @@
 .grat_greet
   - if content.new_record?
-    %p 
+    %p
       Let's make some
       %strong= url
       content!
   - else
     %p
-      Editing 
+      Editing
       %a{:href => url}
         %strong= url
       content.
     
-%form{:action => "/admin#{url}", :method => 'post'}
+%form{:action => "#{content.url}", :method => 'post'}
   .template
     %label{:for => form_nest('template_url')} Template
     %select{:name => form_nest('template_url')}

data/views/delete.haml

@@ -0,0 +1,14 @@
+.grat_greet
+  - if content.new_record?
+    %p
+      What? There's no record here to delete.
+  - else
+    %p
+      Sure you want to delete
+      %a{:href => url}
+        %strong= url
+      content.
+    
+%form{:action => "#{url}", :method => 'post'}
+  %input{:type => 'hidden', :name => '_method', :value => 'delete'}
+  %input{:type => 'submit', :name => 'submit', :value => "Delete"}

data/views/import_form.haml

@@ -1,6 +1,6 @@
 .grat_greet
   %p Hey, import some json if you like.
-%form{:action => "/admin/__import", :method => 'post', :enctype=>'multipart/form-data' }
+%form{:action => "/__admin/import", :method => 'post', :enctype=>'multipart/form-data' }
   .import_file
     %label{:for => 'import_file'} Upload a json file:
     %input{:id => 'import_file', :type => 'file', :name => 'import[file]'}

data/views/list.haml

@@ -6,7 +6,7 @@
     %li
       %a{:href => page.url}= page.url
       (
-      %a{:href => "/admin#{page.url}"} edit
+      %a{:href => edit_path(page.url)} edit
       )
 %h2 Templates
 %ol
@@ -14,5 +14,5 @@
     %li
       %a{:href => template.url}= template.url
       (
-      %a{:href => "/admin#{template.url}"} edit
+      %a{:href => edit_path(template.url)} edit
       )

data/views/missing.haml

@@ -1,10 +1,10 @@
 %h1 Wut?
-%p 
-  Are you from the future? Yes? 
+%p
+  Are you from the future? Yes?
   Ok, well you
   %i should
   know this from your research of our time, but FYI: that page doesn't exist yet.
-%p 
-  Maybe you'd like to 
-  %a{:href=> "admin#{url}"} create it
+%p
+  Maybe you'd like to
+  %a{:href=> edit_path(url)} create it
   \.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.2
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - views/css/_mod_skins.sass
 - views/css/_template.sass
 - views/css/_template_debug.sass
+- views/delete.haml
 - views/import_form.haml
 - views/layout.haml
 - views/list.haml