shaml 0.5.0.alpha → 0.5.0.beta.1

data/lib/shaml/command.rb

@@ -1,4 +1,5 @@
 require 'zip/zip'
+require 'rexml/document'
 
 module Shaml
 class CommandLoader
@@ -27,19 +28,40 @@ class CommandLoader
      }
     }
   end
-  
-  def convert_file(file, appname, modelname, propertydescriptor)
+
+  def convert_file(file, appname, modelname, propertydescriptor = nil)
     out = ""
     pstring = ""
+    propertydescriptor = "" if propertydescriptor.nil?
     insideprop = false
     file.each_line do |line|
-      out << line.gsub("WebBase",appname).gsub("WebSample", camelcase(modelname)).gsub("websample", modelname);
+      if insideprop then
+        if line.strip =~ /__END__PROPERTY__/ then
+          propertydescriptor.split(";").each do |property|
+            p = property.split(":")
+            out << pstring.gsub("PropertyType",p[1]).gsub("Property",p[0])
+          end
+          insideprop = false
+        else
+          pstring << line.gsub("WebBase",appname).gsub("WebSample", camelcase(modelname)).gsub("websample", modelname);
+        end
+      else
+        if line.strip =~ /__BEGIN__PROPERTY__/ then
+          pstring = ""
+          insideprop = true
+        else
+          out << line.gsub("WebBase",appname).gsub("WebSample", camelcase(modelname)).gsub("websample", modelname);
+        end
+      end
     end
     out
   end
 
-  def copy_file(from,to,appname,modelname,propertydescriptor)
+
+  def copy_file(from,to,appname,modelname,propertydescriptor,xmltochange,xmltype)
     outfname = to.gsub("WebSample",camelcase(modelname))
+    outfname_w = outfname.gsub("/","\\")
+    addxml(xmltochange,outfname_w,xmltype)
     FileUtils.mkdir_p(File.dirname(outfname))
     File.open(from,"rb") do |infile|
       File.open(outfname,"wb+") do |outfile|
@@ -49,6 +71,38 @@ class CommandLoader
     end
   end
 
+  # Fix files that depends on the existence of at least one model
+  def fix_with_model(modelname)
+    t = nil
+    appname = getappname
+    name = File.join("App","Data","Mapping","AutoPersistenceModelGenerator.cs")
+    File.open(name,"rb") { |f| t = f.read }; File.open(name,"wb+") { |f| f.write convert_file(t,appname,modelname) }
+    name = File.join("Config","ComponentRegistrar.cs")
+    File.open(name,"rb") { |f| t = f.read }; File.open(name,"wb+") { |f| f.write convert_file(t,appname,modelname) }
+  end
+
+  def addxml(file,content,type)
+    doc = nil
+    dir = File.split(file)[0].gsub("/","\\")
+    c = content.gsub(dir+"\\","")
+    File.open(file,"r") do |f|
+      doc = REXML::Document.new f.read
+      case type
+      when :content
+        el = doc.elements["//ItemGroup[Content]"]
+        cont = el.add_element("Content",{"Include"=>c})
+        stype = cont.add_element("SubType")
+        stype.text = "ASPXCodeBehind"
+      when :compile
+        el = doc.elements["//ItemGroup[Compile]"]
+        cont = el.add_element("Compile",{"Include"=>c})
+      end
+    end
+    File.open(file,"w+") do |f|
+      f.write doc.to_s
+    end
+  end
+
   def run
     if ARGV.length == 0 then
       puts "S#aml architecture: ASP.NET MVC 2 and NHibernate 2.1 on mono 2.4.4+"
@@ -60,26 +114,31 @@ class CommandLoader
       puts "Where command might be:"
       puts " generate"
       puts "  app AppName             : Create new shaml application"
-      puts "  resource ResName        : Create new CRUD resource with"
+      puts "  resource ResName [desc] : Create new CRUD resource with"
       puts "                            a model, a view and a controller"
       puts "  controller Controller   : Create a standalone controller"
-      puts "  model Model             : Create a standalone model"
+      puts "  model Model [desc]      : Create a standalone model"
       puts
-      puts " compile                  : Compiles the solution using xbuild"
+      puts " compile                  : Compiles the solution using {ms|x}build"
       puts " server                   : Runs xsp2"
       puts
+      puts " gconsole                 : Starts a gsharp console"      
       puts " console                  : Starts a csharp console"
-      puts " gconsole                 : Starts a gsharp console"
       puts " runner script_name.cs    : Runs the script"
+      puts " test                     : Runs the tests"
       puts
       puts "Examples: "
       puts "  shaml generate app Blog"
       puts "  shaml generate resource Post"
       puts "  shaml compile"
       puts
-      puts "The console, gconsole and runner parameters will preload the solutions"
+      puts "The console and runner parameters will preload the solutions"
       puts "assemblies and configuration files, and loads everything you need to get"
       puts "working with the domain objects"
+      puts
+      puts "The optional [desc] parameter describes the base schema of the model to"
+      puts "create the scaffold. Here is an example how it looks like:"
+      puts "  name:string;email:string;birthdate:DateTime" 
     else
       command = ARGV.shift
       case command
@@ -111,32 +170,47 @@ class CommandLoader
           when "resource"
             desc = ARGV.shift || nil
             appname = getappname
-            copy_file(File.join(TEMPLATEDIR,"WebSample.cs"),File.join(appname,"App","Models","WebSample.cs"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"WebSamplesController.cs"),File.join(appname,"App","Controllers","WebSamplesController.cs"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"_WebSampleForm.haml"),File.join(appname,"App","Views","WebSamples","_WebSampleForm.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Create.haml"),File.join(appname,"App","Views","WebSamples","Create.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Delete.haml"),File.join(appname,"App","Views","WebSamples","Delete.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Edit.haml"),File.join(appname,"App","Views","WebSamples","Edit.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Index.haml"),File.join(appname,"App","Views","WebSamples","Index.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Show.haml"),File.join(appname,"App","Views","WebSamples","Show.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"WebSampleTests.cs"),File.join(appname+".Tests","Tests","Core","WebSampleTests.cs"),appname,name,desc)        
-            copy_file(File.join(TEMPLATEDIR,"WebSamplesControllerTests.cs"),File.join(appname+".Tests","Tests","Web","Controllers","WebSamplesControllerTests.cs"),appname,name,desc)        
+            xmlname = File.join("App","Core","#{appname}.Core.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSample.cs"),File.join("App","Core","WebSample.cs"),appname,name,desc,xmlname,:compile)
+            xmlname = File.join("App","Data","#{appname}.Data.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSampleMap.cs"),File.join("App","Data","WebSampleMap.cs"),appname,name,desc,xmlname,:compile)            
+            xmlname = File.join("App","Controllers","#{appname}.Controllers.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSamplesController.cs"),File.join("App","Controllers","WebSamplesController.cs"),appname,name,desc,xmlname,:compile)
+            xmlname = "#{appname}.csproj"            
+            copy_file(File.join(TEMPLATEDIR,"_WebSampleForm.haml"),File.join("App","Views","WebSamples","_WebSampleForm.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Create.haml"),File.join("App","Views","WebSamples","Create.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Delete.haml"),File.join("App","Views","WebSamples","Delete.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Edit.haml"),File.join("App","Views","WebSamples","Edit.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Index.haml"),File.join("App","Views","WebSamples","Index.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Show.haml"),File.join("App","Views","WebSamples","Show.haml"),appname,name,desc,xmlname,:content)
+            xmlname = File.join("Tests","#{appname}.Tests.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSampleTests.cs"),File.join("Tests","Core","WebSampleTests.cs"),appname,name,desc,xmlname,:compile)        
+            copy_file(File.join(TEMPLATEDIR,"WebSamplesControllerTests.cs"),File.join("Tests","Controllers","WebSamplesControllerTests.cs"),appname,name,desc,xmlname,:compile)
+            fix_with_model(name)
           when "model"
             desc = ARGV.shift || nil
-            appname = getappname      
-            copy_file(File.join(TEMPLATEDIR,"WebSample.cs"),File.join(appname,"App","Models","WebSample.cs"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"WebSampleTests.cs"),File.join(appname+".Tests","Tests","Core","WebSampleTests.cs"),appname,name,desc)        
+            appname = getappname
+            xmlname = File.join("App","Core","#{appname}.Core.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSample.cs"),File.join("App","Core","WebSample.cs"),appname,name,desc,xmlname,:compile)
+            xmlname = File.join("App","Data","#{appname}.Data.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSampleMap.cs"),File.join("App","Data","WebSampleMap.cs"),appname,name,desc,xmlname,:compile)                        
+            xmlname = File.join("Tests","#{appname}.Tests.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSampleTests.cs"),File.join("Tests","Core","WebSampleTests.cs"),appname,name,desc,xmlname,:compile)
+            fix_with_model(name)            
           when "controller"
             desc = ARGV.shift || nil
             appname = getappname   
-            copy_file(File.join(TEMPLATEDIR,"WebSamplesController.cs"),File.join(appname,"App","Controllers","WebSamplesController.cs"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"_WebSampleForm.haml"),File.join(appname,"App","Views","WebSamples","_WebSampleForm.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Create.haml"),File.join(appname,"App","Views","WebSamples","Create.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Delete.haml"),File.join(appname,"App","Views","WebSamples","Delete.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Edit.haml"),File.join(appname,"App","Views","WebSamples","Edit.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Index.haml"),File.join(appname,"App","Views","WebSamples","Index.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"Show.haml"),File.join(appname,"App","Views","WebSamples","Show.haml"),appname,name,desc)
-            copy_file(File.join(TEMPLATEDIR,"WebSamplesControllerTests.cs"),File.join(appname+".Tests","Tests","Web","Controllers","WebSamplesControllerTests.cs"),appname,name,desc)                
+            xmlname = File.join("App","Controllers","#{appname}.Controllers.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSamplesController.cs"),File.join("App","Controllers","WebSamplesController.cs"),appname,name,desc,xmlname,:compile)
+            xmlname = "#{appname}.csproj"            
+            copy_file(File.join(TEMPLATEDIR,"_WebSampleForm.haml"),File.join("App","Views","WebSamples","_WebSampleForm.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Create.haml"),File.join("App","Views","WebSamples","Create.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Delete.haml"),File.join("App","Views","WebSamples","Delete.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Edit.haml"),File.join("App","Views","WebSamples","Edit.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Index.haml"),File.join("App","Views","WebSamples","Index.haml"),appname,name,desc,xmlname,:content)
+            copy_file(File.join(TEMPLATEDIR,"Show.haml"),File.join("App","Views","WebSamples","Show.haml"),appname,name,desc,xmlname,:content)
+            xmlname = File.join("Tests","#{appname}.Tests.csproj")
+            copy_file(File.join(TEMPLATEDIR,"WebSamplesControllerTests.cs"),File.join("Tests","Controllers","WebSamplesControllerTests.cs"),appname,name,desc,xmlname,:compile)
           else
             puts 'S#aml ERROR: unknown generate argument'
           end        
@@ -145,27 +219,55 @@ class CommandLoader
         end
       when "compile"
         appname = getappname
-        puts "Copying libraries"
         begin
-          FileUtils.rm_r(File.join(appname,"bin"))
+          FileUtils::rm_rf "bin"
         rescue Exception => e
         end
-        FileUtils.cp_r("libraries",File.join(appname,"bin"))
-        puts "Compiling using xbuild"
-        system("xbuild #{appname}.sln")
-        puts "Compiling stylesheets"        
-        Dir.chdir(appname) do    
-          system("compass --update -c Config/compass_config.rb")
+        if Mono.mono_found then
+          puts "Compiling using xbuild"
+          Mono.load_mono_app("/mono/2.0/xbuild.exe","#{appname}.sln")
+        else
+          puts "Mono not found. Compiling using msbuild"
+          system("msbuild #{appname}.sln")
         end
+        puts "Compiling stylesheets"        
+        system("compass -c Config/compass_config.rb")
       when "server"
-        puts "Starting xsp2"    
         appname = getappname
-        Dir.chdir(appname) do
-          puts "Changed directory to #{Dir.pwd}"
-          puts "Starting xsp2 #{ARGV.join(" ")}"
-          system("xsp2 #{ARGV.join(" ")}")
-          puts "Done..."      
+        puts "Starting xsp2 #{ARGV.join(" ")}"
+        if Mono.is_unix then
+          Mono.load_mono_app("/mono/2.0/xsp2.exe",ARGV.join(" "))
+        else
+          Mono.load_mono_app("/mono/2.0/WinHack/xsp2.exe",ARGV.join(" "))
         end
+        puts "Done..."      
+      when "test"
+        puts "Running tests"
+        appname = getappname
+        if Mono.mono_found then
+          Mono.load_app(File.join("libraries","nunit-console.exe"),File.join("bin","#{appname}.Tests.dll"))
+        else
+          system("#{File.join("libraries","nunit-console.exe")} #{File.join("bin","#{appname}.Tests.dll")}")
+        end
+      when "console"
+        appname = getappname
+        script = File.read(File.join("Scripts","setup","common.cs"))
+        script << File.read(File.join("Scripts","setup","csharp.cs"))
+        script = script.gsub("WebBase",appname);
+        Mono.load_csharp(script,"");
+      when "gconsole"
+        appname = getappname
+        script = File.read(File.join("Scripts","setup","common.cs"))
+        script << File.read(File.join("Scripts","setup","gsharp.cs"))
+        script = script.gsub("WebBase",appname);
+        Mono.load_gsharp(script,"");
+      when "runner"
+        appname = getappname
+        command = ARGV.shift
+        script = File.read(File.join("Scripts","setup","common.cs"))
+        script << File.read(File.join("Scripts","setup","runner.cs"))
+        script = script.gsub("WebBase",appname);
+        Mono.load_csharp(script,"#{command}");
       else
         puts 'S#aml ERROR: unknown command'
       end

data/lib/shaml/mono_load.rb

@@ -3,18 +3,23 @@ require 'fileutils'
 
 module Shaml
 class MonoLoader
+  attr_reader :mono_found,:is_unix
+
   def initialize
     @mono_command = '/bin/mono'
     @mono_directory = '/usr'
-    @mono_lib_directory = '/lib'
+    @mono_lib_directory = '/usr/lib'
     @csharp_command = '/mono/2.0/csharp.exe'
     @gsharp_command = '/gsharp/gsharp.exe'
-    @config_dir = '~/.config'
+    @config_dir = "#{ENV['HOME']}/.config"
     @init_script_name = 'shaml.cs'
+    @mono_found = true
+    @is_unix = true
 
     # get mono path for Windows
     if RbConfig::CONFIG['host_os'] =~ /mswin|windows|cygwin|mingw/i
       begin
+        @is_unix = false
         require 'win32/registry'
         # Check in default location
         base = "Software\\Novell\\Mono\\"
@@ -39,9 +44,10 @@ class MonoLoader
       rescue Exception => e
         STDERR.puts "Couldn't determine mono location under Windows!"
         STDERR.puts e.inspect
+        @mono_found = false
       end
     else
-      if ENV['MONO_PREFIX'] != nil then
+      if !ENV['MONO_PREFIX'].nil? and !ENV['MONO_PREFIX'].empty? then
         @mono_directory = ENV['MONO_PREFIX']
         @mono_lib_directory = File.join(@mono_directory,"lib")
       end
@@ -70,23 +76,32 @@ class MonoLoader
   end
 
   # run csharp with an optional initialization script
-  def load_csharp(init_script = nil)
+  def load_csharp(init_script = nil, commands = "")
     create_init_script(init_script,"csharp")
     puts "Mono executable: \"#{File.join(@mono_directory,@mono_command)}\""
     cs = File.join(@mono_lib_directory,@csharp_command)
     puts "CSharp executable: \"#{cs}\""
-    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{cs}\"")
-    delete_init_script("csharp")
+    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{cs}\" #{commands}")
+    delete_init_script(init_script, "csharp")
   end
 
   # run gsharp with an optional initialization script
-  def load_gsharp(init_script = nil)
+  def load_gsharp(init_script = nil, commands = "")
     create_init_script(init_script,"gsharp")
     puts "Mono executable: \"#{File.join(@mono_directory,@mono_command)}\""
     gs = File.join(@mono_lib_directory,@gsharp_command)
     puts "GSharp executable: \"#{gs}\""
-    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{gs}\"")
-    delete_init_script("gsharp") 
+    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{gs}\" #{commands}")
+    delete_init_script(init_script, "gsharp") 
+  end
+
+  def load_mono_app(command,parameters = "")
+    cm = File.join(@mono_lib_directory,command)
+    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{cm}\" #{parameters}")
   end
+  def load_app(command,parameters = "")
+    cm = command
+    system("\"#{File.join(@mono_directory,@mono_command)}\" \"#{cm}\" #{parameters}")
+  end  
 end
 end

data/lib/shaml/templates/Delete.haml

@@ -1,7 +1,11 @@
-%div
+@namespace=WebBase.Core
+@namespace=WebBase.Controllers
+@namespace=Microsoft.Web.Mvc
+@type=WebSample
+%div
   %h2 Delete WebSample
   %p Are you sure?
   - using (Html.BeginForm<WebSamplesController>(c => c.DeleteConfirmed(ViewData.Model.Id)))
-    = Html.AntiForgeryToken()
+    /= Html.AntiForgeryToken()
     %input{ type="submit" value="Yes" }
     %input{ type="button" name="No" value="No" onclick="javascript:history.go(-1);"}

data/lib/shaml/templates/Index.haml

@@ -1,3 +1,7 @@
+@namespace=WebBase.Core
+@namespace=WebBase.Controllers
+@namespace=Microsoft.Web.Mvc
+@type=List<WebSample>
 %div
   %h2 WebSamples
   - if (ViewContext.TempData["message"] != null)
@@ -5,16 +9,16 @@
   %table
     %thead
       %tr
-// TODO: List of properties begin
+        -// __BEGIN__PROPERTY__
         %th Property
-// TODO: List of properties end
+        -// __END__PROPERTY__
         %th{ colspan=3 } Action
     %tbody
       - foreach (WebSample websample in ViewData.Model)
         %tr
-// TODO: List of properties begin
+          -// __BEGIN__PROPERTY__
           %td= websample.Property
-// TODO: List of properties end
+          -// __END__PROPERTY__
           %td
             = Html.ActionLink<WebSamplesController>( c => c.Show( websample.Id ), "Details ")
           %td

data/lib/shaml/templates/Show.haml

@@ -2,9 +2,9 @@
 %div
   %h2 WebSample Details
   %ul
-// TODO: List of properties begin
+  // __BEGIN__PROPERTY__
   %li
-    %label{ for="WebSample.Name" } Property:
-      %span{ id="WebSample.Name" }
+    %label{ for="WebSample.Property" } Property:
+      %span{ id="WebSample.Property" }
         = ViewData.Model.Property
-// TODO: List of properties end
+  // __END__PROPERTY__

data/lib/shaml/templates/WebSample.cs

@@ -1,14 +1,18 @@
 using NHibernate.Validator.Constraints;
 using Shaml.Core.DomainModel;
 using Shaml.Core.PersistenceSupport;
+using Shaml.Membership.Core;
 using System;
 
 namespace WebBase.Core
 {
+    
     public class WebSample : Entity
     {
         public WebSample() { }
 
-        // TODO: Add Properties to the Domain Object
+        // __BEGIN__PROPERTY__
+        public virtual PropertyType Property { get; set; }
+        // __END__PROPERTY__
     }
 }

data/lib/shaml/templates/WebSampleMap.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentNHibernate.Automapping;
+using FluentNHibernate.Automapping.Alterations;
+using Shaml.Data.NHibernate.FluentNHibernate;
+using Shaml.Membership.Core;
+using WebBase.Core;
+
+namespace WebBase.Data.Mapping
+{
+   public class WebSampleMap : IAutoMappingOverride<WebSample>
+   {
+       public void Override(AutoMapping<WebSample> mapping)
+       {
+         // __BEGIN__PROPERTY__
+         // mapping.Map(x => x.Property).CustomType("StringClob").CustomSqlType("text");
+         // __END__PROPERTY__
+       }
+   }
+}

data/lib/shaml/templates/WebSampleTests.cs

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using WebBase.Core;
 using Shaml.Testing;
+using Shaml.Testing.NUnit;
 
 namespace Tests.Blog.Core
 {

data/lib/shaml/templates/WebSamplesController.cs

@@ -1,36 +1,37 @@
 using System.Web.Mvc;
 using WebBase.Core;
-using SharpArch.Core.PersistenceSupport;
-using SharpArch.Core.DomainModel;
+using Shaml.Core.PersistenceSupport;
+using Shaml.Core.DomainModel;
 using System.Collections.Generic;
 using System;
-using SharpArch.Web.NHibernate;
+using Shaml.Web.NHibernate;
 using NHibernate.Validator.Engine;
 using System.Text;
-using SharpArch.Web.CommonValidator;
-using SharpArch.Core;
+using Shaml.Web.CommonValidator;
+using Shaml.Core;
+using System.Linq.Expressions;
 
 namespace WebBase.Controllers
 {
     [HandleError]
     public class WebSamplesController : Controller
     {
-        public WebSamplesController(IRepository<WebSample> websampleRepository) {
-            Check.Require(websampleRepository != null, "websampleRepository may not be null");
+        public WebSamplesController(IRepository<WebSample> WebSampleRepository) {
+            Check.Require(WebSampleRepository != null, "WebSampleRepository may not be null");
 
-            this.websampleRepository = websampleRepository;
+            this.WebSampleRepository = WebSampleRepository;
         }
 
         [Transaction]
         public ActionResult Index() {
-            IList<WebSample> websamples = websampleRepository.GetAll();
-            return View(websamples);
+            IList<WebSample> WebSamples = WebSampleRepository.GetAll();
+            return View(WebSamples);
         }
 
         [Transaction]
         public ActionResult Show(int id) {
-            WebSample websample = websampleRepository.Get(id);
-            return View(websample);
+            WebSample WebSample = WebSampleRepository.Get(id);
+            return View(WebSample);
         }
 
         public ActionResult Create() {
@@ -38,76 +39,86 @@ namespace WebBase.Controllers
             return View(viewModel);
         }
 
-        [ValidateAntiForgeryToken]
+        //[ValidateAntiForgeryToken]
         [Transaction]
         [AcceptVerbs(HttpVerbs.Post)]
-        public ActionResult Create(WebSample websample) {
-            if (ViewData.ModelState.IsValid && websample.IsValid()) {
-                websampleRepository.SaveOrUpdate(websample);
+        public ActionResult Create(WebSample WebSample) {
+            if (ViewData.ModelState.IsValid && WebSample.IsValid()) {
+                WebSampleRepository.SaveOrUpdate(WebSample);
 
                 TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()] = 
-					"The websample was successfully created.";
+					"The WebSample was successfully created.";
                 return RedirectToAction("Index");
             }
 
             WebSampleFormViewModel viewModel = WebSampleFormViewModel.CreateWebSampleFormViewModel();
-            viewModel.WebSample = websample;
+            viewModel.WebSample = WebSample;
             return View(viewModel);
         }
 
         [Transaction]
         public ActionResult Edit(int id) {
             WebSampleFormViewModel viewModel = WebSampleFormViewModel.CreateWebSampleFormViewModel();
-            viewModel.WebSample = websampleRepository.Get(id);
+            viewModel.WebSample = WebSampleRepository.Get(id);
             return View(viewModel);
         }
 
-        [ValidateAntiForgeryToken]
+        //[ValidateAntiForgeryToken]
         [Transaction]
         [AcceptVerbs(HttpVerbs.Post)]
-        public ActionResult Edit(WebSample websample) {
-            WebSample websampleToUpdate = websampleRepository.Get(websample.Id);
-            TransferFormValuesTo(websampleToUpdate, websample);
+        public ActionResult Edit(WebSample WebSample) {
+            WebSample WebSampleToUpdate = WebSampleRepository.Get(WebSample.Id);
+            TransferFormValuesTo(WebSampleToUpdate, WebSample);
 
-            if (ViewData.ModelState.IsValid && websample.IsValid()) {
+            if (ViewData.ModelState.IsValid && WebSample.IsValid()) {
                 TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()] = 
-					"The websample was successfully updated.";
+					"The WebSample was successfully updated.";
                 return RedirectToAction("Index");
             }
             else {
-                websampleRepository.DbContext.RollbackTransaction();
+                WebSampleRepository.DbContext.RollbackTransaction();
 
 				WebSampleFormViewModel viewModel = WebSampleFormViewModel.CreateWebSampleFormViewModel();
-				viewModel.WebSample = websample;
+				viewModel.WebSample = WebSample;
 				return View(viewModel);
             }
         }
 
-        private void TransferFormValuesTo(WebSample websampleToUpdate, WebSample websampleFromForm) {
-          // TODO: Add copy methods
+        private void TransferFormValuesTo(WebSample WebSampleToUpdate, WebSample WebSampleFromForm) {
+            // __BEGIN__PROPERTY__
+            WebSampleToUpdate.Property = WebSampleFromForm.Property;
+            // __END__PROPERTY__
         }
 
-        [ValidateAntiForgeryToken]
+
+        [AcceptVerbs(HttpVerbs.Get)]
+        public ActionResult Delete(int id)
+        {
+            WebSample websampleToDelete = WebSampleRepository.Get(id);
+            return View(websampleToDelete);
+        }
+
+        //[ValidateAntiForgeryToken]
         [Transaction]
         [AcceptVerbs(HttpVerbs.Post)]
-        public ActionResult Delete(int id) {
-            string resultMessage = "The websample was successfully deleted.";
-            WebSample websampleToDelete = websampleRepository.Get(id);
+        public ActionResult DeleteConfirmed(int id) {
+            string resultMessage = "The WebSample was successfully deleted.";
+            WebSample WebSampleToDelete = WebSampleRepository.Get(id);
 
-            if (websampleToDelete != null) {
-                websampleRepository.Delete(websampleToDelete);
+            if (WebSampleToDelete != null) {
+                WebSampleRepository.Delete(WebSampleToDelete);
 
                 try {
-                    websampleRepository.DbContext.CommitChanges();
+                    WebSampleRepository.DbContext.CommitChanges();
                 }
                 catch {
-                    resultMessage = "A problem was encountered preventing the websample from being deleted. " +
-						"Another item likely depends on this websample.";
-                    websampleRepository.DbContext.RollbackTransaction();
+                    resultMessage = "A problem was encountered preventing the WebSample from being deleted. " +
+						"Another item likely depends on this WebSample.";
+                    WebSampleRepository.DbContext.RollbackTransaction();
                 }
             }
             else {
-                resultMessage = "The websample could not be found for deletion. It may already have been deleted.";
+                resultMessage = "The WebSample could not be found for deletion. It may already have been deleted.";
             }
 
             TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()] = resultMessage;
@@ -127,14 +138,13 @@ namespace WebBase.Controllers
 			/// </summary>
             public static WebSampleFormViewModel CreateWebSampleFormViewModel() {
                 WebSampleFormViewModel viewModel = new WebSampleFormViewModel();
-                
                 return viewModel;
             }
 
             public WebSample WebSample { get; internal set; }
         }
 
-        private readonly IRepository<WebSample> websampleRepository;
+        private readonly IRepository<WebSample> WebSampleRepository;
     }
 }
 

data/lib/shaml/templates/WebSamplesControllerTests.cs

@@ -4,6 +4,8 @@ using NUnit.Framework;
 using Rhino.Mocks;
 using Shaml.Core.PersistenceSupport;
 using Shaml.Testing;
+using Shaml.Testing.NUnit;
+using Shaml.Membership.Core;
 using System.Collections.Generic;
 using System.Web.Mvc;
 using WebBase;
@@ -54,8 +56,8 @@ namespace Tests.Blog.Web.Controllers
 
         [Test]
         public void CanEnsureWebSampleCreationIsValid() {
-            WebSample websampleFromForm = new WebSample();
-            ViewResult result = controller.Create(websampleFromForm).AssertViewRendered();
+            WebSample WebSampleFromForm = new WebSample();
+            ViewResult result = controller.Create(WebSampleFromForm).AssertViewRendered();
 
             result.ViewData.Model.ShouldNotBeNull();
             result.ViewData.Model.ShouldBeOfType(typeof(WebSamplesController.WebSampleFormViewModel));
@@ -63,8 +65,8 @@ namespace Tests.Blog.Web.Controllers
 
         [Test]
         public void CanCreateWebSample() {
-            WebSample websampleFromForm = CreateTransientWebSample();
-            RedirectToRouteResult redirectResult = controller.Create(websampleFromForm)
+            WebSample WebSampleFromForm = CreateTransientWebSample();
+            RedirectToRouteResult redirectResult = controller.Create(WebSampleFromForm)
                 .AssertActionRedirect().ToAction("Index");
             controller.TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()].ToString()
 				.ShouldContain("was successfully created");
@@ -72,9 +74,9 @@ namespace Tests.Blog.Web.Controllers
 
         [Test]
         public void CanUpdateWebSample() {
-            WebSample websampleFromForm = CreateTransientWebSample();
-            EntityIdSetter.SetIdOf<int>(websampleFromForm, 1);
-            RedirectToRouteResult redirectResult = controller.Edit(websampleFromForm)
+            WebSample WebSampleFromForm = CreateTransientWebSample();
+            EntityIdSetter.SetIdOf<int>(WebSampleFromForm, 1);
+            RedirectToRouteResult redirectResult = controller.Edit(WebSampleFromForm)
                 .AssertActionRedirect().ToAction("Index");
             controller.TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()].ToString()
 				.ShouldContain("was successfully updated");
@@ -91,7 +93,7 @@ namespace Tests.Blog.Web.Controllers
 
         [Test]
         public void CanDeleteWebSample() {
-            RedirectToRouteResult redirectResult = controller.Delete(1)
+            RedirectToRouteResult redirectResult = controller.DeleteConfirmed(1)
                 .AssertActionRedirect().ToAction("Index");
             
             controller.TempData[ControllerEnums.GlobalViewDataProperty.PageMessage.ToString()].ToString()
@@ -116,17 +118,17 @@ namespace Tests.Blog.Web.Controllers
         }
 
         private WebSample CreateWebSample() {
-            WebSample websample = CreateTransientWebSample();
-            EntityIdSetter.SetIdOf<int>(websample, 1);
-            return websample;
+            WebSample WebSample = CreateTransientWebSample();
+            EntityIdSetter.SetIdOf<int>(WebSample, 1);
+            return WebSample;
         }
 
           private List<WebSample> CreateWebSamples() {
-              List<WebSample> websamples = new List<WebSample>();
+              List<WebSample> WebSamples = new List<WebSample>();
 
             // Create a number of domain object instances here and add them to the list
 
-            return websamples;
+            return WebSamples;
         }
         
         #endregion
@@ -135,11 +137,13 @@ namespace Tests.Blog.Web.Controllers
         /// Creates a valid, transient WebSample; typical of something retrieved back from a form submission
         /// </summary>
         private WebSample CreateTransientWebSample() {
-            WebSample websample = new WebSample() {
-              //TODO: Create the properties of the object
+            WebSample WebSample = new WebSample() {
+                // __BEGIN__PROPERTY__
+                Property = new PropertyType(),
+                // __END__PROPERTY__
             };
             
-            return websample;
+            return WebSample;
         }
 
         private WebSamplesController controller;

data/lib/shaml/templates/_WebSampleForm.haml

@@ -1,16 +1,17 @@
-@type=WebSample
+@namespace=WebBase.Controllers
+@type=WebSamplesController.WebSampleFormViewModel
 = Html.ValidationSummary()
 - using (Html.BeginForm()) 
-  = Html.AntiForgeryToken()
-  = Html.Hidden("id", (ViewData.Model == null) ? 0 : (ViewData.Model).Id)
+  /= Html.AntiForgeryToken()
+  = Html.Hidden("WebSample.Id", (Model.WebSample != null) ? Model.WebSample.Id : 0)
   %ul
-// TODO: List of properties begin
+    // __BEGIN__PROPERTY__
     %li
       %label{ for="WebSample_Property" }Property:
         %div
-          = Html.TextBox("WebSample.Property", ViewData.Model != null ? ViewData.Model.Property.ToString() : "")
+          = Html.TextBox("WebSample.Property", (Model.WebSample != null) ? Model.WebSample.Property.ToString() : "" )
           = Html.ValidationMessage("WebSample.Property")
-// TODO: List of properties end
+    // __END__PROPERTY__
     %li
       %input{ type="submit" name="btnSave" value="Save WebSample"}/
         %button{ name="btnCancel" onClick="window.location.href = '/WebSamples';"} Cancel

metadata

@@ -6,8 +6,9 @@ version: !ruby/object:Gem::Version
   - 0
   - 5
   - 0
-  - alpha
-  version: 0.5.0.alpha
+  - beta
+  - 1
+  version: 0.5.0.beta.1
 platform: ruby
 authors: 
 - Zsolt Sz. Sztupak
@@ -67,6 +68,7 @@ files:
 - lib/shaml/templates/Show.haml
 - lib/shaml/templates/_WebSampleForm.haml
 - lib/shaml/templates/WebSample.cs
+- lib/shaml/templates/WebSampleMap.cs
 - lib/shaml/templates/WebSamplesController.cs
 - lib/shaml/templates/WebSamplesControllerTests.cs
 - lib/shaml/templates/WebSampleTests.cs