couchrest_session_store 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1c4c3fa30d76242b979ee2d05a64a3823e4f7455
+  data.tar.gz: ae8975cba7bb76a3029d1dc47415d15daa0feeb3
+SHA512:
+  metadata.gz: f0079fafa161b1e348676ae7b29ca60e8d3f2bc466a3f6ff07e72e680fc7f154d1a721701b583c02732fa28c813e3e7119818cc596aff8cf0c32178fe930bfab
+  data.tar.gz: 9c41b10a05c7dbc65eea06a7a3725c230b170a21523748f6c47cfe5d345ee23e55586c2afa521d5ee2dfbc6eff9ec2ddbe3ec56195a9534ceab7fa0174b43ba2

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p194
+2.1.5

data/.travis.yml

@@ -1,6 +1,9 @@
 services:
   - couchdb
+# the default bundler version on travis is very old and causes 2.1.5. build issues
+before_install:
+  - gem install bundler
+before_scripe:
+  - "test/setup_couch.sh"
 notifications:
   email: false
-before_script:
-  - "test/setup_couch.sh"

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in couchrest-session-store.gemspec
 gemspec
 
-gem 'debugger'
+gem 'byebug'
 

data/Rakefile

@@ -5,5 +5,7 @@ require 'rake/testtask'
 task default: [:test]
 
 Rake::TestTask.new do |t|
+  t.libs << "test"
   t.pattern = "test/*_test.rb"
+  t.verbose = true
 end

data/couchrest_session_store.gemspec

@@ -14,13 +14,13 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split("\n")
   gem.name = "couchrest_session_store"
   gem.require_paths = ["lib"]
-  gem.version = '0.4.1'
+  gem.version = '0.4.2'
 
   gem.cert_chain  = ['certs/azul.pem']
   gem.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 
-  gem.add_dependency "couchrest"
-  gem.add_dependency "couchrest_model"
+  gem.add_dependency "couchrest", "~> 2.0.0.rc3"
+  gem.add_dependency "couchrest_model", "~> 2.1.0.beta2"
   gem.add_dependency "actionpack", '~> 4.0'
 
   gem.add_development_dependency "minitest"

data/lib/couchrest/model/database_method.rb

@@ -52,7 +52,7 @@ module CouchRest
       protected
 
       def call_database_method
-        if self.respond_to?(self.class.database_method)
+        if self.respond_to?(self.class.database_method, true)
           name = self.send(self.class.database_method)
           self.class.db_name_with_prefix(name)
         else
@@ -72,7 +72,7 @@ module CouchRest
 
         def database
           if database_method
-            if !self.respond_to?(database_method)
+            if !self.respond_to?(database_method, true)
               raise ArgumentError.new("Incorrect argument to database_method(): no such method '#{method}' found in class #{self}.")
             end
             self.server.database(call_database_method)
@@ -107,7 +107,7 @@ module CouchRest
           begin
             CouchRest.head "#{self.server.uri}/#{name}"
             return true
-          rescue RestClient::ResourceNotFound
+          rescue CouchRest::NotFound
             return false
           end
         end

data/lib/couchrest/model/rotation.rb

@@ -10,19 +10,19 @@ module CouchRest
 
       def create(*args)
         super(*args)
-      rescue RestClient::ResourceNotFound => exc
+      rescue CouchRest::NotFound => exc
         raise storage_missing(exc)
       end
 
       def update(*args)
         super(*args)
-      rescue RestClient::ResourceNotFound => exc
+      rescue CouchRest::NotFound => exc
         raise storage_missing(exc)
       end
 
       def destroy(*args)
         super(*args)
-      rescue RestClient::ResourceNotFound => exc
+      rescue CouchRest::NotFound => exc
         raise storage_missing(exc)
       end
 
@@ -138,7 +138,7 @@ module CouchRest
             self.database!
           end
           create_rotation_filter(db)
-          if self.respond_to?(:design_doc)
+          if self.respond_to?(:design_doc, true)
             design_doc.sync!(db)
             # or maybe this?:
             #self.design_docs.each do |design|
@@ -180,7 +180,7 @@ module CouchRest
             design = doc_hash['doc']
             begin
               to.get(design['_id'])
-            rescue RestClient::ResourceNotFound
+            rescue CouchRest::NotFound
               design.delete('_rev')
               to.save_doc(design)
             end
@@ -198,7 +198,7 @@ module CouchRest
           end
           filters = {"not_expired" => filter_string}
           db.save_doc("_id" => "_design/#{name}", "filters" => filters)
-        rescue RestClient::Conflict
+        rescue CouchRest::Conflict
         end
 
         #

data/lib/couchrest/session/document.rb

@@ -27,13 +27,13 @@ class CouchRest::Session::Document < CouchRest::Document
     doc = self.fetch(sid)
     doc.update(session, options)
     return doc
-  rescue RestClient::ResourceNotFound
+  rescue CouchRest::NotFound
     self.build(sid, session, options)
   end
 
   def self.find_by_expires(options = {})
     options[:reduce] ||= false
-    design = database.get '_design/Session'
+    design = database.get! '_design/Session'
     response = design.view :by_expires, options
     response['rows']
   end
@@ -41,8 +41,8 @@ class CouchRest::Session::Document < CouchRest::Document
   def self.create_database!(name=nil)
     db = super(name)
     begin
-      db.get('_design/Session')
-    rescue RestClient::ResourceNotFound
+      db.get!('_design/Session')
+    rescue CouchRest::NotFound
       design = File.read(File.expand_path('../../../../design/Session.json', __FILE__))
       design = JSON.parse(design)
       db.save_doc(design.merge({"_id" => "_design/Session"}))
@@ -55,7 +55,7 @@ class CouchRest::Session::Document < CouchRest::Document
   end
 
   def fetch(sid = nil)
-    @doc = database.get(sid || doc['_id'])
+    @doc = database.get!(sid || doc['_id'])
   end
 
   def to_session
@@ -81,10 +81,10 @@ class CouchRest::Session::Document < CouchRest::Document
 
   def save
     database.save_doc(doc)
-  rescue RestClient::Conflict
+  rescue CouchRest::Conflict
     fetch
     retry
-  rescue RestClient::ResourceNotFound => exc
+  rescue CouchRest::NotFound => exc
     if exc.http_body =~ /no_db_file/
       exc = CouchRest::StorageMissing.new(exc.response, database)
     end

data/lib/couchrest/session/store.rb

@@ -41,10 +41,10 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
     else
       [generate_sid, {}]
     end
-  rescue RestClient::ResourceNotFound
+  rescue CouchRest::NotFound
     # session data does not exist anymore
     return [sid, {}]
-  rescue RestClient::Unauthorized,
+  rescue CouchRest::Unauthorized,
     Errno::EHOSTUNREACH,
     Errno::ECONNREFUSED => e
     # can't connect to couch. We add some status to the session
@@ -53,13 +53,13 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
   end
 
   def set_session(env, sid, session, options)
-    raise RestClient::ResourceNotFound if /^_design\/(.*)/ =~ sid
+    raise CouchRest::Unauthorized if /^_design\/(.*)/ =~ sid
     doc = build_or_update_doc(sid, session, options)
     doc.save
     return sid
-  # if we can't store the session we just return false.
-  rescue RestClient::Unauthorized,
-    RestClient::ServiceUnavailable,
+    # if we can't store the session we just return false.
+  rescue CouchRest::Unauthorized,
+    CouchRest::RequestFailed,
     Errno::EHOSTUNREACH,
     Errno::ECONNREFUSED => e
     return false
@@ -69,7 +69,7 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
     doc = secure_get(sid)
     doc.delete
     generate_sid unless options[:drop]
-  rescue RestClient::ResourceNotFound
+  rescue CouchRest::NotFound
     # already destroyed - we're done.
     generate_sid unless options[:drop]
   end
@@ -88,7 +88,7 @@ class CouchRest::Session::Store < ActionDispatch::Session::AbstractStore
   # this should be prevented on a couch permission level as well.
   # but better be save than sorry.
   def secure_get(sid)
-    raise RestClient::ResourceNotFound if /^_design\/(.*)/ =~ sid
+    raise CouchRest::NotFound if /^_design\/(.*)/ =~ sid
     CouchRest::Session::Document.fetch(sid)
   end
 

data/test/database_method_test.rb

@@ -1,4 +1,5 @@
-require_relative 'test_helper'
+require 'test_helper'
+require "byebug"
 
 class DatabaseMethodTest < MiniTest::Test
 
@@ -17,13 +18,13 @@ class DatabaseMethodTest < MiniTest::Test
   def test_instance_method
     doc1 = TestModel.new({:dbname => 'one'})
     doc1.database.create!
-    assert doc1.database.root.ends_with?('test_db_one')
+    assert_equal '/couchrest_test_db_one', doc1.database.root.path
     assert doc1.save
     doc1.update_attributes(:confirm => 'yep')
 
     doc2 = TestModel.new({:dbname => 'two'})
     doc2.database.create!
-    assert doc2.database.root.ends_with?('test_db_two')
+    assert_equal '/couchrest_test_db_two', doc2.database.root.path
     assert doc2.save
     doc2.confirm = 'sure'
     doc2.save!
@@ -48,7 +49,7 @@ class DatabaseMethodTest < MiniTest::Test
     doc_blue.database!
     doc_blue.save!
 
-    doc_blue_copy = CouchRest.get([root.sub('red','blue'), doc_blue.id].join('/'))
+    doc_blue_copy = CouchRest.get([root.to_s.sub('red','blue'), doc_blue.id].join('/'))
     assert_equal "rose", doc_blue_copy["confirm"]
 
     doc_red.database.delete!
@@ -108,9 +109,7 @@ class DatabaseMethodTest < MiniTest::Test
     assert User.find(user1.id), 'should find user in tmp_users'
     assert_equal user1.login, User.find(user1.id).login
     assert_equal 'test-user-1', User.server.database('couchrest_tmp_users').get(user1.id)['login']
-    assert_raises RestClient::ResourceNotFound do
-      User.server.database('couchrest_users').get(user1.id)
-    end
+    assert_nil User.server.database('couchrest_users').get(user1.id)
   end
 
 end

data/test/session_store_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
 class SessionStoreTest < MiniTest::Test
 
@@ -25,9 +25,8 @@ class SessionStoreTest < MiniTest::Test
   def test_prevent_access_to_design_docs
     sid = '_design/bla'
     session = {views: 'my hacked view'}
-    assert_raises RestClient::ResourceNotFound do
-      store_session(sid, session)
-    end
+    store_session(sid, session)
+    assert_nil CouchRest::Session::Document.database.get('_design/bla')
   end
 
   def test_unmarshalled_session_flow
@@ -99,9 +98,7 @@ class SessionStoreTest < MiniTest::Test
   def test_cleanup_expired_sessions
     sid, session = expired_session
     store.cleanup(store.expired)
-    assert_raises RestClient::ResourceNotFound do
-      CouchTester.new.get(sid)
-    end
+    assert_nil CouchTester.new.get(sid)
   end
 
   def test_keep_fresh_during_cleanup

metadata

@@ -1,123 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_session_store
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Azul
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURaRENDQWt5Z0F3SUJB
-  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREE4TVEwd0N3WURWUVFEREFSaGVu
-  VnMKTVJZd0ZBWUtDWkltaVpQeUxHUUJHUllHY21selpYVndNUk13RVFZS0Na
-  SW1pWlB5TEdRQkdSWURibVYwTUI0WApEVEUyTURVd01USXhNamd6TVZvWERU
-  RTNNRFV3TVRJeE1qZ3pNVm93UERFTk1Bc0dBMVVFQXd3RVlYcDFiREVXCk1C
-  UUdDZ21TSm9tVDhpeGtBUmtXQm5KcGMyVjFjREVUTUJFR0NnbVNKb21UOGl4
-  a0FSa1dBMjVsZERDQ0FTSXcKRFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURD
-  Q0FRb0NnZ0VCQU52Y04vWktwZ0dSZ1V1TlZjYVV2dWgyZXNBYwp3WGRpTGRo
-  Vy9kdXg5RlJoZzRJalpDUHIreFJDOGdrYjJnc2tWdlZhZ0NIZmhMbTFxeXh6
-  ZVJGakRsaG55S2luCnIvNzdyZEczSitPNXd3NkU3Z1Z4S05GQVU0ME5DT2Iy
-  ZE9XSTVHcHkwSlExY0JQMWlYUDJPL1ZOdDFQUG9xV1UKbWRNRmpLaU5kQTFa
-  ZGZVUEZ3MW1mbHlkeGRXNkFqc2tocFl4T1NYSVlMcnVyUU9jeHRFWmJENmhj
-  Q0d3b3hIOQpybGxwRmlwbGt2cm9TbGViYVNXcWdiQlRHbExZM0ZaUythYkZq
-  cUxIVEFoSTFJTXJxa2ZMZDhHWktZTzIzcm9zCnR4RDBjZVY3dllIWEVyNWZs
-  SEs2T3JPUkE4bWhRSXZpVDVUd044aXptUWV0SFhTa3o5ckFzWWdzamdjQ0F3
-  RUEKQWFOeE1HOHdDUVlEVlIwVEJBSXdBREFMQmdOVkhROEVCQU1DQkxBd0hR
-  WURWUjBPQkJZRUZNL2RmSG5pOWFoZQo1TGFMcEhHVWlJNEdURWNHTUJvR0Ex
-  VWRFUVFUTUJHQkQyRjZkV3hBY21selpYVndMbTVsZERBYUJnTlZIUklFCkV6
-  QVJnUTloZW5Wc1FISnBjMlYxY0M1dVpYUXdEUVlKS29aSWh2Y05BUUVGQlFB
-  RGdnRUJBS2k5VzVEQjQza0IKeU4zc0VpMThZQ0VvdDlTSlZHSk4rc1A0SG9F
-  QmZ6UTBZNE9majFrU1A3RFZYYUlIa0ZGQjdUaDhPeDdHRnFuMApTUjA4emMw
-  WlA3eHQwUnU2b1NFUFhDSTh5R2NNUjI4MURvZVZZdWNUdWRYTXpmVFAxTW5S
-  Nk5LYnFsS3VKWGI1CnFTTkdST0VrVFRMekhGMEVNQU5xTkNKb1hIWHZTZitP
-  S2lGZ0VZM2hvb09pNzFLUDRwbisrZHU1OG95V2FpTWcKM3NkcXhHbXU5R1N4
-  WXhTSXhBb3Fxa2JLaVR6TjFNSWFiVDNuRnVyTnBETFVGT1ZGWkNwQmx2eTNB
-  OTE5U3Q0ZwpwbDJpaG40QXAzNDgrYVdmSFFPSjgxN1BpdkNpZW9tRXlZS1Qv
-  YzE0T0Nza3VJbWNPRGs5bHNrZCtOc3FIQVBhCkhvWXI2WlRHbDlvPQotLS0t
-  LUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2016-05-01 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDZDCCAkygAwIBAgIBATANBgkqhkiG9w0BAQUFADA8MQ0wCwYDVQQDDARhenVs
+  MRYwFAYKCZImiZPyLGQBGRYGcmlzZXVwMRMwEQYKCZImiZPyLGQBGRYDbmV0MB4X
+  DTE2MDUwMTIxMjgzMVoXDTE3MDUwMTIxMjgzMVowPDENMAsGA1UEAwwEYXp1bDEW
+  MBQGCgmSJomT8ixkARkWBnJpc2V1cDETMBEGCgmSJomT8ixkARkWA25ldDCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANvcN/ZKpgGRgUuNVcaUvuh2esAc
+  wXdiLdhW/dux9FRhg4IjZCPr+xRC8gkb2gskVvVagCHfhLm1qyxzeRFjDlhnyKin
+  r/77rdG3J+O5ww6E7gVxKNFAU40NCOb2dOWI5Gpy0JQ1cBP1iXP2O/VNt1PPoqWU
+  mdMFjKiNdA1ZdfUPFw1mflydxdW6AjskhpYxOSXIYLrurQOcxtEZbD6hcCGwoxH9
+  rllpFiplkvroSlebaSWqgbBTGlLY3FZS+abFjqLHTAhI1IMrqkfLd8GZKYO23ros
+  txD0ceV7vYHXEr5flHK6OrORA8mhQIviT5TwN8izmQetHXSkz9rAsYgsjgcCAwEA
+  AaNxMG8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFM/dfHni9ahe
+  5LaLpHGUiI4GTEcGMBoGA1UdEQQTMBGBD2F6dWxAcmlzZXVwLm5ldDAaBgNVHRIE
+  EzARgQ9henVsQHJpc2V1cC5uZXQwDQYJKoZIhvcNAQEFBQADggEBAKi9W5DB43kB
+  yN3sEi18YCEot9SJVGJN+sP4HoEBfzQ0Y4Ofj1kSP7DVXaIHkFFB7Th8Ox7GFqn0
+  SR08zc0ZP7xt0Ru6oSEPXCI8yGcMR281DoeVYucTudXMzfTP1MnR6NKbqlKuJXb5
+  qSNGROEkTTLzHF0EMANqNCJoXHXvSf+OKiFgEY3hooOi71KP4pn++du58oyWaiMg
+  3sdqxGmu9GSxYxSIxAoqqkbKiTzN1MIabT3nFurNpDLUFOVFZCpBlvy3A919St4g
+  pl2ihn4Ap348+aWfHQOJ817PivCieomEyYKT/c14OCskuImcODk9lskd+NsqHAPa
+  HoYr6ZTGl9o=
+  -----END CERTIFICATE-----
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: couchrest_model
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0.beta2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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: rake
   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: A Rails Session Store based on CouchRest Model
@@ -127,8 +109,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .ruby-version
-- .travis.yml
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -153,26 +135,25 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/azul/couchrest_session_store
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails Session Store based on CouchRest Model
 test_files: []