yodatra 0.1.0 → 0.1.1

data/lib/yodatra/boot.rb

@@ -19,14 +19,23 @@ module Yodatra
       if app.booting
         # ActiveRecord
         app.register Sinatra::ActiveRecordExtension
+        sinatra_ar_version = Gem.loaded_specs['sinatra-activerecord'].version.to_s
+        if sinatra_ar_version.gsub('\.', '') <= '123'
+          app.set :database_file, "#{Dir.pwd}/config/database.yml"
+        else
+          app.logger.warn("check out the new version (#{sinatra_ar_version}) of sinatra-activerecord, does it include PR#19 ?") if app.logger
+        end
+
         # Models
         Dir["#{app.models_directory}/**/*.rb"].sort.each do |file_path|
           require File.expand_path file_path
         end
+
         # Controllers
         Dir["#{app.controllers_directory}/**/*.rb"].sort.each do |file_path|
           require File.expand_path file_path
         end
+
         app.set :booting, false
         app.set :booted, true
       end

data/lib/yodatra/logger.rb

@@ -0,0 +1,20 @@
+require 'sinatra/logger'
+
+module Yodatra
+  module Logger
+    def self.registered(app)
+      filename = File.join(Dir.pwd, 'log', "#{app.environment}.log")
+      app.configure do
+        app.enable :logging
+        file = File.new(filename, 'a+')
+        file.sync = true
+        app.use Rack::CommonLogger, file
+      end
+      app.register Sinatra::Logger
+      app.set :logger_level, :debug unless app.environment == 'production'
+      # set the full path to the log file
+      app.set :logger_log_file, lambda { filename }
+
+    end #/ self.registered
+  end
+end

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/yodatra.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new 'yodatra', Yodatra::VERSION do |s|
   s.add_dependency 'rack', '~> 1.4'
   s.add_dependency 'sinatra', '~> 1.4.4', '>= 1.4.4'
   s.add_dependency 'sinatra-activerecord'
+  s.add_dependency 'sinatra-logger'
   s.add_dependency 'sinatra-contrib', '~> 1.4.2', '>= 1.4.2'
   s.add_dependency 'rack-protection', '~> 1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yodatra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -65,6 +65,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-logger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +134,7 @@ files:
 - lib/yodatra/base.rb
 - lib/yodatra/boot.rb
 - lib/yodatra/initializers.rb
+- lib/yodatra/logger.rb
 - lib/yodatra/version.rb
 - yodatra.gemspec
 homepage: http://squareteam.github.io/yodatra