card 1.18.1 → 1.18.2

data/mod/05_standard/spec/set/type/image_spec.rb

@@ -68,8 +68,8 @@ describe Card::Set::Type::Image do
 
     describe 'view: act_expanded' do
       it 'gets image url' do
-        act_summary = subject.format
-                             .render(:act_expanded, act: subject.last_act)
+        render_args = { act: subject.last_act, action_view: :expanded }
+        act_summary = subject.format.render :act, render_args
         current_url = subject.image.versions[:medium].url
         expect(act_summary).to match(/#{Regexp.quote current_url}/)
       end

data/spec/lib/card/action_spec.rb

@@ -8,7 +8,7 @@ describe Card::Action do
       a.update_attributes!(content: 'New content')
       a.delete_old_actions
       expect(a.actions.count).to eq(1)
-      expect(a.actions(true).last.new_values[:name]).to eq('New A')
+      expect(a.actions(true).last.value :name).to eq('New A')
     end
   end
 end

data/spec/lib/card/cache_spec.rb

@@ -20,28 +20,29 @@ describe Card::Cache do
   describe 'with same cache_id' do
     before :each do
       @hard = ActiveSupport::Cache::MemoryStore.new
-      @cache = Card::Cache.new store: @hard, prefix: 'prefix'
+      @cache = Card::Cache.new store: @hard
+      @prefix = @cache.hard.prefix
     end
 
     it '#read' do
-      expect(@hard).to receive(:read).with('prefix/foo')
+      expect(@hard).to receive(:read).with("#{@prefix}/foo")
       @cache.read('foo')
     end
 
     it '#write' do
-      expect(@hard).to receive(:write).with('prefix/foo', 'val')
+      expect(@hard).to receive(:write).with("#{@prefix}/foo", 'val')
       @cache.write('foo', 'val')
       expect(@cache.read('foo')).to eq('val')
     end
 
     it '#fetch' do
       block = proc { 'hi' }
-      expect(@hard).to receive(:fetch).with('prefix/foo', &block)
+      expect(@hard).to receive(:fetch).with("#{@prefix}/foo", &block)
       @cache.fetch('foo', &block)
     end
 
     it '#delete' do
-      expect(@hard).to receive(:delete).with('prefix/foo')
+      expect(@hard).to receive(:delete).with("#{@prefix}/foo")
       @cache.delete 'foo'
     end
 
@@ -55,18 +56,20 @@ describe Card::Cache do
 
   it '#reset' do
     @hard = ActiveSupport::Cache::MemoryStore.new
-    @cache = Card::Cache.new store: @hard, prefix: 'prefix'
-    expect(@cache.hard.prefix).to eq('prefix/')
+    @cache = Card::Cache.new store: @hard, database: 'mydb'
+
+    expect(@cache.hard.prefix).to match(/^mydb\//)
     @cache.write('foo', 'bar')
     expect(@cache.read('foo')).to eq('bar')
 
+
     # reset
     @cache.reset
-    expect(@cache.hard.prefix).to eq('prefix/')
+    expect(@cache.hard.prefix).to match(/^mydb\//)
     expect(@cache.read('foo')).to be_nil
 
-    cache2 = Card::Cache.new store: @hard, prefix: 'prefix'
-    expect(cache2.hard.prefix).to eq('prefix/')
+    cache2 = Card::Cache.new store: @hard, database: 'mydb'
+    expect(cache2.hard.prefix).to match(/^mydb\//)
   end
 
   describe 'with file store' do

data/spec/lib/card/stage_director_spec.rb

@@ -98,6 +98,10 @@ describe Card::StageDirector do
                     '12' => { subcards: { '121' => 'A' } }
                   }
     end
+    let(:create_card_with_junction) do
+      Card.create name: '1+2',
+                  subcards: { '11' => 'A'}
+    end
     let(:preorder) { %w(1 11 111 12 121) }
     let(:postorder) { %w(111 11 121 12 1) }
     describe 'validate' do
@@ -207,12 +211,66 @@ describe Card::StageDirector do
             i:112v ptv:112v v:112v
             v:12 v:121
             pts:1 pts:11 pts:111 pts:112v pts:12 pts:121
-            s:1 s:11 s:111 f:111 s:112v f:112v f:11 s:12 s:121 f:121 f:12 f:1
+            s:1
+              s:11
+                s:111 f:111
+                s:112v f:112v
+              f:11
+              s:12
+                s:121 f:121
+              f:12
+            f:1
             ig:1 ig:11 ig:111 ig:112v ig:12 ig:121
             igwd:1 igwd:11 igwd:111 igwd:112v igwd:12 igwd:121
           )
         )
       end
+
+      it 'with junction' do
+        order = []
+        with_test_events do
+          test_event :initialize, on: :create do
+            order << "i:#{name}"
+          end
+          test_event :prepare_to_validate, on: :create do
+            order << "ptv:#{name}"
+          end
+          test_event :validate, on: :create do
+            order << "v:#{name}"
+          end
+          test_event :prepare_to_store, on: :create do
+            order << "pts:#{name}"
+          end
+          test_event :store, on: :create do
+            order << "s:#{name}"
+          end
+          test_event :finalize, on: :create do
+            order << "f:#{name}"
+          end
+          test_event :integrate, on: :create do
+            order << "ig:#{name}"
+          end
+          test_event :integrate_with_delay, on: :create do
+            order << "igwd:#{name}"
+          end
+          create_card_with_junction
+        end
+        expect(order).to eq(
+          %w(
+            i:1+2 i:11
+            ptv:1+2 ptv:11
+            v:1+2 v:11
+            pts:1+2 pts:11
+            s:1+2
+              i:1 ptv:1 v:1 pts:1 s:1 f:1
+              i:2 ptv:2 v:2 pts:2 s:2 f:2
+              s:11 f:11
+            f:1+2
+            ig:1+2 ig:11 ig:1 ig:2
+            igwd:1+2 igwd:11 igwd:1 igwd:2
+          )
+        )
+      end
     end
   end
 

data/spec/models/card/trash_spec.rb

@@ -168,7 +168,7 @@ describe Card, 'revived from trash' do
   end
 
   it 'should still have old content' do
-    expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
+    expect(@c.nth_action(1).value :db_content).to eq('basiccontent')
   end
 
   it 'should have the same content' do
@@ -209,7 +209,7 @@ describe Card, 'junction revival' do
   end
 
   it 'should still have old action' do
-    expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
+    expect(@c.nth_action(1).value :db_content).to eq('basiccontent')
   end
 
   it 'should have old content' do

data/spec/models/card_spec.rb

@@ -44,7 +44,7 @@ describe Card do
     end
 
     it 'should have original action' do
-      expect(@c.nth_action(1).change_for(2).first.value).to eq('basiccontent')
+      expect(@c.nth_action(1).value :db_content).to eq('basiccontent')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.18.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname