card 1.19.1 → 1.19.2

data/mod/machines/spec/set/type/scss_spec.rb

@@ -52,7 +52,7 @@ describe Card::Set::Type::Scss do
     end
   end
 
-  it_should_behave_like "content machine", that_produces_css do
+  it_should_behave_like "content machine", that_produces: :css do
     let(:machine_card) { Card.gimme! "test scss", type: :scss, content: scss }
     let(:card_content) do
       { in:           scss,         out:     compressed_css,

data/mod/machines/spec/set/type/skin_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Type::Skin do
   let(:new_css)                { "#box{display: none }\n"   }
   let(:compressed_new_css)     { "#box{display:none}\n"   }
 
-  it_should_behave_like "pointer machine", that_produces_css do
+  it_should_behave_like "pointer machine", that_produces: :css do
     let(:machine_card) do
       Card.gimme! "test skin machine", type: :skin, content: ""
     end

data/mod/machines/spec/{lib/shared_machine_examples.rb → shared_examples/machine.rb}

@@ -1,19 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-def that_produces type
-  type
-end
-
-def method_missing m, *args, &block
-  case m
-  when /that_produces_(.+)/
-    return Regexp.last_match(1)
-  else
-    super
-  end
-end
-
-shared_examples_for "machine" do |filetype|
+shared_examples_for "machine" do |args|
+  let(:filetype)  { args[:that_produces] }
   context "machine is run" do
     before do
       machine.update_machine_output
@@ -25,14 +13,16 @@ shared_examples_for "machine" do |filetype|
     it "has +machine_output card" do
       expect(machine.machine_output_card.real?).to be_truthy
     end
-    it "generates #{filetype} file" do
+    it "generates #{args[:that_produces]} file" do
       expect(machine.machine_output_path).to match(/\.#{filetype}$/)
     end
   end
 end
 
-shared_examples_for "content machine" do |filetype|
-  it_should_behave_like "machine", that_produces(filetype) do
+shared_examples_for "content machine" do |args|
+  let(:filetype) { args[:that_produces] }
+
+  it_should_behave_like "machine", args do
     let(:machine) { machine_card }
   end
 
@@ -50,7 +40,7 @@ shared_examples_for "content machine" do |filetype|
       path = machine_card.machine_output_path
       expect(File.read(path)).to eq(card_content[:out])
     end
-    it "updates #{filetype} file when content is changed" do
+    it "updates #{args[:that_produces]} file when content is changed" do
       changed_factory = machine_card
       changed_factory.putty content: card_content[:changed_in]
       changed_path = changed_factory.machine_output_path
@@ -59,7 +49,8 @@ shared_examples_for "content machine" do |filetype|
   end
 end
 
-shared_examples_for "pointer machine" do |filetype|
+shared_examples_for "pointer machine" do |args|
+  let(:filetype) { args[:that_produces] }
   subject do
     # We build the following structure:
     #
@@ -115,7 +106,7 @@ shared_examples_for "pointer machine" do |filetype|
     change_machine
   end
 
-  it_should_behave_like "machine", that_produces(filetype) do
+  it_should_behave_like "machine", args do
     let(:machine) { machine_card }
   end
 
@@ -138,18 +129,18 @@ shared_examples_for "pointer machine" do |filetype|
   end
 
   describe "+machine_output card" do
-    it 'creates #{filetype} file with supplied content' do
+    it 'creates #{args[:that_produces]} file with supplied content' do
       path = subject.machine_output_path
       expect(File.read(path)).to eq(card_content[:out])
     end
 
-    it 'updates #{filetype} file if item is changed' do
+    it 'updates #{args[:that_produces]} file if item is changed' do
       machine_input_card.putty content: card_content[:changed_in]
       changed_path = subject.machine_output_path
       expect(File.read(changed_path)).to eq(card_content[:changed_out])
     end
 
-    it 'updates #{filetype} file if item is added' do
+    it 'updates #{args[:that_produces]} file if item is added' do
       Card::Auth.as_bot do
         ca = Card.gimme! "pointer item", type: Card::SkinID, content: ""
         subject.items = [ca]
@@ -161,7 +152,7 @@ shared_examples_for "pointer machine" do |filetype|
     end
 
     context "a non-existent card was added as item and now created" do
-      it 'updates #{filetype} file' do
+      it 'updates #{args[:that_produces]} file' do
         Card::Auth.as_bot do
           subject.content = "[[non-existent input]]"
           subject.save!

data/mod/settings/spec/set/right/script_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Right::Script do
   let(:new_js)                { 'alert( "Hey" );'   }
   let(:compressed_new_js)     { 'alert("Hey");'   }
 
-  it_should_behave_like "pointer machine", that_produces_js do
+  it_should_behave_like "pointer machine", that_produces: :js do
     let(:input_name) { "test js" }
     let(:machine_card) do
       Card.gimme! "test my style+*script", type: :pointer, content: ""

data/mod/settings/spec/set/right/style_spec.rb

@@ -1,8 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require File.expand_path("../../../../../machines/spec/lib/"\
-                         "shared_machine_examples.rb", __FILE__)
-
 describe Card::Set::Right::Style do
   #  describe "#delet"
   #  it "should delete tempfile"
@@ -13,7 +10,7 @@ describe Card::Set::Right::Style do
   let(:new_css)                { "#box{ display: none}\n"   }
   let(:compressed_new_css)     { "#box{display:none}\n"   }
 
-  it_should_behave_like "pointer machine", that_produces_css do
+  it_should_behave_like "pointer machine", that_produces: :css do
     let(:machine_card) do
       Card.gimme! "test my style+*style", type: :pointer, content: ""
     end

data/mod/solid_cache/set/abstract/solid_cache.rb

@@ -28,7 +28,7 @@ module ClassMethods
   # cards whose solid caches are expired because of the update.
   # @param set_of_changed_card [set constant] a set of cards that triggers
   #   a cache update
-  # @params args [Hash]
+  # @param args [Hash]
   # @option args [Symbol, Array of symbols] :on the action(s)
   #   (:create, :update, or :delete) on which the cache update
   #   should be triggered. Default is all actions.

data/spec/lib/card/content_spec.rb

@@ -1,156 +1,144 @@
 # -*- encoding : utf-8 -*-
 require "card/content"
 
-EXAMPLES = {
-  nests: {
-    content: "Some Literals: \\[{I'm not| a link]}, and " \
+describe Card::Content do
+  EXAMPLES = {
+    nests: {
+      content: "Some Literals: \\[{I'm not| a link]}, and " \
                 '\\{{This Card|Is not Included}}' \
                 ", but " \
                 "{{this is}}" \
                 ", and some tail",
-    rendered: ["Some Literals: \\[{I'm not| a link]}, and ",
-               "<span>{</span>{This Card|Is not Included}}",
-               ", but ",
-               { options: { inc_name: "this is",
-                            inc_syntax: "this is"
-                          }
-               },
-               ", and some tail"
-              ],
-    classes: [String, :EscapedLiteral, String, :Include, String]
-  },
-
-  links_and_nests: {
-    content: "Some Links and includes: [[the card|the text]], " \
+      rendered: ["Some Literals: \\[{I'm not| a link]}, and ",
+                 "<span>{</span>{This Card|Is not Included}}",
+                 ", but ",
+                 { options: { inc_name: "this is",
+                              inc_syntax: "this is" } },
+                 ", and some tail"],
+      classes: [String, :EscapedLiteral, String, :Include, String]
+    },
+
+    links_and_nests: {
+      content: "Some Links and includes: [[the card|the text]], " \
                "and {{This Card|Is Included}}{{this too}} " \
                "and [[http://external.wagn.org/path|link text]]" \
                "{{Included|open}}",
-    rendered: ["Some Links and includes: ",
-               '<a class="wanted-card" ' \
+      rendered: ["Some Links and includes: ",
+                 '<a class="wanted-card" ' \
                  'href="/the_card?card%5Bname%5D=the+card">' \
                  "the text</a>",
-               ", and ",
-               { options: { view: "Is Included",
-                            inc_name: "This Card",
-                            inc_syntax: "This Card|Is Included"
-                          }
-               },
-               { options: { inc_name: "this too",
-                            inc_syntax: "this too"
-                          }
-               },
-               " and ",
-               '<a target="_blank" class="external-link" ' \
+                 ", and ",
+                 { options: { view: "Is Included",
+                              inc_name: "This Card",
+                              inc_syntax: "This Card|Is Included" } },
+                 { options: { inc_name: "this too",
+                              inc_syntax: "this too" } },
+                 " and ",
+                 '<a target="_blank" class="external-link" ' \
                'href="http://external.wagn.org/path">link text</a>',
-               { options: { view: "open",
-                            inc_name: "Included",
-                            inc_syntax: "Included|open"
-                          }
-               }
-              ],
-    classes: [
-      String, :Link, String, :Include, :Include, String, :Link, :Include
-    ]
-  },
-
-  uris_and_links: {
-    content: "Some URIs and Links: http://a.url.com/ " \
+                 { options: { view: "open",
+                              inc_name: "Included",
+                              inc_syntax: "Included|open" } }],
+      classes: [
+        String, :Link, String, :Include, :Include, String, :Link, :Include
+      ]
+    },
+
+    uris_and_links: {
+      content: "Some URIs and Links: http://a.url.com/ " \
                "More urls: wagn.com/a/path/to.html " \
                "http://localhost:2020/path?cgi=foo&bar=baz " \
                "[[http://brain.org/Home|extra]] " \
                "[ http://gerry.wagn.com/a/path ] " \
                "{ https://brain.org/more?args } ",
-    rendered: ["Some URIs and Links: ",
-               '<a target="_blank" class="external-link" ' \
+      rendered: ["Some URIs and Links: ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://a.url.com/">http://a.url.com/</a>',
-               " More urls: ",
-               '<a target="_blank" class="external-link" ' \
+                 " More urls: ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://wagn.com/a/path/to.html">' \
                  "wagn.com/a/path/to.html</a>",
-               " ",
-               '<a target="_blank" class="external-link" ' \
+                 " ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://localhost:2020/path?cgi=foo&amp;bar=baz">' \
                  "http://localhost:2020/path?cgi=foo&bar=baz</a>",
-               " ",
-               '<a target="_blank" class="external-link" ' \
+                 " ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://brain.org/Home">extra</a>',
-               " [ ",
-               '<a target="_blank" class="external-link" ' \
+                 " [ ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://gerry.wagn.com/a/path">' \
                  "http://gerry.wagn.com/a/path</a>",
-               " ] { ",
-               '<a target="_blank" class="external-link" ' \
+                 " ] { ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="https://brain.org/more?args">' \
                  "https://brain.org/more?args</a>",
-               " } "
-              ],
-    text_rendered: ["Some URIs and Links: ", "http://a.url.com/",
-                    " More urls: ",
-                    "wagn.com/a/path/to.html[http://wagn.com/a/path/to.html]",
-                    " ",
-                    "http://localhost:2020/path?cgi=foo&bar=baz",
-                    " ",
-                    "extra[http://brain.org/Home]",
-                    " [ ",
-                    "http://gerry.wagn.com/a/path",
-                    " ] { ",
-                    "https://brain.org/more?args",
-                    " } "
-                   ],
-    classes: [
-      String, :URI, String, :HostURI, String, :URI, String, :Link,
-      String, :URI, String, :URI, String
-    ]
-  },
-
-  uris_and_links_2: {
-    content: "Some URIs and Links: http://a.url.com " \
+                 " } "],
+      text_rendered: ["Some URIs and Links: ", "http://a.url.com/",
+                      " More urls: ",
+                      "wagn.com/a/path/to.html[http://wagn.com/a/path/to.html]",
+                      " ",
+                      "http://localhost:2020/path?cgi=foo&bar=baz",
+                      " ",
+                      "extra[http://brain.org/Home]",
+                      " [ ",
+                      "http://gerry.wagn.com/a/path",
+                      " ] { ",
+                      "https://brain.org/more?args",
+                      " } "],
+      classes: [
+        String, :URI, String, :HostURI, String, :URI, String, :Link,
+        String, :URI, String, :URI, String
+      ]
+    },
+
+    uris_and_links_2: {
+      content: "Some URIs and Links: http://a.url.com " \
                "More urls: wagn.com/a/path/to.html " \
                "[ http://gerry.wagn.com/a/path ] " \
                "{ https://brain.org/more?args } " \
                "http://localhost:2020/path?cgi=foo&bar=baz " \
                "[[http://brain.org/Home|extra]]",
-    rendered: ["Some URIs and Links: ",
-               '<a target="_blank" class="external-link" ' \
+      rendered: ["Some URIs and Links: ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://a.url.com">http://a.url.com</a>',
-               " More urls: ",
-               '<a target="_blank" class="external-link" ' \
+                 " More urls: ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://wagn.com/a/path/to.html">' \
                  "wagn.com/a/path/to.html</a>",
-               " [ ",
-               '<a target="_blank" class="external-link" ' \
+                 " [ ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://gerry.wagn.com/a/path">' \
                  "http://gerry.wagn.com/a/path</a>",
-               " ] { ",
-               '<a target="_blank" class="external-link" ' \
+                 " ] { ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="https://brain.org/more?args">' \
                  "https://brain.org/more?args</a>",
-               " } ",
-               '<a target="_blank" class="external-link" ' \
+                 " } ",
+                 '<a target="_blank" class="external-link" ' \
                  'href="http://localhost:2020/path?cgi=foo&amp;bar=baz">' \
                  "http://localhost:2020/path?cgi=foo&bar=baz</a>",
-               " ",
-               '<a target="_blank" class="external-link" ' \
-               'href="http://brain.org/Home">extra</a>'
-              ],
-    classes:  [
-      String, :URI, String, :HostURI, String, :URI, String, :URI, String, :URI,
-      String, :Link
-    ]
-  },
-
-  no_chunks: {
-    content: "No chunks",
-    rendered: "No chunks"
-  },
-
-  single_nest: {
-    content: "{{one nest|size;large}}",
-    classes: [:Include]
-  },
-
-  css: {
-    content: %(
+                 " ",
+                 '<a target="_blank" class="external-link" ' \
+               'href="http://brain.org/Home">extra</a>'],
+      classes:  [
+        String, :URI, String, :HostURI, String, :URI, String, :URI,
+        String, :URI, String, :Link
+      ]
+    },
+
+    no_chunks: {
+      content: "No chunks",
+      rendered: "No chunks"
+    },
+
+    single_nest: {
+      content: "{{one nest|size;large}}",
+      classes: [:Include]
+    },
+
+    css: {
+      content: %(
      /* body text */
      body {
        color: #444444;
@@ -178,21 +166,20 @@ EXAMPLES = {
        color: #222299;
      }
    )
-  }
-}.freeze
+    }
+  }.freeze
 
-EXAMPLES.each_value do |val|
-  next unless val[:classes]
-  val[:classes] = val[:classes].map do |klass|
-    klass.is_a?(Class) ? klass : Card::Content::Chunk.const_get(klass)
+  EXAMPLES.each_value do |val|
+    next unless val[:classes]
+    val[:classes] = val[:classes].map do |klass|
+      klass.is_a?(Class) ? klass : Card::Content::Chunk.const_get(klass)
+    end
   end
-end
 
-describe Card::Content do
   context "instance" do
     before do
       @check_proc = proc do |m, v|
-        if Array === m
+        if m.is_a? Array
           wrong_class = m[0] != v.class
           expect(wrong_class).to be_falsey
           is_last = m.size == 1
@@ -278,18 +265,18 @@ describe Card::Content do
     describe "render" do
       it "renders all nests" do
         @example = :nests
-        expect(cobj.as_json.to_s).to match /not rendered/
-        cobj.process_each_chunk &@render_block
+        expect(cobj.as_json.to_s).to match(/not rendered/)
+        cobj.process_each_chunk(&@render_block)
         rdr = cobj.as_json.to_json
-        expect(rdr).not_to match /not rendered/
+        expect(rdr).not_to match(/not rendered/)
         expect(rdr).to eq(rendered.to_json)
       end
 
       it "renders links and nests" do
         @example = :links_and_nests
-        cobj.process_each_chunk &@render_block
+        cobj.process_each_chunk(&@render_block)
         rdr = cobj.as_json.to_json
-        expect(rdr).not_to match /not rendered/
+        expect(rdr).not_to match(/not rendered/)
         expect(rdr).to eq(rendered.to_json)
       end
 
@@ -298,24 +285,24 @@ describe Card::Content do
         card2 = Card[@card.id]
         format = card2.format format: :text
         cobj = Card::Content.new content, format
-        cobj.process_each_chunk &@render_block
+        cobj.process_each_chunk(&@render_block)
         expect(cobj.as_json.to_json).to eq(text_rendered.to_json)
       end
 
       it "does not need rendering if no nests" do
         @example = :uris_and_links
-        cobj.process_each_chunk &@render_block
+        cobj.process_each_chunk(&@render_block)
         expect(cobj.as_json.to_json).to eq(rendered.to_json)
       end
 
       it "does not need rendering if no nests (b)" do
         @example = :uris_and_links_2
         rdr1 = cobj.as_json.to_json
-        expect(rdr1).to match /not rendered/
+        expect(rdr1).to match(/not rendered/)
         # links are rendered too, but not with a block
-        cobj.process_each_chunk &@render_block
+        cobj.process_each_chunk(&@render_block)
         rdr2 = cobj.as_json.to_json
-        expect(rdr2).not_to match /not rendered/
+        expect(rdr2).not_to match(/not rendered/)
         expect(rdr2).to eq(rendered.to_json)
       end
     end
@@ -325,8 +312,7 @@ describe Card::Content do
                     " {{this is a test}}, {{this|view|is:too}} and",
                     " so is http://foo.bar.come//",
                     ' and foo="my attr, not int a tag" <not a=tag ',
-                    ' p class"foobar"> and more'
-                   ].freeze
+                    ' p class"foobar"> and more'].freeze
 
   context "class" do
     describe "#clean!" do