card 1.16.6 → 1.16.7

data/tmpsets/set/mod007-05_standard/self/navbox.rb

@@ -2,35 +2,35 @@
 class Card; module Set; module Self; module Navbox; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/navbox.rb ~~~~~~~~~~~
 
 format :html do
-  
+
   view :raw do |args|
-    input_args = { :class=>'navbox form-control' }
+    input_args = { class: 'navbox form-control' }
     @@placeholder ||= begin
       p = Card["#{Card[:navbox].name}+*placeholder"] and p.raw_content
     end
     input_args[:placeholder] = @@placeholder if @@placeholder
-    
-    content_tag :div, :class=>'form-group' do
+
+    content_tag :div, class: 'form-group' do
       text_field_tag :_keyword, '', input_args
     end
   end
-  
+
   view :navbar_left do |args|
-    _render_core args.merge(:navbar_class=>'navbar-form navbar-left')
+    _render_core args.merge(navbar_class: 'navbar-form navbar-left')
   end
-  
+
   view :navbar_right do |args|
-    _render_core args.merge(:navbar_class=>'navbar-form navbar-right')
+    _render_core args.merge(navbar_class: 'navbar-form navbar-right')
   end
-  
+
   view :core do |args|
-    tag_args = { :method=>'get', :role=>'search', :class=>"nodblclick navbox-form #{args[:navbar_class]}"}
+    tag_args = { method: 'get', role: 'search', class: "nodblclick navbox-form #{args[:navbar_class]}"}
     form_tag Card.path_setting('/:search'), tag_args do
       _render_raw args
     end
 
   end
-  
+
 end
 
 

data/tmpsets/set/mod007-05_standard/self/recent.rb

@@ -2,7 +2,7 @@
 class Card; module Set; module Self; module Recent; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/recent.rb ~~~~~~~~~~~
 
 view :title do |args|
-   super args.merge( :title=>'Recent Changes' )
+   super args.merge( title: 'Recent Changes' )
 end
 
 format :html do
@@ -34,7 +34,7 @@ format :html do
                  cards_by_day[day].map do |card|
                    %{
                      <div class="search-result-item item-#{ search_vars[:item] }">
-                      #{ nest(card, :view=>search_vars[:item]) }
+                      #{ nest(card, view: search_vars[:item]) }
                     </div>
                    }
                  end * ' '

data/tmpsets/set/mod007-05_standard/self/search.rb

@@ -2,11 +2,11 @@
 class Card; module Set; module Self; module Search; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/self/search.rb ~~~~~~~~~~~
 
 format :html do
-  
+
   view :title do |args|
     vars = root.search_params[:vars]
     if vars && vars[:keyword]
-       args.merge! :title=> %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
+       args.merge! title: %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
     end
     super args
   end
@@ -21,27 +21,27 @@ format :json do
       term = main+term
     end
 
-    exact = Card.fetch term, :new=>{}
+    exact = Card.fetch term, new: {}
     goto_cards = Card.search goto_wql(term)
-    goto_cards.unshift exact.name if exact.known? && !goto_cards.map{|n| n.to_name.key}.include?(exact.key) 
+    goto_cards.unshift exact.name if exact.known? && !goto_cards.map{|n| n.to_name.key}.include?(exact.key)
 
     {
-      :search => true, # card.ok?( :read ),
-      :add    => (exact.new_card? && exact.cardname.valid? && !exact.virtual? && exact.ok?( :create ) && exact.name),
-      :new    => (exact.type_id==Card::CardtypeID &&
-                  Card.new(:type_id=>exact.type_id).ok?(:create) &&
+      search: true, # card.ok?( :read ),
+      add:    (exact.new_card? && exact.cardname.valid? && !exact.virtual? && exact.ok?( :create ) && exact.name),
+      new:    (exact.type_id==Card::CardtypeID &&
+                  Card.new(type_id: exact.type_id).ok?(:create) &&
                   [exact.name, exact.cardname.url_key]
                  ),
-      :goto   => goto_cards.map { |name| [name, highlight(name, term), name.to_name.url_key] }
+      goto:   goto_cards.map { |name| [name, highlight(name, term), name.to_name.url_key] }
     }
-  
+
   end
-  
+
   #hacky.  here for override
   def goto_wql(term)
-   { :complete=>term, :limit=>8, :sort=>'name', :return=>'name' }
+   { complete: term, limit: 8, sort: 'name', return: 'name' }
   end
-  
+
 end
 
 

data/tmpsets/set/mod007-05_standard/self/signin.rb

@@ -4,7 +4,7 @@ class Card; module Set; module Self; module Signin; extend Card::Set # ~~~~~~~~~
 format :html do
 
   view :open do |args|
-    args.merge! :optional_help=>:show
+    args.merge! optional_help: :show
     super args
   end
 
@@ -22,26 +22,26 @@ format :html do
   end
 
   def default_core_args args={}
-    args[:buttons] = button_tag 'Sign in', :situation=>'primary'
-    if Card.new(:type_id=>Card::SignupID).ok? :create
+    args[:buttons] = button_tag 'Sign in', situation: 'primary'
+    if Card.new(type_id: Card::SignupID).ok? :create
       args[:buttons] += link_to( '...or sign up!', card_path("account/signup"))
     end
-    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, :path_opts=>{:slot=>{:hide=>:toolbar}} }</div>") #FIXME - hardcoded styling
+    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, path_opts: {slot: {hide: :toolbar}} }</div>") #FIXME - hardcoded styling
     args
   end
 
   view :core do |args|
-    account = card.fetch :trait=>:account, :new=>{}
+    account = card.fetch trait: :account, new: {}
     form_args = {
-      :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
-      :recaptcha => :off
+      hidden: { success: "REDIRECT: #{Env.interrupted_action || '*previous'}" },
+      recaptcha: :off
     }
 
     with_inclusion_mode :edit do
       card_form :update, form_args do
         [
           Auth.as_bot do
-            subformat(account)._render :content_formgroup, :structure=>true, :items=>{:autocomplete=>'on'}
+            subformat(account)._render :content_formgroup, structure: true, items: {autocomplete: 'on'}
           end,
           _optional_render( :button_formgroup, args )
         ].join
@@ -52,13 +52,13 @@ format :html do
   #FORGOT PASSWORD
   view :edit do |args|
     args.merge!( {
-      :title=>'Forgot Password',
-      :optional_help=>:hide,
-      :buttons => button_tag( 'Reset my password', :situation=>'primary' ),
-      :structure => true,
-      :hidden => {
-        :reset_password => true,
-        :success => { :view => :reset_password_success }
+      title: 'Forgot Password',
+      optional_help: :hide,
+      buttons: button_tag( 'Reset my password', situation: 'primary' ),
+      structure: true,
+      hidden: {
+        reset_password: true,
+        success: { view: :reset_password_success }
       }
     } )
 
@@ -75,7 +75,7 @@ format :html do
 
 end
 
-event :signin, :before=>:approve, :on=>:update do
+event :signin, before: :approve, on: :update do
   email = subcards["+#{Card[:email   ].name}"]
   email &&= email['content']
   pword = subcards["+#{Card[:password].name}"]
@@ -96,11 +96,11 @@ event :signin, :before=>:approve, :on=>:update do
   end
 end
 
-event :signin_success, :after=>:signin do
+event :signin_success, after: :signin do
   abort :success
 end
 
-event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |c| Env.params[:reset_password] } do
+event :send_reset_password_token, before: :signin, on: :update, when: proc{ |c| Env.params[:reset_password] } do
   email = subcards["+#{Card[:email].name}"]
   email &&= email['content']
 
@@ -117,7 +117,7 @@ event :send_reset_password_token, :before=>:signin, :on=>:update, :when=>proc{ |
   end
 end
 
-event :signout, :before=>:approve, :on=>:delete do
+event :signout, before: :approve, on: :delete do
   Auth.signin nil
   abort :success
 end

data/tmpsets/set/mod007-05_standard/self/stats.rb

@@ -14,12 +14,12 @@ format :html do
         </tr>
         <tr>
           <td>cards</td>
-          <td>#{ Card.where(:trash=>false).count }</td>
+          <td>#{ Card.where(trash: false).count }</td>
           <td></td>
         </tr>
         <tr>
           <td>trashed cards</td>
-          <td>#{ Card.where(:trash=>true).count  }</td>
+          <td>#{ Card.where(trash: true).count  }</td>
           <td>#{link_to 'delete all', card_path( 'update/:all?task=empty_trash' )}</td>
         </tr>
         <tr>

data/tmpsets/set/mod007-05_standard/type/basic.rb

@@ -18,7 +18,7 @@ format :html do
         tag, value = $~[1,2]
         value = ActionView::Base.new.strip_tags(value).strip
         next if value.empty?
-        item = { :value => value, :uri => URI.escape(value) }
+        item = { value: value, uri: URI.escape(value) }
         case tag.downcase
         when 'h1'
           item[:depth] = dep = 1; toc << item

data/tmpsets/set/mod007-05_standard/type/cardtype.rb

@@ -4,7 +4,7 @@ class Card; module Set; module Type; module Cardtype; extend Card::Set # ~~~~~~~
 format :html do
 
   view :type do |args|
-    args.merge!(:type_class=>'no-edit') if card.cards_of_type_exist?
+    args.merge!(type_class: 'no-edit') if card.cards_of_type_exist?
     super args
   end
 
@@ -18,10 +18,10 @@ format :html do
 
   view :add_link do |args|
     args[:title] ||= "Add #{card.name}"
-    link_to _render_title(args), _render_add_path(args), :class=>args[:css_class]
+    link_to _render_title(args), _render_add_path(args), class: args[:css_class]
   end
 
-  view :add_button, :view=>:add_link
+  view :add_button, view: :add_link
   def default_add_button_args args
     args[:css_class] = 'btn btn-default'
   end
@@ -64,10 +64,10 @@ end
 
 
 def cards_of_type_exist?
-  !new_card? and Auth.as_bot { Card.count_by_wql :type_id=>id } > 0
+  !new_card? and Auth.as_bot { Card.count_by_wql type_id: id } > 0
 end
 
-event :check_for_cards_of_type, :after=>:validate_delete do
+event :check_for_cards_of_type, after: :validate_delete do
   if cards_of_type_exist?
     errors.add :cardtype, "can't alter this type; #{name} cards still exist"
   end

data/tmpsets/set/mod007-05_standard/type/date.rb

@@ -5,7 +5,7 @@ format :html do
 
   # what is this for?  Can't you just use TYPE-date and editor to match this cas, no special view needed?
   view :editor do |args|
-    text_field :content, :class=>'date-editor'
+    text_field :content, class: 'date-editor'
   end
 end
 

data/tmpsets/set/mod007-05_standard/type/file.rb

@@ -1,6 +1,21 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Type; module File; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/file.rb ~~~~~~~~~~~
-attachment :file, :uploader=>FileUploader
+attachment :file, uploader: FileUploader
+
+module SelectedAction
+  def select_action_by_params params
+    # skip action table lookups for current revision
+    rev_id = params[:rev_id]
+    super unless rev_id && rev_id == last_content_action_id
+  end
+
+  def last_content_action_id
+    # find action id from content (saves lookups)
+    db_content.to_s.split(/[\/\.]/)[1]
+  end
+
+end
+include SelectedAction
 
 format do
   view :source do |args|
@@ -38,10 +53,10 @@ format :file do
       file = selected_file_version
       [ file.path,
         {
-          :type => file.content_type,
-          :filename =>  "#{card.cardname.safe_key}#{file.extension}",
-          :x_sendfile => true,
-          :disposition => (params[:format]=='file' ? 'attachment' : 'inline' )
+          type: file.content_type,
+          filename:  "#{card.cardname.safe_key}#{file.extension}",
+          x_sendfile: true,
+          disposition: (params[:format]=='file' ? 'attachment' : 'inline' )
         }
       ]
     else
@@ -73,7 +88,7 @@ format :html do
     ''
   end
 
-  view :preview_editor, :tags=>:unknown_ok do |args|
+  view :preview_editor, tags: :unknown_ok do |args|
     <<-HTML
       <div class="chosen-file">
         <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
@@ -111,9 +126,9 @@ format :html do
         <span class="btn btn-success fileinput-button">
             <i class="glyphicon glyphicon-cloud-upload"></i>
             <span>
-                #{@slot_view == :edit ? 'Replace' : 'Add'} #{card.attachment_name}...
+                #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
-             #{file_field card.attachment_name, :class=>'file-upload slotter'}
+             #{file_field card.attachment_name, class: 'file-upload slotter'}
         </span>
       </div>
       <div id="progress" class="progress" style="display: none;">

data/tmpsets/set/mod007-05_standard/type/image.rb

@@ -1,13 +1,15 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Type; module Image; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/image.rb ~~~~~~~~~~~
-attachment :image, :uploader=>ImageUploader
+attachment :image, uploader: ImageUploader
+
+include File::SelectedAction
 
 format do
 
   include File::Format
 
   view :closed_content do |args|
-    _render_core :size=>:icon
+    _render_core size: :icon
   end
 
   view :source do |args|
@@ -38,20 +40,20 @@ format :html do
 
   def preview args
     if !card.new_card? || card.preliminary_upload?
-      content_tag( :div, _render_core(args.merge(:size=>:medium)).html_safe,
-          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview")
+      content_tag( :div, _render_core(args.merge(size: :medium)).html_safe,
+          class: 'attachment-preview', id: "#{card.attachment.filename}-preview")
     end
   end
 
   view :content_changes do |args|
     out = ''
     size = args[:diff_type]==:summary ? :icon : :medium
-    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,:before=>args[:action])
+    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,before: args[:action])
       card.selected_action_id=last_change.card_action_id
-      out << Card::Diff.render_deleted_chunk(_render_core(:size=>size))
+      out << Card::Diff.render_deleted_chunk(_render_core(size: size))
     end
     card.selected_action_id=args[:action].id
-    out <<  Card::Diff.render_added_chunk(_render_core(:size=>size))
+    out <<  Card::Diff.render_added_chunk(_render_core(size: size))
     out
   end
 
@@ -75,7 +77,7 @@ format :file do
   end
 
   def selected_file_version
-    style = _render_style(:style=>params[:size]).to_sym
+    style = _render_style(style: params[:size]).to_sym
     (style && style != :original) ? card.attachment.versions[style] : card.attachment
   end
 end

data/tmpsets/set/mod007-05_standard/type/number.rb

@@ -2,10 +2,10 @@
 class Card; module Set; module Type; module Number; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/number.rb ~~~~~~~~~~~
 
 view :editor do |args|
-  text_field :content, :class=>'card-content'
+  text_field :content, class: 'card-content'
 end
 
-event :validate_number, :after=>:approve do
+event :validate_number, after: :approve do
   errors.add :content, "'#{content}' is not numeric" unless valid_number?( content )
 end
 

data/tmpsets/set/mod007-05_standard/type/phrase.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Type; module Phrase; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/phrase.rb ~~~~~~~~~~~
 view :editor do |args|
-  text_field :content, :class=>'card-content'
+  text_field :content, class: 'card-content'
 end
 
 

data/tmpsets/set/mod007-05_standard/type/search_type.rb

@@ -11,7 +11,7 @@ def item_cards params={}
 end
 
 def item_names params={}
-  Card.search(query(params.merge(:return=>:name)))
+  Card.search(query(params.merge(return: :name)))
 end
 
 def item_type
@@ -30,15 +30,17 @@ end
 def get_query params={}
   query = Auth.as_bot do ## why is this a wagn_bot thing?  can't deny search content??
     query_content = params.delete(:query) || raw_content
-    #warn "get_query #{name}, #{query_content}, #{params.inspect}"
-    raise("Error in card '#{self.name}':can't run search with empty content") if query_content.empty?
+    if query_content.empty?
+      raise JSON::ParserError,
+        "Error in card '#{self.name}':can't run search with empty content"
+    end
     String === query_content ? JSON.parse( query_content ) : query_content
   end
   query.symbolize_keys!.merge! params.symbolize_keys
   if default_limit = query.delete(:default_limit) and !query[:limit]
     query[:limit] = default_limit
   end
-  query[:context] ||= (cardname.junction? ? cardname.left_name : cardname)
+  query[:context] ||= cardname
   query
 end
 
@@ -81,10 +83,10 @@ format do
       begin
         v = {}
         v[:query] = card.query( search_params )
-        v[:item]  = set_inclusion_opts args.merge( :query_view=>v[:query][:view] )
+        v[:item]  = set_inclusion_opts args.merge( query_view: v[:query][:view] )
         v
-      rescue =>e
-        { :error => e }
+      rescue JSON::ParserError => e
+        { error: e }
       end
   end
 
@@ -106,13 +108,13 @@ format do
       begin
         card.item_names search_params
       rescue => e
-        { :error => e}
+        { error: e}
       end
   end
 
   def each_reference_with_args args={}
     search_result_names.each do |name|
-      yield(name, nest_args(args.reverse_merge!(:item=>:content)))
+      yield(name, nest_args(args.reverse_merge!(item: :content)))
     end
   end
 
@@ -127,7 +129,7 @@ format do
 
   def page_link text, page, current=false, options={}
     @paging_path_args[:offset] = page * @paging_limit
-    options.merge!(:class=>'card-paging-link slotter', :remote => true)
+    options.merge!(class: 'card-paging-link slotter', remote: true)
     link_to raw(text), path(@paging_path_args), options
   end
 
@@ -138,7 +140,7 @@ format do
                   'disabled'
                 end
     page ||= 0
-    content_tag :li, :class=>css_class do
+    content_tag :li, class: css_class do
       page_link text, page, current, options
     end
   end
@@ -183,7 +185,7 @@ end
 
 format :json do
   def default_search_params
-    set_default_search_params :default_limit => 0
+    set_default_search_params default_limit: 0
   end
 end
 
@@ -192,13 +194,13 @@ format :rss do
     case raw_feed_items args
     when Exception ; @xml.item { render :search_error }
     when Integer   ; @xml.item { render :search_count }
-    else super
+    else super args
     end
   end
 
   def raw_feed_items args
     @raw_feed_items ||= begin
-      search_params.merge!(:default_limit => 25)
+      search_params.merge!(default_limit: 25)
       search_results
     end
   end
@@ -217,7 +219,7 @@ format :html do
           item_view = inclusion_defaults(c)[:view]
           %{
             <div class="search-result-item item-#{ item_view }">
-              #{nest(c, :size=>args[:size], :view=>item_view)}
+              #{nest(c, size: args[:size], view: item_view)}
             </div>
           }
         end.join "\n"
@@ -240,12 +242,12 @@ format :html do
       search_limit = args[:closed_search_limit]
       search_params[:limit] = search_limit && search_limit < Card.config.closed_search_limit ?
                                 search_limit : Card.config.closed_search_limit
-      _render_core args.merge( :hide=>'paging', :item=>:link )
+      _render_core args.merge( hide: 'paging', item: :link )
       # TODO: if item is queryified to be "name", then that should work.  otherwise use link
     end
   end
 
-  view :editor, :mod=>Html::HtmlFormat
+  view :editor, mod: Html::HtmlFormat
 
   view :no_search_results do |args|
     %{<div class="search-no-results"></div>}
@@ -259,7 +261,7 @@ format :html do
     total = card.count search_params
     return '' if limit >= total # should only happen if limit exactly equals the total
 
-    @paging_path_args = { :limit => limit, :item=> inclusion_defaults(card)[:view] }
+    @paging_path_args = { limit: limit, item: inclusion_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
@@ -298,7 +300,7 @@ format :html do
   end
 
   def default_search_params
-    set_default_search_params :default_limit=>20
+    set_default_search_params default_limit: 20
   end
 
 end