captivity 0.0.2 → 0.0.3
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.
- checksums.yaml +7 -0
 - data/captivity.gemspec +6 -5
 - data/lib/captivity.rb +2 -1
 - data/test/test_captivity.rb +17 -1
 - metadata +14 -25
 
    
        checksums.yaml
    ADDED
    
    | 
         @@ -0,0 +1,7 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            ---
         
     | 
| 
      
 2 
     | 
    
         
            +
            SHA1:
         
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 11b7bc9ecf5fba0c5cb4d30853e1e9a28b1e06ff
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: c0d1ec12314fdfa3a155bb72199939b197823971
         
     | 
| 
      
 5 
     | 
    
         
            +
            SHA512:
         
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: 1b8d0350d5f6866c0c02434277bdb9774d4536e723d08db58ed6017019c364a51923a90832c144033dedbbf4d7cb5dfd02ac0a5f266ac9c935080b35b308b04b
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 4fb688865287a62656c6c478d374b42816a58edff960ea7fa945fef5d29c64fdd5c22e820d4fb6ddde8cd633f2c5eac357612139cc87ad43a48770740ddac200
         
     | 
    
        data/captivity.gemspec
    CHANGED
    
    | 
         @@ -2,14 +2,16 @@ 
     | 
|
| 
       2 
2 
     | 
    
         
             
            # DO NOT EDIT THIS FILE DIRECTLY
         
     | 
| 
       3 
3 
     | 
    
         
             
            # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
         
     | 
| 
       4 
4 
     | 
    
         
             
            # -*- encoding: utf-8 -*-
         
     | 
| 
      
 5 
     | 
    
         
            +
            # stub: captivity 0.0.3 ruby lib
         
     | 
| 
       5 
6 
     | 
    
         | 
| 
       6 
7 
     | 
    
         
             
            Gem::Specification.new do |s|
         
     | 
| 
       7 
8 
     | 
    
         
             
              s.name = "captivity"
         
     | 
| 
       8 
     | 
    
         
            -
              s.version = "0.0. 
     | 
| 
      
 9 
     | 
    
         
            +
              s.version = "0.0.3"
         
     | 
| 
       9 
10 
     | 
    
         | 
| 
       10 
11 
     | 
    
         
             
              s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
         
     | 
| 
      
 12 
     | 
    
         
            +
              s.require_paths = ["lib"]
         
     | 
| 
       11 
13 
     | 
    
         
             
              s.authors = ["Julik Tarkhanov"]
         
     | 
| 
       12 
     | 
    
         
            -
              s.date = " 
     | 
| 
      
 14 
     | 
    
         
            +
              s.date = "2015-07-05"
         
     | 
| 
       13 
15 
     | 
    
         
             
              s.description = "A simple logging wrapper for Rack"
         
     | 
| 
       14 
16 
     | 
    
         
             
              s.email = "me@julik.nl"
         
     | 
| 
       15 
17 
     | 
    
         
             
              s.extra_rdoc_files = [
         
     | 
| 
         @@ -29,12 +31,11 @@ Gem::Specification.new do |s| 
     | 
|
| 
       29 
31 
     | 
    
         
             
              ]
         
     | 
| 
       30 
32 
     | 
    
         
             
              s.homepage = "http://github.com/julik/captivity"
         
     | 
| 
       31 
33 
     | 
    
         
             
              s.licenses = ["MIT"]
         
     | 
| 
       32 
     | 
    
         
            -
              s. 
     | 
| 
       33 
     | 
    
         
            -
              s.rubygems_version = "1.8.24"
         
     | 
| 
      
 34 
     | 
    
         
            +
              s.rubygems_version = "2.2.2"
         
     | 
| 
       34 
35 
     | 
    
         
             
              s.summary = "One-line Logger attachment for Rack apps"
         
     | 
| 
       35 
36 
     | 
    
         | 
| 
       36 
37 
     | 
    
         
             
              if s.respond_to? :specification_version then
         
     | 
| 
       37 
     | 
    
         
            -
                s.specification_version =  
     | 
| 
      
 38 
     | 
    
         
            +
                s.specification_version = 4
         
     | 
| 
       38 
39 
     | 
    
         | 
| 
       39 
40 
     | 
    
         
             
                if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
         
     | 
| 
       40 
41 
     | 
    
         
             
                  s.add_runtime_dependency(%q<rack>, [">= 0"])
         
     | 
    
        data/lib/captivity.rb
    CHANGED
    
    | 
         @@ -3,7 +3,7 @@ require 'logger' 
     | 
|
| 
       3 
3 
     | 
    
         
             
            require 'rack/commonlogger'
         
     | 
| 
       4 
4 
     | 
    
         | 
| 
       5 
5 
     | 
    
         
             
            class Captivity
         
     | 
| 
       6 
     | 
    
         
            -
              VERSION = '0.0. 
     | 
| 
      
 6 
     | 
    
         
            +
              VERSION = '0.0.3'
         
     | 
| 
       7 
7 
     | 
    
         | 
| 
       8 
8 
     | 
    
         
             
              # Rack::CommonLogger is so ingeniously put together that
         
     | 
| 
       9 
9 
     | 
    
         
             
              # it does not honor the standard logger levels, it uses #write.
         
     | 
| 
         @@ -25,6 +25,7 @@ class Captivity 
     | 
|
| 
       25 
25 
     | 
    
         
             
              # the defined Logger object in the "captivity.logger" of the env hash
         
     | 
| 
       26 
26 
     | 
    
         
             
              def call(env)
         
     | 
| 
       27 
27 
     | 
    
         
             
                env["captivity.logger"] = @logger
         
     | 
| 
      
 28 
     | 
    
         
            +
                env["rack.logger"] = @logger
         
     | 
| 
       28 
29 
     | 
    
         
             
                set_active_record_logger_if_present!
         
     | 
| 
       29 
30 
     | 
    
         
             
                @app.call(env)
         
     | 
| 
       30 
31 
     | 
    
         
             
              rescue StandardError, LoadError, SyntaxError => exception
         
     | 
    
        data/test/test_captivity.rb
    CHANGED
    
    | 
         @@ -34,7 +34,23 @@ class TestCaptivity < Test::Unit::TestCase 
     | 
|
| 
       34 
34 
     | 
    
         
             
                assert_match /GET \/boom/, stream.string
         
     | 
| 
       35 
35 
     | 
    
         
             
              end
         
     | 
| 
       36 
36 
     | 
    
         | 
| 
       37 
     | 
    
         
            -
              def  
     | 
| 
      
 37 
     | 
    
         
            +
              def test_captivity_injects_env_variable_rack_logger
         
     | 
| 
      
 38 
     | 
    
         
            +
                stream = StringIO.new
         
     | 
| 
      
 39 
     | 
    
         
            +
                
         
     | 
| 
      
 40 
     | 
    
         
            +
                @app = Rack::Builder.app do
         
     | 
| 
      
 41 
     | 
    
         
            +
                   use Captivity, stream
         
     | 
| 
      
 42 
     | 
    
         
            +
                   inner = lambda do |env|
         
     | 
| 
      
 43 
     | 
    
         
            +
                     env["rack.logger"].error("Variable is present!") 
         
     | 
| 
      
 44 
     | 
    
         
            +
                     [200, {'Content-Type' => 'text/plain'}, 'OK']
         
     | 
| 
      
 45 
     | 
    
         
            +
                   end
         
     | 
| 
      
 46 
     | 
    
         
            +
                   run inner
         
     | 
| 
      
 47 
     | 
    
         
            +
                end
         
     | 
| 
      
 48 
     | 
    
         
            +
                
         
     | 
| 
      
 49 
     | 
    
         
            +
                get '/boom'
         
     | 
| 
      
 50 
     | 
    
         
            +
                assert_match /Variable is present/, stream.string
         
     | 
| 
      
 51 
     | 
    
         
            +
              end
         
     | 
| 
      
 52 
     | 
    
         
            +
              
         
     | 
| 
      
 53 
     | 
    
         
            +
              def test_captivity_injects_env_variable_captivity_logger
         
     | 
| 
       38 
54 
     | 
    
         
             
                stream = StringIO.new
         
     | 
| 
       39 
55 
     | 
    
         | 
| 
       40 
56 
     | 
    
         
             
                @app = Rack::Builder.app do
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,62 +1,55 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: captivity
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 0.0. 
     | 
| 
       5 
     | 
    
         
            -
              prerelease: 
         
     | 
| 
      
 4 
     | 
    
         
            +
              version: 0.0.3
         
     | 
| 
       6 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       7 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       8 
7 
     | 
    
         
             
            - Julik Tarkhanov
         
     | 
| 
       9 
8 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       10 
9 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       11 
10 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       12 
     | 
    
         
            -
            date:  
     | 
| 
      
 11 
     | 
    
         
            +
            date: 2015-07-05 00:00:00.000000000 Z
         
     | 
| 
       13 
12 
     | 
    
         
             
            dependencies:
         
     | 
| 
       14 
13 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       15 
14 
     | 
    
         
             
              name: rack
         
     | 
| 
       16 
15 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       17 
     | 
    
         
            -
                none: false
         
     | 
| 
       18 
16 
     | 
    
         
             
                requirements:
         
     | 
| 
       19 
     | 
    
         
            -
                - -  
     | 
| 
      
 17 
     | 
    
         
            +
                - - ">="
         
     | 
| 
       20 
18 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       21 
19 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       22 
20 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       23 
21 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       24 
22 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       25 
     | 
    
         
            -
                none: false
         
     | 
| 
       26 
23 
     | 
    
         
             
                requirements:
         
     | 
| 
       27 
     | 
    
         
            -
                - -  
     | 
| 
      
 24 
     | 
    
         
            +
                - - ">="
         
     | 
| 
       28 
25 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       29 
26 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       30 
27 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       31 
28 
     | 
    
         
             
              name: jeweler
         
     | 
| 
       32 
29 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       33 
     | 
    
         
            -
                none: false
         
     | 
| 
       34 
30 
     | 
    
         
             
                requirements:
         
     | 
| 
       35 
     | 
    
         
            -
                - - ~>
         
     | 
| 
      
 31 
     | 
    
         
            +
                - - "~>"
         
     | 
| 
       36 
32 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       37 
33 
     | 
    
         
             
                    version: 1.8.4
         
     | 
| 
       38 
34 
     | 
    
         
             
              type: :development
         
     | 
| 
       39 
35 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       40 
36 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       41 
     | 
    
         
            -
                none: false
         
     | 
| 
       42 
37 
     | 
    
         
             
                requirements:
         
     | 
| 
       43 
     | 
    
         
            -
                - - ~>
         
     | 
| 
      
 38 
     | 
    
         
            +
                - - "~>"
         
     | 
| 
       44 
39 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       45 
40 
     | 
    
         
             
                    version: 1.8.4
         
     | 
| 
       46 
41 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       47 
42 
     | 
    
         
             
              name: rack-test
         
     | 
| 
       48 
43 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     | 
| 
       49 
     | 
    
         
            -
                none: false
         
     | 
| 
       50 
44 
     | 
    
         
             
                requirements:
         
     | 
| 
       51 
     | 
    
         
            -
                - -  
     | 
| 
      
 45 
     | 
    
         
            +
                - - ">="
         
     | 
| 
       52 
46 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       53 
47 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       54 
48 
     | 
    
         
             
              type: :development
         
     | 
| 
       55 
49 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       56 
50 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       57 
     | 
    
         
            -
                none: false
         
     | 
| 
       58 
51 
     | 
    
         
             
                requirements:
         
     | 
| 
       59 
     | 
    
         
            -
                - -  
     | 
| 
      
 52 
     | 
    
         
            +
                - - ">="
         
     | 
| 
       60 
53 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       61 
54 
     | 
    
         
             
                    version: '0'
         
     | 
| 
       62 
55 
     | 
    
         
             
            description: A simple logging wrapper for Rack
         
     | 
| 
         @@ -67,7 +60,7 @@ extra_rdoc_files: 
     | 
|
| 
       67 
60 
     | 
    
         
             
            - LICENSE.txt
         
     | 
| 
       68 
61 
     | 
    
         
             
            - README.rdoc
         
     | 
| 
       69 
62 
     | 
    
         
             
            files:
         
     | 
| 
       70 
     | 
    
         
            -
            - .document
         
     | 
| 
      
 63 
     | 
    
         
            +
            - ".document"
         
     | 
| 
       71 
64 
     | 
    
         
             
            - Gemfile
         
     | 
| 
       72 
65 
     | 
    
         
             
            - LICENSE.txt
         
     | 
| 
       73 
66 
     | 
    
         
             
            - README.rdoc
         
     | 
| 
         @@ -79,29 +72,25 @@ files: 
     | 
|
| 
       79 
72 
     | 
    
         
             
            homepage: http://github.com/julik/captivity
         
     | 
| 
       80 
73 
     | 
    
         
             
            licenses:
         
     | 
| 
       81 
74 
     | 
    
         
             
            - MIT
         
     | 
| 
      
 75 
     | 
    
         
            +
            metadata: {}
         
     | 
| 
       82 
76 
     | 
    
         
             
            post_install_message: 
         
     | 
| 
       83 
77 
     | 
    
         
             
            rdoc_options: []
         
     | 
| 
       84 
78 
     | 
    
         
             
            require_paths:
         
     | 
| 
       85 
79 
     | 
    
         
             
            - lib
         
     | 
| 
       86 
80 
     | 
    
         
             
            required_ruby_version: !ruby/object:Gem::Requirement
         
     | 
| 
       87 
     | 
    
         
            -
              none: false
         
     | 
| 
       88 
81 
     | 
    
         
             
              requirements:
         
     | 
| 
       89 
     | 
    
         
            -
              - -  
     | 
| 
      
 82 
     | 
    
         
            +
              - - ">="
         
     | 
| 
       90 
83 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       91 
84 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       92 
     | 
    
         
            -
                  segments:
         
     | 
| 
       93 
     | 
    
         
            -
                  - 0
         
     | 
| 
       94 
     | 
    
         
            -
                  hash: 2974344955014551893
         
     | 
| 
       95 
85 
     | 
    
         
             
            required_rubygems_version: !ruby/object:Gem::Requirement
         
     | 
| 
       96 
     | 
    
         
            -
              none: false
         
     | 
| 
       97 
86 
     | 
    
         
             
              requirements:
         
     | 
| 
       98 
     | 
    
         
            -
              - -  
     | 
| 
      
 87 
     | 
    
         
            +
              - - ">="
         
     | 
| 
       99 
88 
     | 
    
         
             
                - !ruby/object:Gem::Version
         
     | 
| 
       100 
89 
     | 
    
         
             
                  version: '0'
         
     | 
| 
       101 
90 
     | 
    
         
             
            requirements: []
         
     | 
| 
       102 
91 
     | 
    
         
             
            rubyforge_project: 
         
     | 
| 
       103 
     | 
    
         
            -
            rubygems_version:  
     | 
| 
      
 92 
     | 
    
         
            +
            rubygems_version: 2.2.2
         
     | 
| 
       104 
93 
     | 
    
         
             
            signing_key: 
         
     | 
| 
       105 
     | 
    
         
            -
            specification_version:  
     | 
| 
      
 94 
     | 
    
         
            +
            specification_version: 4
         
     | 
| 
       106 
95 
     | 
    
         
             
            summary: One-line Logger attachment for Rack apps
         
     | 
| 
       107 
96 
     | 
    
         
             
            test_files: []
         
     |