packages/utils/utils.cfc @@ -13,6 +13,5 @@ </buildSpec> <natures> <nature>XMLCompiler.XMLCompilerNature</nature> - <nature>org.cfeclipse.cfml.CFENature</nature> </natures> </projectDescription> .project @@ -1,7 +1,7 @@ SECURITY="--user farcry:farcry --basic " PORT="" -BASE_URL="http://localhost${PORT}/RobBlog" +BASE_URL="http://blog.local${PORT}" #getting a list of availiable blogs (buckets of FarCry types) function test_get_bucket_list() { notes/atomTests.sh @@ -3,40 +3,24 @@   - - <cfif thistag.executionmode eq "end"> <cfexit /> </cfif> - +<cfset htmlLink = "" /> +<skin:buildLink includeDomain='true' r_url="htmlLink" + type="farBlogPost" view="displayTypeText" /> <cfoutput> - -<link rel="service.post" type="application/atom+xml" title="[[blog title]]" - href="http://localhost:8500/RobBlog/index.cfm?type=farBlogPost&view=displayTypeText"></link> - -<link rel="alternate" type="application/atom+xml" title="[[blog title]] - Atom" href="/atom/atom.cfm"></link> - - - - + title="#application.ApplicationName#" href="#htmlLink#"></link> + +<link rel="service.feed" type="application/atom+xml" + title="#application.ApplicationName#" href="#htmlLink#"></link> + +<link rel="alternate" type="application/atom+xml" + title="#application.ApplicationName# - Atom" href="#htmlLink#"></link> </cfoutput> <cfsetting enablecfoutputonly="No"> \ No newline at end of file tags/serviceLink.cfm @@ -1,3 +1,4 @@ +<cfsetting enablecfoutputonly="true"> <cfoutput> <html> <head> @@ -7,4 +8,5 @@ <p>Nope</p> </body> </html> -</cfoutput> \ No newline at end of file +</cfoutput> +<cfsetting enablecfoutputonly="false"> \ No newline at end of file webskin/types/displayAccessDenied.cfm @@ -1,3 +1,4 @@ +<cfsetting enablecfoutputonly="true"> <cfimport taglib="/farcry/core/tags/webskin" prefix="skin" /> <cfset request.reqData = getHTTPRequestData() /> @@ -52,4 +53,5 @@ <skin:view typename="#stObj.name#" webskin="displayAccessDenied" /> <cfabort /> -</cfif> \ No newline at end of file +</cfif> +<cfsetting enablecfoutputonly="false"> \ No newline at end of file webskin/types/displayBasicAuth.cfm @@ -1,3 +1,6 @@ +<cfsetting enablecfoutputonly="true"> <cfparam name="entryid" default=""> <cfset application.blog.deleteEntry(entryid)> + +<cfsetting enablecfoutputonly="false"> \ No newline at end of file webskin/types/displayDeleteEntry.cfm @@ -1,31 +1,54 @@ -<cfparam name="entryid" default=""> +<cfsetting enablecfoutputonly="true"> +<cfimport taglib="/farcry/core/tags/webskin" prefix="skin" />  <cfset o = createObject("component", application.stCoapi[stObj.name].packagePath) />  -<cfset entry = o.getData(entryid) /> +<cfset entry = o.getData(urlDecode(stParam.entryid)) /> + + +<cfset utils = createObject("component", "/farcry/plugins/farcryatom/packages/utils/utils") /> + + <cfoutput><?xml version="1.0" encoding="utf-8" standalone="yes"?> <entry xmlns="http://www.w3.org/2005/Atom"> - <link href="#application.rootURL#/atom/atom.cfm/1/#entry.id#" - rel="service.edit" title="#XmlFormat(entry.title)#" + + <cfset htmlLink = "" /> + <cfset stLinkParams = { + atomBid='1', + atomPid='#entry.objectId#' + } /> +  + <skin:buildLink includeDomain='true' r_url="htmlLink" + stParameters='#stLinkParams#' view="displayTypeText" + type='#entry.typename#' /> + + <link href="#xmlFormat(htmlLink)#" + rel="service.edit" title="#xmlFormat(entry.title)#" type="application/atom+xml" /> <author> - <name>#entry.name#</name> + <name>#xmlFormat(entry.lastupdatedby)#</name> </author> - <issued>#entry.posted#</issued> - <modified>#entry.posted#Z</modified> - <created>#entry.posted#Z</created> +  + <modified>#utils.isoDateFormat(entry.DATETIMELASTUPDATED)#</modified> + <created>#utils.isoDateFormat(entry.DATETIMECREATED)#</created> + + <skin:buildLink includeDomain='true' r_url="htmlLink" + type='#entry.typename#' objectId="#entry.objectId#" /> - <link href="#application.blog.getProperty("blogURL")#/#year(entry.posted)#/#month(entry.posted)#/#day(entry.posted)#/#entry.alias#" - rel="alternate" title="#XmlFormat(entry.title)#" type="text/html"/> + <link href="#xmlFormat(htmlLink)#" rel="alternate" title="#XmlFormat(entry.title)#" type="text/html"/> - <id>tag:blogcfc.com,2006:blog-1.post-#entry.id#</id> + <id>#entry.objectid#</id> - <title mode="escaped" type="text/html">#XmlFormat(entry.title)#</title> - <content type="text/html" mode="escaped">#XmlFormat(entry.body)#</content> - <draft xmlns="http://purl.org/atom-blog/ns##"><cfif entry.released>false<cfelse>true</cfif></draft> +  + <title type="text/html"><![CDATA[#entry.title#]]></title> +  + <content type="text/html"><![CDATA[#entry.body#]]></content> + + <draft xmlns="http://purl.org/atom-blog/ns##"><cfif entry.STATUS eq "approved">true<cfelse>false</cfif></draft> </entry> -</cfoutput> \ No newline at end of file +</cfoutput> +<cfsetting enablecfoutputonly="false"> \ No newline at end of file webskin/types/displayGetEntry.cfm @@ -13,34 +13,42 @@ <published>#utils.isoDateFormat(stObj.dateTimeCreated)#</published> <updated>#utils.isoDateFormat(stObj.dateTimeLastUpdated)#</updated> - <title type="html"><![CDATA[??'s Blog]]></title> + <title type="html"><![CDATA[#application.ApplicationName#]]></title> <summary type="html"><![CDATA[  ]]></summary> - - <link rel="alternate" type="text/html" href="http://localhost:8500/RobBlog/"></link> + </cfoutput> -  + <cfset htmlLink = "" /> + <skin:buildLink includeDomain='true' href='index.cfm' r_url="htmlLink" /> + <cfoutput> + <link rel="alternate" type="text/html" href="#xmlFormat(htmlLink)#"></link> + </cfoutput> -  - - <link rel="self" type="application/atom+xml" - href="<skin:buildLink includeDomain='true' type='#stObj.name#' view='displayTypeText' urlOnly='true' bXMLEntities='true' />"></link> + <skin:buildLink includeDomain='true' type='#stObj.name#' view='displayTypeText' r_url="htmlLink" /> + <cfoutput> + <link rel="self" type="application/atom+xml" href="#xmlFormat(htmlLink)#"></link> + </cfoutput> <cfset stParams = {atomBid='1'} /> - <link rel="edit" type="application/atom+xml" - href="<skin:buildLink includeDomain='true' type='#stObj.name#' view='displayTypeText' urlOnly='true' stParameters='#stParams#' bXMLEntities='true' />"></link> + <skin:buildLink includeDomain='true' type='#stObj.name#' + view='displayTypeText' stParameters='#stParams#' r_url="htmlLink" /> + <cfoutput> + <link rel="edit" type="application/atom+xml" href="#xmlFormat(htmlLink)# "></link> + <link rel="service.feed" type="application/atom+xml" href="#xmlFormat(htmlLink)#"></link> + </cfoutput> + <cfoutput> <author> <name></name> <email></email> - <uri>#application.url.webroot#/index.cfm?objectId=#session.dmProfile.objectId#</uri> + </cfoutput> + <skin:buildLink includeDomain='true' type='#stObj.name#' + view='displayTypeText' r_url="htmlLink" /> + <cfoutput> + <uri>#xmlFormat(htmlLink)#</uri> </author> - </entry> </cfoutput> <cfsetting enablecfoutputonly="No"> \ No newline at end of file webskin/types/displayListBuckets.cfm @@ -1,6 +1,10 @@ +<cfsetting enablecfoutputonly="Yes"> <cfimport taglib="/farcry/core/tags/webskin" prefix="skin" /> - + <cfset o = createObject("component", application.stCoapi[stObj.name].packagePath) />  <cfset entries = o.getMultipleByQuery() /> @@ -17,65 +21,75 @@ <updated>#utils.isoDateFormat(stObj.dateTimeLastUpdated)#</updated>  - <title type="text">??'s Diary</title> + <title type="text"><![CDATA[#application.ApplicationName#]]></title> <link rel="alternate" type="text/html" href="#application.url.webroot#"></link> +  <author> - <name></name> + <name>#stObj.lastupdatedby#</name> <email></email> <uri></uri> </author> <generator version="1.0" uri="http://farcrycore.org"><![CDATA[ -  ]]></generator> - + </cfoutput> + <cfloop query="entries"> + <cfoutput> <entry> <id>#entries.objectId#</id> <published>#utils.isoDateFormat(entries.dateTimeCreated)#</published> <updated>#utils.isoDateFormat(entries.dateTimeLastUpdated)#</updated> - - <title type="html"><![CDATA[ - <cfif len(entries.title)> - #entries.title# - <cfelse> - #entries.label# - </cfif> - ]]></title> - <content type="html"><![CDATA[ - <cfif structKeyExists(entries, "teaser") and len(entries.teaser)> - #entries.teaser# - <cfelseif structKeyExists(entries, "body")> - #entries.body# - </cfif> - ]]></content> + <title type="html"><![CDATA[<cfif len(entries.title)>#entries.title#<cfelse>#entries.label#</cfif>]]></title> + + <content type="html"><![CDATA[<cfif structKeyExists(entries, "teaser") and len(entries.teaser)>#entries.teaser#<cfelseif structKeyExists(entries, "body")>#entries.body#</cfif>]]></content> + + </cfoutput> - <link rel="alternate" type="text/html" - href="<skin:buildLink includeDomain='true' objectId='#stObj.objectID#' urlOnly='true' />"></link> + <cfset htmlLink = "" /> +  + <skin:buildLink includeDomain='true' objectId="#entries.objectId#" + type="#stObj.name#" r_url="htmlLink" /> - <link rel="self" type="application/atom+xml" - href="#application.url.webroot#/feeds/posts/default/postID"></link> + <cfoutput> + <link rel="alternate" type="text/html" href="#xmlFormat(htmlLink)#"></link> + </cfoutput> - <link rel="edit" type="application/atom+xml" - href="#application.url.webroot#/feeds/blogID/posts/default/postID"></link> + <cfset htmlLink = "" /> + <cfset stParams = {atomBid='1',atomPid='#entries.objectId#'} /> + <skin:buildLink includeDomain='true' type="#stObj.name#" r_url="htmlLink" + stParameters="#stParams#" view="displayTypeText" /> + + <cfoutput> + <link rel="self" type="application/atom+xml" href="#xmlFormat(htmlLink)#"></link> + </cfoutput> + + <cfoutput> + <link rel="edit" type="application/atom+xml" href="#xmlFormat(htmlLink)#"></link> + +  <author> - <name>#entries.createdBy# #entries.ownedBy# #entries.status#</name> + <name>#entries.lastupdatedby#</name> +  <email></email> <uri></uri> </author> </entry> + </cfoutput> </cfloop> - + + <cfoutput> </feed> </cfoutput> +<cfsetting enablecfoutputonly="No"> \ No newline at end of file webskin/types/displayListEntries.cfm @@ -1,3 +1,4 @@ +<cfsetting enablecfoutputonly="true">  <cfset request.method = getHTTPRequestData().method />  +  <cfif not structKeyExists(request.resource, atomItemURLName) and not structKeyExists(request.resource, atomBucketURLName)> <skin:view typename="#stObj.name#" webskin="displayListBuckets" /> -  +  <cfelseif structKeyExists(request.resource, atomBucketURLName) and not structKeyExists(request.resource, atomItemURLName)> <cfset bucketId = request.resource[atomBucketURLName] /> @@ -54,9 +57,12 @@ <cfelseif structKeyExists(request.resource, atomBucketURLName) and structKeyExists(request.resource, atomItemURLName)> - <cfset entryId = request.resource[atomItemURLName] /> - <cfset bucketId = request.resource[atomBucketURLName] /> - <skin:view typename="#stObj.name#" webskin="displayGetEntries" /> + <cfset stParams = { + entryId='#request.resource[atomItemURLName]#', + bucketId='#request.resource[atomBucketURLName]#' + } /> + <skin:view typename="#stObj.name#" webskin="displayGetEntry" + stParam="#stParams#" /> <cfelse>  webskin/types/displayTypeText.cfm 157edf96af60ad16d9044c51c6cf01e5e40eb61c Rob Rohan robrohan@SMacBookPro.gateway.2wire.net http://github.com/robrohan/farcryatom/commit/4219e2d18adc3b3718e24030293865bbae1aea98 4219e2d18adc3b3718e24030293865bbae1aea98

2008-11-15T21:46:21-08:00

Still not much working (except the first couple levels of auth), but I am spinning my wheels and getting frustrated with it so i am going to put it away for a bit. 25104887e0f4b10f57c5adcf39cd5a5796ce7dfb Rob Rohan robrohan@SMacBookPro.gateway.2wire.net