sinatra_more 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/generators/base_app/config.ru.tt

@@ -1,5 +1,4 @@
 RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
-ENV['DATABASE_URL'] = 'your_database_here'
 
 require File.dirname(__FILE__) + '/app.rb'
 

data/generators/components/orms/activerecord_orm_gen.rb

@@ -7,13 +7,28 @@ module ActiveRecordInitializer
     app.configure do
       ActiveRecord::Base.establish_connection(
         :adapter => 'sqlite3',
-        :dbfile =>  ENV['DATABASE_URL']
+        :database => 'your_db_here'
       )
     end
   end
 end
 AR
 
+RAKE = <<-RAKE
+require 'active_record'
+require 'sinatra/base'
+
+namespace :db do
+  desc "Migrate the database"
+  task(:migrate) do
+    load 'config/boot.rb'
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Migration.verbose = true
+    ActiveRecord::Migrator.migrate("db/migrate")
+  end
+end
+RAKE
+
 
    MIGRATION = <<-MIGRATION
 class CreateUsers < ActiveRecord::Migration
@@ -52,7 +67,8 @@ USER
     
     def setup_orm
       insert_require 'active_record', :path => "config/dependencies.rb", :indent => 2
-      create_file("config/initializers/activerecord.rb", AR)
+      create_file("config/initializers/active_record.rb", AR)
+      create_file("Rakefile", RAKE)
       create_file("db/migrate/001_create_users.rb", MIGRATION)
       create_file("app/models/user.rb", USER)
     end

data/generators/components/orms/datamapper_orm_gen.rb

@@ -2,10 +2,10 @@ module SinatraMore
   module DatamapperOrmGen
     
     DM = <<-DM
-module DatamapperInitializer
+module DataMapperInitializer
   def self.registered(app)
     app.configure do
-      DataMapper.setup(:default, ENV['DATABASE_URL'])
+      DataMapper.setup(:default, 'your_db_here')
     end
   end
 end
@@ -15,6 +15,7 @@ DM
 class User
   include DataMapper::Resource
   
+  property :id,       Serial
   property :name,     String
   property :username, String
   property :email,    String
@@ -33,11 +34,12 @@ class User
     BCrypt::Password.new(crypted_password) == password
   end
 end
-  USER
+User.auto_upgrade!
+USER
     
     def setup_orm
       insert_require 'dm-core', :path => "config/dependencies.rb", :indent => 2
-      create_file("config/initializers/datamapper.rb", DM)
+      create_file("config/initializers/data_mapper.rb", DM)
       create_file("app/models/user.rb", USER)
     end
   end

data/generators/components/orms/mongomapper_orm_gen.rb

@@ -4,11 +4,10 @@ module SinatraMore
     MONGO = <<-MONGO
 class MongoDBConnectionFailure < RuntimeError; end
 
-module MongoDBInitializer
+module MongoDbInitializer
   def self.registered(app)
     MongoMapper.connection = Mongo::Connection.new('localhost')
-    MongoMapper.database = 'fyourparking'
-    User.first
+    MongoMapper.database = 'your_db_here'
   rescue RuntimeError
     raise MongoDBConnectionFailure.new("mongodb cannot connect to db! Start the mongodb process and try again.")
   end
@@ -37,8 +36,6 @@ class User
   key :username, String, :required => true
   key :email, String, :required => true
   key :crypted_password, String, :required => true
-
-  many :car_photos
 end
 USER
 
@@ -85,7 +82,7 @@ AUTH
 
     def setup_orm
       insert_require 'mongo_mapper', :path => "config/dependencies.rb", :indent => 2
-      create_file("config/initializers/mongodb.rb", MONGO)
+      create_file("config/initializers/mongo_db.rb", MONGO)
       create_file("lib/ext/mongo_mapper.rb", CONCERNED)
       create_file("app/models/user.rb", USER)
       create_file("app/models/user/authentications.rb", AUTH)

data/generators/components/orms/sequel_orm_gen.rb

@@ -5,7 +5,7 @@ module SinatraMore
 module SequelInitializer
   def self.registered(app)
     app.configure do
-      Sequel.connect(ENV['DATABASE_URL'])
+      Sequel.connect('your_db_here')
     end
   end
 end

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-08}
+  s.date = %q{2009-11-09}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}

data/test/generators/test_skeleton_generator.rb

@@ -75,7 +75,8 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=activerecord', '--script=none']) }
       assert_match /Applying.*?activerecord.*?orm/, buffer
       assert_match_in_file(/require 'active_record'/, '/tmp/sample_app/config/dependencies.rb')
-      assert_match_in_file(/ActiveRecordInitializer/, '/tmp/sample_app/config/initializers/activerecord.rb')
+      assert_match_in_file(/ActiveRecordInitializer/, '/tmp/sample_app/config/initializers/active_record.rb')
+      assert_match_in_file(/Migrate the database/, '/tmp/sample_app/Rakefile')
       assert_match_in_file(/CreateUsers < ActiveRecord::Migration/, '/tmp/sample_app/db/migrate/001_create_users.rb')
       assert_match_in_file(/class User < ActiveRecord::Base/, '/tmp/sample_app/app/models/user.rb')
     end
@@ -84,7 +85,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=datamapper', '--script=none']) }
       assert_match /Applying.*?datamapper.*?orm/, buffer
       assert_match_in_file(/require 'dm-core'/, '/tmp/sample_app/config/dependencies.rb')
-      assert_match_in_file(/DatamapperInitializer/, '/tmp/sample_app/config/initializers/datamapper.rb')
+      assert_match_in_file(/DataMapperInitializer/, '/tmp/sample_app/config/initializers/data_mapper.rb')
       assert_match_in_file(/class User.*?include DataMapper::Resource/m, '/tmp/sample_app/app/models/user.rb')
     end
 
@@ -92,7 +93,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=mongomapper', '--script=none']) }
       assert_match /Applying.*?mongomapper.*?orm/, buffer
       assert_match_in_file(/require 'mongo_mapper'/, '/tmp/sample_app/config/dependencies.rb')
-      assert_match_in_file(/MongoDBInitializer/, '/tmp/sample_app/config/initializers/mongodb.rb')
+      assert_match_in_file(/MongoDbInitializer/, '/tmp/sample_app/config/initializers/mongo_db.rb')
       assert_match_in_file(/class User.*?include MongoMapper::Document/m, '/tmp/sample_app/app/models/user.rb')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -08:00
+date: 2009-11-09 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency