dolt 0.25.0 → 0.26.0

data/test/dolt/sinatra/multi_repo_browser_test.rb

@@ -28,10 +28,10 @@ describe Dolt::Sinatra::MultiRepoBrowser do
   include Rack::Test::Methods
 
   def app
-    actions = Test::Actions.new(Stub::Blob.new)
-    def actions.repositories; []; end
+    lookup = Test::Lookup.new(Stub::Blob.new)
+    def lookup.repositories; []; end
     view = Tiltout.new(Dolt.template_dir)
-    Dolt::Sinatra::MultiRepoBrowser.new(actions, view)
+    Dolt::Sinatra::MultiRepoBrowser.new(lookup, view)
   end
 
   it "serves the index" do
@@ -42,6 +42,6 @@ describe Dolt::Sinatra::MultiRepoBrowser do
   it "redirects repo requests to main tree" do
     get "/gitorious.git"
     assert_equal 302, last_response.status
-    assert_equal "/gitorious.git/tree/HEAD:", last_response.headers["Location"]
+    assert_match "/gitorious.git/tree/HEAD:", last_response.headers["Location"]
   end
 end

data/test/dolt/sinatra/single_repo_browser_test.rb

@@ -29,9 +29,9 @@ describe Dolt::Sinatra::SingleRepoBrowser do
 
   def app
     dir = Pathname("../../../").realpath.to_s
-    actions = Test::Actions.new(Stub::Blob.new)
+    lookup = Test::Lookup.new(Stub::Blob.new)
     view = Tiltout.new(Dolt.template_dir)
-    Dolt::Sinatra::SingleRepoBrowser.new(dir, actions, view)
+    Dolt::Sinatra::SingleRepoBrowser.new(dir, lookup, view)
   end
 
   it "serves the index" do

data/test/test_helper.rb

@@ -68,15 +68,7 @@ module Stub
 end
 
 module Test
-  class SinatraApp
-    include Dolt::Sinatra::Actions
-    attr_reader :actions, :renderer
-
-    def initialize(actions, renderer)
-      @actions = actions
-      @renderer = renderer
-    end
-
+  class App
     def body(str = nil)
       @body = str if !str.nil?
       @body
@@ -118,9 +110,13 @@ module Test
     def raw_url(repo, ref, path)
       "/#{repo}/raw/#{ref}:#{path}"
     end
+
+    def method_missing(name, *args, &block)
+      @actions.send(name, *args, &block)
+    end
   end
 
-  class RedirectingSinatraApp < SinatraApp
+  class RedirectingApp < App
     def redirect_refs?; true; end
   end
 
@@ -135,7 +131,7 @@ module Test
     end
   end
 
-  class Actions
+  class Lookup
     attr_reader :repo, :ref, :path
 
     def initialize(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.26'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.26'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,6 @@ files:
 - ./bin/dolt
 - ./dolt.gemspec
 - ./lib/dolt/sinatra/actions.rb
-- ./lib/dolt/sinatra/base.rb
 - ./lib/dolt/sinatra/multi_repo_browser.rb
 - ./lib/dolt/sinatra/single_repo_browser.rb
 - ./test/dolt/sinatra/actions_test.rb

data/lib/dolt/sinatra/base.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-#--
-#   Copyright (C) 2012-2013 Gitorious AS
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU Affero General Public License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#++
-require "sinatra/base"
-require "dolt/sinatra/actions"
-
-module Dolt
-  module Sinatra
-    class Base < ::Sinatra::Base
-      attr_reader :actions, :renderer
-      include Dolt::Sinatra::Actions
-
-      def initialize(actions, renderer)
-        @actions = actions
-        @renderer = renderer
-        super()
-      end
-    end
-  end
-end