wd_sinatra 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Weasel Diesel Sinatra Changelog
 
+## 1.0.4
+* Minor change to the Rakefile to support the new
+  `wd_sinatra_active_record` gem.
+* Calling `WDSinatra::AppLoader.set_loadpath` now requires a root path
+  (used to be optional) and sets the app's root path if not set already.
+
 ## 1.0.3
 * Bug release due to a problem with requiring the new `WSList
   extension`.

data/README.md

@@ -71,6 +71,12 @@ abspath=$(cd ${0%/*} && echo $PWD/${0##*/})
 $abspath/../../bin/console
 ```
 
+### ORM
+
+By default the generated app doesn't come with any ORMs, but if you want to use ActiveRecord, you can use this gem:
+[wd_sinatra_active_record](https://github.com/mattetti/wd_sinatra_active_record)
+
+
 ### Documentation generation
 
     $ rake doc:services
@@ -213,14 +219,6 @@ Of course, you'll need to require `Yajl` first and add it to your
 Gemfile if you want to use Bundler.
 
 
-
-## Using an ORM
-
-TODO: see https://github.com/mattetti/sinatra-web-api-example/  for now
-for an example of setting up ActiveRecord.
-Eventually the generator will take an option to generate an AR, DM or
-other ORM template.
-
 ## Update
 
 To update your app, just update your gem dependency on `wd_sinatra`, you

data/lib/wd_sinatra/app_loader.rb

@@ -29,7 +29,7 @@ module WDSinatra
       @root = root_path
       unless @booted
         set_env
-        set_loadpath
+        set_loadpath(root_path)
         load_environment
         load_lib_dependencies
         load_app_file
@@ -74,8 +74,8 @@ module WDSinatra
       LOGGER.debug(debug_msg) if debug_msg
     end
 
-    def set_loadpath(root=nil)
-      root ||= root_path
+    def set_loadpath(root)
+      @root ||= root
       $: << root
       $: << File.join(root, 'lib')
       $: << File.join(root, 'models')

data/lib/wd_sinatra/version.rb

@@ -1,5 +1,5 @@
 module WD
   module Sinatra
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/templates/Rakefile

@@ -17,8 +17,16 @@ task :default => :test
 
 # boot the app
 task :setup_app do
-  ENV['DONT_CONNECT'] = 'true'
-  WDSinatra::AppLoader.server(root)
+  ENV['DONT_CONNECT'] ||= 'true'
+  begin
+    WDSinatra::AppLoader.console(root)
+  rescue Exception => e
+    if defined?(ActiveRecord) && e.is_a?(ActiveRecord::ConnectionNotEstablished)
+      ENV['DONT_CONNECT'] == 'true' ? print(e.message+"\n") : raise(e)
+    else
+      raise(e)
+    end
+  end
 end
 
 task :environment do
@@ -26,7 +34,7 @@ task :environment do
   WDSinatra::AppLoader.server(root)
 end
 
-desc "Prints the available routes set by the application"
+desc "Print the available routes"
 task :routes do
   WDSinatra::AppLoader.console(root)
   print "Available routes: \n"

metadata

@@ -1,118 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wd_sinatra
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.0.4
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Matt Aimonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: weasel_diesel
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
   name: rack
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack-test
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id005
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id006
   prerelease: false
-description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra
+  apps using the Weasel Diesel DSL
+email:
 - mattaimonetti@gmail.com
-executables: 
+executables:
 - wd_sinatra
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -209,37 +212,35 @@ files:
 - wd-sinatra.gemspec
 homepage: https://github.com/mattetti/wd-sinatra
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3412356469792400961
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3412356469792400961
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
-test_files: 
+summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps
+  using the Weasel Diesel DSL
+test_files:
 - test/test_helper.rb
 - test/ws_list_ext_test.rb