sinatra_more 0.3.34 → 0.3.35

data/VERSION

@@ -1 +1 @@
-0.3.34
+0.3.35

data/generators/base_app/Gemfile

@@ -1,4 +1,3 @@
-clear_sources
 source 'http://gemcutter.org'
 # Base requirements
 gem 'sinatra'
@@ -6,6 +5,7 @@ gem 'sinatra_more'
 gem 'rack-flash'
 gem 'warden'
 gem 'bcrypt-ruby', :require => 'bcrypt'
+gem 'actionmailer', :require => 'action_mailer'
 
 # Component requirements
 

data/generators/base_app/app/routes/main.rb.tt

@@ -0,0 +1,5 @@
+app do
+  get '/' do
+    "<strong>Hello World</strong> (checkout <em>app/routes/main.rb</em> to change this response)"
+  end
+end

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

@@ -26,10 +26,10 @@ class <%= @class_name %> < Sinatra::Application
   set :environment, RACK_ENV.to_sym if defined?(RACK_ENV)
 
   # Attempts to require all dependencies with bundler, if this fails, bundle and then try again
-  def self.bundler_require_dependencies(environment=nil)
+  def self.bundler_require_dependencies(environment='default')
     require 'bundler'
-    require File.expand_path(File.join(File.dirname(__FILE__), '/../vendor', 'gems', 'environment'))
-    Bundler.require_env(environment)
+    Bundler.setup(environment.to_sym)
+    Bundler.require(environment.to_sym)
   rescue LoadError => e
     puts "Bundler must be run to resolve dependencies!"
     system("cd #{ROOT_DIR}; bundle install")

data/generators/components/component_actions.rb

@@ -13,10 +13,10 @@ module SinatraMore
     # insert_into_gemfile(name, :group => :testing)
     def insert_into_gemfile(name, options={})
       after_pattern = "# Component requirements\n"
-      after_pattern = "# #{options[:group].to_s.capitalize} requirements\n" if environment = options[:group]
+      after_pattern = "# #{options[:group].to_s.capitalize} requirements\n" if group = options[:group]
       include_text = "gem '#{name}'" 
       include_text << ", :require => #{options[:require].inspect}" if options[:require]
-      include_text << ", :group => #{environment.inspect}" if environment
+      include_text << ", :group => #{group.inspect}" if group
       include_text << "\n"
       options.merge!(:content => include_text, :after => after_pattern)
       inject_into_file('Gemfile', options[:content], :after => options[:after])

data/generators/components/orms/activerecord_orm_gen.rb

@@ -7,21 +7,21 @@ module ActiveRecordInitializer
     app.configure :development do
       ActiveRecord::Base.establish_connection(
         :adapter => 'sqlite3',
-        :database => 'your_dev_db_here'
+        :database => ":memory:"
       )
     end
 
     app.configure :production do
       ActiveRecord::Base.establish_connection(
         :adapter => 'sqlite3',
-        :database => 'your_production_db_here'
+        :database => ":memory:"
       )
     end
 
     app.configure :test do
       ActiveRecord::Base.establish_connection(
         :adapter => 'sqlite3',
-        :database => 'your_test_db_here'
+        :database => ":memory:"
       )
     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(: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') }
+    app.configure(:development) { DataMapper.setup(:default, 'sqlite3::memory:') }
+    app.configure(:production)  { DataMapper.setup(:default, 'sqlite3::memory:') }
+    app.configure(:test)        { DataMapper.setup(:default, 'sqlite3::memory:') }
   end
 end
 DM
@@ -44,7 +44,7 @@ User.auto_upgrade!
 USER
     
     def setup_orm
-      require_dependencies 'dm-core', 'dm-validations'
+      require_dependencies 'data_objects', 'do_sqlite3', 'dm-core', 'dm-validations'
       create_file("config/initializers/data_mapper.rb", DM)
       create_file("app/models/user.rb", USER)
     end

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.34"
+  s.version = "0.3.35"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "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/routes/main.rb.tt",
      "generators/base_app/app/views/.empty_directory",
      "generators/base_app/config.ru.tt",
      "generators/base_app/config/boot.rb.tt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.34
+  version: 0.3.35
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -141,6 +141,7 @@ files:
 - 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/routes/main.rb.tt
 - generators/base_app/app/views/.empty_directory
 - generators/base_app/config.ru.tt
 - generators/base_app/config/boot.rb.tt