grat 0.0.5.2 → 0.0.6

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/import_form.haml
 views/layout.haml
 views/list.haml
 views/missing.haml

data/README

@@ -18,4 +18,10 @@ Use it like so:
 
   use Rack::ShowExceptions # <- Up to you.
   run Grat::Application
-4. rackup (or passenger, if you know how)
+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

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.5.2') do |p|
+Echoe.new('grat', '0.0.6') 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.5.2"
+  s.version = "0.0.6"
 
   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-04}
+  s.date = %q{2009-11-09}
   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/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/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/environment.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+require 'json'
 
 module Grat
   @@database_conf = {}

data/lib/grat/content.rb

@@ -51,7 +51,7 @@ class Grat::Content
   end
   
   def template_url=(var)
-    super(var) unless var.empty?
+    super(var) unless var.nil? || var.empty?
   end
   
   def demo_string
@@ -75,9 +75,9 @@ class Grat::Content
     while problem_var = detect_problem_var
       counter += 1
       return false if counter > 200
-      (detect_problem_var(problem_var => demo_string) || 
+      (detect_problem_var(problem_var => demo_string) ||
         default_content_vars.merge!(problem_var => demo_string)) or
-      (detect_problem_var(problem_var => demo_array) || 
+      (detect_problem_var(problem_var => demo_array) ||
         default_content_vars.merge!(problem_var => demo_string)) or
       raise "Don't know how to reconcile."
     end

data/lib/grat.rb

@@ -24,6 +24,57 @@ class Grat::Application < Sinatra::Base
     haml :list
   end
   
+  get '/admin/__export' do
+    content_type('text/json')
+    # Content-disposition: attachment; filename=fname.ext
+    response['Content-disposition'] = "attachment; filename=grat-export-at-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}.json"
+    model.all.to_json
+  end
+  
+  get '/admin/__import' do
+    haml :import_form
+  end
+  
+  post '/admin/__import' do
+    json_text = file_import_text || params[:import][:text]
+    @import_results = import(json_text, params[:import][:strategy])
+    redirect '/admin/__all'
+  end
+  
+  # Rather inefficient at present.
+  def import(json_text, strategy)
+    json_to_import = JSON.parse json_text
+    if json_to_import.is_a? Array
+      model.delete_all if strategy == 'demolish'
+      json_to_import.each do |record|
+        case strategy
+        when 'add'
+          import_record record
+        when 'replace'
+          import_record record, {:replace => true, :check=> true}
+        when 'demolish'
+          import_record record, {:replace => true, :check => false}
+        end
+      end
+    end
+  end
+  
+  def import_record(hash, options = {:replace => false, :check => true})
+    record = model.find_by_url(hash['url']) if options[:check]
+    if record && options[:replace]
+      record.destroy if record
+    end
+    unless record && !options[:replace]
+      model.create hash
+    end
+  end
+  
+  def file_import_text
+    if params[:import] && params[:import][:file] && params[:import][:file][:tempfile]
+      params[:import][:file][:tempfile].read
+    end
+  end
+  
   get '/admin/*' do
     haml :content_form
   end

data/public/gratfiles/custom.css

@@ -1,6 +1,7 @@
 /* @override 
 	http://localhost:9393/custom.css
 	http://grat.local/css/custom.css
+	http://localhost:9393/gratfiles/custom.css
 */
 
 .grat_greet {
@@ -38,4 +39,15 @@ textarea {
 p.editing {
   min-height: 1em;
   background-color: yellow;
-}
+}
+
+input[type=file] {
+  padding-top: .5em;
+  font-size: 1.5em;
+}
+
+input[type=radio] {
+  width: 1em;
+  float: left;
+  margin-top: .25em;
+}

data/views/import_form.haml

@@ -0,0 +1,24 @@
+.grat_greet
+  %p Hey, import some json if you like.
+%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]'}
+  %p
+    %em or
+  .import_text
+    %label{:for => 'import_text'} Paste some json here:
+    %textarea{:id => 'import_text', :name => 'import[text]'}
+  .import_replace_or_add
+    .add
+      %label{:for => 'import_add'} Add new records to database, ignore existing records.
+      %input{:type=> 'radio', :id => 'import_add', :value => 'add', :name => 'import[strategy]', :checked => 'checked'}
+    .replace
+      %label{:for => 'import_replace'} Add new and replace matching records. (danger!)
+      %input{:type=> 'radio', :id => 'import_replace', :value => 'replace', :name => 'import[strategy]'}
+    .demolish
+      %label{:for => 'import_demolish'} Demolish all existing records, then import. (omg danger!)
+      %input{:type=> 'radio', :id => 'import_demolish', :value => 'demolish', :name => 'import[strategy]'}
+  .submit
+    %input{:name => 'import[submit]', :type => 'submit', :value => "Let's save this thing"}
+    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.2
+  version: 0.0.6
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -05:00
+date: 2009-11-09 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/import_form.haml
 - views/layout.haml
 - views/list.haml
 - views/missing.haml