RubyGems - stoor - Versions diffs - 0.1.3 → 0.1.4 - Mend

stoor 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/README.md +2 -2
data/Rakefile +10 -0
data/config.ru +3 -1
data/lib/stoor/add_after.rb +44 -0
data/lib/stoor/version.rb +1 -1
data/lib/stoor.rb +1 -1
data/spec/lib/stoor/add_after_spec.rb +99 -0
data/spec/spec_helper.rb +5 -0
data/stoor.gemspec +3 -0
metadata +41 -4
data/lib/stoor/fix_css_width.rb +0 -35

data/README.md CHANGED Viewed

@@ -128,8 +128,8 @@ Then in `/etc/apache2/httpd.conf`:
       SetEnv STOOR_EXPIRE_AFTER 60
       SetEnv WIKI_PATH /Users/jgn/Dropbox/wiki
       ServerName wiki.local
-      DocumentRoot "/opt/boxen/rbenv/versions/1.9.2-p320/lib/ruby/gems/1.9.1/gems/stoor-0.0.1/public"
-      <Directory "/opt/boxen/rbenv/versions/1.9.2-p320/lib/ruby/gems/1.9.1/gems/stoor-0.0.1/public">
+      DocumentRoot "/opt/boxen/rbenv/versions/1.9.2-p320/lib/ruby/gems/1.9.1/gems/stoor-0.1.4/public"
+      <Directory "/opt/boxen/rbenv/versions/1.9.2-p320/lib/ruby/gems/1.9.1/gems/stoor-0.1.4/public">
         Allow from all
         Options -MultiViews
       </Directory>

data/Rakefile ADDED Viewed

@@ -0,0 +1,10 @@
+require 'rspec/core/rake_task'
+desc 'Default: run the specs.'
+task :default => [:spec]
+desc 'Test the stoor gem.'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--color', "--format progress"]
+  t.pattern = 'spec/**/*_spec.rb'
+end

data/config.ru CHANGED Viewed

@@ -45,7 +45,9 @@ use Rack::Session::Cookie, :domain => domain, :key => 'rack.session', :secret =>
 use Stoor::GithubAuth
 use Stoor::GitConfig
 use Stoor::Decorate
-use Stoor::FixCssWidth if ENV['STOOR_WIDE']
+if ENV['STOOR_WIDE']
+  use Stoor::AddAfter, /<body>/, '<style type="text/css">#wiki-wrapper { width: 90%; } .markdown-body table { width: 100%; }</style>'
+end
 Precious::App.set(:gollum_path, wiki_path)
 Precious::App.set(:default_markup, :markdown)

data/lib/stoor/add_after.rb ADDED Viewed

@@ -0,0 +1,44 @@
+require 'rack'
+module Stoor
+  class AddAfter
+    include Rack::Utils
+    attr_reader :status, :headers
+    attr_reader :rxp, :string, :content_type
+    def initialize(app, rxp, string, content_type = 'text/html')
+      @app, @rxp, @string, @content_type = app, rxp, string, content_type
+    end
+    def call(env)
+      @status, @headers, response = @app.call(env)
+      @headers = HeaderHash.new(@headers)
+      if has_body && not_encoded && headers['content-type'] &&
+        headers['content-type'].index(content_type)
+        content = Array(response).join('')
+        if content =~ rxp
+          pre, match, post = $`, $&, $'
+          new_body = pre + match + string + post
+          headers['Content-Length'] = new_body.bytesize.to_s
+          return [status, headers, [new_body]]
+        end
+      end
+      [status, headers, response]
+    end
+    private
+    def has_body
+      !STATUS_WITH_NO_ENTITY_BODY.include?(status)
+    end
+    def not_encoded
+      !headers['transfer-encoding']
+    end
+  end
+end

data/lib/stoor/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Stoor
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/stoor.rb CHANGED Viewed

@@ -2,7 +2,7 @@ require 'stoor/logger'
 require 'stoor/github_auth'
 require 'stoor/git_config'
 require 'stoor/decorate'
-require 'stoor/fix_css_width'
+require 'stoor/add_after'
 require 'stoor/views/layout'
 require 'stoor/views/logout'

data/spec/lib/stoor/add_after_spec.rb ADDED Viewed

@@ -0,0 +1,99 @@
+require 'stoor/add_after'
+require 'spec_helper'
+module Stoor
+  describe AddAfter, 'content-type matching' do
+    context 'default with text/plain response' do
+      let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/plain' }, '<body>'] } }
+      let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+      it "skips" do
+        get '/'
+        expect(last_response.body).to eq('<body>')
+      end
+    end
+    context 'default with text/html response' do
+      let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/html' }, '<body>'] } }
+      let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+      it "processes" do
+        get '/'
+        expect(last_response.body).to eq('<body>stuff')
+      end
+    end
+    context 'specifying text/plain with text/html response' do
+      let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/html' }, '<body>'] } }
+      let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff', 'text/plain') }
+      it "skips" do
+        get '/'
+        expect(last_response.body).to eq('<body>')
+      end
+    end
+    context 'specifying regexp with text/html response' do
+      let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/whatever' }, '<body>'] } }
+      let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff', /\Atext\//) }
+      it "processes" do
+        get '/'
+        expect(last_response.body).to eq('<body>stuff')
+      end
+    end
+  end
+  describe AddAfter, 'insertion' do
+    let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/html' }, '<body>'] } }
+    let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+    it 'adds text after the first occurrence of a search string' do
+      get '/'
+      expect(last_response.body).to eq('<body>stuff')
+    end
+  end
+  describe AddAfter, 'insertion with two potential matches' do
+    let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/html' }, '<body> <body>'] } }
+    let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+    it 'adds text only after the first occurrence of a search string' do
+      get '/'
+      expect(last_response.body).to eq('<body>stuff <body>')
+    end
+  end
+  describe AddAfter, 'insertion if response is an Array' do
+    let(:inner_app) { ->(env) { [200, { 'Content-Type' => 'text/html' }, [ '<bo', 'dy>' ] ] } }
+    let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+    it 'adds text after the first occurrence of a search string' do
+      get '/'
+      expect(last_response.body).to eq('<body>stuff')
+    end
+  end
+  describe AddAfter, 'status code implies no body' do
+    let(:inner_app) { ->(env) { [204, { 'Content-Type' => 'text/html' }, '<body>' ] } }
+    let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+    it 'skips' do
+      get '/'
+      expect(last_response.body).to eq('<body>')
+    end
+  end
+  describe AddAfter, 'response is transfer-encoded' do
+    let(:inner_app) { ->(env) { [200, { 'Transfer-Encoding' => 'Chunked', 'Content-Type' => 'text/html' }, '<body>' ] } }
+    let(:app) { AddAfter.new(inner_app, /<body>/, 'stuff') }
+    it 'skips' do
+      get '/'
+      expect(last_response.body).to eq('<body>')
+    end
+  end
+end

data/spec/spec_helper.rb ADDED Viewed

@@ -0,0 +1,5 @@
+require 'rack/test'
+RSpec.configure do |conf|
+  conf.include Rack::Test::Methods
+end

data/stoor.gemspec CHANGED Viewed

@@ -19,4 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra_auth_github', '~> 1.0.0'
   s.add_dependency 'json',                '~> 1.8.0'
   s.executables << 'stoor'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'rspec'
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stoor
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
@@ -75,6 +75,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Front-end for Gollum
 email: john@7fff.com
 executables:
@@ -85,11 +117,12 @@ files:
 - .gitignore
 - Gemfile
 - README.md
+- Rakefile
 - bin/stoor
 - config.ru
 - lib/stoor.rb
+- lib/stoor/add_after.rb
 - lib/stoor/decorate.rb
-- lib/stoor/fix_css_width.rb
 - lib/stoor/git_config.rb
 - lib/stoor/github_auth.rb
 - lib/stoor/logger.rb
@@ -99,6 +132,8 @@ files:
 - lib/stoor/views/logout.rb
 - log/.gitignore
 - public/.gitignore
+- spec/lib/stoor/add_after_spec.rb
+- spec/spec_helper.rb
 - stoor.gemspec
 homepage: https://rubygems.org/gems/stoor
 licenses: []
@@ -125,4 +160,6 @@ rubygems_version: 1.8.23
 signing_key:
 specification_version: 3
 summary: Front-end for Gollum
-test_files: []
+test_files:
+- spec/lib/stoor/add_after_spec.rb
+- spec/spec_helper.rb

data/lib/stoor/fix_css_width.rb DELETED Viewed

@@ -1,35 +0,0 @@
-module Stoor
-  class FixCssWidth
-    include Rack::Utils
-    ADDITIONAL_STYLES = '<style type="text/css">#wiki-wrapper { width: 90%; } .markdown-body table { width: 100%; }</style>'
-    def initialize(app); @app = app; end
-    def call(env)
-      @request = Rack::Request.new(env)
-      status, headers, response = @app.call(env)
-      headers = HeaderHash.new(headers)
-      if !STATUS_WITH_NO_ENTITY_BODY.include?(status) &&
-          !headers['transfer-encoding'] &&
-          headers['content-type'] &&
-          headers['content-type'].include?("text/html")
-        # TODO: If the response isn't an Array, it's a Rack::File or something, so ignore
-        if response.respond_to? :inject
-          content = response.inject("") { |content, part| content << part }
-          if content =~ /<body>/
-            pre, match, post = $`, $&, $'
-            new_body = pre + match + ADDITIONAL_STYLES + post
-            headers['Content-Length'] = new_body.bytesize.to_s
-            return [status, headers, [new_body]]
-          end
-        end
-      end
-      [status, headers, response]
-    end
-  end
-end