sinatra_more 0.3.6 → 0.3.7

data/README.rdoc

@@ -494,6 +494,7 @@ functionality on the server. However, smtp is also supported using the following
 Once those have been defined, the default will become smtp delivery unless overwritten in an individual mail definition.
 Next, we should define a custom mailer extended from <tt>SinatraMore::MailerBase</tt>.
 
+  # app/mailers/sample_mailer.rb
   class SampleMailer < SinatraMore::MailerBase
     def registration_email(name, user_email_address)
       from 'admin@site.com'
@@ -512,7 +513,7 @@ is passing the <tt>name</tt> attribute to the body message template which should
 
   # ./views/sample_mailer/registration_email.erb
   This is the body of the email and can access the <%= name %> that was passed in from the mailer definition
-  That's all there is to defining the body of the email which can be plain text or email
+  That's all there is to defining the body of the email which can be plain text or html
 
 Once the mailer definition has been completed and the template has been defined, the email can be sent using:
 
@@ -527,6 +528,7 @@ A few variations are shown below for completeness.
 
 If we want to attach files to our email:
 
+  # app/mailers/sample_mailer.rb
   class SampleMailer < SinatraMore::MailerBase
     def attachment_email(name, user_email_address)
       from 'admin@site.com'
@@ -538,6 +540,7 @@ If we want to attach files to our email:
 
 or perhaps we want to have a short body without the need for a template file:
 
+  # app/mailers/sample_mailer.rb
   class SampleMailer < SinatraMore::MailerBase
     def short_email(name, user_email_address)
       from 'admin@site.com'

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/generators/base_app/config/boot.rb.tt

@@ -1,5 +1,6 @@
 # This file is merely for beginning the boot process, check dependencies.rb for more information
 
+RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
 ROOT_DIR = File.dirname(__FILE__) + '/../' unless defined? ROOT_DIR
 
 # Helper method for file references.
@@ -23,6 +24,7 @@ class <%= @class_name %> < Sinatra::Application
   set :views, root_path("app", "views")
   set :images_path, public_path("images")
   set :default_builder, 'StandardFormBuilder'
+  set :environment, RACK_ENV if defined?(RACK_ENV)
 
   # Dependencies contains all required gems and core configuration
   require File.dirname(__FILE__) + '/dependencies.rb'

data/generators/base_app/config/dependencies.rb.tt

@@ -17,7 +17,7 @@ class <%= @class_name %> < Sinatra::Application
   
   # Returns the list of load paths for this sinatra application
   def self.file_loading_paths
-    ["lib/**/*.rb", "app/helpers/**/*.rb", "app/routes/**/*.rb", "app/models/*.rb"]
+    ["lib/**/*.rb", "app/helpers/**/*.rb", "app/routes/**/*.rb", "app/models/*.rb", "app/mailers/*.rb"]
   end
   
   # Require all the folders and files necessary to run the application

data/generators/base_app/test/test_config.rb.tt

@@ -1,6 +1,4 @@
-%w[rubygems sinatra].each {|gem| require gem }
+RACK_ENV = 'test' unless defined?(RACK_ENV)
+%w[rubygems sinatra/base].each {|gem| require gem }
 require 'rack/test'
 require File.dirname(__FILE__) + "/../app"
-
-
-set :environment, :test

data/generators/components/component_actions.rb

@@ -21,7 +21,7 @@ module SinatraMore
     # insert_test_suite_setup('...CLASS_NAME...')
     # => inject_into_file("test/test_config.rb", TEST.gsub(/CLASS_NAME/, @class_name), :after => "set :environment, :test\n")
     def insert_test_suite_setup(suite_text, options={})
-      options.reverse_merge!(:path => "test/test_config.rb", :after => "set :environment, :test\n")
+      options.reverse_merge!(:path => "test/test_config.rb", :after => /require.*?app.*?\n/)
       inject_into_file(options[:path], suite_text.gsub(/CLASS_NAME/, @class_name), :after => options[:after])
     end
 

data/generators/components/orms/activerecord_orm_gen.rb

@@ -4,10 +4,24 @@ module SinatraMore
     AR = <<-AR
 module ActiveRecordInitializer
   def self.registered(app)
-    app.configure do
+    app.configure :development do
       ActiveRecord::Base.establish_connection(
         :adapter => 'sqlite3',
-        :database => 'your_db_here'
+        :database => 'your_dev_db_here'
+      )
+    end
+
+    app.configure :production do
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'sqlite3',
+        :database => 'your_production_db_here'
+      )
+    end
+
+    app.configure :test do
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'sqlite3',
+        :database => 'your_test_db_here'
       )
     end
   end

data/generators/components/orms/datamapper_orm_gen.rb

@@ -4,9 +4,9 @@ module SinatraMore
     DM = <<-DM
 module DataMapperInitializer
   def self.registered(app)
-    app.configure do
-      DataMapper.setup(:default, 'your_db_here')
-    end
+    app.configure(:development) { DataMapper.setup(:default, 'your_dev_db_here') }
+    app.configure(:production)  { DataMapper.setup(:default, 'your_production_db_here') }
+    app.configure(:test)        { DataMapper.setup(:default, 'your_test_db_here') }
   end
 end
 DM

data/generators/components/orms/mongomapper_orm_gen.rb

@@ -6,10 +6,20 @@ class MongoDBConnectionFailure < RuntimeError; end
 
 module MongoDbInitializer
   def self.registered(app)
-    MongoMapper.connection = Mongo::Connection.new('localhost')
-    MongoMapper.database = 'your_db_here'
-  rescue RuntimeError
-    raise MongoDBConnectionFailure.new("mongodb cannot connect to db! Start the mongodb process and try again.")
+    app.configure :development do
+      MongoMapper.connection = Mongo::Connection.new('localhost')
+      MongoMapper.database = 'your_dev_db_here'
+    end
+
+    app.configure :production do
+      MongoMapper.connection = Mongo::Connection.new('localhost')
+      MongoMapper.database = 'your_production_db_here'
+    end
+
+    app.configure :test do
+      MongoMapper.connection = Mongo::Connection.new('localhost')
+      MongoMapper.database = 'your_test_db_here'
+    end
   end
 end
 MONGO

data/generators/components/orms/sequel_orm_gen.rb

@@ -4,10 +4,10 @@ module SinatraMore
     SEQUEL = <<-SEQUEL
 module SequelInitializer
   def self.registered(app)
-    app.configure do
-      Sequel::Model.plugin(:schema)
-      Sequel.connect('your_db_here')
-    end
+    Sequel::Model.plugin(:schema)
+    app.configure(:development) { Sequel.connect('your_dev_db_here') }
+    app.configure(:production)  { Sequel.connect('your_production_db_here') }
+    app.configure(:test)        { Sequel.connect('your_test_db_here') }
   end
 end
 SEQUEL

data/generators/components/tests/bacon_test_gen.rb

@@ -6,7 +6,7 @@ module SinatraMore
 end
 
 def app
-  CLASS_NAME
+  CLASS_NAME.tap { |app| app.set :environment, :test }
 end
 TEST
 

data/generators/components/tests/riot_test_gen.rb

@@ -5,7 +5,7 @@ module SinatraMore
   include Rack::Test::Methods
   
   def app
-    CLASS_NAME
+    CLASS_NAME.tap { |app| app.set :environment, :test }
   end
 end
 TEST

data/generators/components/tests/rspec_test_gen.rb

@@ -6,7 +6,7 @@ module SinatraMore
 end
 
 def app
-  CLASS_NAME
+  CLASS_NAME.tap { |app| app.set :environment, :test }
 end
 TEST
 

data/generators/components/tests/shoulda_test_gen.rb

@@ -5,7 +5,7 @@ module SinatraMore
   include Rack::Test::Methods
   
   def app
-    CLASS_NAME
+    CLASS_NAME.tap { |app| app.set :environment, :test }
   end
 end
 TEST

data/generators/components/tests/testspec_test_gen.rb

@@ -5,7 +5,7 @@ module SinatraMore
   include Rack::Test::Methods
   
   def app
-    CLASS_NAME
+    CLASS_NAME.tap { |app| app.set :environment, :test }
   end
 end
 TEST

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "generators/base_app/app/.empty_directory",
      "generators/base_app/app/helpers/.empty_directory",
      "generators/base_app/app/helpers/view_helpers.rb",
+     "generators/base_app/app/mailers/.empty_directory",
      "generators/base_app/app/models/.empty_directory",
      "generators/base_app/app/routes/.empty_directory",
      "generators/base_app/app/views/.empty_directory",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -124,6 +124,7 @@ files:
 - generators/base_app/app/.empty_directory
 - generators/base_app/app/helpers/.empty_directory
 - generators/base_app/app/helpers/view_helpers.rb
+- generators/base_app/app/mailers/.empty_directory
 - generators/base_app/app/models/.empty_directory
 - generators/base_app/app/routes/.empty_directory
 - generators/base_app/app/views/.empty_directory