merb_sequel 0.5 → 0.9.2

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/gempackagetask"
 
 PLUGIN   = "merb_sequel"
 NAME     = "merb_sequel"
-VERSION  = "0.5"
+VERSION  = "0.9.2"
 AUTHOR   = "Wayne E. Seguin, Lance Carlson"
 EMAIL    = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
 HOMEPAGE = "http://merb-plugins.rubyforge.org/merb_sequel/"
@@ -23,21 +23,27 @@ specification = Gem::Specification.new do |spec|
   spec.require_path = "lib"
   spec.extra_rdoc_files = ["README", "LICENSE", 'TODO']
   # Dependencies
-  spec.add_dependency("merb",         ">= 0.5")
+  #spec.add_dependency("merb",         ">= 0.9")
+  spec.add_dependency("merb-core", ">= 0.9.2")    # This will probably only be temporary until there is an official merb gem greater than 0.9
   spec.add_dependency("sequel",       ">= 1.0.0")
-  spec.add_dependency("sequel_model", ">= 0.2")
+  spec.add_dependency("sequel_model", ">= 0.3.3")
   spec.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
 end
 
+windows = (PLATFORM =~ /win32|cygwin/) rescue nil
+
+SUDO = windows ? "" : "sudo"
+
 Rake::GemPackageTask.new(specification) do |package|
   package.gem_spec = specification
 end
 
-task :install do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
+desc "Install merb_sequel"
+task :install => :package do
+  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
 end
 
+desc 'Release the current version on rubyforge'
 task :release => :package do
   sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
 end

data/lib/merb/orms/sequel/connection.rb

@@ -7,8 +7,8 @@ module Merb
       class << self
 
         def config_file() Merb.root / "config" / "database.yml" end
-        def sample_dest() Merb.root / "config" / "database.sample.yml" end
-        def sample_source() File.dirname(__FILE__) / "database.sample.yml" end
+        def sample_dest() Merb.root / "config" / "database.yml.sample" end
+        def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
       
         def copy_sample_config
           FileUtils.cp sample_source, sample_dest unless File.exists?(sample_dest)
@@ -36,14 +36,15 @@ module Merb
           require "sequel_model"
 
           if File.exists?(config_file)
-            puts "#{Time.now.httpdate}: Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ..."
+            Merb.logger.info!("Connecting to the '#{config[:database]}' database on '#{config[:host]}' using '#{config[:adapter]}' ...")
             connection = ::Sequel.connect(config_options(config))
-            Merb.logger.error("Connection Error: #{e}") unless connection
+            Merb.logger.error!("Connection Error: #{e}") unless connection
             connection
           else
             copy_sample_config
-            puts "#{Time.now.httpdate}: No database.yml file found in #{Merb.root}/config."
-            puts "A sample file was created called config/database.sample.yml for you to copy and edit."
+            Merb.logger.set_log(STDERR)
+            Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
+            Merb.logger.error! "A sample file was created called config/database.sample.yml for you to copy and edit."
             exit(1)
           end
           
@@ -67,9 +68,11 @@ module Merb
         # Registering this ORM lets the user choose sequel as a session store
         # in merb.yml's session_store: option.
         def register_session_type
-          Merb::BootLoader.register_session_type("sequel",
-            "merb/session/sequel_session",
-            "Using Sequel database sessions")
+          Merb.register_session_type(
+          "sequel",
+          "merb/session/sequel_session",
+          "Using Sequel database sessions"
+          )
         end
 
       end

data/lib/merb/session/sequel_session.rb

@@ -3,9 +3,7 @@ require "base64"
 module Merb
 
   module SessionMixin
-
     def setup_session
-      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::SequelSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
@@ -13,9 +11,12 @@ module Merb
     end
 
     def finalize_session
-      Merb.logger.info("Finalize session")
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
-      set_cookie(_session_id_key, request.session.values[:session_id], _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+      set_cookie(_session_id_key, request.session.values[:session_id], Time.now + _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
+    end
+    
+    def session_store_type
+      "sequel"
     end
 
   end

data/lib/merb_sequel.rb

@@ -1,12 +1,17 @@
-# make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  if Merb::BootLoader.app_loaded?
-    puts "Warning: The merb_sequel gem must be loaded before the application"
-  else
-    require "merb/orms/sequel/connection"
-    Merb::Orms::Sequel.connect
-    Merb::Orms::Sequel.register_session_type
+  Merb::Plugins.config[:merb_sequel] = {}
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection")
+  Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks"
+  
+  class Merb::Orms::Sequel::Connect < Merb::BootLoader
+
+    after BeforeAppRuns
+
+    def self.run
+      Merb::Orms::Sequel.connect
+      Merb::Orms::Sequel.register_session_type
+    end
+
   end
   
-  Merb::Plugins.add_rakefiles "merbtasks"
 end

data/lib/merb_sequel/merbtasks.rb

@@ -0,0 +1,40 @@
+require "fileutils"
+
+namespace :sequel do
+
+  task :merb_start do
+    Merb.start :adapter => 'runner',
+               :environment => ENV['MERB_ENV'] || 'development'
+  end
+
+  namespace :db do
+
+    desc "Perform migration using migrations in schema/migrations"
+    task :migrate => :merb_start do
+      Sequel::Migrator.apply(Merb::Orms::Sequel.connect, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    end
+
+  end
+  
+  namespace :sessions do
+
+    desc "Creates session migration"
+    task :create => :merb_start do
+      migration_exists = Dir[File.join(Merb.root,"schema", "migrations", "*.rb")].detect{ |f| f =~ /database_sessions\.rb/ }
+      if migration_exists
+        puts "\nThe Session Migration File already exists\n\n"
+      else
+        sh %{merb-gen database_sessions_migration}
+      end
+    end
+    
+    desc "Clears sessions"
+    task :clear => :merb_start do
+      table_name = ((Merb::Plugins.config[:sequel] || {})[:session_table_name] || "sessions")
+      
+      Merb::Orms::Sequel.connect.execute("DELETE FROM #{table_name}")
+    end
+
+  end
+
+end

data/sequel_generators/database_sessions_migration/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/sequel_generators/database_sessions_migration/database_sessions_migration_generator.rb

@@ -0,0 +1,53 @@
+class DatabaseSessionsMigrationGenerator < Merb::GeneratorBase
+  
+  default_options :author => nil
+
+  def initialize(runtime_args, runtime_options = {})
+    # put somthing into the runtime_args so that super doesn't show the 
+    # description
+    runtime_args.push ""
+    super
+    @name = 'database_sessions'
+  end
+
+  def manifest
+    record do |m|
+    # Ensure appropriate folder(s) exists
+    m.directory 'schema/migrations'
+
+    # Create stubs
+    highest_migration = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
+    filename = format("%03d_%s", (highest_migration.to_i+1), @name.snake_case)
+    m.template "sessions_migration.erb", "schema/migrations/#{filename}.rb"
+    puts banner
+
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+A migration to add sessions to your database has been created.
+Run 'rake sequel:db:migrate' to add the sessions migration to your database.
+
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+end

data/sequel_generators/migration/migration_generator.rb

@@ -1,14 +1,42 @@
-require "merb/generators/merb_generator_helpers"
-
-class MigrationGenerator < Merb::GeneratorHelpers::MigrationGeneratorBase
+class MigrationGenerator < Merb::GeneratorBase
+  attr_reader :model_attributes, :model_class_name, :model_file_name, :table_name
   
-  def initialize( *args )
-    super( *args )
-    @migration_template_name = "new_migration.erb"
+  def initialize(args, runtime_args = {})
+    @base =                 File.dirname(__FILE__)
+    super
+    @model_file_name  =      args.shift.snake_case
+    @table_name       =      @model_file_name.pluralize
+    @model_class_name =     @model_file_name.to_const_string
+    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
   end
   
-  def self.superclass
-    RubiGen::Base
-  end
+  def manifest
+    record do |m|
+      @m = m
+      
+      m.directory "schema/migrations"
+      
+      current_migration_number = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
+      @migration_file_name = format("%03d_%s", (current_migration_number.to_i+1), model_file_name)
     
+      @assigns = {  :model_file_name  => model_file_name, 
+                    :model_attributes => model_attributes,
+                    :model_class_name => model_class_name,
+                    :table_name       => table_name,
+                    :migration_file_name => @migration_file_name
+                  }
+      copy_dirs
+      copy_files
+    end
+  end
+  
+  protected
+  def banner
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a Sequel Migration stub..
+
+      USAGE: #{spec.name}"
+    EOS
+  end
+      
 end

data/sequel_generators/migration/templates/{new_migration.erb → schema/migrations/%migration_file_name%.rb}

@@ -2,15 +2,15 @@
 # http://sequel.rubyforge.org/
 # http://code.google.com/p/ruby-sequel/wiki/Migrations
 
-class <%= class_name.snake_case.camel_case %> < Sequel::Migration
+class <%= model_class_name %>Migration < Sequel::Migration
 
   def up
     <%= "create_table :#{table_name} do" if table_name %>
-<% if table_attributes.empty? -%>
+<% if model_attributes.empty? -%>
       primary_key :id
 <% else -%>
-<% table_attributes.each do |attribute| -%>
-      <%= attribute.type %> :<%= attribute.name %>
+<% model_attributes.each do |attribute| -%>
+      <%= attribute.last %> :<%= attribute.first %>
 <% end -%>
 <% end -%>
     <%= "end" if table_name %>

data/sequel_generators/model/model_generator.rb

@@ -1,16 +1,41 @@
-require "merb/generators/merb_generator_helpers"
-
-class ModelGenerator < Merb::GeneratorHelpers::ModelGeneratorBase
+class ModelGenerator < Merb::GeneratorBase
+  attr_reader :model_attributes, :model_class_name, :model_file_name, :migration_args
   
-  def initialize( *args )
-    super( *args )
-    @model_template_name = "sequel_model_template.erb"
-    @migration_generator_name = "migration"
-    @model_test_generator_name = "merb_model_test"
+  def initialize(args, runtime_args = {})
+    @base =                 File.dirname(__FILE__)
+    @migration_args = args.dup
+    super
+    @model_file_name =      args.shift.snake_case
+    @model_class_name =     @model_file_name.to_const_string
+    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
+    @model_file_name =      "#{@model_class_name.snake_case}"
+    
+    
   end
   
-  def self.superclass
-    RubiGen::Base
-  end
+  def manifest
+    record do |m|
+      @m = m
     
+      @assigns = {  :model_file_name  => model_file_name, 
+                    :model_attributes => model_attributes,
+                    :model_class_name => model_class_name
+                  }
+      copy_dirs
+      copy_files
+      
+      m.dependency "migration", [*self.migration_args]
+      m.dependency "merb_model_test", [model_file_name], @assigns
+    end
+  end
+  
+  protected
+  def banner
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a Sequel Model stub..
+
+      USAGE: #{spec.name}"
+    EOS
+  end
+      
 end

data/sequel_generators/model/templates/app/models/%model_file_name%.rb

@@ -0,0 +1,2 @@
+class <%= model_class_name %> < Sequel::Model
+end

data/sequel_generators/resource_controller/resource_controller_generator.rb

@@ -1,27 +1,74 @@
-require "merb/generators/merb_generator_helpers"
-
-class ResourceControllerGenerator < Merb::GeneratorHelpers::ControllerGeneratorBase
+class ResourceControllerGenerator < Merb::GeneratorBase
+  
+  attr_reader :controller_class_name, 
+              :controller_file_name, 
+              :controller_base_path,
+              :controller_modules,
+              :model_class_name,
+              :full_controller_const,
+              :singular_model,
+              :plural_model
+  
+  def initialize(args, runtime_args = {})
+    @base =             File.dirname(__FILE__)
+    
+    super
+    name = args.shift
+    nfp = name.snake_case.gsub("::", "/")
+    nfp = nfp.split("/")
+    @model_class_name = nfp.pop.singularize.to_const_string
+    @model_class_name = runtime_args[:model_class_name] if runtime_args[:model_class_name]
+    @singular_model         = @model_class_name.snake_case
+    @plural_model           = @singular_model.pluralize
+    
+    nfp << @plural_model
+    
+    @controller_file_name = nfp.join("/")
+    
+    # Need to setup the directories
+    unless @controller_file_name == File.basename(@controller_file_name)
+      @controller_base_path   = controller_file_name.split("/")[0..-2].join("/") 
+    end
+    
+    @controller_modules     = @controller_file_name.to_const_string.split("::")[0..-2]
+    @controller_class_name  = @controller_file_name.to_const_string.split("::").last
 
-  def initialize(*args)
-    runtime_options = args.last.is_a?(Hash) ? args.pop : {}
-    name, *actions = args.flatten
-    runtime_options[:actions] = %w[index show new edit]
-    runtime_options[:test_stub_generator] = "merb_controller_test"
-    super([name], runtime_options)
+    @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::")
   end
-
-  def self.superclass
-    RubiGen::Base
+  
+  def manifest
+    record do |m|
+      @m = m
+      
+      # Create the controller directory
+      m.directory File.join("app/controllers", controller_base_path) if controller_base_path
+      
+      # Create the helpers directory
+      m.directory File.join("app/helpers", controller_base_path) if controller_base_path
+      
+      @assigns =  {
+                    :controller_modules         => controller_modules,
+                    :controller_class_name      => controller_class_name,
+                    :controller_file_name       => controller_file_name,
+                    :controller_base_path       => controller_base_path,
+                    :full_controller_const      => full_controller_const,
+                    :model_class_name           => model_class_name,
+                    :singular_model             => singular_model,
+                    :plural_model               => plural_model
+                  }      
+      copy_dirs
+      copy_files
+      
+      m.dependency "merb_resource_controller_test", [@controller_class_name], @assigns
+    end
   end
   
   protected
-
   def banner
-    <<-EOS
-  Creates a Merb controller, views and specs using Sequel Models
+    <<-EOS.split("\n").map{|x| x.strip}.join("\n")
+      Creates a basic Merb resource controller.
 
-  USAGE: #{$0} #{spec.name} resource_name"
-  EOS
+      USAGE: #{spec.name} my_resource
+    EOS
   end
-  
-end
+end

data/sequel_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb

@@ -0,0 +1,68 @@
+<% counter = 0 -%>
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>class <%= controller_class_name %> < Application
+<%= "  " * counter %>  # provides :xml, :yaml, :js
+
+<%= "  " * counter %>  def index
+<%= "  " * counter %>    @<%= plural_model %> = <%= model_class_name %>.all
+<%= "  " * counter %>    display @<%= plural_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def show
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>[params[:id]]
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    display @<%= singular_model %>
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def new
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def create
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.new(params[:<%= singular_model %>])
+<%= "  " * counter %>    if @<%= singular_model %>.save
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      render :new
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def edit
+<%= "  " * counter %>    only_provides :html
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>[params[:id]]
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    render
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def update
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>[params[:id]]
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.update(params[:<%= singular_model %>])
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>  def destroy
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>[params[:id]]
+<%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
+<%= "  " * counter %>    if @<%= singular_model %>.destroy
+<%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>s)
+<%= "  " * counter %>    else
+<%= "  " * counter %>      raise BadRequest
+<%= "  " * counter %>    end
+<%= "  " * counter %>  end
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>

data/sequel_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb

@@ -0,0 +1,16 @@
+<% counter = 1 -%>
+module Merb
+<% controller_modules.each_with_index do |mod, i| -%>
+<%= "  " * i %>module <%= mod %>
+<% counter = i -%>
+<% end -%>
+<% counter = counter == 0 ? 0 : (counter + 1) -%>
+<%= "  " * counter %>module <%= controller_class_name %>Helper
+
+<%= "  " * counter %>end
+<% counter = counter == 0 ? 0 : (counter - 1) -%>
+<% controller_modules.reverse.each_with_index do |mod, i| -%>
+<%= "  " * counter %>end # <%= mod %>
+<% counter = counter - 1 -%>
+<% end -%>
+end

data/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, edit action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>

data/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, index action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>

data/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, new action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>

data/sequel_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb

@@ -0,0 +1,3 @@
+<h1><%= full_controller_const %> controller, show action</h1>
+
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>

metadata

@@ -1,109 +1,130 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: merb_sequel
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2008-01-09 00:00:00 -08:00
-summary: Merb plugin that provides support for Sequel and Sequel::Model
-require_paths: 
-- lib
-email: wayneeseguin@gmail.com, lancecarlson@gmail.com
-homepage: http://merb-plugins.rubyforge.org/merb_sequel/
-rubyforge_project: 
-description: Merb plugin that provides support for Sequel and Sequel::Model
-autorequire: merb_sequel
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.9.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Wayne E. Seguin, Lance Carlson
+autorequire: merb_sequel
+bindir: bin
+cert_chain: []
+
+date: 2008-03-24 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: merb-core
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sequel_model
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.3
+    version: 
+description: Merb plugin that provides support for Sequel and Sequel::Model
+email: wayneeseguin@gmail.com, lancecarlson@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- LICENSE
+- TODO
 files: 
 - LICENSE
 - README
 - Rakefile
 - TODO
 - lib/merb
-- lib/merb_sequel.rb
-- lib/merbtasks.rb
 - lib/merb/orms
-- lib/merb/session
 - lib/merb/orms/sequel
 - lib/merb/orms/sequel/connection.rb
-- lib/merb/orms/sequel/database.sample.yml
-- lib/merb/session/001_add_sessions_table.rb
+- lib/merb/orms/sequel/database.yml.sample
+- lib/merb/session
 - lib/merb/session/sequel_session.rb
+- lib/merb_sequel
+- lib/merb_sequel/merbtasks.rb
+- lib/merb_sequel.rb
 - specs/merb_sequel_spec.rb
 - specs/spec_helper.rb
+- sequel_generators/database_sessions_migration
+- sequel_generators/database_sessions_migration/database_sessions_migration_generator.rb
+- sequel_generators/database_sessions_migration/templates
+- sequel_generators/database_sessions_migration/templates/sessions_migration.erb
+- sequel_generators/database_sessions_migration/USAGE
 - sequel_generators/migration
-- sequel_generators/model
-- sequel_generators/resource_controller
 - sequel_generators/migration/migration_generator.rb
 - sequel_generators/migration/templates
+- sequel_generators/migration/templates/schema
+- sequel_generators/migration/templates/schema/migrations
+- sequel_generators/migration/templates/schema/migrations/%migration_file_name%.rb
 - sequel_generators/migration/USAGE
-- sequel_generators/migration/templates/new_migration.erb
+- sequel_generators/model
 - sequel_generators/model/model_generator.rb
 - sequel_generators/model/templates
+- sequel_generators/model/templates/app
+- sequel_generators/model/templates/app/models
+- sequel_generators/model/templates/app/models/%model_file_name%.rb
 - sequel_generators/model/USAGE
-- sequel_generators/model/templates/sequel_model_template.erb
+- sequel_generators/resource_controller
 - sequel_generators/resource_controller/resource_controller_generator.rb
 - sequel_generators/resource_controller/templates
+- sequel_generators/resource_controller/templates/app
+- sequel_generators/resource_controller/templates/app/controllers
+- sequel_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
+- sequel_generators/resource_controller/templates/app/helpers
+- sequel_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
+- sequel_generators/resource_controller/templates/app/views
+- sequel_generators/resource_controller/templates/app/views/%controller_file_name%
+- sequel_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
+- sequel_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
+- sequel_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
+- sequel_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
 - sequel_generators/resource_controller/USAGE
-- sequel_generators/resource_controller/templates/controller.rb
-- sequel_generators/resource_controller/templates/edit.html.erb
-- sequel_generators/resource_controller/templates/helper.rb
-- sequel_generators/resource_controller/templates/index.html.erb
-- sequel_generators/resource_controller/templates/new.html.erb
-- sequel_generators/resource_controller/templates/show.html.erb
-test_files: []
-
+has_rdoc: true
+homepage: http://merb-plugins.rubyforge.org/merb_sequel/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-- LICENSE
-- TODO
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel_model
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.2"
-    version: 
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Merb plugin that provides support for Sequel and Sequel::Model
+test_files: []
+

data/lib/merbtasks.rb

@@ -1,34 +0,0 @@
-require "fileutils"
-
-namespace :sequel do
-
-  namespace :db do
-
-    desc "Perform migration using migrations in schema/migrations"
-    task :migrate => :merb_env do
-      Sequel::Migrator.apply(Merb::Orms::Sequel.connect, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-    end
-
-  end
-  
-  namespace :sessions do
-
-    desc "Creates session migration"
-    task :create => :merb_env do
-      # TODO: this should not use '001' always...
-      dest = File.join(Merb.root, "schema", "migrations","001_add_sessions_table.rb")
-      source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb")
-      
-      FileUtils.cp source, dest unless File.exists?(dest)
-    end
-    
-    desc "Clears sessions"
-    task :clear => :merb_env do
-      table_name = (Merb::Plugins.config[:sequel][:session_table_name] || "sessions")
-      
-      Merb::Orms::Sequel.connect.execute("DELETE FROM #{table_name}")
-    end
-
-  end
-
-end

data/sequel_generators/model/templates/sequel_model_template.erb

@@ -1,2 +0,0 @@
-class <%= class_name %> < Sequel::Model(:<%= class_name.snake_case.pluralize %>)
-end

data/sequel_generators/resource_controller/templates/controller.rb

@@ -1,56 +0,0 @@
-<% klass = class_name.singularize -%>
-<% ivar = class_name.snake_case.singularize -%>
-class <%= class_name %> < Application
-
-  provides :xml, :js, :yaml
-  
-  def index
-    @<%= ivar.pluralize %> = <%= klass %>.all
-    render @<%= ivar.pluralize %>
-  end
-  
-  def show
-    @<%= ivar %> = <%= klass %>[params[:id]]
-    render @<%= ivar %>
-  end
-  
-  def new
-    only_provides :html
-    @<%= ivar %> = <%= klass %>.new(params[:<%= ivar %>])
-    render
-  end
-  
-  def create
-    @<%= ivar %> = <%= klass %>.new(params[:<%= ivar %>])
-    if @<%= ivar %>.save
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      render :action => :new
-    end
-  end
-  
-  def edit
-    only_provides :html
-    @<%= ivar %> = <%= klass %>[params[:id]]
-    render
-  end
-  
-  def update
-    @<%= ivar %> = <%= klass %>[params[:id]]
-    if @<%= ivar %>.update(params[:<%= ivar %>])
-      redirect url(:<%= ivar %>, @<%= ivar %>)
-    else
-      raise BadRequest
-    end
-  end
-  
-  def destroy
-    @<%= ivar %> = <%= klass %>[params[:id]]
-    if @<%= ivar %>.destroy
-      redirect url(:<%= ivar %>s)
-    else
-      raise BadRequest
-    end
-  end
-
-end

data/sequel_generators/resource_controller/templates/edit.html.erb

@@ -1 +0,0 @@
-Edit for <%= class_name %>

data/sequel_generators/resource_controller/templates/helper.rb

@@ -1,5 +0,0 @@
-module Merb
-  module <%= class_name %>Helper
-  
-  end
-end

data/sequel_generators/resource_controller/templates/index.html.erb

@@ -1 +0,0 @@
-Index for <%= class_name %>

data/sequel_generators/resource_controller/templates/new.html.erb

@@ -1 +0,0 @@
-New for <%= class_name %>

data/sequel_generators/resource_controller/templates/show.html.erb

@@ -1 +0,0 @@
-Show for <%= class_name %>