card 1.93.11 → 1.93.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24da04d2280fb8e76a07ae6be4cab46f37507f48
-  data.tar.gz: 338e675444a36b74741beaf87fa704b2c60dad61
+  metadata.gz: 8e72652d9310645908db02675e5c91fb124101d7
+  data.tar.gz: 3af5b0c51954f0e16a2d445d1d9b51c845857dc6
 SHA512:
-  metadata.gz: 057db396bec5424de6ad49ee8c99ada4d0d1132c7b9fc618009f43287dc3ca4550aa87e6d8e22fc20fbd7105a67d2c79c3af964f02125915e149d42bdbd1216d
-  data.tar.gz: abc51603e41b426f0e504ef0338e223b4d35be495a0ff0d97b01785d9d49068547c639b29ffc3f88e983996b5d7ff3747426734f1951001e789dfa75609640e3
+  metadata.gz: 203c7f479d04d566c10e8d68b6bc35d8f5e058da6b8e23c52ac68fbee1a3d18c60a314ca444c63a14cfbc95a5d36e8328b8236c159a2cd642d7be52d874f7d9a
+  data.tar.gz: 91ed62e15d4870e8ad7a8edbaf560353038262f15d6692bfc75ba79c3301dbfd1494143a1172e52731cedecfa8d75fa1fb46a08428582977d774672dfe249302

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/lib/card/env/success.rb

@@ -73,7 +73,7 @@ class Card
         when ""                     then ""
         when "*previous", :previous then :previous
         when %r{^(http|/)}          then value
-        when /^TEXT:\s*(.+)/        then  Regexp.last_match(1)
+        when /^TEXT:\s*(.+)/        then Regexp.last_match(1)
         when /^REDIRECT:\s*(.+)/
           @redirect = true
           process_target Regexp.last_match(1)

data/mod/account/set/type/user.rb

@@ -40,7 +40,7 @@ format :html do
   def setup_hidden_fields
     hidden_tags(
       setup: true,
-      success: "REDIRECT: #{Card.path_setting '/'}",
+      success: "REDIRECT: #{path mark: ''}",
       "card[type_id]" => Card.default_accounted_type_id
     )
   end

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

@@ -146,12 +146,6 @@ module ClassMethods
     end
   end
 
-  def path_setting name # shouldn't this be in location helper?
-    name ||= "/"
-    return name if name =~ /^(http|mailto)/
-    "#{Card.config.relative_url_root}#{name}"
-  end
-
   def toggle val
     val.to_s.strip == "1"
   end

data/mod/core/spec/format/html_format_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Card::Format::HtmlFormat do
         is_expected.to have_tag "header" do
           with_tag 'a.nav-link.internal-link[href="/"]', text: "Home"
           with_tag 'a.nav-link.internal-link[href="/:recent"]', text: "Recent"
-          with_tag 'form.navbox-form[action="/:search"]' do
+          with_tag 'form.navbox-form[action="/*search"]' do
             with_tag 'input[name="_keyword"]'
           end
         end

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

@@ -179,6 +179,10 @@ def item args={}
   item_names(args).first
 end
 
+def count
+  all_raw_items.size
+end
+
 def item_names args={}
   raw_items(args[:content], args[:limit], args[:offset]).map do |item|
     polish_item item, args[:context]
@@ -186,13 +190,16 @@ def item_names args={}
 end
 
 def raw_items content, limit, offset
-  content ||= self.content
-  items = content.to_s.split(/\n+/)
+  items = all_raw_items content
   limit = limit.to_i
   return items unless limit.positive?
   items[offset.to_i, limit] || []
 end
 
+def all_raw_items content=nil
+  (content || self.content).to_s.split(/\n+/)
+end
+
 def polish_item item, context
   item = strip_item(item).to_name
   return item if context == :raw

data/mod/search/set/self/navbox.rb

@@ -23,7 +23,7 @@ format :html do
   end
 
   view :core do
-    form_tag Card.path_setting("/:search"),
+    form_tag path(mark: :search),
              method: "get", role: "search",
              class: classy("navbox-form", "nodblclick") do
       _render_raw

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

@@ -64,6 +64,6 @@ format :html do
   end
 
   def path_to_previous
-    Card.path_setting "/*previous"
+    path mark: "*previous"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.93.11
+  version: 1.93.12
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement