wd_sinatra 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Weasel Diesel Sinatra Changelog
 
+## 1.0.1
+* Added dependency on `WeaselDiesel` `1.2.0` or greater since the API
+  slightly changed.
+
 ## 1.0.0
 * It's time for WD to graduate, it's been behaving well in production
   for a while and no major problems were reported. A new rake task was

data/lib/wd_sinatra/sinatra_ext.rb

@@ -108,14 +108,14 @@ class WeaselDiesel
     service     = self
     upcase_verb = service.verb.to_s.upcase
     unless ENV['DONT_PRINT_ROUTES']
-      LOGGER.info "Available endpoint: #{self.http_verb.upcase} /#{self.url}"
+      LOGGER.info "Available endpoint: #{self.http_verb.upcase} #{self.url}"
     end
     raise "DSL is missing the implementation block" unless ['SKIP_SERVICE_CHECK'] || self.handler
 
     # Define the route directly to save some object allocations on the critical path
     # Note that we are using a private API to define the route and that unlike sinatra usual DSL
     # we do NOT define a HEAD route for every GET route.
-    Sinatra::Base.send(:route, upcase_verb, "/#{self.url}") do
+    Sinatra::Base.send(:route, upcase_verb, self.url) do
       env['wd.service'] = service
       service.handler.dispatch(self)
     end

data/lib/wd_sinatra/test_unit_helpers.rb

@@ -6,8 +6,8 @@ module TestUnitHelpers
     response ||= TestApi.json_response
     print response.rest_response.errors if response.status === 500
     assert response.success?, message || ["Body: #{response.rest_response.body}", "Errors: #{response.errors}", "Status code: #{response.status}"].join("\n")
-    service = WSList.all.find{|s| s.verb == response.verb && s.url == response.uri[1..-1]}
-    raise "Service for (#{response.verb.upcase} #{response.uri[1..-1]}) not found" unless service
+    service = WSList.find(response.verb, response.uri)
+    raise "Service for (#{response.verb.upcase} #{response.uri}) not found" unless service
     unless service.response.nodes.empty?
       assert response.body.is_a?(Hash), "Invalid JSON response:\n#{response.body}"
       valid, errors = service.validate_hash_response(response.body)

data/lib/wd_sinatra/version.rb

@@ -1,5 +1,5 @@
 module WD
   module Sinatra
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/templates/Rakefile

@@ -31,7 +31,7 @@ task :routes do
   WDSinatra::AppLoader.console(root)
   print "Available routes: \n"
   WSList.all.each do |service|
-    print "#{service.http_verb.upcase}\t/#{service.url}\n"
+    print "#{service.http_verb.upcase}\t#{service.url}\n"
   end
 end
 

data/templates/api/hello_world.rb

@@ -1,4 +1,4 @@
-describe_service "hello_world" do |service|
+describe_service "/hello_world" do |service|
   service.formats   :json
   service.http_verb :get
   service.disable_auth # on by default

data/templates/lib/tasks/doc_generator/template.erb

@@ -63,7 +63,7 @@
         <% WSList.all.each do |api| %>
           <div class="api" id="<%= "raw-#{api.verb}-#{api.url}" %>">
             <div>
-              <h2><%= api.verb.upcase %> <%= '[SSL]' if api.ssl %> /<%= api.url %></h2>
+              <h2><%= api.verb.upcase %> <%= '[SSL]' if api.ssl %> <%= api.url %></h2>
               <% if api.auth_required %>
                 <span class='label important'>Authentication required</span>
               <% end %>

data/wd-sinatra.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = WD::Sinatra::VERSION
 
-  gem.add_dependency('weasel_diesel')
+  gem.add_dependency('weasel_diesel', ">= 1.2.0")
   gem.add_dependency('thor')
 end
 

metadata

@@ -1,60 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wd_sinatra
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Matt Aimonetti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: weasel_diesel
-  prerelease: false
-  requirement: &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: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  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
-  version_requirements: *id002
-description: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps using the Weasel Diesel DSL
-email: 
+  prerelease: false
+  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
 - CHANGELOG.md
 - Gemfile
@@ -147,37 +144,28 @@ 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: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 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
+summary: Weasel-Diesel Sinatra app gem, allowing you to generate/update sinatra apps
+  using the Weasel Diesel DSL
 test_files: []
-
 has_rdoc: