card 1.19.5 → 1.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de6e0031d77758dbc7c4ca11a084e2e24cd13ae
-  data.tar.gz: e33dd67fb7b2c868d12d4db50e574c0bc6cfb69b
+  metadata.gz: 3c91002b7b0036a9412a5b3f4d24c785d6cc7cd3
+  data.tar.gz: 91b617c019d6a60441ac0b9e08d9557099094f1c
 SHA512:
-  metadata.gz: eeaafba60cf7defa62e9d63756bcfb184cc84705191fef1503e44d4e60bd4229a1f727f6b7eaa618720781fb62e6899f6676e6bfae6452da7d0a5d00800a026f
-  data.tar.gz: 023ddaf342ae2eed8174132b2a438b7b663809195806e85fd24c3535cd26f0d36352b01e8bfe7c4598f0c0659034c4f2cab77b238048142be3dd724b29193d9a
+  metadata.gz: 93ab7930c6911b7bb811c106ad2167178d9bbd79a3b7b9e0027d5204c381ceeed0d9e6ff122748b4f966c3c37ebf8eb155483526b435660bd69cd72b18f11dd5
+  data.tar.gz: 9d2e34c1d4778d25fe534384bac6fd26a5bb54bcf8bccfbde7a721b5477be596cc212f005d61691aac4e014365ab3e66b1e40a01aac6b36a13966856957de552

data/VERSION

@@ -1 +1 @@
-1.19.5
+1.19.6

data/lib/card/name.rb

@@ -11,11 +11,17 @@ class Card
     self.session = proc { Card::Auth.current.name }
     self.banned_array = ["/"]
 
-    def self.cardish mark
-      case mark
-      when Card            then mark.cardname
-      when Symbol, Integer then Card.quick_fetch(mark).cardname
-      else                      mark.to_name
+    class << self
+      def cardish mark
+        case mark
+        when Card            then mark.cardname
+        when Symbol, Integer then Card.quick_fetch(mark).cardname
+        else                      mark.to_name
+        end
+      end
+
+      def url_key_to_standard key
+        key.to_s.tr "_", " "
       end
     end
 

data/mod/account/set/self/account_links.rb

@@ -37,7 +37,7 @@ format :html do
 
   def default_sign_up_args args
     account_link_text :sign_up, args
-    account_link_opts "signup-link", args, action: :new, type: :signup
+    account_link_opts "signup-link", args, action: :new, mark: :signup
   end
 
   def default_sign_in_args args
@@ -47,7 +47,7 @@ format :html do
 
   def default_invite_args args
     account_link_text :invite, args
-    account_link_opts "invite-a-friend-link", args, action: :new, type: :signup
+    account_link_opts "invite-a-friend-link", args, action: :new, mark: :signup
   end
 
   def default_sign_out_args args

data/mod/basic_formats/set/all/base.rb

@@ -43,10 +43,11 @@ format do
 
   view :link, closed: true, perms: :none do |args|
     title = showname args[:title]
-    known = card.known?
-    path_opts = {}
-    path_opts[:type] = args[:type] if !known && Card.known?(args[:type])
-    link_to_card card.name, title, known: known, path: path_opts
+    opts = { known: card.known? }
+    if args[:type] && !opts[:known]
+      opts[:path] = { card: { type: args[:type] } }
+    end
+    link_to_card card.name, title, opts
   end
 
   view(:codename, closed: true) { card.codename.to_s }

data/mod/basic_formats/spec/set/all/base_spec.rb

@@ -69,6 +69,7 @@ describe Card::Set::All::Base do
         expect(render_card(:array, content: "yoing")).to eq(%(["yoing"]))
       end
     end
+
     it "renders template rule of embed cards based on set" do
       Card::Auth.as_bot
       content = "{{_left+test_another_card|content|content;"\

data/mod/core/set/all/fetch.rb

@@ -187,9 +187,8 @@ module ClassMethods
     opts = (args[:card] || {}).clone
     # clone so that original params remain unaltered.  need deeper clone?
     opts[:type] ||= args[:type] if args[:type]
-    # for /new/:type shortcut.  we should fix and deprecate this.
-    opts[:name] ||= args[:id].to_s.tr("_", " ")
-    # move handling to Card::Name?
+    # for /new/:type shortcut.  we should handle in routing and deprecate this
+    opts[:name] ||= Card::Name.url_key_to_standard(args[:id])
     opts
   end
 

data/mod/core/set/all/utils.rb

@@ -36,7 +36,7 @@ module ClassMethods
   end
 
   def merge name, attribs={}, opts={}
-    puts "merging #{name}"
+    # puts "merging #{name}"
     card = fetch name, new: {}
     [:image, :file].each do |attach|
       next unless attribs[attach] && attribs[attach].is_a?(String)

data/mod/email/set/all/follow.rb

@@ -37,7 +37,7 @@ format do
     end
     set_card = card.default_follow_set_card
     hash[:path] = path(
-      name: set_card.follow_rule_name(Auth.current.name),
+      mark: set_card.follow_rule_name(Auth.current.name),
       action: :update,
       success: { layout: :modal, view: :follow_status },
       card: { content: "[[#{hash[:content]}]]" }
@@ -62,7 +62,7 @@ format :html do
     #   card.default_follow_set_card.follow_rule_name(Auth.current.name),
     #   new: {}
     # )
-    opts = (args[:html_args] || {}).clone
+    opts = (args[:link_opts] || {}).clone
     opts.merge!(
       title:           hash[:title],
       "data-path"      => hash[:path],

data/mod/history/set/all/history.rb

@@ -384,8 +384,8 @@ format :html do
   end
 
   def rollback_link actions
-    # @fixme -- doesn't this need to specify which action it wants?
-    prior =  # @fixme - should be a Card::Action method
+    # FIXME -- doesn't this need to specify which action it wants?
+    prior =  # FIXME - should be a Card::Action method
       actions.select { |action| action.card.last_action_id != action.id }
     return unless card.ok?(:update) && prior.present?
     link = link_to(

data/mod/standard/set/all/error.rb

@@ -100,12 +100,10 @@ format :html do
 
   view :missing do |args|
     return "" unless card.ok? :create  # should this be moved into ok_view?
-    missing_view = args[:denied_view] || args[:home_view]
-    wrap args do
-      link_to_view :new, "Add #{fancy_title args[:title]}",
-                   path: (args[:type] ? { type: args[:type] } : {}),
-                   class: "slotter missing-#{missing_view}"
-    end
+    path_opts = args[:type] ? { card: { type: args[:type] } } : {}
+    link_text = "Add #{fancy_title args[:title]}"
+    klass = "slotter missing-#{args[:denied_view] || args[:home_view]}"
+    wrap(args) { link_to_view :new, link_text, path: path_opts, class: klass }
   end
 
   view :closed_missing, perms: :none do
@@ -153,7 +151,7 @@ format :html do
     sign_in_or_up_links =
       unless Auth.signed_in?
         signin_link = link_to_card :signin, "Sign in"
-        signup_link = link_to "Sign up", path: { account: :new, type: :signup }
+        signup_link = link_to "Sign up", path: { action: :new, mark: :signup }
         %(<div>#{signin_link} or #{signup_link} to create it.</div>)
       end
     frame args.merge(title: "Not Found", optional_menu: :never) do
@@ -184,7 +182,7 @@ format :html do
             or_signup_link =
               if Card.new(type_id: Card::SignupID).ok? :create
                 "or " +
-                  link_to("sign up", path: { account: "new", type: :signup })
+                  link_to("sign up", path: { action: "new", mark: :signup })
               end
             Env.save_interrupted_action(request.env["REQUEST_URI"])
             "Please #{signin_link} #{or_signup_link} #{to_task}"

data/mod/standard/set/all/links.rb

@@ -2,7 +2,7 @@ RESOURCE_TYPE_REGEXP = /^([a-zA-Z][\-+\.a-zA-Z\d]*):/
 
 format :html do
   def link_to text=nil, opts={}
-    opts[:href] = interpret_pathish opts.delete(:path)
+    opts[:href] = path opts.delete(:path)
     text = raw(text || opts[:href])
     interpret_data_opts_to_link_to opts
     content_tag :a, text, opts
@@ -18,31 +18,23 @@ end
 
 format :css do
   def link_to _text=nil, opts={}
-    card_url interpret_pathish(opts.delete(:path))
+    card_url path(opts.delete(:path))
   end
 end
 
 format do
   def link_to text=nil, opts={}
-    href = interpret_pathish opts.delete(:path)
-    if text && href != text
-      "#{text}[#{href}]"
+    path = path opts.delete(:path)
+    if text && path != text
+      "#{text}[#{path}]"
     else
-      href
-    end
-  end
-
-  def smart_link_to text, opts={}
-    if (linktype = [:view, :related, :card, :resource].find { |key| opts[key] })
-      send "link_to_#{linktype}", opts.delete(linktype), text, opts
-    else
-      send :link_to, text, opts
+      path
     end
   end
 
   def link_to_resource resource, text=nil, opts={}
     case (resource_type = resource_type resource)
-    when "external-link" then opts[:target] = "_blank"
+    when "external-link" then opts[:target] ||= "_blank"
     when "internal-link" then resource = internal_url resource[1..-1]
     end
     add_class opts, resource_type
@@ -60,9 +52,7 @@ format do
 
   def link_to_card cardish, text=nil, opts={}
     opts[:path] ||= {}
-    name = opts[:path][:name] = Card::Name.cardish cardish
-    # @fixme - need smarter mark handling
-
+    name = opts[:path][:mark] = Card::Name.cardish cardish
     text ||= name.to_name.to_show @context_names
     add_known_or_wanted_class opts, name
     link_to text, opts
@@ -74,8 +64,8 @@ format do
     add_class opts, (known ? "known-card" : "wanted-card")
   end
 
-  # link to a specific view (defaults to current card)
-  # this is generally used for ajax calls
+  # dynamic (ajax) link to a specific view
+  #
   def link_to_view view, text, opts={}
     opts.reverse_merge! path: {}, remote: true, rel: "nofollow"
     opts[:path][:view] = view unless view == :home
@@ -90,38 +80,55 @@ format do
     link_to_view :related, (text || name), opts
   end
 
-  # @param opts [Hash]
+  # smart_link_to is wrapper method for #link_to, #link_to_card, #link_to_view,
+  # #link_to_resource, and #link_to_related.  If the opts argument contains
+  # :view, :related, :card, or :resource, it will use the respective method to
+  # render a link.
+  def smart_link_to text, opts={}
+    if (linktype = [:view, :related, :card, :resource].find { |key| opts[key] })
+      send "link_to_#{linktype}", opts.delete(linktype), text, opts
+    else
+      send :link_to, text, opts
+    end
+  end
+
+  # path is for generating standard card routes, eg
+  #   [cardname]
+  #   [cardname]?[param]=[value]
+  #   [action]/[cardname]?[param]=[value]
+
+  # @param opts [Hash, String] a String is treated as a complete path and
+  # bypasses all processing
+  # @option opts [String, Card::Name, Integer, Symbol, Card] :mark
   # @option opts [Symbol] :action card action (:create, :update, :delete)
-  # @option opts [Integer, String] :id
-  # @option opts [String, Card::Name] :name
-  # @option opts [String] :type
   # @option opts [Hash] :card
-  # @param mark_type [Symbol] defaults to :id
-  def path opts={}, mark_type=:id
-    path = new_cardtype_path(opts) || standard_path(opts, mark_type)
+  # @option opts []
+  def path opts={}
+    return opts unless opts.is_a? Hash
+    path = new_cardtype_path(opts) || standard_path(opts)
     internal_url path
   end
 
   def new_cardtype_path opts
     return unless opts[:action] == :new
     opts.delete :action
-    return unless (type_mark = opts.delete(:type))
-    "new/#{Card.quick_fetch(type_mark).cardname.url_key}"
+    return unless opts[:mark]
+    "new/#{path_mark opts}"
   end
 
-  def standard_path opts, mark_type
+  def standard_path opts
     standardize_action! opts
-    base = path_action(opts[:action]) + path_mark(opts, mark_type)
+    mark = path_mark opts
+    base = path_base opts[:action], mark
     base + path_query(opts)
   end
 
-  def path_action action
-    case action
-    when :create then "card/#{action}/"
-    # sometimes create action has no mark,
-    # but /create alone would refer to a card named "create"
-    when nil     then ""
-    else              "#{action}/"
+  def path_base action, mark
+    if action
+      mark.present? ? "#{action}/#{mark}" : "card/#{action}"
+      # the card/ prefix prevents interpreting action as cardname
+    else
+      mark
     end
   end
 
@@ -130,58 +137,27 @@ format do
     opts.delete :action
   end
 
-  def path_mark opts, mark_type
-    case mark_type
-    when :id       && (id = path_id opts)        then "~#{id}"
-    when :codename && (codename = card.codename) then ":#{codename}"
-    else (opts[:name] || card.name).to_name.url_key
-    end
-  end
-
-  def path_id opts
-    id = opts.delete :id
-    id if id.present?
+  def path_mark opts
+    return "" if opts[:action] == :create || opts.delete(:no_mark)
+    name = opts[:mark] ? Card::Name.cardish(opts.delete(:mark)) : card.name
+    add_unknown_name_to_opts name.to_name, opts
+    name.to_name.url_key
   end
 
   def path_query opts
-    finalize_card_opts opts.delete(:card), opts
     opts.delete :action
     opts.empty? ? "" : "?#{opts.to_param}"
   end
 
-  def finalize_card_opts card_opts, opts
-    card_opts ||= {}
-    [:name, :type].each do |field|
-      assign_path_card_opt card_opts, field, opts
-    end
-    opts[:card] = card_opts unless card_opts.empty?
-  end
-
-  def assign_path_card_opt card_opts, field, opts
-    optvalue = opts.delete field
-    return if card_opts[field] || !optvalue.present?
-    new_value = send "new_#{field}_in_path_opts", optvalue.to_s, opts
-    return unless new_value
-    card_opts[field] = new_value
-  end
-
-  def new_name_in_path_opts name, opts
-    if opts[:action] == :update
-      name if name != card.name
-    elsif !Card.known?(name) && name != name.to_name.url_key
-      name
-    end
-  end
-
-  def new_type_in_path_opts opttype, _opts
-    opttype if Card.known?(opttype)
+  def add_unknown_name_to_opts name, opts
+    return if opts[:card] && opts[:card][:name]
+    return if name.s == Card::Name.url_key_to_standard(name.url_key)
+    return if Card.known? name
+    opts[:card] ||= {}
+    opts[:card][:name] = name
   end
 
   def internal_url relative_path
     card_path relative_path
   end
-
-  def interpret_pathish pathish
-    pathish.is_a?(Hash) ? path(pathish) : pathish
-  end
 end

data/mod/standard/set/all/rich_html/editing.rb

@@ -43,9 +43,9 @@ format :html do
 
   def generic_new_card_title
     if card.type_id == Card.default_type_id
-      "New #{card.type_name}"
-    else
       "New"
+    else
+      "New #{card.type_name}"
     end
   end
 

data/mod/standard/set/rstar/rules_editor.rb

@@ -139,7 +139,7 @@ format :html do
   view :edit_rule, tags: :unknown_ok do |args|
     return "not a rule" unless card.is_rule?
     form_args = {
-      url: path(action: :update, mark_type: :name),
+      url: path(action: :update, no_mark: true),
       html: { class: "card-form card-rule-form" }
     }
     if args[:remote]

data/mod/standard/spec/chunk/link_spec.rb

@@ -9,7 +9,8 @@ describe Card::Content::Chunk::Link do
       assert_args[0] << "[#{key}=\"#{val}\"]"
     end
     assert_args << { text: text } if text
-    assert_view_select render_content(target, (format_args || {})), *assert_args
+    link = render_content target, (format_args || {})
+    assert_view_select link, *assert_args
   end
 
   it "handles unknown cards" do

data/spec/lib/card/content_spec.rb

@@ -25,7 +25,7 @@ describe Card::Content do
                "{{Included|open}}",
       rendered: ["Some Links and includes: ",
                  '<a class="wanted-card" ' \
-                 'href="/the_card?card%5Bname%5D=the+card">' \
+                 'href="/the_card">' \
                  "the text</a>",
                  ", and ",
                  { options: { view: "Is Included",
@@ -208,18 +208,26 @@ describe Card::Content do
 
     describe "parse" do
       def check_chunk_classes
-        expect(cobj.inject(classes, &@check_proc)).to eq(true)
-        clist = classes.select { |c| String != c }
+        all_classes_pass_check_proc
+        clist = nonstring_classes
         cobj.each_chunk do |chk|
           expect(chk).to be_instance_of clist.shift
         end
         expect(clist).to be_empty
       end
 
+      def nonstring_classes
+        classes.select { |c| String != c }
+      end
+
+      def all_classes_pass_check_proc
+        expect(cobj.inject(classes, &@check_proc)).to eq(true)
+      end
+
       it "finds all the chunks and strings" do
         # note the mixed [} that are considered matching, needs some cleanup ...
         @example = :nests
-        expect(cobj.inject(classes, &@check_proc)).to eq(true)
+        all_classes_pass_check_proc
       end
 
       it "gives just the chunks" do
@@ -229,7 +237,7 @@ describe Card::Content do
 
       it "finds all the chunks links and trasclusions" do
         @example = :links_and_nests
-        expect(cobj.inject(classes, &@check_proc)).to eq(true)
+        all_classes_pass_check_proc
       end
 
       it "finds uri chunks " do

metadata

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