kinbote 0.0.1 → 0.0.2

data/bin/kinbote

@@ -10,4 +10,5 @@ if File.exists?(name)
   exit 1
 end
 
-FileUtils.copy_entry("#{File.dirname(__FILE__)}/../site", name)
+FileUtils.copy_entry("#{File.dirname(__FILE__)}/../site", name)
+FileUtils.mkdir_p("#{name}/public/css")

data/kinbote.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'kinbote'
-  s.version = '0.0.1'
-  s.date = '2010-07-10'
+  s.version = '0.0.2'
+  s.date = '2010-07-11'
 
   s.description = "Kinbote"
   s.summary = "Kinbote"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
  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
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
  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

data/lib/kinbote/attribute.rb

@@ -1,71 +1,43 @@
 module Kinbote
   class Attribute
     include Util
-  
-    attr_accessor :name, :values, :_varname
-  
-    def initialize(name, page, values, global_attribute = nil)
+    include Kinfile
+    attr_reader :name
+
+    def initialize(name, page, values, global=nil)
       @name = name.to_s
       @pages = []
       @values = []
-      @global_attribute = global_attribute || self
+      @global = global || self
       add_page(page, values)
-      @_varname = slugify(@name).gsub("-", "_")
-      @css = File.exist?(file_name(:css))
     end
-  
+
     def add_page(page, values)
       @pages.delete_if{|p| p.slug == page.slug}
       @pages << page
       values.each do |v|
-        g_val = $site.find_value(v, @global_attribute, true)
-        if g_val
-          g_val.add_page(page)
-        else
-          g_val = Value.new(v, page, @global_attribute)
-          $site.add_value(g_val)
-        end
+        g_val = $site.find_value(v, @global, true)
+        g_val ? g_val.add_page(page) : g_val = Value.new(v, page, @global); $site.add_value(g_val)
         l_val = $site.find_value(v, self)
-        if l_val
-          l_val.add_page(page)
-        else
-          @values << Value.new(v, page, @global_attribute, g_val) 
-        end
+        l_val ? l_val.add_page(page) : @values << Value.new(v, page, @global, g_val)
       end
     end
-  
+
     def remove_page(page)
       @values.map{|value| value.remove_page(page)}
-      @global_attribute.pages.delete_if{|p| p.slug == page.slug}
+      @global.pages.delete_if{|p| p.slug == page.slug}
       @pages.delete_if{|p| p.slug == page.slug}
-      @global_attribute.values.delete_if{|v| v.pages.size == 0}
+      @global.values.delete_if{|v| v.pages.size == 0}
       @values.delete_if{|v| v.pages.size == 0}
     end
-  
-    def create_css
-      FileUtils.mkdir_p(file_name(:css, true)) if !File.exist?(file_name(:css, true))
-      File.open(file_name(:css), "w") if !File.exist?(file_name(:css))
-      @global_attribute.css!
+    
+    def values
+      @values.sort{|x, y| x.value <=> y.value }
     end
-  
-    def file_name(type, dir = nil)
-      if type == :css
-        return "#{$site.kinbote_path}/views/sass/attributes/#{@name}/#{!dir ? "_all.sass" : ""}"
-      end
-    end
-  
-    def css_files
-      files = (@global_attribute.css? ? ["/css/attributes/#{@name}/_all"] : [])
-      @values.each do |value|
-        files += value.css_files
-      end
-      files
-    end
-  
-    def pages; @global_attribute == self ? @pages : @global_attribute.pages; end
+    
+    def varname; varify(@name); end
+    def pages; @global == self ? @pages : @global.pages; end
     def to_s; @name; end
-    def css!; @global_attribute == self ? @css = true : @global_attribute.css!; end
-    def css?; @global_attribute == self ? @css : @global_attribute.css?; end
-  
+
   end
 end

data/lib/kinbote/base.rb

@@ -8,6 +8,7 @@ require 'net/ssh'
 require 'net/scp'
 
 require 'kinbote/util'
+require 'kinbote/kinfile'
 require 'kinbote/site'
 require 'kinbote/page'
 require 'kinbote/attribute'
@@ -15,5 +16,5 @@ require 'kinbote/value'
 require 'kinbote/page_match'
 
 module Kinbote
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/kinbote/kinfile.rb

@@ -0,0 +1,71 @@
+module Kinbote
+  module Kinfile
+    
+    def init_files
+      @file_sizes = {}
+    end
+
+    def files(type)
+      files = []
+      if self.is_a?(Attribute)
+        files << "/css/attributes/#{@name}/_all" if has_file?(:css)
+        @values.each{|v| files += v.files(:css)}
+      elsif self.is_a?(Value)
+        files << "/css/attributes/#{@attribute}/#{@value}" if has_file?(:css)
+      elsif self.is_a?(Page)
+        files << "/css/pages/#{@slug}" if has_file?(:css)
+        @attributes.each{|a| files += a.files(type) }
+      end
+      files
+    end
+
+    def create_files(types)
+      types.each {|type| create_file(type) }
+    end
+    
+    def create_file(type)
+      FileUtils.mkdir_p(file_path(type, true)) if !File.exist?(file_path(type, true))
+      File.open(file_path(type), "w") if !File.exist?(file_path(type))
+    end
+    
+    def delete_files(types)
+      types.each {|type| delete_file(type) }
+    end
+    
+    def delete_file(type)
+      FileUtils.rm_f(file_path(type))
+    end
+    
+    def file_size(type)
+      @file_sizes[type] = File.size(file_path(type)) if !@file_sizes.has_key?(type)
+      @file_sizes[type] 
+    end
+    
+    def reset_file_size(type)
+      @file_sizes[type] = File.size(file_path(type))
+    end
+    
+    def has_file?(type)
+      File.exist?(file_path(type))
+    end
+
+    private
+  
+    def file_path(type, dir = nil)
+      if type == :css
+        if self.is_a?(Attribute)
+          return "#{$site.kinbote_path}/views/sass/attributes/#{@name}/#{!dir ? "_all.sass" : ""}"
+        elsif self.is_a?(Value)
+          return "#{$site.kinbote_path}/views/sass/attributes/#{@attribute}/#{!dir ? "#{@value}.sass" : ""}"
+        elsif self.is_a?(Page)
+          return "#{@directory}#{!dir ? "#{@slug}.sass" : ""}"
+        end
+      elsif type == :html
+        return @file if @file && !dir
+        return @directory if @directory && dir
+        return "#{$site.kinbote_path}/views/pages/#{Time.now.strftime("%Y/%m")}/#{!dir ? "/#{slugify(@title)}.haml" : ""}"
+      end
+    end
+    
+  end
+end

data/lib/kinbote/page.rb

@@ -1,22 +1,26 @@
 module Kinbote
   class Page
     include Util
-
-    attr_accessor :title, :attributes, :slug
-  
+    include Kinfile
+    attr_reader :title, :slug
+    
+    BAD_ATTRIBUTE_VARNAMES = ["site", "pages", "attributes"]
+    
     def initialize(title, file=nil, attributes=nil)
+      init_files
       @title = title
       @directory = (file ? dir_from_file(file) : file_path(:html, true))
       @file = file || file_path(:html)
       @slug = slug_from_file(@file)
       @attributes = []
       add_attributes(attributes || {"Date" => Time.now.strftime("%B %d, %Y")})
-      create_html
-      @css = File.exist?(file_path(:css))
+      create_file(:html)
+      Page.add_metadata(self) if !file
       set_ivars
     end
   
-    def set_attributes(attributes)
+    def set_attributes(attributes, values=nil)
+      attributes = kv_to_attributes(attributes, values) if values
       new_title = remove_title(attributes)
       return if same_attributes(attributes, new_title)
       @title = new_title if new_title && new_title.size > 0
@@ -25,18 +29,16 @@ module Kinbote
       @attributes.delete_if{|att| att.pages.size == 0}
       @attributes = []
       add_attributes(attributes)
-      $site.add_kinbote_haml(self)
+      Page.add_metadata(self)
       set_ivars
     end
-  
+    
     def loosely_related_pages(attribute_names = nil)
       page_matches = []
       if !attribute_names
         page_matches += loosely_related_pages(@attributes.map{|a| a.name})
       elsif attribute_names.is_a?(Array)
-        attribute_names.each do |a_name|
-          page_matches += lrp(a_name)
-        end
+        attribute_names.each{ |a_name| page_matches += lrp(a_name) }
       else
         page_matches += lrp(attribute_names)
       end
@@ -48,30 +50,23 @@ module Kinbote
       if !attribute_names
         page_matches += strongly_related_pages(@attributes.map{|a| a.name})
       elsif attribute_names.is_a?(Array)
-        attribute_names.each do |a_name|
-          page_matches += srp(a_name, values)
-        end
+        attribute_names.each{ |a_name| page_matches += srp(a_name, values) }
       else
         page_matches += srp(attribute_names, values)
       end
       page_matches.uniq
     end
   
+    def attributes
+      sorted_attributes(@attributes)
+    end
+    
     def values
       vals = []
-      @attributes.each do |a|
-        a.values.each do |v|
-          vals << v
-        end
-      end
+      attributes.each{ |a| a.values.each{ |v| vals << v } }
       vals
     end
   
-    def delete_files
-      FileUtils.rm_f(file_path(:css))
-      FileUtils.rm_f(file_path(:html))
-    end
-  
     def path
       path = []
       in_path = false
@@ -82,39 +77,71 @@ module Kinbote
       "#{path.join("/")}/#{@slug}"
     end
   
-    def create_css
-      FileUtils.mkdir_p(file_path(:css, true)) if !File.exist?(file_path(:css, true))
-      File.open(file_path(:css), "w") if !File.exist?(file_path(:css))
-      @css = true
+    def to_s; @title; end
+    def url; "#{@slug}.html"; end
+    
+    def self.add_metadata(page = nil)
+      fname = "#{$site.kinbote_path}/views/#{page ? page.path : "index"}"
+      f_new = File.open("#{fname}.haml.new", "w")
+      File.read("#{fname}.haml").to_a.each do |line|
+        break if line.include?("-# Kinbote")
+        f_new.puts line
+      end
+      if page
+        kinbote_haml(f_new, "page_attributes_title")
+        kinbote_haml(f_new, "page_attributes", ["Title: #{page.title}"] + page.values.map{|v| "#{v.attribute.name}: #{v.value}"})
+        kinbote_haml(f_new, "header")
+        kinbote_haml(f_new, "specific", page.attributes.map{|a| a.varname})
+        kinbote_haml(f_new, "related", page.attributes.map{|a| a.name.downcase == "date" ? nil : a.name}.compact)
+        kinbote_haml(f_new, "related2", page.attributes.map{|a| "#{a.name}\", \"#{a.values.first.value}"})
+        kinbote_haml(f_new, "related_any")
+      else
+        kinbote_haml(f_new, "home", $site.attributes.map{|a| a.varname})
+      end
+      f_new.close
+      FileUtils.mv("#{fname}.haml.new", "#{fname}.haml")
+      page.reset_file_size(:html) if page
+      Page.add_metadata if page
     end
-  
-    def css_files
-      files = (css? ? ["/css/pages/#{@slug}"] : [])
-      @attributes.each do |attribute|
-        files += attribute.css_files
+
+    def self.kinbote_haml(f, example_name, replacements=nil)
+      return if replacements && replacements.size == 0 && example_name != "page_attributes"
+      File.read("#{$site.kinbote_path}/.kinbote/views/examples/#{example_name}.haml").to_a.each do |line|
+        if replacements && line.include?("$ALL_VALS$")
+          replacements.each do |r|
+            f.puts(line.gsub("$ALL_VALS$", r))
+          end
+        elsif replacements && line.include?("$ALL_VALS_COMMENTED$")
+          replacements.each_with_index do |r, i|
+            if i == replacements.size - 1
+              f.puts(line.gsub("$ALL_VALS_COMMENTED$", r))
+            else
+              f.puts(line.gsub("- ", "-# ").gsub("$ALL_VALS_COMMENTED$", r))
+            end
+          end
+        elsif replacements && line.include?("$FIRST_VAL$")
+          f.puts(line.gsub("$FIRST_VAL$", replacements.first))
+        elsif replacements && line.include?("$LAST_VAL$")
+          f.puts(line.gsub("$LAST_VAL$", replacements.last))
+        else
+          f.puts(line)
+        end
       end
-      files
+      f.puts "" 
     end
   
-    def file_path(type, dir = nil)
-      if type == :html
-        return @file if @file && !dir
-        return @directory if @directory && dir
-        return "#{$site.kinbote_path}/views/pages/#{Time.now.strftime("%Y/%m")}/#{!dir ? "/#{slugify(@title)}.haml" : ""}"
-      elsif type == :css
-        return "#{@directory}#{!dir ? "#{@slug}.sass" : ""}"
+  private
+    
+    def kv_to_attributes(keys, values)
+      attributes = {}
+      keys.each_with_index do |key, i|
+        next if key.size == 0
+        attributes[key] = [] if !attributes.has_key?(key)
+        attributes[key] << values[i] if !attributes[key].include?(values[i])
       end
+      attributes
     end
   
-    def set_filesize; @filesize = File.size(file_path(:html)); end
-    def get_filesize; @filesize; end
-    def to_s; @title; end
-    def css!; @css = true; end
-    def css?; @css; end
-    def url; "#{@slug}.html"; end
-  
-    private
-  
     def remove_title(attributes)
       new_title = nil
       title_keys = []
@@ -128,18 +155,10 @@ module Kinbote
       new_title.first
     end
   
-    def create_html
-      FileUtils.mkdir_p(file_path(:html, true)) if !File.exist?(file_path(:html, true))
-      if !File.exist?(file_path(:html))
-        File.open(file_path(:html), "w")
-        $site.add_kinbote_haml(self)
-      end
-    end
-  
     def set_ivars
       @attributes.each do |att|
-        instance_variable_set("@#{att._varname}", att.values)
-        Page.send(:define_method, att._varname.to_sym, Proc.new{ eval("@#{att._varname}") }) if !Page.respond_to?(att._varname)
+        instance_variable_set("@#{att.varname}", att.values)
+        Page.send(:define_method, att.varname.to_sym, Proc.new{ eval("@#{att.varname}") }) if !Page.respond_to?(att.varname)
       end
     end
   
@@ -150,19 +169,14 @@ module Kinbote
 
     def add_attributes(attributes)
       attributes.each do |name, values|
-        g_att = $site.find_attribute(name)
-        if g_att
-          g_att.add_page(self, values)
-        else
-          g_att = Attribute.new(name, self, values)
-          $site.add_attribute(g_att)
+        if BAD_ATTRIBUTE_VARNAMES.include?(varify(name))
+          $site.add_message("#{name} is an invalid attribute name")
+          next
         end
+        g_att = $site.find_attribute(name)
+        g_att ? g_att.add_page(self, values) : g_att = Attribute.new(name, self, values); $site.add_attribute(g_att)
         l_att = $site.find_attribute(name, self)
-        if l_att
-          l_att.add_page(self, values)
-        else
-          @attributes << Attribute.new(name, self, values, g_att)
-        end
+        l_att ? l_att.add_page(self, values) : @attributes << Attribute.new(name, self, values, g_att)
       end
     end
   

data/lib/kinbote/page_match.rb

@@ -1,8 +1,8 @@
 module Kinbote
   class PageMatch
-    attr_accessor :page, :attribute, :value
+    attr_reader :page, :attribute, :value
   
-    def initialize(page, attribute, value = nil)
+    def initialize(page, attribute, value=nil)
       @page = page
       @attribute = attribute
       @value = value