grat 0.0.3.1 → 0.0.4

data/Manifest

@@ -6,9 +6,7 @@ lib/environment.rb
 lib/grat.rb
 lib/grat/content.rb
 lib/grat/mongomapper_patches.rb
-lib/grat/page.rb
 lib/grat/system.rb
-lib/grat/template.rb
 public/gratfiles/application.js
 public/gratfiles/custom.css
 public/gratfiles/einars-js-beautify/HTML-Beautify.js

data/Rakefile

@@ -3,8 +3,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.3.1') do |p|
-  p.description    = "Minimal CMS for Rack and MongoDB."
+Echoe.new('grat', '0.0.4') do |p|
+  p.summary        = "Minimal CMS for Rack and MongoDB."
+  p.description    = "Basic interface for making webpages with Haml and (later) erb. Supports nested templates."
   p.url            = "http://samsm.com/"
   p.author         = "Sam Schenkman-Moore"
   p.email          = "samsm@samsm.com"

data/grat.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.3.1"
+  s.version = "0.0.4"
 
   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-02}
-  s.description = %q{Minimal CMS for Rack and MongoDB.}
+  s.description = %q{Basic interface for making webpages with Haml and (later) 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/mongomapper_patches.rb", "lib/grat/page.rb", "lib/grat/system.rb", "lib/grat/template.rb"]
-  s.files = ["Manifest", "README", "Rakefile", "config.ru", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.rb", "lib/grat/mongomapper_patches.rb", "lib/grat/page.rb", "lib/grat/system.rb", "lib/grat/template.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.extra_rdoc_files = ["README", "lib/environment.rb", "lib/grat.rb", "lib/grat/content.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/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.homepage = %q{http://samsm.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Grat", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/environment.rb

@@ -36,8 +36,6 @@ module Grat
     MongoMapper.direct_database = database
     
     require Grat.lib_path + '/grat/content'
-    require Grat.lib_path + '/grat/page'
-    require Grat.lib_path + '/grat/template'
     
   end
 end

data/lib/grat/content.rb

@@ -1,19 +1,18 @@
-module Grat::Content
-  
-  def self.included(base)
-    base.key :url, String
-    base.validates_uniqueness_of :url
-    base.key :content, String
-    base.key :tags, Array
-    base.key :template_url, String
-    base.key :variables_needed, Array
-    base.timestamps!
-    
-    base.before_save :detect_default_content_vars
-    base.key :default_content_vars, Hash
-    
-    base.key :render_engine_name, String
-  end
+class Grat::Content
+  include MongoMapper::Document
+  
+  key :url, String
+  validates_uniqueness_of :url
+  key :content, String
+  key :tags, Array
+  key :template_url, String
+  key :variables_needed, Array
+  timestamps!
+  
+  before_save :detect_default_content_vars
+  key :default_content_vars, Hash
+  
+  key :render_engine_name, String
   
   def editable_fields
     attributes.reject {|k,v| uneditable_keys.include? k }
@@ -30,6 +29,10 @@ module Grat::Content
     super(val.kind_of?(Array) ? val : val.split(' '))
   end
   
+  def self.find_all_by_tag(tag_name)
+    all(:conditions => {'tags' => [tag_name]})
+  end
+  
   def type
     self.class.to_s.sub(/.+::/, '')
   end
@@ -39,7 +42,7 @@ module Grat::Content
   end
   
   def template
-    @template ||= Grat::Template.find_by_url(template_url) if template_url
+    @template ||= Grat::Content.find_by_url(template_url) if template_url
   end
   
   def template=(var)
@@ -67,26 +70,7 @@ module Grat::Content
       raise 'Unimplemented!'
     end
   end
-  
-  # def detect_variables_needed_by_content
-  #   demo_variables = {}
-  #   # formats = [String,Array] # later
-  #   render_fails = true
-  #   counter = 0
-  #   while render_fails
-  #     counter += 1 
-  #     return false if counter > 200 # no infinite loop, thanks
-  #     begin
-  #       content_with(demo_variables)
-  #       render_fails = false
-  #     rescue
-  #       var = $!.to_s.sub(/.+`/,'').sub(/'.+/,'')
-  #       demo_variables[var] = 'text'
-  #     end
-  #   end
-  #   self.variables_needed = demo_variables.keys
-  # end
-  
+    
   def detect_default_content_vars
     counter = 0
     while problem_var = detect_problem_var

data/lib/grat/system.rb

@@ -28,13 +28,7 @@ module Grat::System
     # This avoids requiring mongomapper when it isn't needed
     Grat.database_load
     
-    @model = 
-    case url.split('/')[1]
-    when 'templates'
-      Grat::Template
-    else
-      Grat::Page
-    end
+    @model = Grat::Content
   end
   
   def focus_params

data/lib/grat.rb

@@ -19,8 +19,8 @@ class Grat::Application < Sinatra::Base
   end
   
   get '/admin/__all' do
-    @pages = Page.all
-    @templates = Template.all
+    @pages = model.all
+    @templates = templates
     haml :list
   end
   
@@ -48,6 +48,10 @@ class Grat::Application < Sinatra::Base
     require 'haml'
     super(*args)
   end
+  
+  def templates
+    model.find_all_by_tag('template')
+  end
     
   helpers do
     def form_nest(name)

data/views/content_form.haml

@@ -1,22 +1,22 @@
 .grat_greet
   - if content.new_record?
     %p 
-      Let's make a
+      Let's make some
       %strong= url
-      ==#{content.type}!
+      content!
   - else
     %p
       Editing 
       %a{:href => url}
         %strong= url
-      == (a #{content.type})
+      content.
     
 %form{:action => "/admin#{url}", :method => 'post'}
   .template
     %label{:for => form_nest('template_url')} Template
     %select{:name => form_nest('template_url')}
       %option{:value=>''} None
-      - Grat::Template.all.each do |template|
+      - templates.each do |template|
         - option_hash = {:value => template.url}
         - option_hash.merge!(:selected => 'selected') if template.url == content.template_url
         %option{option_hash}= template.url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.1
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -52,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Minimal CMS for Rack and MongoDB.
+description: Basic interface for making webpages with Haml and (later) erb. Supports nested templates.
 email: samsm@samsm.com
 executables: []
 
@@ -64,9 +64,7 @@ extra_rdoc_files:
 - lib/grat.rb
 - lib/grat/content.rb
 - lib/grat/mongomapper_patches.rb
-- lib/grat/page.rb
 - lib/grat/system.rb
-- lib/grat/template.rb
 files: 
 - Manifest
 - README
@@ -76,9 +74,7 @@ files:
 - lib/grat.rb
 - lib/grat/content.rb
 - lib/grat/mongomapper_patches.rb
-- lib/grat/page.rb
 - lib/grat/system.rb
-- lib/grat/template.rb
 - public/gratfiles/application.js
 - public/gratfiles/custom.css
 - public/gratfiles/einars-js-beautify/HTML-Beautify.js

data/lib/grat/page.rb

@@ -1,5 +0,0 @@
-class Grat::Page
-  include MongoMapper::Document
-  include Grat::Content
-      
-end

data/lib/grat/template.rb

@@ -1,13 +0,0 @@
-class Grat::Template
-  include MongoMapper::Document
-  include Grat::Content
-  
-  BEGINS_WITH_TEMPLATE = /\A\/templates\/.+/
-  
-  validates_format_of :url, :with => BEGINS_WITH_TEMPLATE, :message => "needs to begin with '/templates'"
-    
-  def url=(val)
-    super(val =~ BEGINS_WITH_TEMPLATE ? val : '/templates/' + val.sub(/\A\//,''))
-  end
-    
-end