kinbote 0.0.2 → 0.0.3

data/README.rdoc

@@ -6,10 +6,17 @@ Install the gem:
 
   sudo gem install kinbote
 
-Create a new kinbote project and start the local server:
+Create a new kinbote project:
 
   kinbote mysite
+
+Edit your site configuration:
+
   cd mysite
+  [edit config.yml]
+
+Start the local server:
+
   ./kinbote-server
 
 Open the local site in your browser at http://localhost:4567

data/TODO

@@ -0,0 +1,3 @@
+max file size for rack
+draft/published?
+no more @globals?

data/bin/kinbote

@@ -11,4 +11,5 @@ if File.exists?(name)
 end
 
 FileUtils.copy_entry("#{File.dirname(__FILE__)}/../site", name)
+FileUtils.mv("#{name}/config.yml.sample", "#{name}/config.yml")
 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.2'
-  s.date = '2010-07-11'
+  s.version = '0.0.3'
+  s.date = '2010-08-03'
 
   s.description = "Kinbote"
   s.summary = "Kinbote"
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
  LICENSE
  README.rdoc
  Rakefile
+ TODO
  bin/kinbote
  kinbote.gemspec
  lib/kinbote.rb
@@ -31,6 +32,10 @@ Gem::Specification.new do |s|
  lib/kinbote/value.rb
  lib/sinatra/kinbote.rb
  lib/sinatra/kinbote_helpers.rb
+ site/.kinbote/js/core.js
+ site/.kinbote/js/jquery.js
+ site/.kinbote/sass/core.sass
+ site/.kinbote/sass/reset.sass
  site/.kinbote/views/attributes.haml
  site/.kinbote/views/examples/header.haml
  site/.kinbote/views/examples/home.haml
@@ -45,7 +50,7 @@ Gem::Specification.new do |s|
  site/.kinbote/views/page.haml
  site/.kinbote/views/pages.haml
  site/.kinbote/views/site.haml
- site/config/site.yml
+ site/config.yml.sample
  site/kinbote-server
  site/public/favicon.ico
  site/public/js/core.js

data/lib/kinbote/attribute.rb

@@ -2,13 +2,13 @@ module Kinbote
   class Attribute
     include Util
     include Kinfile
-    attr_reader :name
+    
+    attr_reader :name, :pages
 
-    def initialize(name, page, values, global=nil)
+    def initialize(name, page, values)
       @name = name.to_s
       @pages = []
       @values = []
-      @global = global || self
       add_page(page, values)
     end
 
@@ -16,27 +16,37 @@ module Kinbote
       @pages.delete_if{|p| p.slug == page.slug}
       @pages << page
       values.each do |v|
-        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)
-        l_val ? l_val.add_page(page) : @values << Value.new(v, page, @global, g_val)
+        val = $site.find_value(v, self)
+        val ? val.add_page(page) : @values << Value.new(v, page, self)
       end
     end
 
-    def remove_page(page)
-      @values.map{|value| value.remove_page(page)}
-      @global.pages.delete_if{|p| p.slug == page.slug}
+    def rem_page(page)
+      values_for(page).map{|value| value.rem_page(page)}
+      values_for(page).delete_if{|v| v.pages.size == 0}
       @pages.delete_if{|p| p.slug == page.slug}
-      @global.values.delete_if{|v| v.pages.size == 0}
-      @values.delete_if{|v| v.pages.size == 0}
     end
     
     def values
-      @values.sort{|x, y| x.value <=> y.value }
+      @values.sort!{|x, y| x.value <=> y.value}
+      @values
+    end
+    
+    def values_for(page=nil)
+      return @values if !page
+      slug = (page.is_a?(String) ? page : page.slug)
+      vals = []
+      @values.each do |v|
+        vals << v if v.has_page?(slug)
+      end
+      vals.sort{|x, y| x.value <=> y.value}
     end
     
+    def has_value?(v, page=nil)
+      values_for(page).map{|vv| vv.value}.include?(v)
+    end
+
     def varname; varify(@name); end
-    def pages; @global == self ? @pages : @global.pages; end
     def to_s; @name; end
 
   end

data/lib/kinbote/base.rb

@@ -16,5 +16,5 @@ require 'kinbote/value'
 require 'kinbote/page_match'
 
 module Kinbote
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/kinbote/kinfile.rb

@@ -51,19 +51,20 @@ module Kinbote
 
     private
   
-    def file_path(type, dir = nil)
+    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" : ""}"
+          #return "#{@directory}#{!dir ? "#{@slug}.sass" : ""}"
+          return "#{$site.kinbote_path}/views/sass/pages/#{Time.now.strftime("%Y/%m/%d")}/#{!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" : ""}"
+        return "#{$site.kinbote_path}/views/pages/#{Time.now.strftime("%Y/%m/%d")}#{!dir ? "/#{slugify(@title)}.haml" : ""}"
       end
     end
     

data/lib/kinbote/page.rb

@@ -13,7 +13,7 @@ module Kinbote
       @file = file || file_path(:html)
       @slug = slug_from_file(@file)
       @attributes = []
-      add_attributes(attributes || {"Date" => Time.now.strftime("%B %d, %Y")})
+      add_attributes(attributes || new_page_attributes)
       create_file(:html)
       Page.add_metadata(self) if !file
       set_ivars
@@ -21,11 +21,11 @@ module Kinbote
   
     def set_attributes(attributes, values=nil)
       attributes = kv_to_attributes(attributes, values) if values
-      new_title = remove_title(attributes)
+      new_title = rem_title(attributes)
       return if same_attributes(attributes, new_title)
       @title = new_title if new_title && new_title.size > 0
-      $site.remove_page_attributes(self)
-      @attributes.map{|att| att.remove_page(self)}
+      $site.rem_page_attributes(self)
+      @attributes.map{|att| att.rem_page(self)}
       @attributes.delete_if{|att| att.pages.size == 0}
       @attributes = []
       add_attributes(attributes)
@@ -33,7 +33,43 @@ module Kinbote
       set_ivars
     end
     
-    def loosely_related_pages(attribute_names = nil)
+    def add_attributes(attributes)
+      attributes.each do |name, values|
+        add_attribute(name, values)
+      end
+    end
+    
+    def add_attribute(name, values)
+      if BAD_ATTRIBUTE_VARNAMES.include?(varify(name))
+        $site.add_message("#{name} is an invalid attribute name")
+        next
+      end
+      att = $site.find_attribute(name) || Attribute.new(name, self, values)
+      att.add_page(self, values)
+      $site.add_attribute(att)
+      @attributes << att if !@attributes.map{|a| a.name}.include?(name)
+    end
+    
+    def rem_attribute(att_name)
+      @attributes.map{|att| att.rem_page(self) if att.name == att_name}
+      @attributes.delete_if{|att| att.name == att_name}
+      $site.attributes.delete_if{|att| att.pages.size == 0}
+    end
+    
+    def rem_value(att_name, val)
+      att = $site.find_attribute(att_name, self)
+      return if !att
+      v = $site.find_value(val, att)
+      return if !v || !v.has_page?(@slug)
+      v.rem_page(self)
+      att.rem_page(self) if att.values_for(self).size == 0
+      att.values_for(self).delete_if{|vv| vv.pages.size == 0}
+      @attributes.delete_if{|aa| aa.pages.size == 0 || aa.values_for(self).size == 0}
+      att.values.delete_if{|vv| vv.pages.size == 0}
+      $site.attributes.delete_if{|aa| aa.pages.size == 0 || aa.values.size == 0}
+    end
+    
+    def loosely_related_pages(attribute_names=nil)
       page_matches = []
       if !attribute_names
         page_matches += loosely_related_pages(@attributes.map{|a| a.name})
@@ -45,7 +81,7 @@ module Kinbote
       page_matches.uniq
     end
   
-    def strongly_related_pages(attribute_names = nil, values = nil)
+    def strongly_related_pages(attribute_names=nil, values=nil)
       page_matches = []
       if !attribute_names
         page_matches += strongly_related_pages(@attributes.map{|a| a.name})
@@ -63,9 +99,16 @@ module Kinbote
     
     def values
       vals = []
-      attributes.each{ |a| a.values.each{ |v| vals << v } }
+      attributes.each{ |a| a.values_for(self).each{ |v| vals << v } }
       vals
     end
+    
+    def filtered_by?(attribute=nil, value=nil)
+      return false if (!attribute || attribute.strip.size == 0) && (!value || value.strip.size == 0)
+      a = $site.find_attribute(attribute, self)
+      return true if !a
+      (!value || value.strip.size == 0 || ($site.find_value(value, a) && $site.find_value(value, a).has_page?(@slug))) ? false : true
+    end
   
     def path
       path = []
@@ -90,13 +133,15 @@ module Kinbote
       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")
+        if $site.print_sample_code?
+          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_for(page).first.value}"})
+          kinbote_haml(f_new, "related_any")
+        end
       else
-        kinbote_haml(f_new, "home", $site.attributes.map{|a| a.varname})
+        kinbote_haml(f_new, "home", $site.attributes.map{|a| a.varname}) if $site.print_sample_code?
       end
       f_new.close
       FileUtils.mv("#{fname}.haml.new", "#{fname}.haml")
@@ -109,28 +154,43 @@ module Kinbote
       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))
+            kinwrite(f, 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))
+              kinwrite(f, line.gsub("$ALL_VALS_COMMENTED$", r))
             else
-              f.puts(line.gsub("- ", "-# ").gsub("$ALL_VALS_COMMENTED$", r))
+              kinwrite(f, line.gsub("- ", "-# ").gsub("$ALL_VALS_COMMENTED$", r))
             end
           end
         elsif replacements && line.include?("$FIRST_VAL$")
-          f.puts(line.gsub("$FIRST_VAL$", replacements.first))
+          kinwrite(f, line.gsub("$FIRST_VAL$", replacements.first))
         elsif replacements && line.include?("$LAST_VAL$")
-          f.puts(line.gsub("$LAST_VAL$", replacements.last))
+          kinwrite(f, line.gsub("$LAST_VAL$", replacements.last))
         else
-          f.puts(line)
+          kinwrite(f, line)
         end
       end
       f.puts "" 
     end
+    
+    def self.kinwrite(f, line)
+      line.gsub!(/\t/, $site.config["haml_indentation"]) if ($site.config.has_key?("haml_indentation") && $site.config["haml_indentation"] != '\t')
+      f.puts(line)
+    end
+    
+    def has_attribute?(att_name)
+      @attributes.map{|a| a.name}.include?(att_name)
+    end
   
   private
+  
+    def new_page_attributes
+      atts = $site.config["new_page_attributes"] || {}
+      atts.merge!({"Date" => Time.now.strftime("%B %d, %Y")}) if atts.has_key?("Date")
+      atts
+    end
     
     def kv_to_attributes(keys, values)
       attributes = {}
@@ -142,7 +202,7 @@ module Kinbote
       attributes
     end
   
-    def remove_title(attributes)
+    def rem_title(attributes)
       new_title = nil
       title_keys = []
       attributes.each do |key, value|
@@ -164,39 +224,24 @@ module Kinbote
   
     def same_attributes(attributes, new_title)
       return false if !new_title || new_title.size == 0 || new_title != @title
-      @attributes.sort_by{|a| a.name}.map{|a| "#{a.name}#{a.values.sort_by{|v| v.value}.map{|v| v.value}.join}"}.join == attributes.to_a.sort_by{|a| a.first}.map{|a| "#{a.first}#{a.last.sort.join}"}.join
+      @attributes.sort_by{|a| a.name}.map{|a| "#{a.name}#{a.values_for(self).sort_by{|v| v.value}.map{|v| v.value}.join}"}.join == attributes.to_a.sort_by{|a| a.first}.map{|a| "#{a.first}#{a.last.sort.join}"}.join
     end
 
-    def add_attributes(attributes)
-      attributes.each do |name, values|
-        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)
-        l_att ? l_att.add_page(self, values) : @attributes << Attribute.new(name, self, values, g_att)
-      end
-    end
-  
     def srp(attribute_name, values)
       page_matches = []
-      l_att = $site.find_attribute(attribute_name, self)
-      g_att = $site.find_attribute(attribute_name)
-      return page_matches if !l_att || !g_att
-      l_att.values.each do |val|
+      att = $site.find_attribute(attribute_name, self)
+      return page_matches if !att
+      att.values_for(self).each do |val|
         next if values && values.size > 0 && !values.include?(val.value)
-        g_val = $site.find_value(val.value, g_att, true)
-        page_matches += (g_val.pages - [self]).map{|p| PageMatch.new(p, g_att, g_val)}
+        page_matches += (val.pages - [self]).map{|p| PageMatch.new(p, att, val)}
       end
       page_matches
     end
   
     def lrp(attribute_name)
-      g_att = $site.find_attribute(attribute_name)
-      return [] if !g_att || g_att.name.downcase == "date"
-      (g_att.pages - [self]).map{|p| PageMatch.new(p, g_att)}  
+      att = $site.find_attribute(attribute_name)
+      return [] if !att || att.name.downcase == "date"
+      (att.pages - [self]).map{|p| PageMatch.new(p, att)}  
     end
   
   end

data/lib/kinbote/site.rb

@@ -15,7 +15,6 @@ module Kinbote
     end
     
     def load
-      load_pages
     end
     
     def reload
@@ -30,15 +29,15 @@ module Kinbote
       nil
     end
 
-    def find_attribute(name, page = nil)
+    def find_attribute(name, page=nil)
       (page ? page.attributes : @attributes).each do |attribute|
         return attribute if (attribute.name == name || attribute.varname == varify(name))
       end
       nil
     end
 
-    def find_value(val, attribute, global = false)
-      (global ? @values : attribute.values).each do |value|
+    def find_value(val, attribute)
+      attribute.values.each do |value|
         return value if (value.value == val && (attribute.name == value.attribute.name || attribute.varname == varify(value.attribute.name)))
       end
       nil
@@ -54,30 +53,64 @@ module Kinbote
     
     def delete_page(slug)
       page = find_page(slug)
-      @attributes.map{|att| att.remove_page(page)}
+      @attributes.map{|att| att.rem_page(page)}
       @attributes.delete_if{|att| att.pages.size == 0}
       page.delete_files([:html, :css])
       @pages.delete_if{|p| p.slug == page.slug}
       Page.add_metadata
     end
     
-    def remove_page_attributes(page)
-      @attributes.map{|att| att.remove_page(page)}
+    def rem_page_attributes(page)
+      @attributes.map{|att| att.rem_page(page)}
       @attributes.delete_if{|att| att.pages.size == 0}
     end
     
+    def rem_page_attribute(page, att_name)
+      @attributes.map{|att| att.rem_page(page) if att.name == att_name}
+      @attributes.delete_if{|att| att.pages.size == 0}
+    end
+    
+    def bulk_update(slugs=[], action={})
+      return if !slugs || slugs.size == 0
+      slugs.each do |slug|
+        page = find_page(slug)
+        next if !page
+        if action["type"] == "add_attribute"
+          next if (!action.has_key?("attribute") || action["attribute"].strip.size == 0) || (!action.has_key?("value") || action["value"].strip.size == 0)
+          page.add_attribute(action["attribute"], [action["value"]])
+        elsif action["type"] == "rem_attribute"
+          next if !action.has_key?("attribute") || action["attribute"].strip.size == 0
+          if action.has_key?("value") && action["value"].strip.size > 0
+            page.rem_value(action["attribute"], action["value"])
+          else
+            page.rem_attribute(action["attribute"])
+          end
+        end
+        Page.add_metadata(page)
+      end
+    end
+    
     def pages
-      @pages.sort{|x, y| x.title <=> y.title }
+      @pages.sort{|x, y| x.title.downcase <=> y.title.downcase }
     end
     
     def attributes
       sorted_attributes(@attributes)
     end
-
+    
+    def print_sample_code?
+      @config.has_key?("print_sample_code") && @config["print_sample_code"] != false
+    end
+    
     def kinbote_path= (path); @kinbote_path = path; end
     
-    def add_attribute(attribute); @attributes << attribute; end
-    def add_value(value); @values << value; end
+    def add_attribute(attribute)
+      @attributes << attribute if !has_attribute?(attribute.name)
+    end
+    
+    def has_attribute?(att_name)
+      @attributes.map{|a| a.name}.include?(att_name)
+    end
     
     def add_message(message); @messages << message if !@messages.include?(message); end
     def has_messages?; @messages.size > 0; end
@@ -85,13 +118,6 @@ module Kinbote
     
   private
   
-    def load_pages
-      Dir.glob("#{@kinbote_path}/views/pages/**/*.{haml}").each do |file|
-        title, attributes = file_attributes(file)
-        create_page(title, file, attributes)
-      end
-    end
-    
     def reload_pages
       files = Dir.glob("#{@kinbote_path}/views/pages/**/*.{haml}")
       files.each do |file|
@@ -100,6 +126,7 @@ module Kinbote
         page = find_page(slug)
         if page
           next if File.size(file) == page.file_size(:html)
+          puts "Reload #{page.title}"
           page.set_attributes(attributes.merge({"title" => [title]}))
           page.reset_file_size(:html)
         else
@@ -132,7 +159,7 @@ module Kinbote
     end
     
     def read_config
-      @config = (File.exist?("#{@kinbote_path}/config/site.yml") ? YAML::load_file("#{@kinbote_path}/config/site.yml") : {"title" => "Kinbote Site"})
+      @config = (File.exist?("#{@kinbote_path}/config.yml") ? YAML::load_file("#{@kinbote_path}/config.yml") : {"title" => "Kinbote Site"})
       @config.each do |key, value|
         Site.send(:define_method, varify(key).to_sym, Proc.new{ @config[key] }) if !Site.respond_to?(varify(key).to_sym)
       end