card 1.16.3 → 1.16.4

data/tmpsets/set/mod007-05_standard/all/links.rb

@@ -149,5 +149,13 @@ format :html do
 end
 
 
+format :css do
+  def link_to text, href, opts={}
+    interpret_href href
+  end
+
+end
+
+
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/links.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod007-05_standard/all/rich_html/header.rb

@@ -17,13 +17,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/tmpsets/set/mod007-05_standard/right/account.rb

@@ -96,11 +96,11 @@ event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_r
   case ( result = authenticate_by_token @env_token )
   when Integer
     Auth.signin result
-    Env.params[:success] = edit_password_success_args
+    success << edit_password_success_args
     abort :success
   when :token_expired
     send_reset_password_token
-    Env.params[:success] = {
+    success << {
       :id => '_self',
       :view => 'message',
       :message => "Sorry, this token has expired. Please check your email for a new password reset link."

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

@@ -32,7 +32,6 @@ format :html do
 
   view :core do |args|
     account = card.fetch :trait=>:account, :new=>{}
-
     form_args = {
       :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
       :recaptcha => :off

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

@@ -1,9 +1,6 @@
 # -*- 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 ~~~~~~~~~~~
-include Abstract::Attachment
-
-set_specific_attributes :file, :remote_file_url
-mount_uploader :file, FileUploader
+attachment :file, :uploader=>FileUploader
 
 format do
   view :source do |args|
@@ -42,7 +39,7 @@ format :file do
       [ file.path,
         {
           :type => file.content_type,
-          :filename =>  "#{card.cardname.safe_key}.#{file.extension}",
+          :filename =>  "#{card.cardname.safe_key}#{file.extension}",
           :x_sendfile => true,
           :disposition => (params[:format]=='file' ? 'attachment' : 'inline' )
         }
@@ -68,29 +65,61 @@ format :html do
   end
 
   view :editor do |args|
-    #Rails.logger.debug "editor for file #{card.inspect}"
     file_chooser args
   end
 
-  def file_chooser args, db_column=:file
-    preview =
-      if !card.new_card?
-        content_tag :div, _render_core(args).html_safe,
-          :class=>'attachment-preview', :id=>"#{card.attachment.filename}-preview"
-      end
 
+  def preview  args
+    ''
+  end
+
+  view :preview_editor, :tags=>:unknown_ok do |args|
+    <<-HTML
+      <div class="chosen-file">
+        <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
+        <table role="presentation" class="table table-striped"><tbody class="files">
+          <tr class="template-download fade in">
+            <td>
+              <span class="preview">
+                #{preview(args)}
+              </span>
+            </td>
+            <td>
+              <p class="name">
+                #{card.original_filename}
+              </p>
+            </td>
+            <td>
+              <span class="size">#{number_to_human_size(card.attachment.size)}</span>
+            </td>
+            <td class="pull-right">
+              <button class="btn btn-danger delete cancel-upload" data-type="DELETE">
+                <i class="glyphicon glyphicon-trash"></i>
+                <span>Delete</span>
+              </button>
+            </td>
+          </tr></tbody>
+        </table>
+      </div>
+    HTML
+  end
+
+  def file_chooser args
     <<-HTML
       <div class="choose-file">
-        #{preview}
-        <div>#{file_field db_column, :class=>'file-upload slotter'}</div>
+        #{preview(args)}
+        <span class="btn btn-success fileinput-button">
+            <i class="glyphicon glyphicon-cloud-upload"></i>
+            <span>
+                #{@slot_view == :edit ? 'Replace' : 'Add'} #{card.attachment_name}...
+            </span>
+             #{file_field card.attachment_name, :class=>'file-upload slotter'}
+        </span>
       </div>
-      <div class="chosen-file" style="display:none">
-        <div>
-          <label>File chosen:</label>
-          <span class="chosen-filename"></span>
-        </div>
-        <div><a class="cancel-upload">Unchoose</a></div>
+      <div id="progress" class="progress" style="display: none;">
+        <div class="progress-bar progress-bar-success" style="width: 0%;"></div>
       </div>
+      <div class="chosen-file"></div>
     HTML
   end
 

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

@@ -1,9 +1,6 @@
 # -*- 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 ~~~~~~~~~~~
-include Abstract::Attachment
-set_specific_attributes :image, :remote_image_url
-mount_uploader :image, ImageUploader
-
+attachment :image, :uploader=>ImageUploader
 
 format do
 
@@ -33,28 +30,28 @@ end
 format :html do
   include File::HtmlFormat
 
-
-  view :editor do |args|
-    file_chooser args, :image
-  end
-
-
   view :core do |args|
     handle_source args do |source|
       source == 'missing' ? "<!-- image missing #{@card.name} -->" : image_tag(source)
     end
   end
 
+  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")
+    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])
       card.selected_action_id=last_change.card_action_id
-      out << Card::Diff.render_added_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_deleted_chunk(_render_core(:size=>size))
+    out <<  Card::Diff.render_added_chunk(_render_core(:size=>size))
     out
   end
 

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

@@ -48,18 +48,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|
@@ -76,7 +80,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
@@ -84,13 +88,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
@@ -180,9 +188,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/tmpsets/set/mod008-06_bootstrap/self/bootswatch_shared.rb

@@ -7,7 +7,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.3
+  version: 1.16.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,8 @@ files:
 - db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.rb
 - db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb
 - db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb
+- db/migrate_core_cards/20150824135418_update_file_history.rb
+- db/migrate_core_cards/20150903130006_attachment_upload_cards.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -402,6 +404,7 @@ files:
 - lib/card/set_pattern.rb
 - lib/card/simplecov_helper.rb
 - lib/card/spec_helper.rb
+- lib/card/success.rb
 - lib/card/version.rb
 - lib/card/view_cache.rb
 - lib/card/view_name.rb
@@ -722,6 +725,7 @@ files:
 - mod/05_standard/set/type/user.rb
 - mod/05_standard/spec/chunk/include_spec.rb
 - mod/05_standard/spec/chunk/link_spec.rb
+- mod/05_standard/spec/chunk/query_reference_spec.rb
 - mod/05_standard/spec/format/css_format_spec.rb
 - mod/05_standard/spec/format/csv_format_spec.rb
 - mod/05_standard/spec/format/email_html_format_spec.rb
@@ -957,6 +961,7 @@ files:
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
+- spec/lib/card/success_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb
@@ -1185,6 +1190,7 @@ test_files:
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
+- spec/lib/card/success_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb