junebug 0.0.8 → 0.0.9

data/CHANGELOG

@@ -0,0 +1,40 @@
+v0.0.9 2006-11-10
+
+ * Mosquito unit tests
+
+v0.0.8 2006-11-08
+
+ * Style work
+ * Addd rss link to head
+ * Stylesheet update rake task
+
+v0.0.7 2006-11-07
+
+ * Redirect bugfix for proxied sites
+ 
+v0.0.6 2006-11-07
+
+  * Delete pages
+  * More style work
+
+v0.0.5 2006-11-06
+
+  * Style cleanups
+  * Security fix
+  * Format test page
+
+v0.0.4 2006-11-05
+
+  * Readonly pages
+  * Start page
+  * Bugfixes
+
+v0.0.3 2006-10-30
+
+  * User accounts
+  * Daemonize
+  * Default page fixtures
+
+v0.0.2 2006-10-22
+
+  * Initial release

data/README

@@ -5,7 +5,7 @@ Junebug is a minimalist wiki, running on Camping.
 
 == Status
 
-Junebug v0.0.8 release, 2006-11-08
+Junebug v0.0.9 release, 2006-11-10
 
 This is an alpha release.  Use at your own risk.  Please do not use this for anything important.
 

data/Rakefile

@@ -0,0 +1,97 @@
+$:.unshift './lib'
+
+require 'rubygems'
+require 'rake'
+require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'active_record'
+
+Gem.manage_gems
+
+gem_spec = Gem::Specification.new do |s|
+  s.name = 'junebug'
+  s.version = '0.0.9'
+  s.summary = "Junebug is a minimalist ruby wiki."
+  s.description = "Junebug is a minimalist ruby wiki running on Camping."
+  s.author = "Tim Myrtle"
+  s.email = 'tim.myrtle@gmail.com'
+  s.homepage = 'http://www.junebugwiki.com/'
+  
+  s.require_paths = ['lib']
+  s.bindir = 'bin'
+  s.executables = ['junebug']
+  s.files = FileList['README','LICENSE','CHANGELOG','Rakefile','lib/**/*','deploy/**/*','fixtures/**/*']
+  s.test_files = FileList['test/**/*']
+
+  s.add_dependency('mongrel', '>=0.3.13.4')
+  s.add_dependency('camping', '>=1.5')
+  s.add_dependency('RedCloth', '>=3.0.4')
+  s.add_dependency('daemons')
+  s.add_dependency('sqlite3-ruby', '>=1.1.0.1')
+  s.add_dependency('activerecord', '>=1.14.4')
+end
+
+Rake::GemPackageTask.new(gem_spec) do |pkg|
+  pkg.need_zip = false
+  pkg.need_tar = false
+end
+
+desc "View tidy html from dev server in editor"
+task :tidy do
+  system("curl http://localhost:3301/#{ENV['PAGE']} | tidy -i -wrap 1000 | #{ENV['VISUAL'] || ENV['EDITOR'] || 'vim' }")
+end
+
+
+
+
+desc "Clean up directory"
+task :clean => :clobber_package do
+  rm 'deploy/junebug.db', :force => true
+  rm 'deploy/junebug.log', :force => true
+  rm 'test/test.log', :force => true
+end
+
+
+desc 'Dump wiki pages'
+task :dump_pages do
+  fixtures_dir = File.join('.', 'fixtures')
+  
+  # clean out fixtures dir
+  puts "fixtures_dir: #{fixtures_dir}"
+  Dir[File.join(fixtures_dir, '*')].each { |f| rm_f(f, :verbose => false) }
+  
+  # open db connection
+  ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database  => "./deploy/junebug.db")
+  
+  # open fixtures file
+  File.open(File.join(fixtures_dir, "junebug_pages.yml"), 'w') do |file|
+    
+    # grab all pages
+    pages = Junebug::Models::Page.find(:all)
+    page_data = []
+    pages.each do |page|
+      page_data << page.attributes
+    end
+    
+    file.write page_data.to_yaml
+  end
+  
+  puts "Got pages and put them in #{fixtures_dir}."
+end
+
+
+desc 'Test the campground.'
+Rake::TestTask.new(:test) do |t|
+#  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+
+
+
+
+
+

data/bin/junebug

@@ -9,6 +9,8 @@ if ARGV.first.empty?
   exit
 end
 
+ENV['INTERACTIVE']='1'
+
 Junebug::Generator.generate(ARGV)
 
 

data/lib/junebug/generator.rb

@@ -8,7 +8,6 @@ module Junebug
     extend self
   
     def generate(args)
-      puts "In generator"
       src_root = File.dirname(__FILE__) + '/../../deploy'
       app = ARGV.first
       FileUtils.cp_r(src_root, app)

data/lib/junebug/models.rb

@@ -4,9 +4,21 @@ require 'acts_as_versioned'
 module Junebug::Models
 
   class User < Base
+    validates_uniqueness_of :username
+    validates_format_of :username, :with => /^([\w]*)$/
     validates_length_of :username, :within=>3..30
+    validates_format_of :password, :with => /^([\w]*)$/
     validates_length_of :password, :within=>5..30
     has_many :pages
+
+    def username=(text)
+      write_attribute(:username, (text ? text.strip.downcase : text) )
+    end
+
+    def password=(text)
+      write_attribute(:password, (text ? text.strip : text) )
+    end
+
   end
 
   class Page < Base
@@ -44,15 +56,15 @@ module Junebug::Models
       Page.reset_column_information
       
       # Create admin account
-      if ENV['DAEMONS_ARGV']
-        username = 'admin'
-        password = 'password'
-      else
+      if ENV['INTERACTIVE']
         print "Create an initial user account\n"
         print "\nEnter your username (3-30 chars, no spaces or punctuation): "
         username = STDIN.gets.strip
         print "\nEnter your password (5-30 chars, no spaces or punctuation): "
         password = STDIN.gets.strip
+      else
+        username = 'admin'
+        password = 'password'
       end
       admin = User.create :username => username, :password => password
       

data/lib/junebug/mosquito.rb

@@ -0,0 +1,210 @@
+%w(
+  rubygems
+  test/unit
+  active_record
+  active_record/fixtures
+  active_support/binding_of_caller
+  camping
+  fileutils
+  stringio
+  cgi
+).each { |lib| require lib }
+
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
+ActiveRecord::Base.logger = Logger.new("test/test.log")
+
+Test::Unit::TestCase.fixture_path = "test/fixtures/"
+
+class Test::Unit::TestCase #:nodoc:
+  def create_fixtures(*table_names)
+    if block_given?
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
+    else
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+    end
+  end
+
+  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
+  self.use_transactional_fixtures = true
+  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
+  self.use_instantiated_fixtures  = false
+end
+
+class MockRequest
+  def initialize
+    @headers = {
+      'SERVER_NAME' => 'localhost',
+      'PATH_INFO' => '',
+      'HTTP_ACCEPT_ENCODING' => 'gzip,deflate',
+      'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.8.0.1) Gecko/20060214 Camino/1.0',
+      'SCRIPT_NAME' => '/',
+      'SERVER_PROTOCOL' => 'HTTP/1.1',
+      'HTTP_CACHE_CONTROL' => 'max-age=0',
+      'HTTP_ACCEPT_LANGUAGE' => 'en,ja;q=0.9,fr;q=0.9,de;q=0.8,es;q=0.7,it;q=0.7,nl;q=0.6,sv;q=0.5,nb;q=0.5,da;q=0.4,fi;q=0.3,pt;q=0.3,zh-Hans;q=0.2,zh-Hant;q=0.1,ko;q=0.1',
+      'HTTP_HOST' => 'localhost',
+      'REMOTE_ADDR' => '127.0.0.1',
+      'SERVER_SOFTWARE' => 'Mongrel 0.3.12.4',
+      'HTTP_KEEP_ALIVE' => '300',
+      'HTTP_REFERER' => 'http://localhost/',
+      'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
+      'HTTP_VERSION' => 'HTTP/1.1',
+      'REQUEST_URI' => '/',
+      'SERVER_PORT' => '80',
+      'GATEWAY_INTERFACE' => 'CGI/1.2',
+      'HTTP_ACCEPT' => 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
+      'HTTP_CONNECTION' => 'keep-alive',
+      'REQUEST_METHOD' => 'GET',
+    }
+  end
+
+  def set(key, val)
+    @headers[key] = val
+  end
+    
+  def to_hash
+    @headers
+  end
+
+  def [](key)
+    @headers[key]
+  end
+
+  def []=(key, value)
+    @headers[key] = value
+  end
+
+  ##
+  # Allow getters like this:
+  #  o.REQUEST_METHOD
+
+  def method_missing(method_name, *args)
+    if @headers.has_key?(method_name.to_s)
+      return @headers[method_name.to_s]
+    else
+      super(method_name, args)
+    end
+  end
+
+end
+
+
+module Camping
+
+  class Test < Test::Unit::TestCase
+    
+    def test_dummy; end
+          
+    def deny(condition, message='')
+      assert !condition, message
+    end
+
+    # http://project.ioni.st/post/217#post-217
+    #
+    #  def test_new_publication
+    #    assert_difference(Publication, :count) do
+    #      post :create, :publication_title => ...
+    #      # ...
+    #    end
+    #  end
+    # 
+    # Is the number of items different?
+    #
+    # Can be used for increment and decrement.
+    #
+    def assert_difference(object, method = :count, difference = 1)
+      initial_value = object.send(method)
+      yield
+      assert_equal initial_value + difference, object.send(method), "#{object}##{method}"
+    end
+    def assert_no_difference(object, method, &block)
+      assert_difference object, method, 0, &block
+    end
+    
+  end
+  
+  class FunctionalTest < Test
+
+    def setup
+      @class_name_abbr = self.class.name.gsub(/Test$/, '')
+      @request = MockRequest.new
+    end
+
+    def get(url='/')
+      send_request url, {}, 'GET'
+    end
+
+    def post(url, post_vars={})
+      send_request url, post_vars, 'POST'
+    end
+
+    def send_request(url, post_vars, method)
+      @request['REQUEST_METHOD'] = method
+      @request['SCRIPT_NAME'] = '/' + @class_name_abbr.downcase
+      @request['PATH_INFO'] = '/' + url
+      @request['REQUEST_URI'] = [@request.SCRIPT_NAME, @request.PATH_INFO].join('')
+      
+      @request['HTTP_COOKIE'] = @cookies.map {|k,v| "#{k}=#{v}" }.join('; ') if @cookies
+      
+      @response = eval("#{@class_name_abbr}.run StringIO.new('#{qs_build(post_vars)}'), @request")
+      
+      @cookies = @response.headers['Set-Cookie'].inject(@cookies||{}) do |res,header|
+        data = header.split(';').first
+        name, value = data.split('=')
+        res[name] = value
+        res
+      end
+
+      if @response.headers['X-Sendfile']
+        @response.body = File.read(@response.headers['X-Sendfile'])
+      end      
+    end
+
+    def assert_response(status_code)
+      case status_code
+      when :success
+        assert_equal 200, @response.status
+      when :redirect
+        assert_equal 302, @response.status
+      when :error
+        assert @response.status >= 500
+      else
+        assert_equal status_code, @response.status
+      end
+    end
+
+    def assert_match_body(regex, message=nil)
+      assert_match regex, @response.body, message
+    end    
+    def assert_no_match_body(regex, message=nil)
+      assert_no_match regex, @response.body, message
+    end
+    
+    def assert_redirected_to(url, message=nil)
+      assert_equal  url, 
+                    @response.headers['Location'].path.gsub(%r!/#{@class_name_abbr.downcase}!, ''), 
+                    message
+    end
+    
+    def assert_cookie(name, pat, message=nil)
+        assert_match pat, @cookies[name], message
+    end
+
+    def test_dummy; end
+
+    private
+
+    def qs_build(var_hash)
+      var_hash.map do |k, v|
+        [Camping.escape(k.to_s), Camping.escape(v.to_s)].join('=')
+      end.join('&')
+    end
+
+  end
+
+  class UnitTest < Test
+    
+    def test_dummy; end
+  
+  end
+  
+end

data/lib/junebug/views.rb

@@ -75,10 +75,10 @@ module Junebug::Views
               text " Readonly"
               br
             end
-            input :type => 'submit', :name=>'submit', :value=>'delete', :class=>'button', :onclick=>'return confirm("You sure?")', :style=>'float: right;'
-            input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button'
+            _button 'cancel', :href => R(Show, @page.title, @page.version), :style=>'float: right;'
+            input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
+            input :type => 'submit', :name=>'submit', :value=>'delete', :class=>'button', :onclick=>'return confirm("You sure?")'
           end
-          _button 'cancel', :href => R(Show, @page.title, @page.version); text ' '
           a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
           br :clear=>'all'
         }

data/test/fixtures/junebug_users.yml

@@ -0,0 +1,4 @@
+id_1:
+  id: 1
+  username: admin
+  password: password

data/test/wiki_test.rb

@@ -0,0 +1,151 @@
+require File.dirname(__FILE__) + "/../lib/junebug/mosquito"
+require File.dirname(__FILE__) + "/../lib/junebug"
+
+Junebug.create
+include Junebug::Models
+
+# class JunebugTest < Camping::FunctionalTest
+# 
+#   fixtures :junebug_users
+#   
+#   def setup
+#     super
+#   end
+#   
+#   def test_index
+#     get
+#     assert_response :success
+#     assert_match_body %r!>blog<!
+#   end
+# 
+#   def test_view
+#     get '/view/1'
+#     assert_response :success
+#     assert_match_body %r!The quick fox jumped over the lazy dog!
+#   end
+#       
+#   def test_styles
+#     get 'styles.css'
+#     assert_match_body %r!Utopia!
+#   end
+# 
+#   def test_edit_should_require_login
+#     get '/edit/1'
+#     assert_response :success
+#     assert_match_body 'login'
+#   end
+# 
+#   def test_login
+#     post 'login', :username => 'quentin', :password => 'password'
+#     assert_match_body 'login success'
+#   end
+# 
+#   def test_comment
+#     assert_difference(Comment) {
+#       post 'comment', :post_username => 'jim', 
+#                       :post_body => 'Nice article.', 
+#                       :post_id => 1
+#       assert_response :redirect
+#       assert_redirected_to '/view/1'
+#     }
+#   end
+# 
+# end
+# 
+# class PostTest < Camping::UnitTest
+# 
+#   fixtures :junebug_users
+#       
+#   def test_create
+#     post = create
+#     assert post.valid?
+#   end
+# 
+#   def test_assoc
+#     post = Post.find :first
+#     assert_kind_of User, post.user
+#     assert_equal 1, post.user.id
+#   end
+# 
+#   def test_destroy
+#     original_count = Post.count
+#     Post.destroy 1
+#     assert_equal original_count - 1, Post.count
+#   end
+# 
+# private
+# 
+#   def create(options={})
+#     Post.create({ :user_id => 1, 
+#                   :title => "Title", 
+#                   :body => "Body"}.merge(options))
+#   end
+#     
+# end
+
+class UserTest < Camping::UnitTest
+
+  fixtures :junebug_users
+
+  def test_create
+    user = create
+    assert user.valid?
+  end
+
+  def test_required
+    user = create(:username => nil)
+    deny user.valid?
+    assert_not_nil user.errors.on(:username)
+    
+    user = create(:password => nil)
+    deny user.valid?
+    assert_not_nil user.errors.on(:password)
+  end
+
+  def test_valid_username
+    user = create(:username => 'aa')
+    deny user.valid?
+    assert_not_nil user.errors.on(:username)
+
+    user = create(:username => 'aaa aaa')
+    deny user.valid?
+    assert_not_nil user.errors.on(:username)
+  end
+
+  def test_valid_password
+    user = create(:password => 'aa')
+    deny user.valid?
+    assert_not_nil user.errors.on(:password)
+
+    user = create(:password => 'aaa aaa')
+    deny user.valid?
+    assert_not_nil user.errors.on(:password)
+  end
+
+  def test_unique
+    user = create(:username => 'admin')
+    deny user.valid?
+    assert_not_nil user.errors.on(:username)
+
+    user = create(:username => 'Admin')
+    deny user.valid?
+    assert_not_nil user.errors.on(:username)
+  end
+
+  def test_spaces
+    user = create(:username => 'aaaaaa  ', :password =>'aaaaaa  ')
+    assert user.valid?
+    assert user.username == 'aaaaaa'
+    assert user.password == 'aaaaaa'
+  end
+
+
+private
+  
+  def create(options={})
+    User.create({ :username => 'godfrey', 
+                  :password => 'password' }.merge(options))
+  end
+  
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: junebug
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
-date: 2006-11-08 00:00:00 -08:00
+  version: 0.0.9
+date: 2006-11-10 00:00:00 -08:00
 summary: Junebug is a minimalist ruby wiki.
 require_paths: 
 - lib
@@ -31,6 +31,8 @@ authors:
 files: 
 - README
 - LICENSE
+- CHANGELOG
+- Rakefile
 - lib/acts_as_versioned.rb
 - lib/junebug
 - lib/junebug.rb
@@ -40,6 +42,7 @@ files:
 - lib/junebug/generator.rb
 - lib/junebug/helpers.rb
 - lib/junebug/models.rb
+- lib/junebug/mosquito.rb
 - lib/junebug/views.rb
 - deploy/config.yml
 - deploy/console
@@ -55,8 +58,10 @@ files:
 - deploy/static/style/yui/grids.css
 - deploy/static/style/yui/reset.css
 - fixtures/junebug_pages.yml
-test_files: []
-
+test_files: 
+- test/fixtures
+- test/wiki_test.rb
+- test/fixtures/junebug_users.yml
 rdoc_options: []
 
 extra_rdoc_files: []