card 1.19.6 → 1.20.0

data/mod/machines/set/abstract/script.rb

@@ -3,10 +3,46 @@ require "uglifier"
 
 include_set Abstract::AceEditor
 
+def self.included host_class
+  host_class.include_set Abstract::Machine
+  host_class.include_set Abstract::MachineInput
+
+  host_class.machine_input { standard_machine_input }
+  host_class.store_machine_output filetype: "js"
+end
+
+def standard_machine_input
+  js = format(:js)._render_core
+  js = compress_js js if compress_js?
+  comment_with_source js
+end
+
 def comment_with_source js
   "//#{name}\n#{js}"
 end
 
+def compress_js input
+  Uglifier.compile input
+rescue => e
+  # CoffeeScript is compiled in a view
+  # If there is a CoffeeScript syntax error we get the rescued view here
+  # and the error that the rescued view is no valid Javascript
+  # To get the original error we have to refer to Card::Error.current
+  raise Card::Error, compression_error_message(e)
+end
+
+def compression_error_message e
+  if Card::Error.current
+    Card::Error.current.message
+  else
+    "JavaScript::SyntaxError (#{name}): #{e.message}"
+  end
+end
+
+def compress_js?
+  !Rails.env.development?
+end
+
 def clean_html?
   false
 end
@@ -23,17 +59,16 @@ format :html do
   end
 
   view :content_changes do |args|
-    %(
-      <pre>#{super(args)}</pre>
-    )
+    wrap_with(:pre) { super args }
   end
 
-  view :core do |_args|
-    process_content highlighted_js
+  view :core do
+    script = card.format(:js).render_core
+    process_content highlight(script)
   end
 
-  def highlighted_js
-    ::CodeRay.scan(_render_raw, :js).div
+  def highlight script
+    ::CodeRay.scan(script, :js).div
   end
 end
 

data/mod/machines/set/right/machine_input.rb

@@ -1,3 +1,7 @@
 def followable?
   false
 end
+
+def history?
+  false
+end

data/mod/machines/set/type/coffee_script.rb

@@ -2,35 +2,21 @@
 require "coffee-script"
 
 include_set Abstract::Script
-include_set Abstract::Machine
-include_set Abstract::MachineInput
-
-store_machine_output filetype: "js"
-
-machine_input do
-  js = Uglifier.compile compile_coffee(format(:js)._render_raw)
-  comment_with_source js
-end
-
-def compile_coffee script
-  ::CoffeeScript.compile script
-rescue => e
-  raise Card::Error, "CoffeeScript::Error (#{name}): #{e.message}"
-end
 
 format :html do
   def default_editor_args args
     args[:ace_mode] ||= "coffee"
   end
-
-  def highlighted_js
-    js = card.compile_coffee _render_raw
-    ::CodeRay.scan(js, :js).div
-  end
 end
 
 format do
-  view :core do |_args|
-    process_content card.compile_coffee(_render_raw)
+  view :core do
+    compile_coffee _render_raw
+  end
+
+  def compile_coffee script
+    ::CoffeeScript.compile script
+  rescue => e
+    raise Card::Error, "CoffeeScript::Error (#{name}): #{e.message}"
   end
 end

data/mod/machines/set/type/css.rb

@@ -40,8 +40,8 @@ format :html do
     args[:ace_mode] = "css"
   end
 
-  def get_nest_defaults _nested_card
-    { view: :closed }
+  def default_nest_view
+    :closed
   end
 
   view :core do |_args|

data/mod/machines/set/type/java_script.rb

@@ -2,28 +2,8 @@
 
 include_set Abstract::Script
 
-include_set Abstract::Machine
-include_set Abstract::MachineInput
-
-store_machine_output filetype: "js"
-
-machine_input do
-  js = compress_js format(:js)._render_core
-  comment_with_source js
+format :js do
+  view :core do
+    _render_raw
+  end
 end
-
-def compress_js input
-  Uglifier.compile(input)
-rescue => e
-  # CoffeeScript is compiled in a view
-  # If there is a CoffeeScript syntax error we get the rescued view here
-  # and the error that the rescued view is no valid Javascript
-  # To get the original error we have to refer to Card::Error.current
-  msg = if Card::Error.current
-          Card::Error.current.message
-        else
-          "CoffeeScript::SyntaxError (#{name}): #{e.message}"
-        end
-  raise Card::Error, msg
-end
-

data/mod/machines/set/type/scss.rb

@@ -1,7 +1,7 @@
 include_set Type::Css
 
 format do
-  view :core do |_args|
+  view :core, cache: :never do |_args|
     compile_scss(process_content _render_raw)
   end
 

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

@@ -6,7 +6,7 @@ describe Card::Set::Type::Css do
   let(:changed_css)            { "#box { display: inline }" }
   let(:compressed_changed_css) { "#box{display:inline}\n" }
 
-  it "should highlight code" do
+  it "highlights code" do
     Card::Auth.as_bot do
       css_card = Card.create! name: "tmp css", type_code: "css",
                               content: "p { border: 1px solid black; }"

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

@@ -19,12 +19,12 @@ describe Card::Set::Type::Scss do
     @scss_card = Card[:style_cards]
   end
 
-  it "should highlight code in html" do
+  it "highlights code in html" do
     assert_view_select @scss_card.format(:html).render_core,
                        "div[class=CodeRay]"
   end
 
-  it "should not highlight code in css" do
+  it "does not highlight code in css" do
     expect(@scss_card.format(:css).render_core).not_to match(/CodeRay/)
   end
 
@@ -44,7 +44,7 @@ describe Card::Set::Type::Scss do
     end
   end
 
-  it "should process links and nests but not urls" do
+  it "processes links and nests but not urls" do
     Card::Auth.as_bot do
       scss = ".TYPE-X.no-citations {\n  color: #BA5B5B;\n}\n"
       card = Card.create! name: "minimal css", type: "scss", content: scss

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

@@ -47,9 +47,9 @@ describe Card::Set::Type::Skin do
     it "updates output of related machine card" do
       # item = Card.gimme! "skin item", type: :css, content: css
       skin = Card.gimme! "test skin supplier", type: :skin, content: ""
+      item = Card.gimme! "skin item", type: :css, content: css
       machine = Card.gimme! "style with skin machine+*style",
                             type: :pointer, content: "[[test skin supplier]]"
-      item = Card.gimme! "skin item", type: :css, content: css
       skin << item
       skin.putty
       updated_machine = Card.gimme machine.cardname
@@ -61,16 +61,16 @@ describe Card::Set::Type::Skin do
   context "when item changed" do
     it "updates output of related machine card" do
       skin = Card.gimme! "test skin supplier", type: :skin, content: ""
-      machine = Card.gimme! "style with skin machine+*style",
-                            type: :pointer,
-                            content: "[[test skin supplier]]"
       item = Card.gimme! "skin item", type: :css, content: css
+      machine = Card.gimme! "style with skin machine+*style",
+                            type: :pointer, content: "[[test skin supplier]]"
       skin << item
       skin.putty
+
       Card::Auth.as_bot do
-        item.update_attributes content: changed_css
-        { get: machine.machine_output_url }
-        item.update_attributes content: new_css
+        Card["skin_item"].update_attributes content: changed_css
+        machine.machine_output_url
+        Card["skin_item"].update_attributes content: new_css
       end
       updated_machine = Card.gimme machine.cardname
       path = updated_machine.machine_output_path

data/mod/pointer/set/abstract/01_pointer.rb

@@ -12,6 +12,10 @@ stage_method :added_item_names do
   item_names - old_items
 end
 
+stage_method :changed_item_cards do
+  item_cards content: changed_item_names
+end
+
 format do
   def item_links args={}
     card.item_cards(args).map do |item_card|
@@ -23,90 +27,84 @@ format do
     item # no wrap in base
   end
 
-  view :core do |args|
-    render_pointer_items args.merge(joint: ", ")
+  def nest_item_array
+    card.item_cards.map do |item|
+      nest_item item
+    end
   end
 
-  view :pointer_items, tags: :unknown_ok do |args|
-    i_args = item_args(args)
-    joint = args[:joint] || " "
-    card.item_cards.map do |i_card|
-      wrap_item nest(i_card, i_args.clone), i_args
-    end.join joint
+  view :core do |_args|
+    pointer_items.join ", "
+  end
+
+  def pointer_items args={}
+    card.item_cards.map do |item_card|
+      nest_item item_card, args do |rendered, item_view|
+        wrap_item rendered, item_view
+      end
+    end
   end
 end
 
 format :html do
-  view :core do |args|
-    %(<div class="pointer-list">#{render_pointer_items args}</div>)
+  view :core do
+    wrap_with :div, pointer_items, class: "pointer-list"
   end
 
-  view :closed_content do |args|
-    args[:item] =
-      if (args[:item] || nest_defaults(card)[:view]) == "name"
-        "name"
-      else
-        "link"
-      end
-    args[:joint] ||= ", "
-    _render_core args
+  view :closed_content do
+    item_view = implicit_item_view
+    item_view = item_view == "name" ? "name" : "link"
+    wrap_with :div, class: "pointer-list" do
+      pointer_items(view: item_view).join ", "
+    end
   end
 
-  def wrap_item item, args
-    %(<div class="pointer-item item-#{args[:view]}">#{item}</div>)
+  def wrap_item rendered, item_view
+    %(<div class="pointer-item item-#{item_view}">#{rendered}</div>)
   end
 end
 
 format :css do
   # generalize to all collections?
   def default_item_view
-    params[:item] || :content
+    :content
   end
 
-  view :titled do |_args|
+  view :titled do
     %(#{major_comment "STYLE GROUP: \"#{card.name}\"", '='}#{_render_core})
   end
 
-  view :core do |args|
-    card.item_cards.map do |item|
-      nest item, view: item_view(args)
-    end.join "\n\n"
+  view :core do
+    nest_item_array.join "\n\n"
   end
 
   view :content, :core
 end
 
 format :js do
-  view :core do |args|
-    card.item_cards.map do |item|
-      nest item, view: (args[:item] || :core)
-    end.join "\n\n"
+  view :core do
+    nest_item_array.join "\n\n"
   end
 end
 
 format :data do
-  view :core do |_args|
-    card.item_cards.map do |c|
-      nest c
-    end
+  view :core, cache: :never do
+    nest_item_array
   end
 end
 
 format :rss do
-  def raw_feed_items _args
-    @raw_feed_items ||= begin
-      card.item_cards
-    end
+  def raw_feed_items
+    @raw_feed_items ||= card.item_cards
   end
 end
 
 format :json do
   view :export_items do |args|
-    result =
-      card.known_item_cards.map do |ic|
-        subformat(ic).render_export(args)
-      end
-    result.flatten.reject(&:blank?)
+    item_args = args.merge view: :export
+    card.known_item_cards.map do |item_card|
+      nest_item item_card, item_args
+    end.flatten.reject(&:blank?)
   end
 end
 
@@ -118,7 +116,7 @@ end
 event :standardize_items, :prepare_to_validate,
       on: :save,
       changed: :content,
-      when: proc { |c| c.type_id == Card::PointerID  } do
+      when: proc { |c| c.type_id == Card::PointerID } do
   self.content = item_names(context: :raw).map do |name|
     "[[#{name}]]"
   end.join "\n"
@@ -130,7 +128,7 @@ end
 
 def item_cards args={}
   if args[:complete]
-    query = args.reverse_merge referred_to_by: name
+    query = args.reverse_merge referred_to_by: name, limit: 0
     Card::Query.run query
   elsif args[:known_only]
     known_item_cards args

data/mod/pointer/set/abstract/01_pointer/edit.rb

@@ -12,9 +12,6 @@ event :insert_item_event, :prepare_to_validate,
 end
 
 format :html do
-  #  view :edit do |args|
-  #    super(args.merge(pointer_item_class: 'form-control'))
-  #  end
 
   view :editor do |args|
     part_view = (c = card.rule(:input)) ? c.gsub(/[\[\]]/, "") : :list
@@ -46,7 +43,7 @@ format :html do
   end
 
   def add_item_button
-    content_tag :span, class: "input-group" do
+    wrap_with :span, class: "input-group" do
       button_tag class: "pointer-item-add" do
         glyphicon("plus") + " add another"
       end
@@ -167,8 +164,7 @@ def add_item name
 end
 
 def add_item! name
-  add_item name
-  save!
+  add_item(name) && save!
 end
 
 def drop_item name
@@ -196,13 +192,8 @@ def insert_item! index, name
 end
 
 def option_names
-  result_names =
-    if (oc = options_rule_card)
-      oc.item_names default_limit: 50, context: name
-    else
-      Card.search({ sort: "name", limit: 50, return: :name },
-                  "option names for pointer: #{name}")
-    end
+  result_names = configured_option_names
+
   if (selected_options = item_names)
     result_names += selected_options
     result_names.uniq!
@@ -210,6 +201,15 @@ def option_names
   result_names
 end
 
+def configured_option_names
+  if (oc = options_rule_card)
+    oc.item_names context: name, limit: oc.default_limit
+  else
+    Card.search({ sort: "name", limit: 50, return: :name },
+                "option names for pointer: #{name}")
+  end
+end
+
 def option_cards
   option_names.map do |name|
     Card.fetch name, new: {}