grat 0.0.8 → 0.1.0

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('grat', '0.0.8') do |p|
+Echoe.new('grat', '0.1.0') 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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grat}
-  s.version = "0.0.8"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]

data/lib/grat/content.rb

@@ -1,6 +1,8 @@
 class Grat::Content
   include MongoMapper::Document
   
+  attr_accessor :suggested_fields
+  
   key :url, String
   validates_uniqueness_of :url
   key :content, String
@@ -107,5 +109,7 @@ class Grat::Content
     send "#{render_engine}_render", y, content, locals
   end
   
-  
+  def suggested_fields
+    @suggested_fields or []
+  end
 end

data/lib/grat/system.rb

@@ -9,6 +9,17 @@ module Grat::System
     collection
   end
   
+  def request_type
+    case env['HTTP_ACCEPT']
+    when /html/
+      'html'
+    when /json/
+      'json'
+    when /xml/ #?
+      'xml'
+    end
+  end
+  
   not_found do
     missing_page
   end
@@ -18,7 +29,19 @@ module Grat::System
   end
   
   def content
-    @content ||= model.find_by_url(url) || model.new(:url => url)
+    @content ||= model.find_by_url(url) || new_content
+  end
+  
+  def new_content
+    content = model.new(:url => url)
+    if params[:template]
+      template = model.find_by_url params[:template]
+      if template
+        content.template_url = template.url
+        content.suggested_fields = template.default_content_vars.keys
+      end
+    end
+    content
   end
       
   def model

data/lib/grat.rb

@@ -101,12 +101,19 @@ class Grat::Application < Sinatra::Base
   
   get '/*' do
     pass if content.new_record?
-    locals = {}
-    template_chain.inject('') do |sum, template|
-      locals = template.default_content_vars.
-                 merge(template.attributes_for_variables).
-                 merge(locals)
-      combine_docs(sum,template, locals)
+    
+    case request_type
+    when 'html'
+      locals = {}
+      template_chain.inject('') do |sum, template|
+        locals = template.default_content_vars.
+                   merge(template.attributes_for_variables).
+                   merge(locals)
+        combine_docs(sum,template, locals)
+      end
+    when 'json'
+      response['Content-Type'] = 'application/json'
+      content.to_json
     end
   end
   

data/public/gratfiles/application.js

@@ -1,5 +1,22 @@
 // once page is loaded ...
 $(document).ready(function(){
+  $('.template select').change(function() {
+    // if template has url
+    selected_option = $(this).val()
+    if (selected_option) {
+      // look up template data
+      $.getJSON(selected_option, {ajax: 'true'}, function(j) {
+        // clear current suggested fields -- in future check for data first
+        $('#suggested_fields').html('');
+        for (key in j['default_content_vars']) {
+          new_field = '<div class="'+ key +'"><label for="content['+ key +']">'+ key +'</label><input name="content['+ key +']" /></div>';
+          $.test = new_field;
+          $('#suggested_fields').append(new_field);
+        }
+      })
+    }
+  })
+  
   // New field button + features
   $('a[href=#new_field]').click(function(){
     
@@ -30,22 +47,22 @@ $(document).ready(function(){
         input.attr('name',new_name);
       })
       
-      // Move to input field on enter 
+      // Move to input field on enter
       editable.keypress(function(event){
-				
-				// move to field input is cancelled if enter is pressed
-				if (event.which == 13) {
-				  
-				  // Remove editing class -- should add edited class maybe
-				  editable.removeClass('editing');
-				  
-				  // forward to text input
-				  $(editable).parent().children().filter('input').focus();
-				  return false
-				} else {
-				  return event.which
-				}
-			});
+        
+        // move to field input is cancelled if enter is pressed
+        if (event.which == 13) {
+          
+          // Remove editing class -- should add edited class maybe
+          editable.removeClass('editing');
+          
+          // forward to text input
+          $(editable).parent().children().filter('input').focus();
+          return false
+        } else {
+          return event.which
+        }
+      });
       
       editable.change(function() {
         console.log('blur');

data/views/content_form.haml

@@ -33,6 +33,11 @@
     %div{:class => k}
       %label{:for => form_nest(k)}= k.capitalize
       %input{:name => form_nest(k), :value => v}
+  #suggested_fields
+    - content.suggested_fields.each do |field|
+      %div{:class => field}
+        %label{:for => form_nest(field)}= field.capitalize
+        %input{:name => form_nest(field)}
   #new_fields
     %p
       %a.add{:href=>'#new_field'} Add a New Field

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grat
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Sam Schenkman-Moore