sinatra-s3 0.98 → 0.99

data/README

@@ -1,23 +1,41 @@
-An implementation of the S3 API in Sinatra.  Most of the code was originaly taken from
-ParkPlace, another S3 clone written by _why.
+Sinatra-S3 is an implementation of the Amazon S3 API.  Based on the
+Parkplace, written by _why, Sinatra-S3 has been extended to provide
+additional support for ACLs, versioning and a bittorrent tracker.
 
-Requirements
--------------------------------------------------------
+Install
+------------------------------------------------------------------
 
-  gem install sinatra haml aws-s3
+To install or upgrade Sinatra-S3
 
-Optional Torrent Support
--------------------------------------------------------
+  sudo gem install sinatra-s3
+  sinatra-s3 directory
+  cd directory
+  rake db:migrate
 
-If you are interested in using Sinatra-S3 as a Bittorrent tracker you will need a custom
-version of RubyTorrent found at http://github.com/nricciar/rubytorrent.
+Or we could install from github (bleeding edge, may not work)
 
-Install
--------------------------------------------------------
-
-  1) cp s3.yml.example s3.yml
-  2) edit s3.yml to suit your needs
-  3) rake db:migrate
-  4) rackup config.ru -p 6060
-  5) go to http://localhost:6060/control/ and login with the username admin and the
-     password pass@word1
+  sudo gem install sinatra builder aws-s3
+  git clone git://github.com/nricciar/sinatra-s3.git
+  cd sinatra-s3/
+  cp s3.yml.example s3.yml
+  rake db:migrate
+
+Optional Gems
+
+ruby-git     - Enable S3 versioning support.
+rubytorrent* - Enable S3 torrent support. 
+
+* A custom version of rubytorrent is required to enable bittorrent 
+  support. see http://github.com/nricciar/rubytorrent. 
+
+Setup
+------------------------------------------------------------------
+
+Once Sinatra-S3 has been installed we can start our server and log in 
+with the default username admin and password pass@word1. 
+
+  rackup config.ru -p 6060
+
+Once running log in with the username admin and password pass@word1 
+via the control center at http://127.0.0.1:6060/control/.  Make sure
+to change your password!

data/bin/sinatra-s3

@@ -7,24 +7,56 @@ if ARGV.any? { |arg| %w(--version -v).any? { |flag| arg == flag } }
   exit 0
 end
 
-app_path = ARGV.last
-install_success = false
+if ARGV.any? { |arg| %w(--help -h).any? { |flag| arg == flag } }
+  puts "sinatra-s3 [options] install_dir\n\n"
+  puts "  --version -v    Get version string"
+  puts "  --help -h       this"
+  puts "  --include-wiki  installs sinatra-s3 with wiki support"
+  exit 0
+end
 
-unless File.exists?(app_path)
-  FileUtils.mkdir_p(app_path)
+$APP_PATH = ARGV.last
 
-  config_ru = "require 'rubygems'\nrequire 'sinatra-s3'"
-  if ARGV.any? { |arg| %w(--include-wiki --wiki).any? { |flag| arg == flag } }
-    FileUtils.copy(File.join(S3::ROOT_DIR,"examples","wiki.rb"), File.join(app_path,"wiki.rb"))
-    config_ru += "\nrequire 'wiki'"
+def check_install(file,data)
+  file_path = File.join($APP_PATH, file)
+  if File.exists?(file_path)
+    if Digest::MD5.hexdigest(data) == Digest::MD5.hexdigest(File.read(file_path))
+      install_msg("identical",file)
+    else
+      if ['y','a',''].include?(verify_overwrite(file).downcase)
+        File.open(file_path,"w") { |f| f.write(data) }
+	install_msg("force",file)
+      else
+	install_msg("skip",file)
+      end
+    end
+  else
+    install_msg("create", file)
+    File.open(file_path,"w") { |f| f.write(data) }
   end
-  config_ru += "\n\nuse S3::Tracker if defined?(RubyTorrent)\nuse S3::Admin\nrun S3::Application"
-  File.open(File.join(app_path,"config.ru"),"w") { |f| f.write(config_ru) }
+end
+def install_msg(status, msg)
+  print status.rjust(10) + " #{msg}\n"
+end
+def verify_overwrite(file)
+  return 'a' if $SKIP_INSTALL_VERIFY
+
+  print "overwrite #{file} [Yna] "
+  resp = STDIN.gets.chomp
+  $SKIP_INSTALL_VERIFY = true if resp.downcase == "a"
 
-  File.open(File.join(app_path,"Rakefile"),"w") { |f| f.write("require 'sinatra-s3/tasks'") }
-  FileUtils.copy(File.join(S3::ROOT_DIR,"s3.yml.example"), File.join(app_path,"s3.yml"))
+  resp = verify_overwrite(file) unless ['y','n','a',''].include?(resp.downcase)
+  resp
+end
 
-  puts "Sinatra-S3 installed in #{app_path}."
-else
-  puts "Unable to install Sinatra-S3.  Install dir already exists."
+FileUtils.mkdir_p($APP_PATH)
+FileUtils.mkdir_p(File.join($APP_PATH, "public"))
+config_ru = "require 'rubygems'\nrequire 'sinatra-s3'"
+if ARGV.any? { |arg| %w(--include-wiki --wiki).any? { |flag| arg == flag } }
+  check_install("wiki.rb", File.read(File.join(S3::ROOT_DIR,"examples","wiki.rb")))
+  config_ru += "\nrequire 'wiki'"
 end
+config_ru += "\n\nuse S3::Tracker if defined?(RubyTorrent)\nuse S3::Admin\nrun S3::Application"
+check_install("config.ru", config_ru)
+check_install("Rakefile", "require 'sinatra-s3/tasks'")
+check_install("s3.yml", File.read(File.join(S3::ROOT_DIR,"s3.yml.example")))

data/examples/wiki.rb

@@ -6,9 +6,7 @@ S3::Application.callback :mime_type => 'text/wiki' do
   if params.has_key?('edit')
     r :edit, "Editing #{@slot.name.gsub(/_/,' ')}"
   elsif params.has_key?('diff')
-    @from = Bit.find_by_version(params[:diff])
-    @to = Bit.find_by_version(params[:to])
-    @diff = @from.diff(@to)
+    @diff = Bit.diff(params[:diff],params[:to])
     r :diff, "Changes to #{@slot.name.gsub(/_/,' ')}"
   elsif params.has_key?('history')
     @history = Slot.find(:all, :conditions => [ 'name = ? AND parent_id = ?', @slot.name, @slot.parent_id ], :order => "id DESC", :limit => 20)
@@ -116,10 +114,10 @@ __END__
 %html
   %head
     %title #{@title}
-    %style{:type => "text/css"}
-      @import '/control/s/css/control.css';
-    %style{:type => "text/css"}
-      @import '/control/s/css/wiki.css';
+    %style{:type => "text/css"} @import '/control/s/css/control.css';
+    %style{:type => "text/css"} @import '/control/s/css/wiki.css';
+    %script{ :type => "text/javascript", :language => "JavaScript", :src => "/control/s/js/prototype.js" }
+    %script{ :type => "text/javascript", :language => "JavaScript", :src => "/control/s/js/wiki.js" }
   %body
     %div#header
       %h1
@@ -167,7 +165,7 @@ __END__
 
 @@ edit
 %h2 #{@slot.nil? ? "Edit Page" : "Editing #{@slot.name.gsub(/_/,' ')}"}
-%form.create{ :method => "POST", :action => env['PATH_INFO'] }
+%form#edit_page_form.create{ :method => "POST", :action => env['PATH_INFO'] }
   %input{ :type => "hidden", :name => "redirect", :value => env['PATH_INFO'] }
   %input{ :type => "hidden", :name => "Content-Type", :value => "text/wiki" }
   %div.required
@@ -185,14 +183,16 @@ __END__
   %table#revision_history
     - @history.each_with_index do |rev, count|
       %tr
-        %td.check
-          %input{ :type => "radio", :name => "diff", :value => rev.version }
-        %td.check
-          %input{ :type => "radio", :name => "to", :value => rev.version }
+        - if @history.length > 1
+          %td.check
+            %input.from{ :type => "radio", :name => "diff", :value => rev.version, :checked => (count == 1 ? true : false), :style => (count > 0 ? nil : "display:none") }
+          %td.check
+            %input.to{ :type => "radio", :name => "to", :value => rev.version, :checked => (count == 0 ? true : false) }
         %td
           %a{ :href => "#{env['PATH_INFO']}?version-id=#{rev.version}" } #{rev.meta['comment']}
           on #{rev.updated_at}
-  %input{ :type => "submit", :value => "Compare Revisions" }
+  - if @history.length > 1
+    %input{ :type => "submit", :value => "Compare Revisions" }
 
 @@ wiki
 %div#wiki_page

data/lib/sinatra-s3/admin.rb

@@ -22,7 +22,7 @@ module S3
     end
 
     get %r{^/control/s/(.*)} do
-      open(File.join(PUBLIC_PATH, params[:captures].first))
+      open(File.join(ROOT_DIR, 'public', params[:captures].first))
     end
 
     get '/control/login' do

data/lib/sinatra-s3/base.rb

@@ -1,14 +1,10 @@
 module S3
 
-  def self.config
-    @config ||= YAML.load_file("s3.yml")[S3::Application.environment] rescue { :db => { :adapter => 'sqlite3', :database => "db/s3.db" } }
-  end
-
   class Application < Sinatra::Base
 
     enable :static
     disable :raise_errors, :show_exceptions
-    set :environment, :production
+    set :environment, S3_ENV
     set :public, PUBLIC_PATH
 
     helpers do

data/lib/sinatra-s3/models/bit.rb

@@ -42,8 +42,8 @@ class Bit < ActiveRecord::Base
   end
 
   def self.diff(from,to)
-    from = Bit.find_by_version(from)
-    to = Bit.find_by_version(to)
+    from = Bit.find_by_version(from) if from.instance_of?(String)
+    to = Bit.find_by_version(to) if to.instance_of?(String)
     from.git_repository.diff(from.objectish, to.objectish)
   end
 

data/lib/sinatra-s3/s3.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
-require 'activerecord'
+require 'active_record'
 
+require 'fileutils'
 require 'sinatra/base'
 require 'openssl'
 require 'digest/sha1'
@@ -29,13 +30,19 @@ rescue LoadError
 end
 
 module S3
-  VERSION = "0.98"
+  S3_ENV = :production
+
+  def self.config
+    @config ||= YAML.load_file("s3.yml")[S3_ENV] rescue { :db => { :adapter => 'sqlite3', :database => "db/s3.db" } }
+  end
+
+  VERSION = "0.99"
   DEFAULT_PASSWORD = 'pass@word1'
 
   BUFSIZE = (4 * 1024)
   ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-  PUBLIC_PATH = File.join(ROOT_DIR, 'public')
-  STORAGE_PATH = File.expand_path('storage') unless defined?(STORAGE_PATH)
+  PUBLIC_PATH = File.expand_path(S3.config[:public_path] || File.join(ROOT_DIR, 'public'))
+  STORAGE_PATH = File.expand_path(S3.config[:storage_path] || 'storage') unless defined?(STORAGE_PATH)
   RESOURCE_TYPES = %w[acl versioning torrent]
   CANNED_ACLS = {
     'private' => 0600,

data/public/js/wiki.js

@@ -0,0 +1,35 @@
+window.onload = function ()
+{
+  if ($('revision_history') != null) {
+    update_rev_checkboxes();
+    $$('input.from').each(function (e) {
+	e.onchange = update_rev_checkboxes;
+    })
+  }
+  if ($('edit_page_form') != null) {
+    $('edit_page_form').onsubmit = submit_edit_page;
+  }
+}
+function submit_edit_page()
+{
+  if ($('page_comment').value == '') {
+    alert('Please provide a comment describing the changes you made to the page.');
+    return false;
+  }
+}
+function update_rev_checkboxes()
+{
+  hide_to = false;
+  rows = $$('#revision_history tr');
+  rows.each(function (e) {
+    f = e.getElementsBySelector('.from')[0]
+    t = e.getElementsBySelector('.to')[0]
+    if (f.checked == true)
+      hide_to = true;
+
+    if (hide_to == true)
+      t.style.display = 'none';
+    else
+      t.style.display = 'inline';
+  })
+}

data/s3.yml.example

@@ -1,17 +1,20 @@
 :development:
-  :storage: storage
+  :public_path: public
+  :storage_path: storage
   :db:
     :database: db/development.db
     :adapter: sqlite3
 
 :test:
-  :storage: test/storage
+  :public_path: public
+  :storage_path: test/storage
   :db:
     :database: db/test.db
     :adapter: sqlite3
 
 :production:
-  :storage: storage
+  :public_path: public
+  :storage_path: storage
   :db:
     :database: db/production.db
     :adapter: sqlite3

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-s3
 version: !ruby/object:Gem::Version 
-  version: "0.98"
+  hash: 205
+  prerelease: false
+  segments: 
+  - 0
+  - 99
+  version: "0.99"
 platform: ruby
 authors: 
 - David Ricciardi
@@ -9,39 +14,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -04:00
+date: 2010-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 2
+        - 15
         version: 2.2.15
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: nricciar@gmail.com
 executables: 
@@ -52,76 +74,44 @@ extra_rdoc_files:
 - README
 files: 
 - bin/sinatra-s3
+- lib/sinatra-s3/admin.rb
 - lib/sinatra-s3/base.rb
 - lib/sinatra-s3/errors.rb
+- lib/sinatra-s3/ext.rb
+- lib/sinatra-s3/helpers/acp.rb
+- lib/sinatra-s3/helpers/admin.rb
+- lib/sinatra-s3/helpers/tracker.rb
+- lib/sinatra-s3/helpers/versioning.rb
+- lib/sinatra-s3/helpers.rb
 - lib/sinatra-s3/models/bit.rb
+- lib/sinatra-s3/models/bucket.rb
+- lib/sinatra-s3/models/file_info.rb
 - lib/sinatra-s3/models/git_bucket.rb
 - lib/sinatra-s3/models/slot.rb
+- lib/sinatra-s3/models/torrent.rb
 - lib/sinatra-s3/models/torrent_peer.rb
-- lib/sinatra-s3/models/file_info.rb
 - lib/sinatra-s3/models/user.rb
-- lib/sinatra-s3/models/bucket.rb
-- lib/sinatra-s3/models/torrent.rb
-- lib/sinatra-s3/helpers.rb
+- lib/sinatra-s3/s3.rb
 - lib/sinatra-s3/tasks.rb
-- lib/sinatra-s3/admin.rb
-- lib/sinatra-s3/ext.rb
 - lib/sinatra-s3/tracker.rb
-- lib/sinatra-s3/helpers/acp.rb
-- lib/sinatra-s3/helpers/admin.rb
-- lib/sinatra-s3/helpers/tracker.rb
-- lib/sinatra-s3/helpers/versioning.rb
-- lib/sinatra-s3/s3.rb
 - lib/sinatra-s3.rb
-- public/test.html
-- public/images/external-link.gif
-- public/css/wiki.css
 - public/css/control.css
+- public/css/wiki.css
+- public/images/external-link.gif
 - public/js/prototype.js
 - public/js/upload_status.js
-- examples/wiki.ru
+- public/js/wiki.js
 - examples/wiki.rb
-- examples/README
-- examples/wikicloth/wikicloth-0.1.3.gem
-- examples/wikicloth/install.rb
-- examples/wikicloth/wikicloth.gemspec
-- examples/wikicloth/run_tests.rb
-- examples/wikicloth/README
-- examples/wikicloth/MIT-LICENSE
-- examples/wikicloth/sample_documents/george_washington.wiki
-- examples/wikicloth/sample_documents/pipe_trick.wiki
-- examples/wikicloth/sample_documents/default.css
-- examples/wikicloth/sample_documents/random.wiki
-- examples/wikicloth/sample_documents/tv.wiki
-- examples/wikicloth/sample_documents/air_force_one.wiki
-- examples/wikicloth/sample_documents/lists.wiki
-- examples/wikicloth/sample_documents/images.wiki
-- examples/wikicloth/sample_documents/elements.wiki
-- examples/wikicloth/sample_documents/wiki_tables.wiki
-- examples/wikicloth/sample_documents/wiki.png
-- examples/wikicloth/sample_documents/cheatsheet.wiki
-- examples/wikicloth/init.rb
-- examples/wikicloth/lib/wiki_buffer.rb
-- examples/wikicloth/lib/wikicloth.rb
-- examples/wikicloth/lib/wiki_cloth.rb
-- examples/wikicloth/lib/core_ext.rb
-- examples/wikicloth/lib/wiki_buffer/table.rb
-- examples/wikicloth/lib/wiki_buffer/html_element.rb
-- examples/wikicloth/lib/wiki_buffer/var.rb
-- examples/wikicloth/lib/wiki_buffer/link.rb
-- examples/wikicloth/lib/wiki_link_handler.rb
-- examples/wikicloth/tasks/wikicloth_tasks.rake
-- examples/wikicloth/uninstall.rb
-- examples/wikicloth/Rakefile
-- examples/wikicloth/test/wiki_cloth_test.rb
-- examples/wikicloth/test/test_helper.rb
+- examples/wiki.ru
 - db/migrate/001_create_bits.rb
+- db/migrate/002_create_users.rb
 - db/migrate/003_create_bits_users.rb
 - db/migrate/004_create_torrents.rb
-- db/migrate/002_create_users.rb
 - db/migrate/005_create_torrent_peers.rb
 - Rakefile
 - s3.yml.example
+- test/s3api_test.rb
+- test/test_helper.rb
 - README
 has_rdoc: true
 homepage: http://github.com/nricciar/sinatra-s3
@@ -133,21 +123,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An implementation of the Amazon S3 API in Ruby