card 1.18.0 → 1.18.1

data/mod/05_standard/spec/chunk/link_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Chunk::Link do
+describe Card::Content::Chunk::Link do
   def assert_link target, args
     text = args.delete(:text)
     format_args = args.delete(:format_args)

data/mod/05_standard/spec/chunk/query_reference_spec.rb

@@ -1,14 +1,14 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Chunk::QueryReference, 'QueryReference' do
+describe Card::Content::Chunk::QueryReference, 'QueryReference' do
   context 'syntax parsing' do
     before do
-      @class = Card::Chunk::QueryReference
+      @class = Card::Content::Chunk::QueryReference
     end
 
     let :query_refs do
       content = Card::Content.new @content, Card.new(type: 'Search')
-       content.find_chunks(Card::Chunk::QueryReference)
+      content.find_chunks(Card::Content::Chunk::QueryReference)
     end
 
     subject { query_refs.first.name }
@@ -34,7 +34,8 @@ describe Card::Chunk::QueryReference, 'QueryReference' do
     end
 
     it 'handles nested query structures' do
-      @content = '{"any":{"content":"Where", "right_plus":["is",{"name":"Waldo"}]}}'
+      @content = '{"any":{"content":"Where", ' \
+                 '"right_plus":["is",{"name":"Waldo"}]}}'
       expect(query_refs[0].name).to eq 'Where'
       expect(query_refs[1].name).to eq 'is'
       expect(query_refs[2].name).to eq 'Waldo'

data/spec/lib/card/chunk_spec.rb

@@ -1,15 +1,17 @@
 # -*- encoding : utf-8 -*-
-require 'card/chunk'
+require 'card/content/chunk'
 
-describe Card::Chunk, 'Chunk' do
+describe Card::Content::Chunk, 'Chunk' do
   context 'Class' do
     it 'should populate prefix map on load' do
-      expect(Card::Chunk.prefix_map.keys.size).to be > 0
-      expect(Card::Chunk.prefix_map['{'][:class]).to eq(Card::Chunk::Include)
+      expect(Card::Content::Chunk.prefix_map.keys.size).to be > 0
+      expect(Card::Content::Chunk.prefix_map['{'][:class])
+        .to eq(Card::Content::Chunk::Include)
     end
 
     it 'should find Chunk classes using matched prefix' do
-      expect(Card::Chunk.find_class_by_prefix('{{')).to eq(Card::Chunk::Include)
+      expect(Card::Content::Chunk.find_class_by_prefix('{{'))
+        .to eq(Card::Content::Chunk::Include)
     end
   end
 end

data/spec/lib/card/content_spec.rb

@@ -184,7 +184,7 @@ EXAMPLES = {
 EXAMPLES.each_value do |val|
   next unless val[:classes]
   val[:classes] = val[:classes].map do |klass|
-    Class === klass ? klass : Card::Chunk.const_get(klass)
+    klass.is_a?(Class) ? klass : Card::Content::Chunk.const_get(klass)
   end
 end
 
@@ -401,16 +401,16 @@ describe Card::Content do
                      )
       end
 
-      it "doesn't fix regular nbsp order with setting" do
-        # manually configure this setting, then make this one live
-        # (test above will then fail)
-        pending "Can't set Card.config.space_last_in_multispace= false "\
-                'for one test'
-        assert_equal 'space  test  two   space',
-                     Card::Content.clean!(
-                       'space  test  two   space'
-                     )
-      end
+      # it "doesn't fix regular nbsp order with setting" do
+      #   # manually configure this setting, then make this one live
+      #   # (test above will then fail)
+      #   pending "Can't set Card.config.space_last_in_multispace= false "\
+      #           'for one test'
+      #   assert_equal 'space  test  two   space',
+      #                Card::Content.clean!(
+      #                  'space  test  two   space'
+      #                )
+      # end
     end
   end
 end

data/spec/lib/card/diff_spec.rb

@@ -35,28 +35,28 @@ describe Card::Diff do
     it 'is green for addition' do
       a = 'a'
       b = 'a b'
-      db = Card::Diff::DiffBuilder.new(a, b)
+      db = Card::Diff.new(a, b)
       expect(db.green?).to be_truthy
       expect(db.red?).to be_falsey
     end
     it 'is red for deletion' do
       a = 'a'
       b = ''
-      db = Card::Diff::DiffBuilder.new(a, b)
+      db = Card::Diff.new(a, b)
       expect(db.green?).to be_falsey
       expect(db.red?).to be_truthy
     end
     it 'is green and red for change' do
       a = 'a'
       b = 'b'
-      db = Card::Diff::DiffBuilder.new(a, b)
+      db = Card::Diff.new(a, b)
       expect(db.green?).to be_truthy
       expect(db.red?).to be_truthy
     end
     it 'is off for no change' do
       a = 'a'
       b = 'a'
-      db = Card::Diff::DiffBuilder.new(a, b)
+      db = Card::Diff.new(a, b)
       expect(db.green?).to be_falsey
       expect(db.red?).to be_falsey
     end

data/spec/lib/card/stage_director_spec.rb

@@ -215,4 +215,60 @@ describe Card::StageDirector do
       end
     end
   end
+
+  describe 'subcards' do
+    def create_subcards
+      Card.create! name: '', subcards: {
+        '+sub1' => 'some content',
+        '+sub2' => { '+sub3' => 'content' }
+      }
+    end
+
+    it "has correct name if supercard's name get changed" do
+      Card::Auth.as_bot do
+        changed = false
+        in_stage :prepare_to_validate,
+                 on: :create,
+                 trigger: :create_subcards do
+          self.name = 'main' if name.empty? && !changed
+        end
+        expect(Card['main+sub1'].class).to eq(Card)
+        expect(Card['main+sub2+sub3'].class).to eq(Card)
+      end
+    end
+    it "has correct name if supercard's name get changed to a junction card" do
+      Card::Auth.as_bot do
+        changed = false
+        in_stage :prepare_to_validate,
+                 on: :create,
+                 trigger: :create_subcards do
+          if name.empty? && !changed
+            self.name = 'main1+main2'
+            expect(subfield('sub1')).to be
+            expect(subfield('sub1').content).to eq('some content')
+          end
+        end
+        expect(Card['main1+main2+sub1'].class).to eq(Card)
+        expect(Card['main1+main2+sub1'].content).to eq('some content')
+        expect(Card['main1+main2+sub2+sub3'].class).to eq(Card)
+        expect(Card['main1+main2+sub2+sub3'].content).to eq('content')
+      end
+    end
+  end
+
+  describe 'creating and updating cards in stages' do
+    it 'update_attributes works integrate stage' do
+      act_cnt = Card['A'].acts.size
+      in_stage :integrate,
+               on: :create,
+               trigger: -> { Card.create! name: 'act card' } do
+        Card['A'].update_attributes content: 'changed content'
+      end
+      expect(Card['A'].content).to eq 'changed content'
+      # no act added to A
+      expect(Card['A'].acts.size).to eq act_cnt
+      # new act for 'act card'
+      expect(Card['act card'].acts.size).to eq 1
+    end
+  end
 end

data/spec/lib/card/subcards_spec.rb

@@ -69,7 +69,6 @@ describe Card::Subcards do
         )
         expect(card.errors).to be_empty
         expect(Card["#{card.name}+editable"]).to be_truthy
-
         @card = Card.create!(
           type: 'Book',
           subcards: { '+editable' => 'sure' }

data/spec/models/card/type_transition_spec.rb

@@ -99,43 +99,11 @@ describe Card, 'type transition approve create' do
   end
 end
 
-# describe Card, "type transition validate_delete" do
-#   before do @c = change_card_to_type("type-c-card", :basic) end
-#
-#   it "should have errors" do
-#     @c.errors[:delete_error].first.should == "card c is indestructible"
-#   end
-#
-#   it "should retain original type" do
-#     Card["type_c_card"].type_code.should == :cardtype_c
-#   end
-# end
-
-describe Card, 'type transition validate_create' do
-  before { @c = change_card_to_type 'basicname', 'cardtype_d' }
-
-  it 'should have errors' do
-    pending 'CardtypeD does not have a codename, so this is an invalid test'
-    msg = /card d always has errors/
-    expect(@c.errors[:type].first.match msg).to be_truthy
-  end
-
-  it 'should retain original type' do
-    pending 'CardtypeD does not have a codename, so this is an invalid test'
-    expect(Card['basicname'].type_code).to eq(:basic)
-  end
-end
-
 describe Card, 'type transition delete callback' do
   before do
     @c = change_card_to_type('type-e-card', :basic)
   end
 
-  it 'should decrement counter in before delete' do
-    pending 'no trigger for this test anymore'
-    expect(Card.count).to eq(1)
-  end
-
   it 'should change type of the card' do
     expect(Card['type-e-card'].type_code).to eq(:basic)
   end
@@ -144,16 +112,12 @@ end
 describe Card, 'type transition create callback' do
   before do
     Card::Auth.as_bot do
-      Card.create(name: 'Basic+*type+*delete', type: 'Pointer', content: '[[Anyone Signed in]]')
+      Card.create name: 'Basic+*type+*delete', type: 'Pointer',
+                  content: '[[Anyone Signed in]]'
     end
     @c = change_card_to_type('basicname', :cardtype_f)
   end
 
-  it 'should increment counter'  do
-    pending 'No extensions, so no hooks for this now'
-    expect(Card.count).to eq(3)
-  end
-
   it 'should change type of card' do
     expect(Card['basicname'].type_code).to eq(:cardtype_f)
   end
@@ -161,9 +125,8 @@ end
 
 def change_card_to_type name, type
   card = Card.fetch(name)
-  tid = card.type_id = Symbol === type ? Card::Codename[type] : Card.fetch_id(type)
-  # warn "card[#{name.inspect}, T:#{type.inspect}] is #{card.inspect}, TID:#{tid}"
-  r = card.save
-  # warn "saved #{card.inspect} R#{r}"
+  card.type_id =
+    type.is_a?(Symbol) ? Card::Codename[type] : Card.fetch_id(type)
+  card.save
   card
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -27,20 +27,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: activerecord-session_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -89,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -201,14 +187,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +209,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-description: Cards are data atoms that are grouped into Sets to which Rules can apply.
-  Cards can formatted with Views and transformed with Events.
+description: Cards are data atoms grouped into Sets to which Rules can apply. Cards
+  can formatted with Views and transformed with Events.
 email:
 - info@wagn.org
 executables: []
@@ -391,12 +377,15 @@ files:
 - lib/card/cache.rb
 - lib/card/cache/persistent.rb
 - lib/card/cache/temporary.rb
-- lib/card/chunk.rb
 - lib/card/codename.rb
 - lib/card/content.rb
+- lib/card/content/chunk.rb
+- lib/card/content/parser.rb
 - lib/card/core_ext.rb
 - lib/card/core_migration.rb
 - lib/card/diff.rb
+- lib/card/diff/lcs.rb
+- lib/card/diff/result.rb
 - lib/card/director_register.rb
 - lib/card/env.rb
 - lib/card/exceptions.rb

data/lib/card/chunk.rb

@@ -1,122 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-require 'uri/common'
-
-# A chunk is a pattern of text that can be protected
-# and interrogated by a format. Each Chunk class has a
-# +pattern+ that states what sort of text it matches.
-# Chunks are initalized by passing in the result of a
-
-class Card
-  # A chunk is a pattern of text that can be protected
-  # and interrogated by a format. Each Chunk class has a
-  # +pattern+ that states what sort of text it matches.
-  # Chunks are initalized by passing in the result of a
-  # match by its pattern.
-  module Chunk
-    mattr_accessor :raw_list, :prefix_regexp_by_list, :prefix_map
-    @@raw_list = {}
-    @@prefix_regexp_by_list = {}
-    @@prefix_map = {}
-
-    class << self
-      def register_class klass, hash
-        klass.config = hash.merge class: klass
-        prefix_index = hash[:idx_char] || :default
-        # ^ this is gross and needs to be moved out.
-        prefix_map[prefix_index] = klass.config
-      end
-
-      def register_list key, list
-        raw_list[key] = list
-      end
-
-      def find_class_by_prefix prefix
-        config = prefix_map[prefix[0, 1]] ||
-                 prefix_map[prefix[-1, 1]] ||
-                 prefix_map[:default]
-        # prefix identified by first character, last character, or default.
-        # a little ugly...
-        config[:class]
-      end
-
-      def get_prefix_regexp chunk_list_key
-        prefix_regexp_by_list[chunk_list_key] ||= begin
-          prefix_res = raw_list[chunk_list_key].map do |chunkname|
-            chunk_class = const_get chunkname
-            chunk_class.config[:prefix_re]
-          end
-          /(?:#{ prefix_res * '|' })/m
-        end
-      end
-    end
-
-    # not sure whether this is best place.  Could really happen almost anywhere
-    # (even before chunk classes are loaded).
-    register_list :default, [
-      :URI, :HostURI, :EmailURI, :EscapedLiteral, :Include, :Link
-    ]
-    register_list :references,  [:EscapedLiteral, :Include, :Link]
-    register_list :nest_only, [:Include]
-    register_list :query, [:QueryReference]
-
-    class Abstract
-      class_attribute :config
-      attr_reader :text, :process_chunk
-
-      class << self
-        # if the prefix regex matched check that chunk against the full regex
-        def full_match content, prefix=nil
-          content.match full_re(prefix)
-        end
-
-        def full_re _prefix
-          config[:full_re]
-        end
-
-        def context_ok? _content, _chunk_start
-          true
-        end
-      end
-
-      def reference_code
-        'I'
-      end
-
-      def initialize match, content
-        @text = match[0]
-        @processed = nil
-        @content = content
-        interpret match, content
-        self
-      end
-
-      def interpret _match_string, _content, _params
-        Rails.logger.info 'no #interpret method found for chunk class: ' \
-                          "#{self.class}"
-      end
-
-      def format
-        @content.format
-      end
-
-      def card
-        @content.card
-      end
-
-      def to_s
-        @process_chunk || @processed || @text
-      end
-
-      def inspect
-        "<##{self.class}##{self}>"
-      end
-
-      def as_json _options={}
-        @process_chunk || @processed ||
-          "not rendered #{self.class}, #{card && card.name}"
-      end
-    end
-  end
-  Loader.load_chunks
-end