masamune 0.18.6 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ccbb4687f3e0f907f1b679d494904de9d6e473a
-  data.tar.gz: 769aa5dc646399ff25512e4cfcd213f47ec4f3cd
+  metadata.gz: e886df417cffdf88380ab29c2bf209f12ae2fa5e
+  data.tar.gz: d94a89c271bd19c15d8a368e2e5a2e40a7def4e6
 SHA512:
-  metadata.gz: b9bd7f5d4e52e9164faf4880e6ae8770b172e7edda34ddb72b631ddf6ad1f433773437ba5d3c3fb2b8b9b34241a725510e0647e8533ece7213bab94fba0c6c9c
-  data.tar.gz: f604d683e7eb70f78b95deae96a8cfcac8b1762e28672759f705bf9ddc0bb55539fd6a7df9b6e459f3098b3517cadd9a8554e6707d2ac98457a2169917ba64d7
+  metadata.gz: c6b60f88135189d1bf95f88123f371f0f082fe7be93612e40ddf90d32c15e7b4a1cc76eb4a827164826c3cc66a73413192ea60af97ca94bf6eaa8c2aa7a3ce54
+  data.tar.gz: 34c1cb0aa9a851f06157046a1f9de8f71b1d686e175d1bf9751353fe21a961e948a38e63071c872f360fa7982d72522580b7d49437a7c63cc6e55da9105cecff

data/lib/masamune/data_plan/rule.rb

@@ -253,6 +253,16 @@ class Masamune::DataPlan::Rule
   end
 
   def cache_depth
+    [max_cache_depth, step_cache_depth].min
+  end
+
+  private
+
+  def max_cache_depth
+    pattern.split('/').select { |x| x.include?('%') || x.include?('*') }.count
+  end
+
+  def step_cache_depth
     case time_step
     when :hour, :hours
       2
@@ -263,8 +273,6 @@ class Masamune::DataPlan::Rule
     end
   end
 
-  private
-
   def time_step_to_format(step)
     case step
     when :hour, :hours

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.18.6'.freeze
+  VERSION = '0.18.7'.freeze
 end

data/spec/masamune/data_plan/rule_spec.rb

@@ -464,4 +464,48 @@ describe Masamune::DataPlan::Rule do
       it { is_expected.to be(true) }
     end
   end
+
+  describe '#cache_depth' do
+    subject { instance.cache_depth }
+
+    context 'with flat glob' do
+      let(:pattern) { 'logs/*.log' }
+      it { is_expected.to be(1) }
+    end
+
+    context 'with nested glob' do
+      let(:pattern) { 'logs/%Y-%m-%d/*.log' }
+      it { is_expected.to be(1) }
+    end
+
+    context 'with flat :hourly' do
+      let(:pattern) { 'logs/*%H-s.log' }
+      it { is_expected.to be(1) }
+    end
+
+    context 'with nested :hourly' do
+      let(:pattern) { 'report/%Y-%m-%d/%H' }
+      it { is_expected.to be(2) }
+    end
+
+    context 'with flat :daily' do
+      let(:pattern) { 'report/%Y-%m-%d' }
+      it { is_expected.to be(1) }
+    end
+
+    context 'with nested :daily' do
+      let(:pattern) { 'report/%Y-%m/%d' }
+      it { is_expected.to be(1) }
+    end
+
+    context 'with flat :monthly' do
+      let(:pattern) { 'report/%Y-%m' }
+      it { is_expected.to be(0) }
+    end
+
+    context 'with nested :monthly' do
+      let(:pattern) { 'report/%Y/%m' }
+      it { is_expected.to be(0) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.18.7
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor