card 1.16.2 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec1e44206ec47eb8359856ed1bf79bf3cf5c4f9
-  data.tar.gz: 240d15a424f700f18e2665881f2b2c77265c7cf5
+  metadata.gz: f829038f8e82d4313aee74187c462260d21b56d5
+  data.tar.gz: 624f09e6b2426dac0d9fd8f92fb046f7ce846080
 SHA512:
-  metadata.gz: b24e1b0caa3bf3d23b9e5a4c5595360c762f9470edcd807d02a4d68401bb858e48ea9f965eafcd37a56439636a3fa1ca2d5b9b8140d3bda7a473719211760043
-  data.tar.gz: 59708dc4b1b579b6ee1de2ee918e433bc46e9b8c6022de2318fca81ff5866ece38edfa578b76b267ff41e809771f3c48352637e138b459d5cdc6dd1a7968737a
+  metadata.gz: ce5ecb4a4e0c44ff5e57aaf08e64268d7328d165e3111ceb9874f4c86a641c6ecd51c703eb6ca99f8b68249ffc139bff30af76ea64297127967971fd854f99a2
+  data.tar.gz: 8f28faffd83374a20a967b5a94ea39a21a868dfe674e3d99b10399c1eb9ef951650097c2f974142d3aaab5296f8cdb60b9048e305159164d9d52c4e7ea07f334

data/.yardopts

@@ -1,5 +1,5 @@
 **/lib/**/*.rb                    \
-tmp/set*/**/*.rb -                \
+tmpsets/set*/**/*.rb -            \
 **/*.rdoc                         \
 GPL                               \
 LICENSE                           \

data/VERSION

@@ -1 +1 @@
-1.16.2
+1.16.3

data/lib/card/env.rb

@@ -1,6 +1,6 @@
-# Card::Env can differ for each request; Card.config should not
-
 class Card
+
+  # Card::Env can differ for each request; Card.config should not
   module Env
     class << self
       def reset args={}

data/lib/card/format.rb

@@ -30,8 +30,6 @@ class Card
         "#{ format.camelize }Format"
       end
 
-
-
       def extract_class_vars view, opts
         return unless opts.present?
         perms[view]        = opts.delete(:perms)      if opts[:perms]

data/mod/02_basic_types/set/all/file.rb

@@ -15,8 +15,15 @@ end
 
 def mod_file?
   # when db_content was changed assume that it's no longer a mod file
-  if !db_content_changed? && content.present? && content =~ /^:[^\/]+\/([^.]+)/
-    $1
+  if !db_content_changed? && content.present?
+    case content
+    when /^:[^\/]+\/([^.]+)/ ; $1     # current mod_file format
+    when /^\~/               ; false  # current id file format
+    else
+      if lines = content.split("\n") and lines.size == 4 # old format, still used in card_changes.
+        lines.last
+      end
+    end
   end
 end
 

data/mod/02_basic_types/set/all/rss.rb

@@ -6,11 +6,10 @@ format :rss do
 
   def initialize card, args
     super
-    @xml = @parent.xml if @parent
+    @xml = @parent ? @parent.xml : ::Builder::XmlMarkup.new
   end
 
   def show view, args
-    @xml = ::Builder::XmlMarkup.new
     view ||= :feed
     render view, args
   end
@@ -24,7 +23,7 @@ format :rss do
           @xml.title       render_feed_title
           @xml.description render_feed_description
           @xml.link        render_url
-          render_feed_item_list
+          render_feed_body
         end
       end
     rescue =>e
@@ -32,12 +31,16 @@ format :rss do
     end
   end
 
-  def raw_feed_items
+  def raw_feed_items args
     [card]
   end
 
+  view :feed_body do |args|
+    render_feed_item_list
+  end
+
   view :feed_item_list do |args|
-    raw_feed_items.each do |item|
+    raw_feed_items(args).each do |item|
       @xml.item do
         subformat(item).render_feed_item :view_changes=>(card.id==RecentID)  #FIXME! yuck.
       end

data/mod/02_basic_types/set/type/pointer.rb

@@ -185,7 +185,7 @@ format :css do
 
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || args[:item] || :content)
+      nest item, :view=>(args[:item] || :content)
     end.join "\n\n"
   end
 
@@ -197,7 +197,7 @@ end
 format :js do
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || args[:item] || :core)
+      nest item, :view=>( args[:item] || :core)
     end.join "\n\n"
   end
 end

data/mod/02_basic_types/spec/set/all/rss_spec.rb

@@ -5,4 +5,11 @@ describe Card::Set::All::Rss do
     rendered = Card[:recent].format(:rss).show( nil, {} )
     expect(rendered).to match(/xml/)
   end
+
+  it 'should handle faulty search queries' do
+    bad_search = Card.create! :name=>'Bad Search', :type=>'Search', :content=>'not no search'
+    rendered = bad_search.format(:rss).render_feed_body
+    expect(rendered).to match(/item/)
+  end
+
 end

data/mod/04_settings/set/right/structure.rb

@@ -1,10 +1,15 @@
 
 format :rss do
-  def raw_feed_items
+  def raw_feed_items args
     [card]
-  end 
+  end
 end
 
 format :html do
   include AddHelp::HtmlFormat
+
+  view :core do |args|
+    render_raw args
+  end
+
 end

data/mod/04_settings/spec/set/right/structure_spec.rb

@@ -14,4 +14,9 @@ describe Card::Set::Right::Structure do
       '<a class="cardtype known-card" href="/HTML">HTML</a> : [[link]] {{inclusion}}'
     )
   end
+
+  it 'renders core as raw' do
+    trs = Card.fetch('*type+*right+*structure').format.render_core
+    expect(trs).to eq '{"type":"_self"}'
+  end
 end

data/mod/05_standard/set/all/links.rb

@@ -145,3 +145,11 @@ format :html do
   end
 
 end
+
+
+format :css do
+  def link_to text, href, opts={}
+    interpret_href href
+  end
+
+end

data/mod/05_standard/set/all/rich_html/header.rb

@@ -15,13 +15,11 @@ format :html do
   end
 
   def default_header_args args
-    if @slot_view == :open
-      if (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) || toolbar_pinned?) && card.type_code != :basic
-        args[:optional_type_info] ||= :show
-      end
-      if toolbar_pinned?
-        args[:optional_toolbar] ||= :show
-      end
+    if @slot_view == :open && toolbar_pinned?
+      args[:optional_toolbar] ||= :show
+    end
+    if show_view?(:toolbar,args.merge(:default_visibility=>:hide)) && card.type_code != :basic
+      args[:optional_type_info] ||= :show
     end
   end
 

data/mod/05_standard/set/type/search_type.rb

@@ -46,18 +46,22 @@ end
 format do
 
   view :core do |args|
-    search_vars args
-
-    case
-    when e = search_vars[:error]
-      %{#{e.class.to_s} :: #{e.message} :: #{card.raw_content}}
-    when search_vars[:query][:return] =='count'
-      search_results.to_s
-    when @mode == :template
-      render :raw
-    else
-      _render_card_list args
-    end
+    view = case search_results args
+      when Exception           ;  :search_error
+      when Integer             ;  :search_count
+      when @mode == :template  ;  :raw
+      else                     ;  :card_list
+      end
+    _render view, args
+  end
+
+
+  view :search_count do |args|
+    search_results.to_s
+  end
+
+  view :search_error do |args|
+    %{#{search_results.class.to_s} :: #{search_results.message} :: #{card.raw_content}}
   end
 
   view :card_list do |args|
@@ -74,7 +78,7 @@ format do
     @search_vars ||=
       begin
         v = {}
-        v[:query] = card.query(search_params)
+        v[:query] = card.query( search_params )
         v[:item]  = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
         v
       rescue =>e
@@ -82,13 +86,17 @@ format do
       end
   end
 
-  def search_results
-    @search_results ||=
-      begin
-        card.item_cards search_params
-      rescue => e
-        { :error => e}
+  def search_results args={}
+    @search_results ||= begin
+      search_vars args
+      if search_vars[:error]
+        search_vars[:error]
+      else
+        raw_results = card.item_cards search_params
+        is_count = search_vars[:query][:return] =='count'
+        is_count ? raw_results.to_i : raw_results
       end
+    end
   end
 
   def search_result_names
@@ -178,9 +186,19 @@ format :json do
 end
 
 format :rss do
-  def raw_feed_items
-    search_params.merge!(:default_limit => 25)
-    search_results
+  view :feed_body do |args|
+    case raw_feed_items args
+    when Exception ; @xml.item { render :search_error }
+    when Integer   ; @xml.item { render :search_count }
+    else super
+    end
+  end
+
+  def raw_feed_items args
+    @raw_feed_items ||= begin
+      search_params.merge!(:default_limit => 25)
+      search_results
+    end
   end
 end
 

data/mod/06_bootstrap/set/self/bootswatch_shared.rb

@@ -5,7 +5,7 @@ view :raw do |args|
   content = File.read("#{bootstrap_path}/_variables.scss")
   content += %{
       $bootstrap-sass-asset-helper: false;
-      $icon-font-path: "#{card_path '/assets/fonts/'}";
+      $icon-font-path: "#{card_path 'assets/fonts/'}";
     }
   # mixins
   content += Dir.glob("#{bootstrap_path}/mixins/*.scss").map do |name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.16.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -1193,3 +1193,4 @@ test_files:
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
 - spec/spec_helper.rb
+has_rdoc: