thermos 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6ebfef1211842802f2544583d0166fa06fa48ec
-  data.tar.gz: 01dd7f14c0bf339d21f04c877799e7b00afc0cbe
+  metadata.gz: 3e56270eb773c627e1ecfec8ed6e1ba088a0811b
+  data.tar.gz: 96e2dbe3ea7c9d38b6e8367bc90e7342a38de677
 SHA512:
-  metadata.gz: 5da371b9c7b85993ff137c8a835fd73b3dbb14b68d04a489ea6814cab85c0ac2b8f697cd02cf30ae7267d22c0737e5645deb8328a7fa6b8aa35bca56d1c4437c
-  data.tar.gz: 77b08295b2f6e68d73946c1d9870502114e5bb85e0535311883e8e5d46962379d0bc198674f94651843256d54b8acec86b7e3517413e7e0bac7192ac26fa7136
+  metadata.gz: c32012da14be8ce3f8f481f6a4c534b9a18fa6f6e1af77592b913cd70df8831158d79dd7f8dd5bbb247de98d8cec99d51f5552cb1e31fec0701d9eef33965339
+  data.tar.gz: b4e7ed1511a64989d63b9c80f2b7a14f4cdbc43aac6e593d27ffc69e6516ef1be81d85519ab4d6310f34bf547ef70d3814f99fb41b550ee31e9d1c7bcaf7af01

data/lib/thermos/beverage.rb

@@ -1,32 +1,34 @@
-class Thermos::Beverage
-  attr_reader :key, :model, :deps, :action, :lookup_key
+module Thermos
+  class Beverage
+    attr_reader :key, :model, :deps, :action, :lookup_key
 
-  def initialize(key:, model:, deps:, action:, lookup_key: nil)
-    @key = key
-    @model = model
-    @lookup_key = lookup_key || :id
-    @deps = deps.map do |dep|
-      Thermos::Dependency.new(model: model, association: dep)
-    end
-    @action = action
+    def initialize(key:, model:, deps:, action:, lookup_key: nil)
+      @key = key
+      @model = model
+      @lookup_key = lookup_key || :id
+      @deps = deps.map do |dep|
+        Dependency.new(model: model, association: dep)
+      end
+      @action = action
 
-    set_observers
-  end
+      set_observers
+    end
 
-  def deps_for_class(klass)
-    @deps.select do |dep|
-      dep.klass == klass.name
+    def deps_for_class(klass)
+      @deps.select do |dep|
+        dep.klass == klass.name
+      end
     end
-  end
 
-  private
+    private
 
-  def set_observers
-    observe(@model)
-    @deps.each { |dep| observe(dep.klass) }
-  end
+    def set_observers
+      observe(@model)
+      @deps.each { |dep| observe(dep.klass) }
+    end
 
-  def observe(model)
-    model.include(Thermos::Notifier) unless model.included_modules.include?(Thermos::Notifier)
+    def observe(model)
+      model.include(Notifier) unless model.included_modules.include?(Notifier)
+    end
   end
 end

data/lib/thermos/beverage_storage.rb

@@ -0,0 +1,20 @@
+class Thermos::BeverageStorage
+  include Singleton
+
+  def add_beverage(beverage)
+    @beverages ||= {}
+    @beverages[beverage.key] = beverage
+  end
+
+  def get_beverage(key)
+    @beverages[key]
+  end
+
+  def empty!
+    @beverages = {}
+  end
+
+  def beverages
+    @beverages.values
+  end
+end

data/lib/thermos/dependency.rb

@@ -1,11 +1,13 @@
-class Thermos::Dependency
-  attr_reader :model, :association, :klass, :table
+module Thermos
+  class Dependency
+    attr_reader :model, :association, :klass, :table
 
-  def initialize(model:, association:)
-    @model = model
-    @association = association
-    reflection = @model.reflections[@association.to_s]
-    @table = reflection.table_name
-    @klass = reflection.class_name.constantize
+    def initialize(model:, association:)
+      @model = model
+      @association = association
+      reflection = @model.reflections[@association.to_s]
+      @table = reflection.table_name
+      @klass = reflection.class_name.constantize
+    end
   end
 end

data/lib/thermos/notifier.rb

@@ -1,14 +1,15 @@
-module Thermos::Notifier
-  extend ActiveSupport::Concern
+module Thermos
+  module Notifier
+    extend ActiveSupport::Concern
 
-  included do
-    after_save :notify_thermos
-  end
+    included do
+      after_save :notify_thermos
+    end
 
-  private
+    private
 
-  def notify_thermos
-    Thermos::RefillJob.perform_later self
+    def notify_thermos
+      RefillJob.perform_later self
+    end
   end
-
 end

data/lib/thermos/rebuild_cache_job.rb

@@ -0,0 +1,8 @@
+module Thermos
+  class RebuildCacheJob < ActiveJob::Base
+    def perform(key, id)
+      beverage = BeverageStorage.instance.get_beverage(key)
+      Rails.cache.write([key, id], beverage.action.call(id))
+    end
+  end
+end

data/lib/thermos/refill_job.rb

@@ -1,6 +1,28 @@
-class Thermos::RefillJob < ActiveJob::Base
-  def perform(model)
-    Thermos.refill_primary_caches(model)
-    Thermos.refill_dependency_caches(model)
+module Thermos
+  class RefillJob < ActiveJob::Base
+    def perform(model)
+      refill_primary_caches(model)
+      refill_dependency_caches(model)
+    end
+
+    def refill_primary_caches(model)
+      BeverageStorage.instance.beverages.each do |beverage|
+        if beverage.model == model.class
+          Thermos::RebuildCacheJob.perform_later(beverage.key, model.send(beverage.lookup_key))
+        end
+      end
+    end
+
+    def refill_dependency_caches(model)
+      BeverageStorage.instance.beverages.each do |beverage|
+        deps = beverage.deps.select { |dependency| dependency.klass == model.class }
+        deps.each do |dependency|
+          beverage_models = beverage.model.joins(dependency.association).where(dependency.table => { id: model.id })
+          beverage_models.find_each do |beverage_model|
+            Thermos::RebuildCacheJob.perform_later(beverage.key, beverage_model.send(beverage.lookup_key))
+          end
+        end
+      end
+    end
   end
 end

data/lib/thermos/version.rb

@@ -1,3 +1,3 @@
 module Thermos
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/thermos.rb

@@ -1,7 +1,9 @@
 require "thermos/beverage"
+require "thermos/beverage_storage"
 require "thermos/dependency"
 require "thermos/notifier"
 require "thermos/refill_job"
+require "thermos/rebuild_cache_job"
 
 module Thermos
 
@@ -11,40 +13,14 @@ module Thermos
   end
 
   def self.fill(key:, model:, deps: [], lookup_key: nil, &block)
-    @thermos ||= {}
-    @thermos[key] = Beverage.new(key: key, model: model, deps: deps, action: block, lookup_key: lookup_key)
+    BeverageStorage.instance.add_beverage(
+      Beverage.new(key: key, model: model, deps: deps, action: block, lookup_key: lookup_key)
+    )
   end
 
   def self.drink(key:, id:)
     Rails.cache.fetch([key, id]) do
-      @thermos[key].action.call(id)
+      BeverageStorage.instance.get_beverage(key).action.call(id)
     end
   end
-
-  def self.empty
-    @thermos = {}
-  end
-
-  def self.refill_primary_caches(model)
-    @thermos.values.each do |beverage|
-      refill(beverage, model.send(beverage.lookup_key)) if beverage.model == model.class
-    end
-  end
-
-  def self.refill_dependency_caches(model)
-    @thermos.values.each do |beverage|
-      deps = beverage.deps.select { |dependency| dependency.klass == model.class }
-      deps.each do |dependency|
-        beverage_models = beverage.model.joins(dependency.association).where(dependency.table => { id: model.id })
-        beverage_models.find_each do |beverage_model|
-          refill(beverage, beverage_model.send(beverage.lookup_key))
-        end
-      end
-    end
-  end
-
-  def self.refill(beverage, id)
-    @thermos[beverage.key] = beverage
-    Rails.cache.write([beverage.key, id], beverage.action.call(id))
-  end
 end

data/test/dummy/log/development.log

@@ -1,51 +1,55 @@
-   (3.8ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
-   (0.2ms)  select sqlite_version(*)
-   (1.4ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Migrating to CreateCategories (20160325214744)
    (0.1ms)  begin transaction
-   (0.5ms)  CREATE TABLE "categories" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "store_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.3ms)  CREATE TABLE "categories" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "store_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
   SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160325214744"]]
-   (0.9ms)  commit transaction
+   (0.7ms)  commit transaction
 Migrating to CreateProducts (20160325214849)
    (0.1ms)  begin transaction
    (0.4ms)  CREATE TABLE "products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160325214849"]]
-   (0.9ms)  commit transaction
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160325214849"]]
+   (0.6ms)  commit transaction
 Migrating to CreateCategoryItems (20160325220006)
-   (0.1ms)  begin transaction
-   (0.4ms)  CREATE TABLE "category_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "category_id" integer, "product_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160325220006"]]
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "category_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "category_id" integer, "product_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160325220006"]]
    (0.7ms)  commit transaction
 Migrating to CreateStores (20160326174530)
-   (0.1ms)  begin transaction
-   (1.0ms)  CREATE TABLE "stores" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160326174530"]]
-   (0.8ms)  commit transaction
+   (0.0ms)  begin transaction
+   (0.2ms)  CREATE TABLE "stores" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20160326174530"]]
+   (0.6ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.0ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.0ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"