pg_cache_key 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de9641f70be650b00f1aea66b0b19c4b805183b
-  data.tar.gz: b3d53d547d4bcc550bebb5f9b5575c06498b2e6a
+  metadata.gz: e77a9f091922442dc6b19d2015d53e1e7bf93ece
+  data.tar.gz: 339813b6a21d0b8de74412de8b62567ad341ab3e
 SHA512:
-  metadata.gz: ab9e30ce53ffe894d2ece3af511d0e947b65055582814440f64649ded86e41c4769bcb9aa361fec35dec7660460c58babc4d86a7b39dd0fe0903cc08a00c2030
-  data.tar.gz: d0ff6f9564c326282ec1d884fd84d7f1583318f53c8fbf0dd9838a49fb00d0ecdae2794f5541fa4ab923493db32743b8e1cc688e7b44ee297f9bb9b3fc9b03f8
+  metadata.gz: 930b14dc2c3545747b6209db0f378d403eb3a695b04de241ac6e934d5483636db09c6fb8bb109986bc918dd9c0782d8adc3a0e063848c63184662b5e93a4e448
+  data.tar.gz: 20bf20ebcda951fae3d0e5107bbd08de7e2a10c7be761daccbdf2f12c9ddaeeba91ecb16177bd2980658da9c60e6697a1358fe35842e19a6b65f7ba844535410

data/README.md

@@ -71,11 +71,12 @@ It works out of the box.
 
 По идее работает само из коробки, но если будут траблы - пишите.
 
-## Development
+## Testing
+Tested only query string for simple case. In your project you may test it on more specific query. 
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+## Testing(рус)
+Тестируется только строка запроса для самого простого случая + добавление метода в активрекорд релейшен. 
+Стабильность на сложных запросах специфических для вашего приложения можете добавить в свои тесты.
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,6 @@
-require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 task :default => :spec
+
+RSpec::Core::RakeTask.new('spec')
+
+

data/lib/pg_cache_key/version.rb

@@ -1,3 +1,3 @@
 module PgCacheKey
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/pg_cache_key.rb

@@ -15,18 +15,39 @@ require "pg_cache_key/version"
 #   end
 # end
 
-# in rails >= 4 it would go like this:
+module PgCacheKey
+  def cache_key_raw_sql( timestamp_column = :updated_at )
+    "SELECT md5(string_agg( t.ckc_#{timestamp_column}||t.ckc_id, '') ) as cache_key \
+FROM (#{ select( [timestamp_column, :id].map{|ckc| "#{table_name}.#{ckc}::text as ckc_#{ckc}" } ).try(:to_sql) }) t"
+  end
+end
+
+# Actually this all depends on retrieve_cache_key(key) from active_support:
+# def retrieve_cache_key(key)
+#   case
+#     when key.respond_to?(:cache_key) then key.cache_key
+#     when key.is_a?(Array)            then key.map { |element| retrieve_cache_key(element) }.to_param
+#     when key.respond_to?(:to_a)      then retrieve_cache_key(key.to_a)
+#     else                                  key.to_param
+#   end.to_s
+# end
+# in rails 4 there is no cache_key in relations so if we deliver relation as key in rails 4 it will convert to array first
+# in rails 5 there is cache_key, the method below is copy+paste from rails 5 except it doesn't use rails 5 collection_cache_key,
+# and use it's own algorithm for cache_key
 module ActiveRecord
   # = Active Record \Relation
   class Relation
+    include PgCacheKey
+
     def cache_key(timestamp_column = :updated_at)
       @cache_keys ||= {}
       # Rem 1: why use connection.execute instead of doing collection.select because of an order. if you using some order on your scope
       # then columns you using to order must appear in the GROUP BY clause or be used in an aggregate function or you will get an error
       # Rem 2: we need to add select( cache_columns ) explicitly because if relation has includes it might transform columns to aliases
-      @cache_keys[timestamp_column] ||= connection.execute(
-          "SELECT md5(string_agg( t.cc_#{timestamp_column}||t.cc_id, '') ) as cache_key
-                      FROM (#{ select( [timestamp_column, :id].map{|cc| "#{table_name}.#{cc}::text as cc_#{cc}" } ).try(:to_sql) }) t" )[0]['cache_key']
+      # and we must also select them as uniq-aliase so PG wouldn't be confused
+      # 'ckc' means cache key column :)
+      @cache_keys[timestamp_column] ||= connection.execute( cache_key_raw_sql(timestamp_column) )[0]['cache_key']
     end
+
   end
 end

data/pg_cache_key.gemspec

@@ -35,4 +35,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_cache_key
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: 'collection_cache_key replacement for system which uses PG as DB, uses
   PG aggregation functions '
 email: