findit 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a0af7fdc13e935c0c272b7856c7696a718b3b0
-  data.tar.gz: 8b5a7c64c41d532c216655ae47e32631792e6960
+  metadata.gz: 6a8a4312793f6f42a65341ed111881e256230f35
+  data.tar.gz: c8a38afe7a521f7663915b1bfac93fc1d54257c8
 SHA512:
-  metadata.gz: 04bca2768a0452e08b151793ae973397428ede963f27634b17a31db5b6683ccd1edbd6e49b93cad0b700a962947b8e63de90d2446d9352a46649914f86940b75
-  data.tar.gz: 90c76bee21b2634f2cb7c37c191db5f8f92ed8dea834113e026804f42a79e2242e3bf4ba5aeefeda8aad41b80f305c7efb1422dc104e23003a62cc0d5635e56a
+  metadata.gz: 9d8fd66b0123e72b5c08f08b520d243c63cf1b1953f64cd06d89ce58d6c0aba245bfe3ad1a111fe84bbb44fe997aaa94141d6c941cb0aedfc8873281935d61e7
+  data.tar.gz: 7650158362ba60928cb1302c2f6202ffaeb91907b88d496306337e9f5cfbdcbf9685fdedd133d548933f6fba9b8024ac58e9e9711418dc88d8729baa3b791775

data/.drone.yml

@@ -1,19 +1,86 @@
-build:
-  test:
-    image: abakpress/dind-testing
-    pull: true
-    privileged: true
-    volumes:
-      - /home/data/drone/images:/images
-      - /home/data/drone/gems:/bundle
+name: build
+
+kind: pipeline
+type: docker
+
+volumes:
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+  - name: images
+    host:
+      path: /home/data/drone/images
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: keys
+    host:
+      path: /home/data/drone/key_cache
+
+spec_step_common: &spec_step_common
+  image: abakpress/dind-testing:1.0.3
+  pull: if-not-exists
+  privileged: true
+  volumes:
+    - name: images
+      path: /images
+    - name: bundle
+      path: /bundle
+    - name: keys
+      path: /ssh_keys
+  commands:
+    - prepare-build
+
+    - fetch-images
+      --image whilp/ssh-agent
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+
+    - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
+    - dip provision
+    - dip rspec
+
+steps:
+  - name: Tests Ruby 2.2
     environment:
-      - COMPOSE_FILE_EXT=drone
-      - RUBY_IMAGE_TAG=2.2-latest
-    commands:
-      - wrapdocker docker -v
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - fetch-images
-        --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+  - name: Tests Ruby 2.3
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.3
+      RUBY_IMAGE_TAG: 2.3-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: Tests Ruby 2.4
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.4
+      RUBY_IMAGE_TAG: 2.4-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - dip provision
-      - dip rspec
+  - name: Tests Ruby 2.5
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.5
+      RUBY_IMAGE_TAG: 2.5-latest
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: release
+    image: abakpress/gem-publication:latest
+    pull: if-not-exists
+    when:
+      event: push
+      branch: master
+      status: success
+    volumes:
+      - name: rubygems
+        path: /root/.gem
+    commands:
+      - release-gem --public

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /gemfiles/*
 /spec/internal/test
+/.idea/

data/Appraisals

@@ -1,20 +1,43 @@
-appraise 'rails3.1' do
-  gem 'rails', '~> 3.1'
+if RUBY_VERSION < '2.4'
+  appraise 'rails4.0' do
+    gem 'activesupport', '~> 4.0.0'
+    gem 'sqlite3', '~> 1.3.6'
+  end
+
+  appraise 'rails4.1' do
+    gem 'activesupport', '~> 4.1.0'
+    gem 'sqlite3', '~> 1.3.6'
+  end
 end
 
-appraise 'rails3.2' do
-  gem 'rails', '~> 3.2'
+appraise 'rails4.2' do
+  gem 'activesupport', '~> 4.2.0'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
-appraise 'rails4.0' do
-  gem 'rails', '~> 4.0'
+appraise 'rails5.0' do
+  gem 'activesupport', '~> 5.0.0'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
-appraise 'rails4.1' do
-  gem 'rails', '~> 4.1'
+appraise 'rails5.1' do
+  gem 'activesupport', '~> 5.1.0'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
-appraise 'rails4.2' do
-  gem 'rails', '~> 4.2'
+appraise 'rails5.2' do
+  gem 'activesupport', '~> 5.2.0'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
+if RUBY_VERSION >= '2.5'
+  appraise 'rails6.0' do
+    gem 'activesupport', '~> 6.0.0'
+    gem 'sqlite3', '~> 1.4'
+  end
+
+  appraise 'rails6.1' do
+    gem 'activesupport', '~> 6.1.0'
+    gem 'sqlite3', '~> 1.4'
+  end
+end

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+# v1.4.1
+
+* 2021-08-06 [0941afd](../../commit/0941afd) - __(TamarinEA)__ Release 1.4.1 
+* 2021-08-06 [9d06ecf](../../commit/9d06ecf) - __(TamarinEA)__ chore: test ruby 2.2-2.5 and rails 4.0-6.1 
+* 2018-05-29 [3fd7608](../../commit/3fd7608) - __(Pavel Galkin)__ fix: expire_in -> expires_in typo 
+Из поисков по коду как я понял expires_in это верный вариант
+
+https://github.com/sorentwo/readthis/blob/v2.0.2/lib/readthis/cache.rb#L395
+
+# v1.4.0
+
+* 2017-05-03 [fd29452](../../commit/fd29452) - __(evseevleo)__ feat(collection): delegate :shift 
+* 2017-04-03 [92e5b37](../../commit/92e5b37) - __(Denis Korobicyn)__ Release 1.3.0 
+
+# v1.3.0
+
+* 2017-03-31 [51de445](../../commit/51de445) - __(Denis Korobicyn)__ feature: cache extension 
+* 2017-03-30 [7e85787](../../commit/7e85787) - __(Denis Korobicyn)__ feature: single extension 
+* 2017-03-30 [fa2445f](../../commit/fa2445f) - __(Denis Korobicyn)__ chore: add drone CI 
+
+# v1.2.0
+
+* 2016-05-10 [ce9751b](../../commit/ce9751b) - __(Denis Korobicyn)__ feature: will_paginate integration (#5) 
+
+# v1.1.0
+
+* 2016-05-06 [cc5c612](../../commit/cc5c612) - __(Denis Korobicyn)__ feature: delegate to_a, to_ary to call (#4) 
+
+# v1.0.0
+
+* 2016-05-05 [222dc6e](../../commit/222dc6e) - __(Denis Korobicyn)__ version 1.0.0 
+* 2016-05-05 [baffa09](../../commit/baffa09) - __(Denis Korobicyn)__ feature: removed `data`, and pure virtual method - `find` (#3) 
+* 2016-05-05 [274a7af](../../commit/274a7af) - __(Denis Korobicyn)__ fix: cache key with namespace of class name (#2) 
+
+# v0.1.0
+
+* 2016-05-04 [1d8e898](../../commit/1d8e898) - __(Denis Korobicyn)__ Init commit (#1) 
+* Init commit
+
+* 2016-04-26 [56d5ce8](../../commit/56d5ce8) - __(Artem Napolskih)__ Initial commit 

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
-gem 'mime-types', '< 3.0' if RUBY_VERSION < '2'
 
 gemspec

data/README.md

@@ -156,7 +156,7 @@ class PostsController < ApplicationController
 end
 
 #/app/views/posts/index.html.erb
-<% cache(@posts, expire_in: 30.minutes) do %>
+<% cache(@posts, expires_in: 30.minutes) do %>
    <%=render 'post', collection: @posts, as: :post%> # it will automaticly iterate over finder results by each method
 ```
 
@@ -197,7 +197,7 @@ class PostsController < ApplicationController
 end
 
 # app/views/posts/index.html.erb
-<% cache(@posts, expire_in: 30.minutes) do %>
+<% cache(@posts, expires_in: 30.minutes) do %>
   <%= render 'post', collection: @posts, as: :post %>
   <%= will_paginate @posts %>
 ```
@@ -232,7 +232,7 @@ end
 ### Cache
 
 Extends finder with cache possibility. Every call of `call` method will be cached in `Rails.cache`.
-Method `cache options` allows you to add custom options like `expire_in` or `tags` to `Rails.cache.fetch`.
+Method `cache options` allows you to add custom options like `expires_in` or `tags` to `Rails.cache.fetch`.
 If you want to disable cache dependent of initialization arguments, you can use `cache?` DSL method.
 
 All in one Example:
@@ -247,7 +247,7 @@ class CachedPostsFinder
   end
 
   cache_options do
-    {expire_in: 15.minutes} # This will be directly passed to Rails.cache.fetch
+    {expires_in: 15.minutes} # This will be directly passed to Rails.cache.fetch
   end
 
   def initialize(user)

data/dip.yml

@@ -1,8 +1,8 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 2.2
-  RUBY_IMAGE_TAG: 2.2-latest
+  DOCKER_RUBY_VERSION: 2.5
+  RUBY_IMAGE_TAG: 2.5-latest
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test
 

data/findit.gemspec

@@ -17,17 +17,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activesupport', '>= 3.1'
+  spec.add_runtime_dependency 'activesupport', '>= 4.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'will_paginate'
   spec.add_development_dependency "rspec", ">= 3.2"
-  spec.add_development_dependency "rspec-rails", ">= 3.2"
+  spec.add_development_dependency "rspec-rails", ">= 3.9.1"
   spec.add_development_dependency 'combustion', '>= 0.5'
   spec.add_development_dependency "appraisal", ">= 2.1.0"
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'shoulda-matchers', '< 3.0.0'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'test-unit'
 end

data/lib/findit/cache.rb

@@ -14,7 +14,7 @@
 #    end
 #
 #    cache_options do
-#      {expire_in: 15.minutes}
+#      {expires_in: 15.minutes}
 #    end
 #
 #    private

data/lib/findit/collections.rb

@@ -31,7 +31,7 @@
 #  end
 #
 #  #/app/views/posts/index.html.erb
-#  <% cache(@posts, tags: @posts.cache_tags, expire_in: @posts.expire_in) do %>
+#  <% cache(@posts, tags: @posts.cache_tags, expires_in: @posts.expires_in) do %>
 #    <%= render 'post' colection: @posts, as: :post%>
 #
 module Findit

data/lib/findit/single.rb

@@ -29,7 +29,7 @@
 #  end
 #
 #  #/app/views/posts/show.html.erb
-#  <% cache(@post, expire_in: 15.minutes) do %>
+#  <% cache(@post, expires_in: 15.minutes) do %>
 #    <%= render 'post', post: @post.load%>
 #
 module Findit

data/lib/findit/version.rb

@@ -1,3 +1,3 @@
 module Findit
-  VERSION = "1.4.0"
+  VERSION = "1.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: findit
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Denis Korobicyn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.9.1
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - deniskorobitcin@gmail.com
@@ -188,6 +160,7 @@ files:
 - ".drone.yml"
 - ".gitignore"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -224,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Extensions for Finder classes