teamon-rubber 0.0.4 → 0.0.5

data/README.textile

@@ -1,4 +1,4 @@
-h2. rubber v. 0.0.1
+h2. rubber v. 0.0.5
 
 Edytor szablonów Joggera
 
@@ -14,7 +14,7 @@ h3. Inicjalizacja
 <pre><code>
 mkdir my_jogger
 cd my_jogger
-rubber
+rubber configure
 </pre></code>
 
 h3. Pobranie plików z Joggera

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "rubber"
 GEM_NAME = "rubber"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Tymon Tobolski"
 EMAIL = "i@teamon.eu"
 HOMEPAGE = "http://teamon.eu/projekty/"
@@ -24,6 +24,7 @@ spec = Gem::Specification.new do |s|
   s.files = %w( LICENSE README.textile Rakefile ) +  Dir.glob("{bin,lib}/**/*")
   s.add_dependency('mechanize', '>= 0.9.0')
   s.add_dependency('thin')
+  s.add_dependency('ezcrypto', '>= 0.7.0')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/content.yml.sample

@@ -13,7 +13,22 @@
     :favicon: http://blog.teamon.eu/files/favicon.png
     :edit: true
     :class: owner # owner, jogger, guest, trackback
-  
+    
+- :subject: Lorem ipsum dolor sit amet
+  :content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p><EXCERPT><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  :date: 2009-05-08 22:19:41.282848 +02:00
+  :categories: [One, Two, Three]
+  :tags: [Ruby, Merb, Awesome]
+  :comments_allowed: true
+  :miniblog: true
+  :comments:
+  - :nick: teamon
+    :date: 2009-05-08 23:19:16.282848 +02:00
+    :content: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+    :favicon: http://blog.teamon.eu/files/favicon.png
+    :edit: true
+    :class: owner # owner, jogger, guest, trackback
+
 - :subject: Consectetur adipisicing elit
   :content: <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p><EXCERPT><p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
   :date: 2009-05-08 22:19:41.282848 +02:00

data/lib/rubber.rb

@@ -1,4 +1,5 @@
 require 'mechanize'
+require 'ezcrypto'
 
 class Rubber
   def initialize(args)
@@ -7,22 +8,9 @@ class Rubber
   end
 
   def run
-    load_config_file
-  end
-
-  protected
-
-  def load_config_file
-    if File.exists?("config.yml")
-      @config = YAML.load(File.read("config.yml"))
-    else
-      File.open("config.yml", "w") {|f| f.write YAML.dump({:jabber_id => "your@jabber.id", :password => "secret"}) }
-      File.open("content.yml", "w") {|f| f.write File.read(File.join(File.dirname(__FILE__), "content.yml.sample")) } unless File.exists?("content.yml")
-      puts "Brak pliku config.yml. Przykładowy plik został utworzony."
-      exit
-    end
-
     case @args[0]
+    when 'configure'
+      configure
     when 'download'
       download
     when 'upload'
@@ -35,6 +23,36 @@ class Rubber
     end
   end
 
+  protected
+
+  def ez
+    EzCrypto::Key.with_password "password", (RUBY_PLATFORM =~ /mswin32/ ? `hostname` : `uname -a`)
+  end
+
+  def load_config_file
+    if File.exists?("config.yml")
+      @config = YAML.load(File.read("config.yml"))
+      @config[:password] = ez.decrypt64 @config[:password]
+    else
+      puts "Brak pliku config.yml. Uruchom 'rubber configure'"
+      exit
+    end
+  end
+
+  def configure
+    print "jabber id: "
+    id = STDIN.gets.chomp
+    print "hasło: "
+    system "stty -echo"
+    pass = ez.encrypt64 STDIN.gets.chomp
+    system "stty echo"
+    puts
+
+    File.open("config.yml", "w") {|f| f.write YAML.dump({:jabber_id => id, :password => pass}) }
+    File.open("content.yml", "w") {|f| f.write File.read(File.join(File.dirname(__FILE__), "content.yml.sample")) } unless File.exists?("content.yml")
+    puts "Plik config.yml został utworzony."
+  end
+
   def server
     system("thin start -R #{File.join(File.dirname(__FILE__), "server.ru")} -p 1337")
   end
@@ -121,6 +139,7 @@ class Rubber
   end
 
   def login
+    load_config_file
     form = @agent.get('https://login.jogger.pl/login/').forms.first
     form.login_jabberid = @config[:jabber_id]
     form.login_jabberpass = @config[:password]

data/lib/server.ru

@@ -1,8 +1,6 @@
 require 'rack/response'
 
 
-J = YAML.load(File.read("content.yml"))
-
 MONTHS = %w(stycznia lutego marca kwietnia maja czerwca lipa sierpnia września pażdziernika listopada grudnia)
 
 def tag(body, pattern, replacement)
@@ -26,9 +24,9 @@ def parse_with_comment(body, comment, counter = 0)
   tag body, "COMMENT_ID", rand(100)
   tag body, "COMMENT_NICK_CLASS", comment[:class]
   
-  body.gsub!(%r|<COMMENT_FAVICON_EXIST>(.+)</COMMENT_FAVICON_EXIST>|m) { comment[:favicon] ? parse_with_comment($1, comment, counter) : "" }
-  body.gsub!(%r|<COMMENT_FAVICON_NOT_EXIST>(.+)</COMMENT_FAVICON_NOT_EXIST>|m) { comment[:favicon] ? "" : parse_with_comment($1, comment, counter) }
-  body.gsub!(%r|<COMMENT_EDIT_EXIST>(.+)</COMMENT_EDIT_EXIST>|m) { comment[:edit] ? parse_with_comment($1, comment, counter) : "" }
+  body.gsub!(%r|<COMMENT_FAVICON_EXIST>(.+?)</COMMENT_FAVICON_EXIST>|m) { comment[:favicon] ? parse_with_comment($1, comment, counter) : "" }
+  body.gsub!(%r|<COMMENT_FAVICON_NOT_EXIST>(.+?)</COMMENT_FAVICON_NOT_EXIST>|m) { comment[:favicon] ? "" : parse_with_comment($1, comment, counter) }
+  body.gsub!(%r|<COMMENT_EDIT_EXIST>(.+?)</COMMENT_EDIT_EXIST>|m) { comment[:edit] ? parse_with_comment($1, comment, counter) : "" }
 end
 
 def parse_with_entry(body, entry, counter = 0)
@@ -47,15 +45,15 @@ def parse_with_entry(body, entry, counter = 0)
   tag body, "ENTRY_CONTENT", entry[:content].sub(%r|<EXCERPT>|, "")
   tag body, "ENTRY_CONTENT_LONG", entry[:content].split(%r|<EXCERPT>|).last
   tag body, "ENTRY_CONTENT_SHORT", entry[:content].split(%r|<EXCERPT>|).first
-  body.gsub!(%r|<ENTRY_CONTENT_SHORT_EXIST>(.+)</ENTRY_CONTENT_SHORT_EXIST>|m) { entry[:content]["<EXCERPT>"] ? parse_with_entry($1, entry) : "" }
-  body.gsub!(%r|<ENTRY_CONTENT_SHORT_NOT_EXIST>(.+)</ENTRY_CONTENT_SHORT_NOT_EXIST>|m) { entry[:content]["<EXCERPT>"] ? "" : parse_with_entry($1, entry) }
+  body.gsub!(%r|<ENTRY_CONTENT_SHORT_EXIST>(.+?)</ENTRY_CONTENT_SHORT_EXIST>|m) { entry[:content]["<EXCERPT>"] ? parse_with_entry($1, entry) : "" }
+  body.gsub!(%r|<ENTRY_CONTENT_SHORT_NOT_EXIST>(.+?)</ENTRY_CONTENT_SHORT_NOT_EXIST>|m) { entry[:content]["<EXCERPT>"] ? "" : parse_with_entry($1, entry) }
   
   tag body, "ENTRY_COMMENT_HREF", "/entry"
   tag body, "ENTRY_COMMENT_HREF_DESCR", entry[:comments] ? "#{entry[:comments].size} komentarzy" : "Brak komentarzy"
   tag body, "ENTRY_CLASS", "entry#{(counter % 2)+1}"
   entry_counter = 0 if body["ENTRY_CLASS_RESET"]
   
-  body.gsub!(%r|<ENTRY_CATEGORY_BLOCK>(.+)</ENTRY_CATEGORY_BLOCK>|m) do
+  body.gsub!(%r|<ENTRY_CATEGORY_BLOCK>(.+?)</ENTRY_CATEGORY_BLOCK>|m) do
     category_block = $1
     category_counter = -1
     entry[:categories].map do |category|
@@ -66,13 +64,13 @@ def parse_with_entry(body, entry, counter = 0)
       tag catbody, "ENTRY_CATEGORY_HREF", "/za_duzo_bys_chcial"
       tag catbody, "ENTRY_CATEGORY_HREF_DESCR", category
       tag catbody, "ENTRY_CATEGORY_TITLE", category
-      catbody.gsub!(%r|<ENTRY_CATEGORY_NOT_LAST>(.+)</ENTRY_CATEGORY_NOT_LAST>|m) { category_counter == entry[:categories].size-1 ? "" : $1 }
+      catbody.gsub!(%r|<ENTRY_CATEGORY_NOT_LAST>(.+?)</ENTRY_CATEGORY_NOT_LAST>|m) { category_counter == entry[:categories].size-1 ? "" : $1 }
       catbody
     end.join
   end
   
-  body.gsub!(%r|<ENTRY_TAG_BLOCK_EXIST>(.+)</ENTRY_TAG_BLOCK_EXIST>|m) { entry[:tags] ? parse_with_entry($1, entry) : "" }
-  body.gsub!(%r|<ENTRY_TAG_BLOCK>(.+)</ENTRY_TAG_BLOCK>|m) do
+  body.gsub!(%r|<ENTRY_TAG_BLOCK_EXIST>(.+?)</ENTRY_TAG_BLOCK_EXIST>|m) { entry[:tags] ? parse_with_entry($1, entry) : "" }
+  body.gsub!(%r|<ENTRY_TAG_BLOCK>(.+?)</ENTRY_TAG_BLOCK>|m) do
     tag_block = $1
     entry[:tags].map do |t|
       tagbody = tag_block.dup
@@ -82,14 +80,14 @@ def parse_with_entry(body, entry, counter = 0)
   end
   
   tag body, "ENTRY_TRACKBACK_HREF", entry[:trackback]
-  body.gsub!(%r|<ENTRY_TRACKBACK_EXIST>(.+)</ENTRY_TRACKBACK_EXIST>|m) { entry[:trackback] ? parse_with_entry($1, entry) : "" }
-  body.gsub!(%r|<ENTRY_TRACKBACK_NOT_EXIST>(.+)</ENTRY_TRACKBACK_NOT_EXIST>|m) { entry[:trackback] ? "" : parse_with_entry($1, entry) }
+  body.gsub!(%r|<ENTRY_TRACKBACK_EXIST>(.+?)</ENTRY_TRACKBACK_EXIST>|m) { entry[:trackback] ? parse_with_entry($1, entry) : "" }
+  body.gsub!(%r|<ENTRY_TRACKBACK_NOT_EXIST>(.+?)</ENTRY_TRACKBACK_NOT_EXIST>|m) { entry[:trackback] ? "" : parse_with_entry($1, entry) }
   
   ["PREV", "NEXT"].each do |type|
     p = entry[type.downcase.to_sym]
     
-    body.gsub!(%r|<ENTRY_#{type}_EXIST>(.+)</ENTRY_#{type}_EXIST>|m) { p ? parse_with_entry($1, entry) : "" }
-    body.gsub!(%r|<ENTRY_#{type}_NOT_EXIST>(.+)</ENTRY_#{type}_NOT_EXIST>|m) { p ? "" : parse_with_entry($1, entry) }
+    body.gsub!(%r|<ENTRY_#{type}_EXIST>(.+?)</ENTRY_#{type}_EXIST>|m) { p ? parse_with_entry($1, entry) : "" }
+    body.gsub!(%r|<ENTRY_#{type}_NOT_EXIST>(.+?)</ENTRY_#{type}_NOT_EXIST>|m) { p ? "" : parse_with_entry($1, entry) }
    
     if p
       tag body, "ENTRY_#{type}_SUBJECT", p[:subject]
@@ -101,18 +99,18 @@ def parse_with_entry(body, entry, counter = 0)
     end
   end
 
-  body.gsub!(%r|<ENTRY_IS_MINIBLOG>(.+)</ENTRY_IS_MINIBLOG>|m) { entry[:miniblog] ? parse_with_entry($1, entry) : "" }
+  body.gsub!(%r|<ENTRY_IS_MINIBLOG>(.+?)</ENTRY_IS_MINIBLOG>|m) { entry[:miniblog] ? parse_with_entry($1, entry) : "" }
   
   body
 end
 
-def parse(type, body)
-  body.gsub!(%r|<INCLUDE>(.+)</INCLUDE>|) { parse nil, File.read("files/#{$1}") }
+def parse(type, body)  
+  body.gsub!(%r|<INCLUDE>(.+?)</INCLUDE>|) { parse nil, File.read("files/#{$1}") }
   
-  body.gsub!(%r|<ARCHIVE_BLOCK>(.+)</ARCHIVE_BLOCK>|m) do
+  body.gsub!(%r|<ARCHIVE_BLOCK>(.+?)</ARCHIVE_BLOCK>|m) do
     archive_block = $1
     archive_counter = -1
-    J[:archive].map do |archive|
+    @Jogger[:archive].map do |archive|
       archive_counter += 1
       archbody = archive_block.dup
       
@@ -121,15 +119,15 @@ def parse(type, body)
       tag archbody, "ARCHIVE_HREF_DESCR", archive[:name]
       tag archbody, "ARCHIVE_CLASS", "archive#{(archive_counter % 2)+1}"
       tag archbody, "ARCHIVE_CURRENT_DESCR", "Maj 2009"
-      archbody.gsub!(%r|<ARCHIVE_NOT_LAST>(.+)</ARCHIVE_NOT_LAST>|m) { archive_counter == J[:archive].size-1 ? "" : $1 }
+      archbody.gsub!(%r|<ARCHIVE_NOT_LAST>(.+?)</ARCHIVE_NOT_LAST>|m) { archive_counter == @Jogger[:archive].size-1 ? "" : $1 }
       archbody
     end.join
   end
   
-  body.gsub!(%r|<CATEGORY_BLOCK>(.+)</CATEGORY_BLOCK>|m) do
+  body.gsub!(%r|<CATEGORY_BLOCK>(.+?)</CATEGORY_BLOCK>|m) do
     category_block = $1
     category_counter = -1
-    J[:categories].map do |category|
+    @Jogger[:categories].map do |category|
       catbody = category_block.dup
       category_counter += 1
       
@@ -141,21 +139,21 @@ def parse(type, body)
       tag catbody, "CATEGORY_ID", category_counter
       tag catbody, "CATEGORY_LEVEL", rand(6)
       tag catbody, "CATEGORY_SUB_CLASS", "subcategory#{category[:sub]}"
-      catbody.gsub!(%r|<CATEGORY_NOT_LAST>(.+)</CATEGORY_NOT_LAST>|m) { category_counter == J[:categories].size-1 ? "" : $1 }
+      catbody.gsub!(%r|<CATEGORY_NOT_LAST>(.+?)</CATEGORY_NOT_LAST>|m) { category_counter == @Jogger[:categories].size-1 ? "" : $1 }
       catbody
     end.join
   end
   
-  body.gsub!(%r|<LINK_BLOCK_EXIST>(.+)</LINK_BLOCK_EXIST>|m) { J[:links] ? parse(nil, $1) : "" }
+  body.gsub!(%r|<LINK_BLOCK_EXIST>(.+?)</LINK_BLOCK_EXIST>|m) { @Jogger[:links] ? parse(nil, $1) : "" }
     
-  body.gsub!(%r|<LINK_GROUP_BLOCK>(.+)</LINK_GROUP_BLOCK>|m) do
+  body.gsub!(%r|<LINK_GROUP_BLOCK>(.+?)</LINK_GROUP_BLOCK>|m) do
     link_group_block = $1
     link_counter = -1
-    J[:links].map do |link_group|
+    @Jogger[:links].map do |link_group|
       grobody = link_group_block.dup
       tag grobody, "LINK_GROUP_DESCR", link_group[:name]
       
-      grobody.gsub!(%r|<LINK_BLOCK>(.+)</LINK_BLOCK>|m) do
+      grobody.gsub!(%r|<LINK_BLOCK>(.+?)</LINK_BLOCK>|m) do
         link_block = $1
         link_group[:links].map do |link|
           link_counter += 1
@@ -175,26 +173,59 @@ def parse(type, body)
     end.join
   end
   
+  tag body, "JID", "me@jabber.foo"
+  tag body, "JOG_TITLE", "My super awesome jogger"
+  tag body, "JOG", "teamon"
+  tag body, "HOME", "/"
+  tag body, "RSS", "/rss"
+  tag body, "ALL_ENTRIES_HREF", "/"
+  tag body, "CURRENT_PAGE_HREF", "/entry"
+  
+  tag body, "HEADER", <<-HEADER
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="robots" content="noindex, nofollow">
+<title>Jogger :: teamon</title>
+<link rel="StyleSheet" href="/files/style.css" type="text/css">
+</head>
+<body>
+  HEADER
+  
+  tag body, "FOOTER", <<-FOOTER  
+</body>
+</html>
+  FOOTER
+  
   case type
   when :entries
-    body.gsub!(%r|<ENTRY_BLOCK>(.+)</ENTRY_BLOCK>|m) do
+    body.gsub!(%r|<MINIBLOG_BLOCK>(.+?)</MINIBLOG_BLOCK>|m) do
+      $1.gsub!(%r|<ENTRY_BLOCK>(.+?)</ENTRY_BLOCK>|m) do
+        entry_block = $1
+        entry_counter = -1
+        @Jogger[:entries].select {|e| e[:miniblog] }.map {|entry| parse_with_entry(entry_block.dup, entry, entry_counter += 1) }.join    
+      end
+    end
+    
+    body.gsub!(%r|<ENTRY_BLOCK>(.+?)</ENTRY_BLOCK>|m) do
       entry_block = $1
       entry_counter = -1
-      J[:entries].map {|entry| parse_with_entry(entry_block.dup, entry, entry_counter += 1) }.join    
+      @Jogger[:entries].reject {|e| e[:miniblog] }.map {|entry| parse_with_entry(entry_block.dup, entry, entry_counter += 1) }.join    
     end
     
-    body.gsub!(%r|<PAGE_BLOCK_EXIST>(.+)</PAGE_BLOCK_EXIST>|) { parse(:entries, $1) }
-    body.gsub!(%r|<PAGE_PREV_EXIST>(.+)</PAGE_PREV_EXIST>|) { parse(:entries, $1) }
-    body.gsub!(%r|<PAGE_NEXT_EXIST>(.+)</PAGE_NEXT_EXIST>|) { parse(:entries, $1) }
+    body.gsub!(%r|<PAGE_BLOCK_EXIST>(.+?)</PAGE_BLOCK_EXIST>|) { parse(:entries, $1) }
+    body.gsub!(%r|<PAGE_PREV_EXIST>(.+?)</PAGE_PREV_EXIST>|) { parse(:entries, $1) }
+    body.gsub!(%r|<PAGE_NEXT_EXIST>(.+?)</PAGE_NEXT_EXIST>|) { parse(:entries, $1) }
     tag body, "PAGE_PREV_HREF", "/prev"
     tag body, "PAGE_NEXT_HREF", "/next"
     
 
   when :comments
-    entry = J[:entries].first
+    entry = @Jogger[:entries].first
     parse_with_entry(body, entry)
     
-    body.gsub!(%r|<COMMENT_BLOCK>(.+)</COMMENT_BLOCK>|m) do
+    body.gsub!(%r|<COMMENT_BLOCK>(.+?)</COMMENT_BLOCK>|m) do
       comment_block = $1
       comment_counter = -1
       entry[:comments].map do |comment|
@@ -202,10 +233,10 @@ def parse(type, body)
       end.join   
     end
 
-    body.gsub!(%r|<COMMENT_BLOCK_EXIST>(.+)</COMMENT_BLOCK_EXIST>|m) { entry[:comments] ? parse(:comments, $1) : "" }
-    body.gsub!(%r|<COMMENT_BLOCK_NOT_EXIST>(.+)</COMMENT_BLOCK_NOT_EXIST>|m) { entry[:comments] ? "" : parse(:comments, $1) }    
-    body.gsub!(%r|<COMMENT_ALLOWED_BLOCK>(.+)</COMMENT_ALLOWED_BLOCK>|m) { entry[:comments_allowed] ? parse(:comments, $1) : "" }   
-    body.gsub!(%r|<COMMENT_NONE_BLOCK>(.+)</COMMENT_NONE_BLOCK>|m) { entry[:comments_allowed] ? "" : parse(:comments, $1) }    
+    body.gsub!(%r|<COMMENT_BLOCK_EXIST>(.+?)</COMMENT_BLOCK_EXIST>|m) { entry[:comments] ? parse(:comments, $1) : "" }
+    body.gsub!(%r|<COMMENT_BLOCK_NOT_EXIST>(.+?)</COMMENT_BLOCK_NOT_EXIST>|m) { entry[:comments] ? "" : parse(:comments, $1) }    
+    body.gsub!(%r|<COMMENT_ALLOWED_BLOCK>(.+?)</COMMENT_ALLOWED_BLOCK>|m) { entry[:comments_allowed] ? parse(:comments, $1) : "" }   
+    body.gsub!(%r|<COMMENT_NONE_BLOCK>(.+?)</COMMENT_NONE_BLOCK>|m) { entry[:comments_allowed] ? "" : parse(:comments, $1) }    
     
     
     
@@ -260,7 +291,7 @@ def parse(type, body)
     FORM
     
     
-    body.gsub!(%r|<COMMENT_FORM_BLOCK>(.+)</COMMENT_FORM_BLOCK>|m) { $1 }
+    body.gsub!(%r|<COMMENT_FORM_BLOCK>(.+?)</COMMENT_FORM_BLOCK>|m) { $1 }
       
     tag body, "COMMENT_FORM_ACTION", "/lawl"
     tag body, "COMMENT_FORM_BODY", "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@@ -277,9 +308,9 @@ def parse(type, body)
   when :login
     
   when :page
-    tag body, "PAGE_SUBJECT", J[:pages].first[:subject]
-    tag body, "PAGE_TITLE", J[:pages].first[:subject]
-    tag body, "PAGE_CONTENT", J[:pages].first[:content]
+    tag body, "PAGE_SUBJECT", @Jogger[:pages].first[:subject]
+    tag body, "PAGE_TITLE", @Jogger[:pages].first[:subject]
+    tag body, "PAGE_CONTENT", @Jogger[:pages].first[:content]
   else
     
   end
@@ -293,6 +324,8 @@ app = Proc.new do |env|
   if path =~ %r[/files/]
     Rack::File.new(Dir.pwd).call(env)
   else
+    @Jogger = YAML.load(File.read("content.yml"))
+    
     content = case path
     when "/"
       parse :entries, File.read("Szablon wpisów.html")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: teamon-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tymon Tobolski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-09 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: rubber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ezcrypto
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
 description: "Edytor szablon\xC3\xB3w Joggera"
 email: i@teamon.eu
 executables: