Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 4 files changed
  • 0 commit comments
  • 3 contributors
Showing with 14 additions and 13 deletions.
  1. +1 −0  .gitignore
  2. +11 −0 Gemfile
  3. +0 −5 bin/parkplace
  4. +2 −8 lib/parkplace.rb
View
1  .gitignore
@@ -0,0 +1 @@
+Gemfile.lock
View
11 Gemfile
@@ -0,0 +1,11 @@
+source 'http://rubygems.org'
+
+gem 'camping', '~> 1.5.180'
+gem 'rack', '~> 1.0.1'
+gem 'activesupport', '~> 2.2.0'
+gem 'activerecord', '~> 2.2.0'
+gem 'mongrel'
+
+group :sqlite do
+ gem 'sqlite3'
+end
View
5 bin/parkplace
@@ -3,16 +3,11 @@ $:.unshift "./lib"
require 'optparse'
$PARKPLACE_ACCESSORIES = true
require 'rubygems'
-gem 'mongrel'
-gem 'activesupport', '~> 2.2.0'
-gem 'activerecord', '~> 2.2.0'
require 'parkplace'
DEFAULT_PASSWORD = 'pass@word1'
DEFAULT_SECRET = 'OtxrzxIsfpFjA7SwPzILwy8Bw21TLhquhboDYROV'
-#
-
options = ParkPlace.options
options.host = "127.0.0.1"
options.port = 3002
View
10 lib/parkplace.rb
@@ -1,4 +1,5 @@
require 'rubygems'
+require 'metaid'
require 'camping'
require 'camping/session'
require 'digest/sha1'
@@ -6,6 +7,7 @@
require 'time'
require 'md5'
+require 'active_record'
require 'active_record/acts/nested_set'
ActiveRecord::Base.send :include, ActiveRecord::Acts::NestedSet
@@ -80,14 +82,6 @@ def config(options)
end
options.storage_dir = File.expand_path(options.storage_dir || 'storage', options.parkplace_dir)
options.database ||= {:adapter => 'sqlite3', :database => File.join(options.parkplace_dir, 'park.db')}
- if options.database[:adapter] == 'sqlite3'
- begin
- require 'sqlite3_api'
- rescue LoadError
- puts "!! Your SQLite3 adapter isn't a compiled extension."
- abort "!! Please check out http://code.whytheluckystiff.net/camping/wiki/BeAlertWhenOnSqlite3 for tips."
- end
- end
ParkPlace::STORAGE_PATH.replace options.storage_dir
end
def serve(host, port)

No commit comments for this range

Something went wrong with that request. Please try again.