sinatra_more 0.3.1 → 0.3.2

data/README.rdoc

@@ -580,7 +580,7 @@ The available components and their default options are listed below:
 * renderer: <tt>erb</tt>    (default), <tt>haml</tt>
 * mock:     <tt>mocha</tt>  (default), <tt>rr</tt>
 * script:   <tt>jquery</tt> (default), <tt>prototype</tt>, <tt>rightjs</tt>
-* orm:      <tt>sequel</tt> (default), <tt>datamapper</tt>, <tt>mongomapper</tt>, <tt>activerecord</tt>
+* orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>
  
 The generator framework within sinatra_more is highly extensible and additional components and tools can easily be added. 
 This would be achieved through forking our project and reading through the code in <tt>/generators/sinatra_generator.rb</tt> and

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

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

@@ -26,12 +26,4 @@ class <%= @class_name %> < Sinatra::Application
 
   # Dependencies contains all required gems and core configuration
   require File.dirname(__FILE__) + '/dependencies.rb'
-
-  # Requires the initializer modules which configure specific components
-  Dir[File.dirname(__FILE__) + '/initializers/*.rb'].each do |file|
-    # Each initializer file contains a module called 'XxxxInitializer' (i.e HassleInitializer)
-    require file
-    file_class = File.basename(file, '.rb').classify
-    register "#{file_class}Initializer".constantize
-  end
 end

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

@@ -7,6 +7,14 @@ class <%= @class_name %> < Sinatra::Application
   use Rack::Session::Cookie
   use Rack::Flash
 
+  # Requires the initializer modules which configure specific components
+  Dir[File.dirname(__FILE__) + '/initializers/*.rb'].each do |file|
+    # Each initializer file contains a module called 'XxxxInitializer' (i.e HassleInitializer)
+    require file
+    file_class = File.basename(file, '.rb').classify
+    register "#{file_class}Initializer".constantize
+  end
+  
   # 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"]

data/generators/base_app/config.ru.tt

@@ -1,5 +1,5 @@
 RACK_ENV = ENV["RACK_ENV"] ||= "development" unless defined? RACK_ENV
-ROOT_DIR = $0.gsub(%r{^.*?/}, '/') unless defined? ROOT_DIR
+ENV['DATABASE_URL'] = 'your_database_here'
 
 require File.dirname(__FILE__) + '/app.rb'
 
@@ -8,6 +8,4 @@ log = File.new("log/sinatra.log", "a")
 $stdout.reopen(log)
 $stderr.reopen(log)
 
-ENV['DATABASE_URL'] = 'your_database_here'
-
 run <%= @class_name %>

data/generators/components/component_actions.rb

@@ -6,7 +6,7 @@ module SinatraMore
     def insert_require(*libs)
       options = libs.extract_options!
       options.reverse_merge!(:indent => 0, :after => /require\sgem.*?\n/)
-      multiple_gem_require = "%w[#{libs.join(' ')}].each { |gem| require gem }\n"
+      multiple_gem_require = "%w[#{libs.join(' ')}].each { |lib| require lib }\n"
       req = indent_spaces(options[:indent]) + (libs.size == 1 ? "require '#{libs}'\n" : multiple_gem_require)
       inject_into_file(options[:path], req, :after => options[:after])
     end

data/generators/skeleton_generator.rb

@@ -19,7 +19,7 @@ module SinatraMore
     argument :path, :desc => "The path to create your app"
 
     # Definitions for the available customizable components
-    component_option :orm,      "database engine",    :aliases => '-d', :choices => [:sequel, :datamapper, :mongomapper, :activerecord]
+    component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel]
     component_option :test,     "testing framework",  :aliases => '-t', :choices => [:bacon, :shoulda, :rspec, :testspec, :riot]
     component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr]
     component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/generators/test_skeleton_generator.rb

@@ -17,7 +17,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "create components file containing options chosen with defaults" do
       silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp']) }
       components_chosen = YAML.load_file('/tmp/sample_app/.components')
-      assert_equal 'sequel', components_chosen[:orm]
+      assert_equal 'datamapper', components_chosen[:orm]
       assert_equal 'bacon', components_chosen[:test]
       assert_equal 'mocha', components_chosen[:mock]
       assert_equal 'jquery', components_chosen[:script]
@@ -62,7 +62,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
 
 
   context "the generator for orm components" do
-    should "properly generate default for sequel" do
+    should "properly generate for sequel" do
       SinatraMore::SkeletonGenerator.instance_eval("undef setup_orm if respond_to?('setup_orm')")
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=sequel', '--script=none']) }
       assert_match /Applying.*?sequel.*?orm/, buffer
@@ -80,7 +80,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match_in_file(/class User < ActiveRecord::Base/, '/tmp/sample_app/app/models/user.rb')
     end
 
-    should "properly generate for datamapper" do
+    should "properly generate default for datamapper" do
       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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nathan Esquenazi