litestack 0.4.1 → 0.4.3

data/lib/active_support/cache/litecache.rb

@@ -3,23 +3,21 @@ require "active_support/core_ext/enumerable"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/numeric/time"
 require "active_support/cache"
-require_relative '../../litestack'
-
+require_relative "../../litestack/litecache"
 
 module ActiveSupport
   module Cache
     class Litecache < Store
+      #prepend Strategy::LocalCache
 
-      prepend Strategy::LocalCache
-		  
       def self.supports_cache_versioning?
         true
       end
 
-      def initialize(options={})
+      def initialize(options = {})
         super
         @options[:return_full_record] = true
-      	@cache = ::Litecache.new(@options) # reachout to the outer litecache class
+        @cache = ::Litecache.new(@options) # reachout to the outer litecache class
       end
 
       def increment(key, amount = 1, options = nil)
@@ -27,39 +25,44 @@ module ActiveSupport
         options = merged_options(options)
         # todo: fix me
         # this is currently a hack to avoid dealing with Rails cache encoding and decoding
-        #@cache.transaction(:immediate) do
-          if value = read(key, options)
-            value = value.to_i + amount
-            write(key, value, options)
-          end
-        #end
+        # and it can result in a race condition as it stands
+        # @cache.transaction(:immediate) do 
+          # currently transactions are not compatible with acquiring connections 
+          # this needs fixing by storing the connection to the context once acquired
+        if (value = read(key, options))
+          value = value.to_i + amount
+          write(key, value, options)
+        else
+          write(key, amount, options)
+        end
+        # end
       end
 
       def decrement(key, amount = 1, options = nil)
         options = merged_options(options)
-        increment(key, -1 * amount, options[:expires_in])
+        increment(key, -1 * amount, options)
       end
-      
+
       def prune(limit = nil, time = nil)
         @cache.prune(limit)
       end
 
       def cleanup(limit = nil, time = nil)
         @cache.prune(limit)
-      end 
+      end
 
-      def clear(options = nil)
-      	@cache.clear
+      def clear(options=nil)
+        @cache.clear
       end
-      
+
       def count
         @cache.count
       end
-      
+
       def size
         @cache.size
       end
-      
+
       def max_size
         @cache.max_size
       end
@@ -70,33 +73,50 @@ module ActiveSupport
 
       private
 
-        # Read an entry from the cache.
-        def read_entry(key, **options)
-          deserialize_entry(@cache.get(key))
-        end
+      # Read an entry from the cache.
+      def read_entry(key, **options)
+        deserialize_entry(@cache.get(key))
+      end
 
-        # Write an entry to the cache.
-        def write_entry(key, entry, **options)
-          write_serialized_entry(key, serialize_entry(entry, **options), **options)
+      def read_multi_entries(names, **options)
+        results = {}
+        return results if names == []
+        rs = @cache.get_multi(*names.flatten)
+        rs.each_pair{|k, v| results[k] = deserialize_entry(v).value }
+        results
+      end
+      
+      # Write an entry to the cache.
+      def write_entry(key, entry, **options)
+        write_serialized_entry(key, serialize_entry(entry, **options), **options)
+      end
+      
+      def write_multi_entries(entries, **options)
+        return if entries.empty?
+        entries.each_pair {|k,v| entries[k] = serialize_entry(v, **options)}
+        expires_in = options[:expires_in].to_i
+        if options[:race_condition_ttl] && expires_in > 0 && !options[:raw]
+          expires_in += 5.minutes
         end
+        @cache.set_multi(entries, expires_in)        
+      end
 
-        def write_serialized_entry(key, payload, **options)
-          expires_in = options[:expires_in].to_i
-          if options[:race_condition_ttl] && expires_in > 0 && !options[:raw]
-            expires_in += 5.minutes
-          end
-          if options[:unless_exist]
-            @cache.set_unless_exists(key, payload, expires_in)
-          else
-            @cache.set(key, payload, expires_in)
-          end
+      def write_serialized_entry(key, payload, **options)
+        expires_in = options[:expires_in].to_i
+        if options[:race_condition_ttl] && expires_in > 0 && !options[:raw]
+          expires_in += 5.minutes
         end
-
-        # Delete an entry from the cache.
-        def delete_entry(key, **options)
-          return @cache.delete(key)
+        if options[:unless_exist]
+          @cache.set_unless_exists(key, payload, expires_in)
+        else
+          @cache.set(key, payload, expires_in)
         end
+      end
 
+      # Delete an entry from the cache.
+      def delete_entry(key, **options)
+        @cache.delete(key)
+      end
     end
   end
 end

data/lib/generators/litestack/install/install_generator.rb

@@ -27,9 +27,9 @@ class Litestack::InstallGenerator < Rails::Generators::Base
   def modify_gitignore
     append_file ".gitignore", <<~TEXT
 
-    # Ignore default Litestack SQLite databases.
-    /db/**/*.sqlite3
-    /db/**/*.sqlite3-*
+      # Ignore default Litestack SQLite databases.
+      /db/**/*.sqlite3
+      /db/**/*.sqlite3-*
     TEXT
   end
 end

data/lib/generators/litestack/install/templates/cable.yml

@@ -4,8 +4,5 @@ development:
 test:
   adapter: test
 
-staging:
-  adapter: litecable
-
 production:
   adapter: litecable

data/lib/generators/litestack/install/templates/database.yml

@@ -7,6 +7,9 @@
 # `Litesupport.root.join("data.sqlite3")` stores
 # application data in the path `./db/#{Rails.env}/data.sqlite3`
 #
+# `Litesupport.root(env).join(path)` stores 
+# application data in the path `./db/#{env}/#{path}`
+#
 # idle_timeout should be set to zero, to avoid recycling sqlite connections
 # and losing the page cache
 # 
@@ -14,16 +17,17 @@ default: &default
   adapter: litedb
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   idle_timeout: 0
-  database: <%= Litesupport.root.join("data.sqlite3") %>
 
 development:
   <<: *default
+  database: <%= Litesupport.root("development").join("data.sqlite3") %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
+  database: <%= Litesupport.root("test").join("data.sqlite3") %>
 
 # Warning: Make sure your production database path is on a persistent
 # volume, otherwise your application data could be deleted between deploys.
@@ -32,3 +36,5 @@ test:
 # `LITESTACK_DATA_PATH` environment variable.
 production:
   <<: *default
+  database: <%= Litesupport.root("production").join("data.sqlite3") %>
+