rest_in_peace 0.1.1 → 0.2.0

data/Rakefile

@@ -10,11 +10,12 @@ begin
     gem.email = "chinmaygarde@gmail.com"
     gem.homepage = "http://github.com/chinmaygarde/rest_in_peace"
     gem.authors = ["Chinmay Garde"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.add_development_dependency "sinatra", ">= 0.9.4"
     gem.add_development_dependency "datamapper", ">= 0.10.2"
-    gem.add_development_dependency "builder", ">= 2.2.2"
+    gem.add_development_dependency "builder"
     gem.add_development_dependency "taps", ">= 0.2.26"
+    gem.add_development_dependency "bundler", ">= 0.9.11"
+    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rest_in_peace/bindings/controller_view_binding.rb

@@ -0,0 +1,9 @@
+class ControllerViewBinding
+  
+  attr_accessor :controller_name, :dependent_entity
+  
+  def get_binding
+    binding
+  end
+  
+end

data/lib/rest_in_peace/bindings/model_view_binding.rb

@@ -0,0 +1,23 @@
+class ModelViewBinding
+  
+  attr_accessor :model_name, :columns, :associations, :statements
+  
+  def get_binding
+    binding
+  end
+  
+  def convert_associations_to_datamapper_statements
+    @statements = Array.new unless @statements
+    @associations.each do |entity_name, entity_type|
+      case entity_type
+      when "has_many"
+        @statements << "has n, :#{entity_name.pluralize}"
+      when "belongs_to"
+        @statements << "belongs_to :#{entity_name}"
+      when "has_and_belongs_to_many"
+        # TODO
+      end
+    end
+  end
+  
+end

data/lib/rest_in_peace/bindings/view_binding.rb

@@ -0,0 +1,25 @@
+class ViewBinding
+  
+  attr_accessor :view_name, :fields, :html_tags
+  
+  def get_binding
+    binding
+  end
+  
+  def map_fields_to_html_tags
+    @html_tags = Hash.new
+    @fields.each do |key, value|
+      @html_tags[key] = tag_for_field_type(value)
+    end
+  end
+  
+  def tag_for_field_type(type)
+    case type
+    when "string"
+      "text" #for now, only text inputs will work. Really need to think this through.
+    else
+      "text"
+    end
+  end
+  
+end

data/lib/rest_in_peace/generator.rb

@@ -29,7 +29,9 @@ class Generator
     
     File.open(File.join(settings.project_root, "README"), "w") << File.open(File.join(settings.template_directory, "readme.txt.erb")).read
     
-    File.open(File.join(settings.project_root, ".gems"), "w") << File.open(File.join(settings.template_directory, "gems")).read
+    FileUtils.cp(File.join(settings.template_directory, "Gemfile"), settings.project_root)
+    
+    FileUtils.cp(File.join(settings.template_directory, "config.yml"), settings.config_directory)
     
     File.open(File.join(settings.view_directory, "layouts", "application.html.erb"), "w") << File.open(File.join(settings.template_directory, "html", "layout.html.erb")).read
 
@@ -44,32 +46,33 @@ class Generator
     migration_file = File.open(File.join(settings.script_directory, "migrate"), "w")
     migration_file << File.open(File.join(settings.template_directory, "script", "migrate")).read
 
-    File.chmod(0755, define_file.path, server_file.path, migration_file.path)
+    cloud_file = File.open(File.join(settings.script_directory, "cloud"), "w")
+    cloud_file << File.open(File.join(settings.template_directory, "script", "cloud")).read
+
+    File.chmod(0755, define_file.path, server_file.path, migration_file.path, cloud_file.path)
     
     puts "Your project is six feet under at #{settings.project_root}"
   end
 
   def generate_scaffold(*args)
-    generate_model(*args)
-    generate_controller(args[0])
-    generate_views(*args)
-  end
-
-  def generate_model(*args)
-
-    model_name = args[0]
-    columns = Hash.new
-
-    (1 .. (args.length - 1)).each do |i|
-      key_value = args[i].split(':')
-      columns[key_value[0]] = key_value[1]
-    end
+    
+    # TODO: Throw proper error messages
+    arguments = parse_arguments(*args)
 
-    b = ModelViewBinding.new
-    b.model_name = model_name
-    b.columns = columns
+    generate_model(arguments["entity"], arguments["columns"], arguments["associations"])
+    generate_controller(arguments["entity"], arguments["associations"])
+    generate_views(arguments["entity"], arguments["columns"])
+  end
 
-    model_string = ERB.new(File.open( File.join(settings.template_directory, "model.rb.erb") ).read ).result(b.get_binding)
+  def generate_model(model_name, columns, associations)
+    
+    model_binding = ModelViewBinding.new
+    model_binding.model_name = model_name
+    model_binding.columns = columns
+    model_binding.associations = associations
+    model_binding.convert_associations_to_datamapper_statements
+    
+    model_string = ERB.new(File.open( File.join(settings.template_directory, "model.rb.erb") ).read ).result(model_binding.get_binding)
 
     file_path = File.join(settings.model_directory, "#{model_name.capitalize}.rb")
 
@@ -84,10 +87,16 @@ class Generator
     
   end
   
-  def generate_controller(name)
+  def generate_controller(name, associations)
 
     b = ControllerViewBinding.new
     b.controller_name = name
+    b.dependent_entity = Array.new
+    associations.each do |associated_entity, association_type|
+      if association_type == "has_many"
+        b.dependent_entity << associated_entity
+      end
+    end
     
     controller_string = ERB.new(File.open( File.join(settings.template_directory, "controller.rb.erb") ).read).result(b.get_binding)
     file_path = File.join(settings.controller_directory, "#{name.capitalize}Controller.rb")
@@ -104,9 +113,8 @@ class Generator
   end
 
   
-  def generate_views(*args)
-    model_name = args[0].downcase
-    
+  def generate_views(model_name, columns)
+
     directory = File.join(settings.view_directory, model_name)
     if File.exists?(directory)
       puts "Views for this model already exist. Skipping generation"
@@ -114,18 +122,9 @@ class Generator
       
       v = ViewBinding.new
       v.view_name = model_name
-      v.fields = Hash.new
-      (1 .. (args.length - 1)).each do |i|
-        key_value = args[i].split(':')
-        v.fields[key_value[0]] = key_value[1]
-      end
+      v.fields = columns
       v.map_fields_to_html_tags
 
-      (1 .. (args.length - 1)).each do |i|
-        key_value = args[i].split(':')
-        v.fields[key_value[0]] = key_value[1]
-      end
-      
       FileUtils.mkdir(directory)
       index_file = File.open(File.join(directory, "index.erb"), "w")
       index_file << ERB.new(File.open(File.join(settings.template_directory, "html" ,"index.html.erb")).read).result(v.get_binding)
@@ -143,11 +142,9 @@ class Generator
       new_file << ERB.new(File.open(File.join(settings.template_directory, "html" ,"new.html.erb")).read).result(v.get_binding)
       new_file.close
       
-      puts "Views Created."
+      puts "Views for #{model_name.capitalize} Created."
       
     end
-
-    
   end
 
   
@@ -181,20 +178,18 @@ class Generator
       end
     end
     
-    app_file << line("Sinatra::Base.set :public, File.join(File.dirname(File.dirname(__FILE__)), 'public')")
+    app_file << line("Sinatra::Base.set :public, File.join(File.dirname(__FILE__), 'public')")
 
     controller_names.each do |controller|
       app_file << line("map \"/#{controller.downcase.gsub("controller", "")}\" do")
-        #app_file << line("Sinatra::Base.set :public, File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'public'))", 1)
-        #app_file << line("p File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'public'))", 1)
-        app_file << line("DataMapper.setup(:default, \"sqlite3://#{settings.database_directory.gsub(settings.project_root + "/", "")}/development.sqlite3\")" , 1)
-        app_file << line("controller = #{controller.gsub("controller", "Controller")}.new(File.dirname(File.dirname(__FILE__)))", 1)
+        app_file << line("DataMapper.setup(:default,  ENV['DATABASE_URL'] || \"sqlite3://#{settings.database_directory}/development.sqlite3\")" , 1)
+        app_file << line("controller = #{controller.gsub("controller", "Controller")}.new(File.dirname(__FILE__))", 1)
       	app_file << line("run controller", 1)
       app_file << line("end")
     end
 
     app_file << line("map \"/public\" do")
-      app_file << line("run RIPController.new(File.dirname(File.dirname(__FILE__)))", 1)
+      app_file << line("run RIPController.new(File.dirname(__FILE__))", 1)
     app_file << line("end")
     
     app_file.close
@@ -203,6 +198,36 @@ class Generator
   
   private
   
+  def parse_arguments(*args)
+    arguments = Hash.new
+    
+    # First argument has to be entity name
+    arguments["entity"] = args[0].downcase
+
+    
+    columns = Hash.new
+    associations = Hash.new
+    
+    # Iterate over rest of the arguments
+    (1 .. (args.length - 1)).each do |index|
+      key_value = args[index].split(':')
+      key_value[0] = key_value[0].downcase
+      key_value[1] = key_value[1].downcase.singularize
+      
+      # Check if argument is part a known association
+      if key_value[0] == "has_many" || key_value[0] == "belongs_to" || key_value[0] == "has_and_belongs_to_many"
+        associations[key_value[1]] = key_value[0] # Key is the name of the entity
+      else
+        columns[key_value[0]] = key_value[1]          
+      end
+    end
+    
+    arguments["columns"] = columns
+    arguments["associations"] = associations
+    
+    return arguments
+  end
+  
   def line(str, indent=0)
     out_str = ""
     indent.times do
@@ -212,49 +237,3 @@ class Generator
   end
   
 end
-
-class ModelViewBinding
-  
-  attr_accessor :model_name, :columns
-  
-  def get_binding
-    binding
-  end
-  
-end
-
-class ControllerViewBinding
-  
-  attr_accessor :controller_name
-  
-  def get_binding
-    binding
-  end
-  
-end
-
-class ViewBinding
-  
-  attr_accessor :view_name, :fields, :html_tags
-  
-  def get_binding
-    binding
-  end
-  
-  def map_fields_to_html_tags
-    @html_tags = Hash.new
-    @fields.each do |key, value|
-      @html_tags[key] = tag_for_field_type(value)
-    end
-  end
-  
-  def tag_for_field_type(type)
-    case type
-    when "string"
-      "text" #for now, only text inputs will work. Really need to think this through.
-    else
-      "text"
-    end
-  end
-  
-end

data/lib/rest_in_peace/migration.rb

@@ -12,7 +12,7 @@ class Migration
       end
     end
     DataMapper.setup(:default, "sqlite3://#{settings.database_directory}/development.sqlite3")
-    DataMapper.auto_migrate!
+    DataMapper.auto_upgrade!
     puts "All #{count} Migrations Complete"
   end
   

data/lib/rest_in_peace/project_settings.rb

@@ -21,6 +21,11 @@ class ProjectSettings
     # Gem Specific Paths
     self.template_directory = File.join("#{File.dirname(__FILE__)}", "templates")
     
+    self
+  end
+  
+  def get_config_options
+    YAML::load(File.open(File.join(self.config_directory, "config.yml"), "r").read)
   end
   
 end

data/lib/rest_in_peace/rip_cloud.rb

@@ -0,0 +1,99 @@
+require 'grit'
+class RIPCloud
+  
+  def initialize(project_root)
+    @settings = ProjectSettings.new(project_root)
+  end
+  
+  def deploy
+
+    create_rackup_config
+
+    migrate_databases
+
+    repo = create_git_repository
+
+    if commit_latest_changes(repo)
+      
+      puts "Changes committed to git repository"
+      
+      create_heroku_application unless heroku_remote_exists?
+
+      push_changes_to_heroku
+      
+      sync_databases
+      
+    else
+      puts "Failed to make commit to Git repository"
+    end
+    
+  end
+  
+  def create_rackup_config
+    ServerManager.new(@settings.project_root).create_rackup_config
+  end
+  
+  def migrate_databases
+    
+    Migration.new.migrate(@settings.project_root)
+    
+  end
+  
+  def heroku_remote_exists?
+    
+    exists = true # Pessimistic, dont want to create Heroku apps left and right
+    
+    Dir.chdir(@settings.project_root) do
+      remotes = `git remote show`
+      exists = false if remotes.match("heroku").to_s != "heroku"
+    end
+    
+    exists
+    
+  end
+  
+  def create_git_repository
+    
+    unless File.exists?(File.join(@settings.project_root, ".git"))
+      
+      Dir.chdir(@settings.project_root) do
+        system("git init")
+      end
+      
+    else
+      puts "Git repository already exists"
+    end
+
+    repo = Grit::Repo.new(@settings.project_root)
+    
+  end
+
+  def commit_latest_changes(repo)
+    repo.add(@settings.project_root)
+    repo.commit_all("Rest in Peace: Deployment to Heroku at #{Time.now.to_s}")
+  end
+
+  def create_heroku_application
+    
+    Dir.chdir(@settings.project_root) do
+      heroku_app = @settings.get_config_options["heroku_app"] || ""
+      system "heroku create #{heroku_app} --stack bamboo-ree-1.8.7"
+    end
+    
+  end
+
+  def push_changes_to_heroku
+    
+    Dir.chdir(@settings.project_root) do
+      system "git push heroku master"
+    end
+    
+  end
+  
+  def sync_databases
+    Dir.chdir(@settings.project_root) do
+      system "heroku db:push sqlite://#{@settings.database_directory}/development.sqlite3"
+    end    
+  end
+
+end

data/lib/rest_in_peace/rip_controller.rb

@@ -21,9 +21,13 @@ class RIPController < Sinatra::Base
 		end
 	end
 	
-	def to_html(view, controller=self)
+	def to_html(view, entity = self.class.to_s)
+	  # Check if the view to be displayed is the default one for the controller
+    if entity != self.class.to_s
+      @parent_entity = self.class.to_s.downcase.gsub("controller", "").strip
+    end
     content_type("text/html")
-    Sinatra::Base.set(:views, File.join(@settings.view_directory, controller.class.to_s.downcase.gsub("controller", "")))
+    Sinatra::Base.set(:views, File.join(@settings.view_directory, entity.downcase.gsub("controller", "").strip))
     @yield = erb(view)
     ERB.new(File.open(File.join(@settings.view_directory, "layouts", "application.html.erb")).read).result(binding)
 	end

data/lib/rest_in_peace/server_manager.rb

@@ -1,18 +1,25 @@
 class ServerManager
   
-  def start_server(project_root)
-    
-    settings = ProjectSettings.new(project_root)
+  def initialize(project_root)
+    @settings = ProjectSettings.new(project_root)
+  end
   
-    Generator.new(project_root).generate_rackup_config
+  def start_server
+    
+    create_rackup_config
+    
+    config_options = @settings.get_config_options
     
     puts "--------------------------------------------------------------------------------"
+    puts "-------------------- Dead man walking at localhost:#{config_options["server_port"]} ------------------------"
     puts "--------------------------------------------------------------------------------"
-    puts "-------------------- Dead man walking at localhost:4567 ------------------------"
-    puts "--------------------------------------------------------------------------------"
-    puts "--------------------------------------------------------------------------------"
-    system "rackup #{File.join(settings.project_root, "config.ru")} -p 4567 -s webrick"
     
+    system "rackup #{File.join(@settings.project_root, "config.ru")} -p #{config_options["server_port"]} -s #{config_options["server_adapter"]}"
+    
+  end
+  
+  def create_rackup_config
+    Generator.new(@settings.project_root).generate_rackup_config    
   end
   
 end

data/lib/rest_in_peace/templates/Gemfile

@@ -0,0 +1,7 @@
+source :gemcutter
+gem "rest_in_peace"
+gem "datamapper"
+gem "sinatra"
+gem "builder"
+gem "data_objects"
+gem "do_postgres"

data/lib/rest_in_peace/templates/config.yml

@@ -0,0 +1,4 @@
+server_adapter: webrick
+server_port: 4567
+database_adapter: sqlite
+# heroku_app: my_rip_app

data/lib/rest_in_peace/templates/controller.rb.erb

@@ -1,52 +1,118 @@
 class <%= @controller_name.capitalize %>Controller < RIPController
+  
+  <% @dependent_entity.each do |entity| %>
+  
+  # Show all <%= entity.pluralize %> for a particular <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/1/<%= entity %>
+  get "/:id/<%= entity %>/?" do
+    @<%= entity.pluralize %> = <%= @controller_name.capitalize %>.get(params[:id]).<%= entity.pluralize %>
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:index,"<%= entity %>")
+  end
+  
+  # Show a page where you can fill in details for adding a new <%= entity %> for a <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/1/<%= entity %>/new
+  get "/:id/<%= entity %>/new" do
+    @<%= entity %> = <%= entity.capitalize %>.new
+	  to_html(:new, "<%= entity %>")
+  end
+
+  # Show the edit page for a particular <%= entity %> of a <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/1/<%= entity %>/1/edit
+  get "/:id/<%= entity %>/:id2/edit" do
+    @<%= entity %> = <%= @controller_name.capitalize %>.get(params[:id]).<%= entity.pluralize %>.get(params[:id2])
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:edit, "<%= entity %>")
+  end
+  
+  # Add a new <%= entity %> for a particular <%= @controller_name %>
+  # HTTP POST at /<%= @controller_name %>/1/<%= entity %>
+  post "/:id/<%= entity %>" do
+    @<%= entity %> = <%= entity.capitalize %>.new
+    @<%= entity %>.attributes = params[:<%= entity %>]
+    @<%= entity %>.save
+    #to_xml(@<%= entity %>)
+	  to_html(:show, "<%= entity %>")
+  end
+  
+  # Edit a particular <%= entity %> for a <%= @controller_name %>
+  # HTTP PUT at /<%= @controller_name %>/1/<%= entity %>/1
+  put "/:id/<%= entity %>/:id2/?" do
+    @<%= entity %> = <%= @controller_name.capitalize %>.get(params[:id]).<%= entity.pluralize %>.get(params[:id2])
+    @<%= entity %>.update(params[:<%= entity %>])
+    #to_xml(@<%= entity %>)
+	  to_html(:show, "<%= entity %>")
+  end
+  
+  # Delete a particular <%= entity %> for a <%= @controller_name %>
+  # HTTP DELETE at /<%= @controller_name %>/1/<%= entity %>/1
+  delete "/:id/<%= entity/:id2 %>" do
+    @<%= entity %> = <%= entity.capitalize %>.get(params[:id]).<%= entity.pluralize %>.get(params[:id2])
+    @<%= entity %>.destroy!
+    #to_xml(<%= entity %>)
+	  to_html(:index, "<%= entity %>")
+  end
+  <% end %>
 
-  # HTTP GET
+  # Shows list of all <%= @controller_name.pluralize %>
+  # HTTP GET at /<%= @controller_name %>
   get "/?" do
-    @<%= @controller_name.downcase %>s = <%= @controller_name.capitalize %>.all
-    #to_xml(<%= @controller_name.downcase %>s)
-	to_html(:index)
+    @<%= @controller_name.pluralize %> = <%= @controller_name.capitalize %>.all
+    #to_xml(@<%= @controller_name.pluralize %>)
+	  to_html(:index)
   end
 
+  # Show a page where you can fill in details for adding a new <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/new
   get "/new" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.new
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:new)
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.new
+	  to_html(:new)
   end
 
+  # Show a particular <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/1
   get "/:id" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.get(params[:id])
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:show)
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.get(params[:id])
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:show)
   end
-
+  
+  # Show the edit page for a particular <%= @controller_name %>
+  # HTTP GET at /<%= @controller_name %>/1/edit
   get "/:id/edit" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.get(params[:id])
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:edit)
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.get(params[:id])
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:edit)
   end
 
-  # HTTP POST
+  
+  # Add a new <%= @controller_name %>
+  # HTTP POST at /<%= @controller_name %>
   post "/?" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.new
-    @<%= @controller_name.downcase %>.attributes = params[:<%= @controller_name.downcase %>]
-    @<%= @controller_name.downcase %>.save
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:show)
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.new
+    @<%= @controller_name %>.attributes = params[:<%= @controller_name %>]
+    @<%= @controller_name %>.save
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:show)
   end
-
-  # HTTP PUT
-  put "/:id" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.get(params[:id])
-    @<%= @controller_name.downcase %>.update(params[:<%= @controller_name.downcase %>])
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:show)
+  
+  # Edit a <%= @controller_name %>
+  # HTTP PUT at /<%= @controller_name %>/1
+  put "/:id/?" do
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.get(params[:id])
+    @<%= @controller_name %>.update(params[:<%= @controller_name %>])
+    #to_xml(@<%= @controller_name %>)
+	  to_html(:show)
   end
 
-  # HTTP DELETE
+  
+  # Delete a <%= @controller_name %>
+  # HTTP DELETE at /<%= @controller_name %>/1
   delete "/:id" do
-    @<%= @controller_name.downcase %> = <%= @controller_name.capitalize %>.get(params[:id])
-    @<%= @controller_name.downcase %>.destroy!
-    #to_xml(<%= @controller_name.downcase %>)
-	to_html(:index)
+    @<%= @controller_name %> = <%= @controller_name.capitalize %>.get(params[:id])
+    @<%= @controller_name %>.destroy!
+    #to_xml(<%= @controller_name %>)
+	  to_html(:index)
   end
+
 end

data/lib/rest_in_peace/templates/html/edit.html.erb

@@ -1,5 +1,9 @@
 <h1>Editing <%= @view_name %></h1>
-<form action="/<%= @view_name %>/<%%= params[:id] %>" method="post" accept-charset="utf-8">
+<%% if @parent_entity %>
+  <form action="/<%%= @parent_entity %>/<%%= params[:id] %>/<%= @view_name %>/<%%= params[:id] %>" method="post" accept-charset="utf-8">
+<%% else %>
+  <form action="/<%= @view_name %>/<%%= params[:id] %>" method="post" accept-charset="utf-8">
+<%% end %>
 	<input type="hidden" id="_method" name="_method" value="put" />
 	<% @html_tags.each do |key, value| %>
 		<p>

data/lib/rest_in_peace/templates/html/index.html.erb

@@ -6,7 +6,7 @@
 		<% end %>
 
 	</tr>
-	<%% <%= "@#{@view_name}s.each do |#{@view_name}|" %> %>
+	<%% <%= "@#{@view_name.downcase.pluralize}.each do |#{@view_name.downcase}|" %> %>
 	<tr>
 	<% @html_tags.each do |key, value| %>
 		<td><%%= <%= "#{@view_name}.#{key}" %> %></td>
@@ -15,5 +15,9 @@
 	<%% end %>
 </table>
 <p>
-	<a href="/<%= @view_name %>/new">Add new <%= @view_name.capitalize %></a>
+  <%% if @parent_entity %>
+	  <a href="/<%%= @parent_entity %>/<%%= params[:id] %>/<%= @view_name %>/new">Add new <%= @view_name.capitalize %></a>
+	<%% else %>
+	  <a href="/<%= @view_name %>/new">Add new <%= @view_name.capitalize %></a>
+	<%% end %>
 </p>

data/lib/rest_in_peace/templates/html/new.html.erb

@@ -1,11 +1,20 @@
 <h1>New <%= @view_name %></h1>
-<form action="/<%= @view_name %>" method="post" accept-charset="utf-8">
+<%% if @parent_entity %>
+  <form action="/<%%= @parent_entity %>/<%%= params[:id] %>/<%= @view_name %>" method="post" accept-charset="utf-8">
+  	<input type="hidden" id="<%= "#{@view_name}" %><%%= "_#{@parent_entity}_id" %>" name="<%= "#{@view_name}" %><%%= "[#{@parent_entity}_id]" %>" value="<%%= params[:id] %>" />
+<%% else %>
+  <form action="/<%= @view_name %>" method="post" accept-charset="utf-8">
+<%% end %>
 	<% @html_tags.each do |key, value| %>
 		<p>
 			<label for="<%= key %>"><%= key.capitalize %></label><br />
 			<input type="<%= value %>" name="<%= "#{@view_name}[#{key}]" %>" value="" id="<%= "#{@view_name}_#{key}" %>">
-		</p>		
+		</p>
 	<% end %>
 	<p><input type="submit" value="Submit &rarr;"></p>
-	<a href="/<%= @view_name %>">Back</a>
+  <%% if @parent_entity %>
+	  <a href="/<%%= @parent_entity %>/<%%= params[:id] %>/<%= @view_name %>">Back</a>
+	<%% else %>
+	  <a href="/<%= @view_name %>">Back</a>	  
+	<%% end %>	
 </form>

data/lib/rest_in_peace/templates/html/show.html.erb

@@ -5,5 +5,10 @@
 		<%= key.capitalize %>: <%%= <%= "@#{@view_name}.#{key}" %> %>
 	</p>
 <% end %>
-<a href="/<%= @view_name %>">Back</a> | 
-<a href="/<%= @view_name %>/<%%= params[:id] %>/edit">Edit</a>
+<%% if @parent_entity %>
+  <a href=/<%%= @parent_entity %>/<%%= params[:id] %>"/<%= @view_name %>">Back</a> | 
+  <a href="/<%%= @parent_entity %>/<%%= params[:id] %>/<%= @view_name %>/<%%= params[:id] %>/edit">Edit</a>
+<%% else %>
+  <a href="/<%= @view_name %>">Back</a> | 
+  <a href="/<%= @view_name %>/<%%= params[:id] %>/edit">Edit</a>
+<%% end %>

data/lib/rest_in_peace/templates/model.rb.erb

@@ -1,9 +1,11 @@
 class <%= @model_name.capitalize %>
 
 	include DataMapper::Resource
-	
-    property :id, Serial
+	property :id, Serial
 	<% @columns.each do |key, value| %>
 	property :<%= key %>, <%= value.capitalize %>
 	<% end %>
+	<% @statements.each do |statement| %>
+	<%= statement %>
+  <% end %>
 end

data/lib/rest_in_peace/templates/script/cloud

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'rest_in_peace'
+project_root = File.dirname(File.dirname(__FILE__))
+RIPCloud.new(project_root).deploy

data/lib/rest_in_peace/templates/script/server

@@ -2,4 +2,4 @@
 require 'rubygems'
 require 'rest_in_peace'
 project_root = File.dirname(File.dirname(__FILE__))
-ServerManager.new.start_server(project_root)
+ServerManager.new(project_root).start_server

data/lib/rest_in_peace.rb

@@ -1,9 +1,16 @@
 require 'datamapper'
 require 'sinatra/base'
 require 'rest_in_peace/rip_controller'
+require 'active_support'
 autoload :Generator, 'rest_in_peace/generator'
 autoload :Builder, 'builder'
 autoload :ProjectSettings, 'rest_in_peace/project_settings'
 autoload :ERB, 'erb'
 autoload :ServerManager, 'rest_in_peace/server_manager'
-autoload :Migration, 'rest_in_peace/migration'
+autoload :Migration, 'rest_in_peace/migration'
+autoload :ModelViewBinding, 'rest_in_peace/bindings/model_view_binding'
+autoload :ControllerViewBinding, 'rest_in_peace/bindings/controller_view_binding'
+autoload :ViewBinding, 'rest_in_peace/bindings/view_binding'
+autoload :Bundler, 'bundler'
+autoload :YAML, 'yaml'
+autoload :RIPCloud, 'rest_in_peace/rip_cloud'

data/rest_in_peace.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest_in_peace}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chinmay Garde"]
-  s.date = %q{2010-03-16}
+  s.date = %q{2010-04-25}
   s.default_executable = %q{rip}
   s.description = %q{Minimal web framework with a focus on simplicity. Powered by Sinatra and DataMapper}
   s.email = %q{chinmaygarde@gmail.com}
@@ -26,13 +26,18 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/rip",
      "lib/rest_in_peace.rb",
+     "lib/rest_in_peace/bindings/controller_view_binding.rb",
+     "lib/rest_in_peace/bindings/model_view_binding.rb",
+     "lib/rest_in_peace/bindings/view_binding.rb",
      "lib/rest_in_peace/generator.rb",
      "lib/rest_in_peace/migration.rb",
      "lib/rest_in_peace/project_settings.rb",
+     "lib/rest_in_peace/rip_cloud.rb",
      "lib/rest_in_peace/rip_controller.rb",
      "lib/rest_in_peace/server_manager.rb",
+     "lib/rest_in_peace/templates/Gemfile",
+     "lib/rest_in_peace/templates/config.yml",
      "lib/rest_in_peace/templates/controller.rb.erb",
-     "lib/rest_in_peace/templates/gems",
      "lib/rest_in_peace/templates/html/edit.html.erb",
      "lib/rest_in_peace/templates/html/index.html.erb",
      "lib/rest_in_peace/templates/html/layout.html.erb",
@@ -41,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/rest_in_peace/templates/image/favicon.ico",
      "lib/rest_in_peace/templates/model.rb.erb",
      "lib/rest_in_peace/templates/readme.txt.erb",
+     "lib/rest_in_peace/templates/script/cloud",
      "lib/rest_in_peace/templates/script/define",
      "lib/rest_in_peace/templates/script/migrate",
      "lib/rest_in_peace/templates/script/server",
@@ -64,24 +70,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_development_dependency(%q<datamapper>, [">= 0.10.2"])
-      s.add_development_dependency(%q<builder>, [">= 2.2.2"])
+      s.add_development_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<taps>, [">= 0.2.26"])
+      s.add_development_dependency(%q<bundler>, [">= 0.9.11"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_dependency(%q<datamapper>, [">= 0.10.2"])
-      s.add_dependency(%q<builder>, [">= 2.2.2"])
+      s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<taps>, [">= 0.2.26"])
+      s.add_dependency(%q<bundler>, [">= 0.9.11"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     s.add_dependency(%q<datamapper>, [">= 0.10.2"])
-    s.add_dependency(%q<builder>, [">= 2.2.2"])
+    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<taps>, [">= 0.2.26"])
+    s.add_dependency(%q<bundler>, [">= 0.9.11"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Chinmay Garde
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +05:30
+date: 2010-04-25 00:00:00 +05:30
 default_executable: rip
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,11 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 4
+        version: 0.9.4
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: datamapper
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -38,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 10
+        - 2
+        version: 0.10.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -52,27 +54,25 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 10
-        - 2
-        version: 0.10.2
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: taps
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 0
         - 2
-        - 2
-        - 2
-        version: 2.2.2
+        - 26
+        version: 0.2.26
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: taps
+  name: bundler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -80,11 +80,23 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 26
-        version: 0.2.26
+        - 9
+        - 11
+        version: 0.9.11
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Minimal web framework with a focus on simplicity. Powered by Sinatra and DataMapper
 email: chinmaygarde@gmail.com
 executables: 
@@ -102,13 +114,18 @@ files:
 - VERSION
 - bin/rip
 - lib/rest_in_peace.rb
+- lib/rest_in_peace/bindings/controller_view_binding.rb
+- lib/rest_in_peace/bindings/model_view_binding.rb
+- lib/rest_in_peace/bindings/view_binding.rb
 - lib/rest_in_peace/generator.rb
 - lib/rest_in_peace/migration.rb
 - lib/rest_in_peace/project_settings.rb
+- lib/rest_in_peace/rip_cloud.rb
 - lib/rest_in_peace/rip_controller.rb
 - lib/rest_in_peace/server_manager.rb
+- lib/rest_in_peace/templates/Gemfile
+- lib/rest_in_peace/templates/config.yml
 - lib/rest_in_peace/templates/controller.rb.erb
-- lib/rest_in_peace/templates/gems
 - lib/rest_in_peace/templates/html/edit.html.erb
 - lib/rest_in_peace/templates/html/index.html.erb
 - lib/rest_in_peace/templates/html/layout.html.erb
@@ -117,6 +134,7 @@ files:
 - lib/rest_in_peace/templates/image/favicon.ico
 - lib/rest_in_peace/templates/model.rb.erb
 - lib/rest_in_peace/templates/readme.txt.erb
+- lib/rest_in_peace/templates/script/cloud
 - lib/rest_in_peace/templates/script/define
 - lib/rest_in_peace/templates/script/migrate
 - lib/rest_in_peace/templates/script/server

data/lib/rest_in_peace/templates/gems

@@ -1 +0,0 @@
-rest_in_peace --version '0.1.1'