kinbote 0.0.1 → 0.0.2

data/site/.kinbote/views/attributes.haml

@@ -5,14 +5,14 @@
     - next if attribute.name.downcase == "date"
     %li
       = "#{attribute.name} (#{attribute.pages.size})"
-      - if !attribute.css?
+      - if !attribute.has_file?(:css)
         %form{:action => "/kinbote/attributes/css", :method => "post"}
           %input{:type => "hidden", :name => "attribute", :value => attribute.name}
           %input{:type => "submit", :value => "Create SASS"}
       %ul
         - attribute.values.each do |value|
           %li= "#{value.value} (#{value.pages.size})"
-          - if !value.css?
+          - if !value.has_file?(:css)
             %form{:action => "/kinbote/values/css", :method => "post"}
               %input{:type => "hidden", :name => "attribute", :value => attribute.name}
               %input{:type => "hidden", :name => "value", :value => value.value}

data/site/.kinbote/views/examples/header.haml

@@ -1,12 +1,6 @@
 -# Kinbote Sample Code
 
-.clear{:style => "clear:both;"}
-%a{:href => "#samples", :onclick => "$('.examples').toggle();"} Show info >
-%a{:name => "samples"}
-
-.examples{:style => "border: 1px solid #000; display:none;"}
-
-	%p You can print all the attributes of this page ...
+	%h5 This page's attributes:
 	%ul
-		- @page.attributes.each do |attribute|
-			%li= "#{attribute.name}: #{attribute.values.join(", ")}"
+	- @page.attributes.each do |attribute|
+		%li= "#{attribute}: #{attribute.values.join(", ")}"

data/site/.kinbote/views/examples/home.haml

@@ -1,40 +1,34 @@
 -# Kinbote Sample Code
 
-.clear{:style => "clear:both;"}
-%a{:href => "#samples", :onclick => "$('.examples').toggle();"} Show info >
-%a{:name => "samples"}
-
-.examples{:style => "border: 1px solid #000; display:none;"}
-	%h3 All of the pages on this'ere website:
+	%h5 All pages:
 	%ul
 		- @pages.each do |page|
 			%li
-				%a{:href => "/#{page.url}"}= page.title
+				%a{:href => "/#{page.url}"}= page
 
-	%h3 Here are all the pages that have a '$FIRST_VAL$' attribute:
+	%h5 Pages that contain the '$FIRST_VAL$' attribute:
 	%ul
 		- @$FIRST_VAL$.pages.each do |page|
 			%li
 				%a{:href => "/#{page.url}"}= page.title
 
-	%h3 Below are those same pages, and the VALUES for their $FIRST_VAL$:
+	%h5 Those same pages, and the values for their '$FIRST_VAL$':
 	%ul
 		- @$FIRST_VAL$.values.each do |$FIRST_VAL$_value|
 			- $FIRST_VAL$_value.pages.each do |page|
 				%li
-					%a{:href => "/#{page.url}"}= page.title
-					= "(#{$FIRST_VAL$_value.value})"
+					%a{:href => "/#{page.url}"}= "#{page.title} (#{$FIRST_VAL$_value})"
 
-	%h3 These are all the attributes used on the site (and the number of times they've been used):
+	%h5 All attributes used on the site (and the number of times they've been used):
 	%ul
 		- @attributes.each do |attribute|
-			%li= "#{attribute.name} (#{attribute.pages.size})"
+			%li= "#{attribute} (#{attribute.pages.size})"
 
-	%h3 Here are all those attributes and their values:
+	%h5 All those attributes and their values:
 	%ul
 		- @attributes.each do |attribute|
 			%li
-				= "#{attribute.name} (#{attribute.pages.size})"
+				= "#{attribute} (#{attribute.pages.size})"
 				%ul
 					- attribute.values.each do |value|
-						%li= "#{value.value} (#{value.pages.size})"
+						%li= "#{value} (#{value.pages.size})"

data/site/.kinbote/views/examples/page_attributes_title.haml

@@ -1,2 +1 @@
-
 -# Kinbote Page Attributes

data/site/.kinbote/views/examples/related.haml

@@ -1,16 +1,16 @@
-	%p You can get all the other pages that have the "$LAST_VAL$" attribute:
+	%h5 All the other pages that have the '$LAST_VAL$' attribute:
 	%ul
-		- @page.loosely_related_pages("$ALL_VALS_COMMENTED$").each do |page_match|
+		- @page.loosely_related_pages("$ALL_VALS$").each do |page_match|
 			%li
-				%a{:href => "/#{page_match.page.url}"}= page_match.page.title
+				%a{:href => "/#{page_match.page.url}"}= page_match.page
 				is matched to this page because it contains the attribute
-				= page_match.attribute.name
+				= page_match.attribute
 
-	%p You can also get all the pages that have the same VALUE for "$LAST_VAL$" as this page:
+	%h5 All the pages that have the same value for '$LAST_VAL$' as this page:
 	%ul
-		- @page.strongly_related_pages("$ALL_VALS_COMMENTED$").each do |page_match|
+		- @page.strongly_related_pages("$ALL_VALS$").each do |page_match|
 			%li
-				%a{:href => "/#{page_match.page.url}"}= page_match.page.title
+				%a{:href => "/#{page_match.page.url}"}= page_match.page
 				is matched to this page because it contains
-				= page_match.value.value
-				= page_match.attribute.name
+				= page_match.value
+				= page_match.attribute

data/site/.kinbote/views/examples/related2.haml

@@ -1,8 +1,8 @@
-	%p You can also get all the pages that have the same SPECIFIC value for "$LAST_VAL$" as this page:
+	%h5 All the pages with the same specific value for '$LAST_VAL$' as this page:
 	%ul
-		- @page.strongly_related_pages("$ALL_VALS_COMMENTED$").each do |page_match|
+		- @page.strongly_related_pages("$ALL_VALS$").each do |page_match|
 			%li
-				%a{:href => "/#{page_match.page.url}"}= page_match.page.title
+				%a{:href => "/#{page_match.page.url}"}= page_match.page
 				is matched to this page because it contains
-				= page_match.value.value
-				= page_match.attribute.name
+				= page_match.value
+				= page_match.attribute

data/site/.kinbote/views/examples/related_any.haml

@@ -1,8 +1,9 @@
-	%p Or, you can get all the pages that are related to this page via ANY attribute/value:
+	%h5 All pages that are related to this page via any attribute/value:
 	%ul
 		- @page.strongly_related_pages.each do |page_match|
 			%li
-				= "#{page_match.attribute.name}: #{page_match.value.value} relates"
-				%a{:href => "/#{page_match.page.url}"}= page_match.page.title
+				= "#{page_match.attribute}: #{page_match.value} relates"
+				%a{:href => "/#{page_match.page}"}= page_match.page
 
+	%h5 How to include a snippet:
 	= snippet("sample")

data/site/.kinbote/views/examples/specific.haml

@@ -1,3 +1,3 @@
-	%p ... or specific ones:
+	%h5 Specific attributes:
 	%ul
 		%li= @page.$ALL_VALS$.join(", ")

data/site/.kinbote/views/layout.haml

@@ -11,4 +11,6 @@
     %a{:href => "/kinbote/attributes"} attributes
     %a{:href => "/", :style => "margin-left:400px;"} The real site >>
 
+    = haml :'../.kinbote/views/messages', :layout => false
+
     = yield

data/site/.kinbote/views/messages.haml

@@ -0,0 +1,5 @@
+- if $site.has_messages?
+  %h2 Your site contains these errors:
+  %ul
+  - $site.render_messages.each do |message|
+    %li= message

data/site/.kinbote/views/pages.haml

@@ -13,7 +13,7 @@
           %a{:href => "/kinbote/pages/#{page.slug}"}= page.title
         %td= "[#{page.attributes.map{|a| "#{a}: #{a.values.map{|v| v.to_s}.join(', ')}"}.join('] [')}]"
         %td
-          - if !page.css?
+          - if !page.has_file?(:css)
             %form{:action => "/kinbote/pages/#{page.slug}/css", :method => "post"}
               %input{:type => "submit", :value => "Create SASS"}
         %td

data/site/.kinbote/views/site.haml

@@ -1,4 +1,4 @@
-<h1>Manage my website</h1>
+%h1 Manage my website
 
 %form{:action => "/kinbote/publish", :method => "post"}
   %input{:type => "submit", :value => "Publish"}

data/site/kinbote-server

@@ -1,12 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-
-if `hostname` == "femur\n"
-  require "#{File.dirname(__FILE__)}/../lib/kinbote"
-else
-  require 'kinbote'
-end
+require (`hostname` == "femur\n" ? "#{File.dirname(__FILE__)}/../lib/kinbote" : 'kinbote')
 
 s = Kinbote::Server
 s.set :kinbote_path, "#{File.expand_path(File.dirname(__FILE__))}"

data/site/views/index.haml

@@ -1 +1,8 @@
 %h1= @site.title
+
+%h2 Pages:
+%ul
+	- @pages.each do |page|
+		%li
+			%a{:href => "/#{page.url}"}= page
+

data/site/views/layout.haml

@@ -5,9 +5,8 @@
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
     
     %link{:href => "/css/core.css", :rel => "stylesheet", :type => "text/css"}
-    %link{:href => "/css/blueprint/screen.css", :rel => "stylesheet", :type => "text/css"}
     - if @page
-      - @page.css_files.each do |path|  
+      - @page.files(:css).each do |path|  
         %link{:href => "#{path}.css", :rel => "stylesheet", :type => "text/css"}
  
     %script{:src  => "/js/jquery.js", :type => "text/javascript"}

data/site/views/snippets/sample.haml

@@ -1,4 +1,4 @@
 %h4 Sample Snippet
 
-%p You can access the current page like this:
+%p You can still access the current page in a snippet:
 = @page.title

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kinbote
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jay Boice
@@ -9,39 +15,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -04:00
+date: 2010-07-11 00:00:00 -04:00
 default_executable: kinbote
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 0
+        - 13
         version: 3.0.13
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-scp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Kinbote
 email: jboice@gmail.com
 executables: 
@@ -61,6 +82,7 @@ files:
 - lib/kinbote.rb
 - lib/kinbote/attribute.rb
 - lib/kinbote/base.rb
+- lib/kinbote/kinfile.rb
 - lib/kinbote/page.rb
 - lib/kinbote/page_match.rb
 - lib/kinbote/site.rb
@@ -78,6 +100,7 @@ files:
 - site/.kinbote/views/examples/related_any.haml
 - site/.kinbote/views/examples/specific.haml
 - site/.kinbote/views/layout.haml
+- site/.kinbote/views/messages.haml
 - site/.kinbote/views/page.haml
 - site/.kinbote/views/pages.haml
 - site/.kinbote/views/site.haml
@@ -108,21 +131,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Kinbote