@@ -1,26 +1,25 @@ require 'rubygems' require 'sinatra' -require 'dm-core' -require 'dm-validations' -require 'dm-timestamps' +require 'sequel' require 'syntaxi' -DataMapper.setup(:default, ENV['DATABASE_URL'] || 'sqlite3://my.db') +DB = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite://my.db') # Database Model -class Snippet - include DataMapper::Resource - - property :id, Integer, :serial => true # primary serial key - property :body, Text, :nullable => false # cannot be null - property :created_at, DateTime - property :updated_at, DateTime - - # validates_present :body - # validates_length :body, :minimum => 1 +class Snippet < Sequel::Model Syntaxi.line_number_method = 'floating' Syntaxi.wrap_at_column = 80 + + def self.create_table + DB.create_table :snippets do + primary_key :id + text :body + timestamp :timestamp + end + rescue Sequel::DatabaseError + #Assume Database is created. + end def formatted_body replacer = Time.now.strftime('[code-%d]') @@ -29,7 +28,9 @@ class Snippet end end -DataMapper.auto_upgrade! +configure do + Snippet.create_table +end # new get '/' do @@ -38,7 +39,7 @@ end # create post '/' do - @snippet = Snippet.new(:body => params[:snippet_body]) + @snippet = Snippet.new(:body => params[:snippet_body], :timestamp => (params[:timestamp] || Time.now)) if @snippet.save redirect "/#{@snippet.id}" else @@ -48,7 +49,7 @@ end # show get '/:id' do - @snippet = Snippet.get(params[:id]) + @snippet = Snippet[params[:id]] if @snippet erb :show else pasteez.rb @@ -1,6 +1,6 @@ <div class="snippet"> <div class="sbody" id="content"><%= @snippet.formatted_body %></div> - <div class="sdate">Created on <%= @snippet.created_at.strftime("%B %d, %Y at %I:%M %p") %></div> + <div class="sdate">Created on <%= @snippet.timestamp.strftime("%B %d, %Y at %I:%M %p") %></div> <br/><a href="/">New Paste!</a> </div> views/show.erb 788341ea51d106fdfb3671f70077499cdfd95af2 Mark Turner mark@amerine.net http://github.com/amerine/pasteez/commit/bce9ef7047f9a8dc1e86f7789af3f9645591eb12 bce9ef7047f9a8dc1e86f7789af3f9645591eb12 2009-06-24T23:29:34-07:00 2009-06-24T23:29:34-07:00 moved from datamapper to sequel 0324d5ff82607872dc9a3af369e56b6d363afc3e Mark Turner mark@amerine.net