sinatra-scope 0.1.1 → 0.1.2

data/README.md

@@ -0,0 +1,69 @@
+# Sinatra::Scope
+
+Simple nested routes in sinatra.
+
+## Installation
+
+    > gem install sinatra-scope
+
+    # Gemfile
+    gem 'sinatra-scope'
+
+## Usage
+
+The `scope` method is provided as a class method for `Sinatra::Base`. An
+example shows this better than anything else.
+
+```ruby
+class Blog < Sinatra::Base
+  register Sinatra::Scope
+
+  scope :posts do
+    get do
+      @posts = Post.published.paginate(params)
+      erb :posts
+    end
+
+    get(:new) do
+      @post = Post.new
+      erb(:new_post)
+    end
+
+    post do
+      @post = Post.new(params[:post])
+      if @post.save
+        redirect "/posts/#{@post.id}"
+      else
+        erb(:new_post)
+      end
+    end
+
+    scope ":id" do
+      before { @post = Post.find(params[:id]) }
+
+      get { erb(:post) }
+
+      get(:edit) { erb(:edit_post) }
+
+      put do
+        if @post.update_attributes params[:post]
+          redirect "/posts/#{@post.id}"
+        else
+          erb(:edit_post)
+        end
+      end
+
+      delete do
+        @post.destroy
+        redirect "/posts"
+      end
+    end
+  end
+end
+```
+
+## TODO
+
+* before and after in an unamed scope leak out of the scope
+* Is there a way to scope template names?
+* Track scopes as named urls

data/test/helper.rb

@@ -10,10 +10,7 @@ $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
 require 'contest'
 require 'rack/test'
-require 'sinatra/base'
 require 'sinatra/scope'
-require 'sinatra/resource'
-require 'sinatra/urls'
 
 class Sinatra::Base
   # Allow assertions in request context
@@ -23,9 +20,6 @@ end
 # App that includes scope helpers
 class ScopeApp < Sinatra::Base
   register Sinatra::Scope
-  register Sinatra::Resource
-  register Sinatra::UrlScope
-  helpers Sinatra::UrlHelpers
 end
 
 Sinatra::Base.set :environment, :test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-scope
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -66,17 +66,15 @@ extensions: []
 extra_rdoc_files:
 - Gemfile
 - Gemfile.lock
+- README.md
 files:
-- lib/sinatra/resource.rb
 - lib/sinatra/scope.rb
-- lib/sinatra/urls.rb
 - test/contest.rb
 - test/helper.rb
-- test/sinatra_resource_test.rb
 - test/sinatra_scope_test.rb
-- test/sinatra_urls_test.rb
 - Gemfile
 - Gemfile.lock
+- README.md
 homepage: http://github.com/myobie/sinatra-scope
 licenses: []
 post_install_message: 

data/lib/sinatra/resource.rb

@@ -1,69 +0,0 @@
-require 'sinatra/scope'
-
-module Sinatra
-  module Resource
-
-    def resource(name, &block)
-      scope name, &block
-    end
-    alias resources resource
-
-    def member(&block)
-      scope ":id", &block
-    end
-
-    def index(&block)
-      get &block
-    end
-
-    def _new(&block)
-      get "/new", &block
-    end
-
-    def create(&block)
-      post &block
-    end
-
-    def show(&block)
-      if block.arity == 0
-        get &block
-      else
-        get { block.call(params[:id]) }
-      end
-    end
-
-    def edit(&block)
-      if block.arity == 0
-        get "/edit", &block
-      else
-        get("/edit") { block.call(params[:id]) }
-      end
-    end
-
-    def update(&block)
-      if block.arity == 0
-        put &block
-      else
-        put { block.call(params[:id]) }
-      end
-    end
-
-    def _delete(&block)
-      if block.arity == 0
-        get "/delete", &block
-      else
-        get("/delete") { block.call(params[:id]) }
-      end
-    end
-
-    def destroy(&block)
-      if block.arity == 0
-        delete &block
-      else
-        delete { block.call(params[:id]) }
-      end
-    end
-
-  end
-
-end

data/lib/sinatra/urls.rb

@@ -1,35 +0,0 @@
-require 'sinatra/scope'
-require 'active_support/core_ext/class/attribute'
-
-module Sinatra
-
-  class UrlTracker
-    class_attribute :urls
-    self.urls = {}
-
-    def self.add(path, scopes = [], options = {})
-      name = (scopes.join("_") + "_" + path.to_s).gsub(/^_|_$/, "")
-
-      if name =~ /[a-zA-z0-9_\-%]/
-        self.urls[name] = ("/" + scopes.join("/") + "/" + path).squeeze("/")
-      end
-    end
-  end
-
-  module UrlScope
-
-    def scope(path = '', options = {}, &block)
-      UrlTracker.add(super, @scopes, options)
-    end
-
-  end
-
-  module UrlHelpers
-
-    def url(name, *args)
-      UrlTracker.urls[name.to_s]
-    end
-
-  end
-
-end

data/test/sinatra_resource_test.rb

@@ -1,267 +0,0 @@
-require File.expand_path 'helper', File.dirname(__FILE__)
-
-class ResourceTest < Test::Unit::TestCase
-
-  it 'supports the resource method' do
-    mock_app {
-      resource "pages" do
-        get do
-          "Pages are great!"
-        end
-      end
-    }
-
-    get "/pages"
-    assert ok?
-    assert_equal "Pages are great!", body
-  end
-
-  it 'supports the resources method' do
-    mock_app {
-      resources "pages" do
-        get do
-          "Pages are great!"
-        end
-      end
-    }
-
-    get "/pages"
-    assert ok?
-    assert_equal "Pages are great!", body
-  end
-
-  it 'supports the member method' do
-    mock_app {
-      resource "pages" do
-        member do
-          get do
-            "Page id: #{params[:id]}"
-          end
-        end
-      end
-    }
-
-    get "/pages/3"
-    assert ok?
-    assert_equal "Page id: 3", body
-  end
-
-  it "supports the index method of a resource" do
-    mock_app do
-      resource "pages" do
-        index do
-          "Hello"
-        end
-      end
-    end
-
-    get "/pages"
-    assert ok?
-    assert_equal "Hello", body
-  end
-
-  it "supports the new (_new) method of a resource" do
-    mock_app do
-      resource "pages" do
-        _new do
-          "New page"
-        end
-      end
-    end
-
-    get "/pages/new"
-    assert ok?
-    assert_equal "New page", body
-  end
-
-  it "supports the create method of a resource" do
-    mock_app do
-      resource "pages" do
-        create do
-          "Created the page"
-        end
-      end
-    end
-
-    post "/pages", {}
-    assert ok?
-    assert_equal "Created the page", body
-  end
-
-  it "supports the show method of a resource" do
-    mock_app do
-      resource "pages" do
-        member do
-          show do
-            "Page #{params[:id]}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1"
-    assert ok?
-    assert_equal "Page 1", body
-  end
-
-  it "supports the show method of a resource with the id argument" do
-    mock_app do
-      resource "pages" do
-        member do
-          show do |id|
-            "Page #{id}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1"
-    assert ok?
-    assert_equal "Page 1", body
-  end
-
-  it "supports the edit method of a resource" do
-    mock_app do
-      resource "pages" do
-        member do
-          edit do
-            "Edit page #{params[:id]}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1/edit"
-    assert ok?
-    assert_equal "Edit page 1", body
-  end
-
-  it "supports the edit method of a resource with the id argument" do
-    mock_app do
-      resource "pages" do
-        member do
-          edit do |id|
-            "Edit page #{id}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1/edit"
-    assert ok?
-    assert_equal "Edit page 1", body
-  end
-
-  it "supports the update method of a resource" do
-    mock_app do
-      resource "pages" do
-        member do
-          update do
-            "Updated page #{params[:id]}"
-          end
-        end
-      end
-    end
-
-    put "/pages/1", {}
-    assert ok?
-    assert_equal "Updated page 1", body
-  end
-
-  it "supports the update method of a resource with the id argument" do
-    mock_app do
-      resource "pages" do
-        member do
-          update do |id|
-            "Updated page #{id}"
-          end
-        end
-      end
-    end
-
-    put "/pages/1", {}
-    assert ok?
-    assert_equal "Updated page 1", body
-  end
-
-  it "supports the delete (_delete) method of a resource" do
-    mock_app do
-      resource "pages" do
-        member do
-          _delete do
-            "Page #{params[:id]}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1/delete"
-    assert ok?
-    assert_equal "Page 1", body
-  end
-
-  it "supports the delete (_delete) method of a resource with the id argument" do
-    mock_app do
-      resource "pages" do
-        member do
-          _delete do |id|
-            "Page #{id}"
-          end
-        end
-      end
-    end
-
-    get "/pages/1/delete"
-    assert ok?
-    assert_equal "Page 1", body
-  end
-
-  it "supports the destroy method of a resource" do
-    mock_app do
-      resource "pages" do
-        member do
-          destroy do
-            "destroyd page #{params[:id]}"
-          end
-        end
-      end
-    end
-
-    delete "/pages/1", {}
-    assert ok?
-    assert_equal "destroyd page 1", body
-  end
-
-  it "supports the destroy method of a resource with the id argument" do
-    mock_app do
-      resource "pages" do
-        member do
-          destroy do |id|
-            "destroyd page #{id}"
-          end
-        end
-      end
-    end
-
-    delete "/pages/1", {}
-    assert ok?
-    assert_equal "destroyd page 1", body
-  end
-
-  it 'supports using a class as a resource' do
-    class Page; end
-
-    mock_app {
-      resource Page do
-        _new do
-          "Create a new page?"
-        end
-      end
-    }
-
-    get "/pages/new"
-    assert ok?
-    assert_equal "Create a new page?", body
-  end
-
-end

data/test/sinatra_urls_test.rb

@@ -1,35 +0,0 @@
-require File.expand_path 'helper', File.dirname(__FILE__)
-
-class UrlHelperTest < Test::Unit::TestCase
-
-  it "supports the url method" do
-    mock_app do
-      scope "admin" do
-        get do
-          "hello #{url(:admin)}"
-        end
-      end
-    end
-
-    get "/admin"
-    assert ok?
-    assert_equal "hello /admin", body
-  end
-
-  it "supports nested scopes with the url method" do
-    mock_app do
-      scope "admin" do
-        scope "projects" do
-          get do
-            "hello #{url(:admin_projects)}"
-          end
-        end
-      end
-    end
-
-    get "/admin/projects"
-    assert ok?
-    assert_equal "hello /admin/projects", body
-  end
-
-end