sinatra_simple_router 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNjMTU0NDRhYTNmYTE5NTRiZjkxZTdhMjVkZGEyNzk4YjMzMjM4OQ==
+    NzdlNDVmMGY3OGYzYTU5NjZjYTk1YWFhZTFhZTYxNmYzNzY5NjY4OQ==
   data.tar.gz: !binary |-
-    ZWNhY2Q3NjQ2MmJkNGZlYWRiZDg5ZGVjN2NhYTY3M2Q4OWU3ZGVkYg==
-!binary "U0hBNTEy":
+    YWU2ODZiZTZjZTZmMzIxOTBmNjIyZjU4MzIwZGJmZDBlN2Q0MzAzZA==
+SHA512:
   metadata.gz: !binary |-
-    NWFkNjU4YTljZDM5NmJlYmIwNTgxNWE1MTAwNTc3ZDY2OTk3YzgyMjhkMWIz
-    NzIwYTAyNTRmNzVmZjQzNDJiODg1NDlmYTA3ZmMxMzc3MDc4MDUyN2MwNjVi
-    YzljMjlkMmYzZWUyNzJkM2Q3YmQzOGYyNTA1NDRlZjc3MjhjNjg=
+    MDgxOTdhZmY3NDkzOTVjMTFiMjVmMzE1MmY0NzU2YjEzZDkwODQzZTY1Zjlk
+    ZTM5NzU4YjhmNGQ1NGY5Y2YyMDNjNjQ1ZGMzYmI5NDY3OTdkMDBmOGUzMDBl
+    ZGFhZGRlMDNjYmY2NzgyM2Q4MGY2NzBmZDA5Yjc1ZmVkNGJlMDQ=
   data.tar.gz: !binary |-
-    NTk3YzM0N2MzN2Y1ZDAzNzZhNzJiNGJmYjVjNjBkZGJlZjhmOTk0YjAxZTQ4
-    NzNjMWNmZGQ4ZmU2MmMxODk3YjJkNjE2MWExZjU1ZWRhMGQ3ZGYxNDA1YjVi
-    NDNkNDU1NzFiMDE2ZTY5NWZhMWYxNTk2MGNmOWM1NzI2ZGYwZmU=
+    ODZkMTRhYzhlMjJkOTc0ZjAxMTVjM2I1ZjFlMzI2MTZkMGE1MDdjM2Y3Y2M4
+    MGI5Njk1OWFlMDMwNTEzMTQyYWMwN2RmNTk3OGMwNmQ4MjZjNjBlZmE3YjY4
+    OGQzZTQwZTFhYjc3OGQ5NzFlOTNkM2QzNmM5NDc3Yjg1YjFhNjg=

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+notifications:
+  email: false

data/LICENSE.txt

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,9 @@
 # SinatraSimpleRouter
 
-Simple routing abstraction for Sinatra applications. 
+[![Build Status](https://travis-ci.org/elvio/sinatra_simple_router.png)](https://travis-ci.org/elvio/sinatra_simple_router)
+[![RubyGem](https://badge.fury.io/rb/sinatra_simple_router.png)](https://rubygems.org/gems/sinatra_simple_router)
+
+Simple routing abstraction for Sinatra applications.
 
 ## Installation
 
@@ -22,19 +25,27 @@ Or install it yourself as:
 require "sinatra"
 require "sinatra_simple_router"
 
-class UsersController < SinatraSimpleRouter::Controller
-    def show
-        @user = User.find(params[:id])
-        erb :"users/show"
+class OrdersController
+    def initialize(app)
+        @app = app
     end
-    
-    def update
-        @user = User.find(params[:id])
-        @user.update_attributes(params[:user])
-        redirect "/users/#{@user.id}"
+
+    def show
+        @order = Order.find(params[:id])
+        @app.content_type "application/json"
+        @app.body @order.to_json
     end
 end
 
+class Application < Sinatra::Base
+    include SinatraSimpleRouter
+    match :get, "/orders/:id.json", OrdersController, :show
+end
+```
+
+### SinatraSimpleRouter::Controller
+
+```ruby
 class ItemsController < SinatraSimpleRouter::Controller
     def show
       @item = Item.find(params[:id])
@@ -44,13 +55,45 @@ end
 
 class Application < Sinatra::Base
     include SinatraSimpleRouter
-
-    match :get, "/users/:id", UsersController, :show
-    match :patch, "/users/:id", UsersController, :update
     match :get, "/items/:id.json", ItemsController, :show
 end
 ```
 
+### Versioning URLs
+
+```ruby
+require "sinatra"
+require "sinatra_simple_router"
+
+class V1::ItemsController < SinatraSimpleRouter::Controller
+    def show
+      @item = Item.find(params[:id])
+      render json: @item
+    end
+end
+
+class V2::ItemsController < SinatraSimpleRouter::Controller
+    def show
+      @item = Item.find(params[:id])
+      render json: ItemDecorator.new(@item).to_json
+    end
+end
+
+class Application < Sinatra::Base
+    include SinatraSimpleRouter
+
+    # maps '/v1/items/:id.json' to V1::ItemsController
+    version :v1 do
+      match :get, "/items/:id.json", V1::ItemsController, :show
+    end
+
+    # maps '/v2/items/:id.json' to V2::ItemsController
+    version :v2 do
+      match :get, "/items/:id.json", V2::ItemsController, :show
+    end
+end
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -23,5 +23,4 @@ RSpec::Core::RakeTask.new("spec") do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-task :default => :spec
-
+task :default => :spec

data/lib/sinatra_simple_router/controller.rb

@@ -4,19 +4,18 @@ module SinatraSimpleRouter
       @app = app
     end
 
-    def render(options = {})
-      if code=options[:status].to_i and code > 0
-        status code
-      end
+    def render(attrs = {})
+      code = attrs[:status].to_i
+      status(code) if code > 0
 
-      if html=options[:html]
+      if attrs[:html]
         content_type "text/html"
-        body html.to_s
-      elsif json=options[:json]
+        body attrs[:html].to_s
+      elsif attrs[:json]
         content_type "application/json"
-        body json.to_json
+        body attrs[:json].to_json
       else
-        raise ArgumentError.new("Unknown format in #{options.keys.sort}")
+        raise ArgumentError.new("Unknown format in #{attrs.inspect}")
       end
     end
 

data/lib/sinatra_simple_router/version.rb

@@ -1,3 +1,3 @@
 module SinatraSimpleRouter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/sinatra_simple_router.rb

@@ -12,9 +12,20 @@ module SinatraSimpleRouter
 
   module ClassMethods
     def match(method, path, klass, action)
+      if @version
+        path = "/#{@version}#{path}"
+      end
+
+      puts "Registering: #{path}"
       send(method, path) do
         klass.new(self).send(action)
       end
     end
+
+    def version(version, &block)
+      @version = version
+      instance_eval(&block)
+      @version = nil
+    end
   end
 end

data/spec/sinatra_simple_router_spec.rb

@@ -18,14 +18,18 @@ module SinatraSimpleRouter
     end
 
     describe ".match" do
-      before do
-        MyApplication.match(:get, "/", UsersController, :index)
-      end
-
       it "dispatches the route to the controller class and action" do
-        request = Rack::MockRequest.new(MyApplication)
+        request = Rack::MockRequest.new(SimpleApplication)
         response = request.get("/")
-        expect(response.body).to eq("it works")
+        expect(response.body).to eq("index")
+      end
+    end
+
+    describe ".version" do
+      it "uses the specified version as prefix" do
+        request = Rack::MockRequest.new(VersionedApplication)
+        response = request.post("/v1/subscribe")
+        expect(response.body).to eq("subscribe")
       end
     end
   end

data/spec/spec_helper.rb

@@ -10,15 +10,28 @@ module SinatraSimpleRouter
     end
 
     def index
-      "it works"
+      "index"
+    end
+
+    def subscribe
+      "subscribe"
     end
   end
 
   class ItemsController < Controller
   end
 
-  class MyApplication < Sinatra::Base
+  class SimpleApplication < Sinatra::Base
     include SinatraSimpleRouter
+    match(:get, "/", UsersController, :index)
+  end
+
+  class VersionedApplication < Sinatra::Base
+    include SinatraSimpleRouter
+
+    version :v1 do
+      match(:post, "/subscribe", UsersController, :subscribe)
+    end
   end
 
   class HasAncestor < Sinatra::Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra_simple_router
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - elvio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Simple routing and controller abstraction to Sinatra applications