wagn 1.16.9 → 1.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2d535153a197b92c0822ab179707b0682c4bf0
-  data.tar.gz: 61a2241a28124f1ffbe02b07988de44ecdccd85d
+  metadata.gz: 868985bd60371dbdf3eb8985578149faf1d72ca6
+  data.tar.gz: b2c87b109129dadd549da40bf355cde451b59df4
 SHA512:
-  metadata.gz: 164ead08ce3191ec24b18852e3248638e0caf1719816792fc63669e7211a950d8660229a38ede7c4065b1a2d3b93b876e3c00963e9471dd4e56cb68be37e8ef1
-  data.tar.gz: 7eb97223c44d5337b9a4333786a45d76725c38b5cdee516fe5efea2569a1e5d843e5cebe52248846a42829e3b82250111ca9ebb795124813a176884eefd13445
+  metadata.gz: ba75aef50dee68c139d0fb9d6b068c9cf8c3a2a05d291b0c680f31c2b14cf5e7478466857ce64c15c29c4b813c612ceb24c698591aecfcd21bcd6289b5a1307f
+  data.tar.gz: 130c1496e1ed4eefb74658b5b0a8a0337443748ace7f17f45efa04b899403f67a25ac768437770da57c4be545832f9604be7bac6b8c8639e161f3dcc3410a14e

data/features/paging.feature

@@ -0,0 +1,20 @@
+@javascript
+Feature: paging
+  In order to see limited items per page
+  As an Viewer
+  I want to have paging function
+
+  Background:
+    Given I am signed in as Joe Admin
+    And I create Search card "basic card search" with content "{\"type\":\"basic\", \"limit\":2}"
+    And I create HTML card "basic item structure" with content "{{_|name}}"
+    And I create HTML card "list all basic cards" with content "{{basic card search||content;structure:basic item structure}}"
+
+  Scenario: jump to pages should keep the item structure
+    When I go to card "list all basic cards"
+    And I click "2" within ".paging"    
+    And I wait until ajax response done
+    Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"
+    And I click "3" within ".paging"    
+    And I wait until ajax response done
+    Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"

data/features/step_definitions/wagn_steps.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 require 'uri'
 require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+support_paths_file = File.join File.dirname(__FILE__), '..', 'support', 'paths'
+require File.expand_path support_paths_file
 
 if RUBY_VERSION =~ /^2/
   require 'byebug'
@@ -9,7 +10,6 @@ else
   require 'debugger'
 end
 
-
 Given /^site simulates setup need$/ do
   Card::Auth.simulate_setup_need!
 end
@@ -21,30 +21,28 @@ end
 
 Given /^I am signed in as (.+)$/ do |account_name|
   accounted = Card[account_name]
-  visit "/update/:signin?card[subcards][%2B*email][content]=#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
-  #could optimize by specifying simple text success page
+  visit '/update/:signin?card[subcards][%2B*email][content]='\
+    "#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
+  # could optimize by specifying simple text success page
 end
 
 Given /^I am signed out$/ do
-  visit "/"
-  if page.has_content? "Sign out"
+  visit '/'
+  if page.has_content? 'Sign out'
     step 'I follow "Sign out"'
   end
 end
 
-=begin
-Given /^I sign in as (.+)$/ do |account_name|
-  # FIXME: define a faster simulate method ("I am logged in as")
-  accounted = Card[account_name]
-  @current_id = accounted.id
-  visit "/:signin"
-  fill_in "card[subcards][+*email][content]", with: accounted.account.email
-  fill_in "card[subcards][+*password][content]", with: 'joe_pass'
-  click_button "Sign in"
-  page.should have_content(account_name)
-end
-=end
-
+# Given /^I sign in as (.+)$/ do |account_name|
+#   # FIXME: define a faster simulate method ("I am logged in as")
+#   accounted = Card[account_name]
+#   @current_id = accounted.id
+#   visit "/:signin"
+#   fill_in "card[subcards][+*email][content]", with: accounted.account.email
+#   fill_in "card[subcards][+*password][content]", with: 'joe_pass'
+#   click_button "Sign in"
+#   page.should have_content(account_name)
+# end
 
 Given /^the card (.*) contains "([^\"]*)"$/ do |cardname, content|
   Card::Auth.as_bot do
@@ -60,23 +58,26 @@ When /^(.*) edits? "([^\"]*)"$/ do |username, cardname|
   end
 end
 
-When /^(.*) edits? "([^\"]*)" entering "([^\"]*)" into wysiwyg$/ do |username, cardname, content|
+wysiwyg_re = /^(.*) edits? "([^\"]*)" entering "([^\"]*)" into wysiwyg$/
+When wysiwyg_re do |username, cardname, content|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
     page.execute_script "$('#main .card-content').val('#{content}')"
-    click_button("Submit")
+    click_button 'Submit'
   end
 end
 
-When /^(.*) edits? "([^\"]*)" setting (.*) to "([^\"]*)"$/ do |username, cardname, field, content|
+edit_re = /^(.*) edits? "([^\"]*)" setting (.*) to "([^\"]*)"$/
+When edit_re do |username, cardname, _field, content|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
     fill_in 'card[content]', with: content
-    click_button("Submit")
+    click_button 'Submit'
   end
 end
 
-When /^(.*) edits? "([^\"]*)" filling in "([^\"]*)"$/ do |username, cardname, content|
+filling_re = /^(.*) edits? "([^\"]*)" filling in "([^\"]*)"$/
+When filling_re do |_username, cardname, content|
   visit "/card/edit/#{cardname.to_name.url_key}"
   fill_in 'card[content]', with: content
 end
@@ -87,27 +88,34 @@ When /^(.*) edits? "([^\"]*)" with plusses:/ do |username, cardname, plusses|
     plusses.hashes.first.each do |name, content|
       fill_in "card[subcards][#{cardname}+#{name}][content]", with: content
     end
-    click_button("Submit")
+    click_button 'Submit'
   end
 end
 
-When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/ do |username, cardtype, cardname, content|
+content_re = /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/
+When content_re do |username, cardtype, cardname, content|
   create_card(username, cardtype, cardname, content) do
-    normal_textarea_card_type = ["JavaScript","CoffeeScript","HTML","CSS","SCSS","Search"]
-    if not normal_textarea_card_type.include? cardtype or not page.evaluate_script "typeof ace != 'undefined'"
-      fill_in("card[content]", with: content)
+    normal_textarea_types = %w(
+      JavaScript CoffeeScript HTML CSS SCSS Search
+    )
+    if !normal_textarea_types.include?(cardtype) ||
+       !page.evaluate_script("typeof ace != 'undefined'")
+      fill_in('card[content]', with: content)
     else
-      page.execute_script %{ace.edit($('.ace_editor').get(0)).getSession().setValue('#{content}')}
+      page.execute_script "ace.edit($('.ace_editor').get(0))"\
+        ".getSession().setValue('#{content}')"
     end
   end
 end
 
-When /^(.*) creates?\s*([^\s]*) card "([^"]*)"$/ do |username, cardtype, cardname|
-  create_card(username,cardtype,cardname)
+create_re = /^(.*) creates?\s*([^\s]*) card "([^"]*)"$/
+When create_re do |username, cardtype, cardname|
+  create_card username, cardtype, cardname
 end
 
-When /^(.*) creates?\s*([^\s]*) card "([^"]*)" with plusses:$/ do |username,cardtype,cardname,plusses|
-  create_card(username,cardtype,cardname) do
+plus_re = /^(.*) creates?\s*([^\s]*) card "([^"]*)" with plusses:$/
+When plus_re do |username, cardtype, cardname, plusses|
+  create_card(username, cardtype, cardname) do
     plusses.hashes.first.each do |name, content|
       fill_in "card[subcards][+#{name}][content]", with: content
     end
@@ -122,30 +130,30 @@ end
 
 When /^(?:|I )enter "([^"]*)" into "([^"]*)"$/ do |value, field|
   selector = ".RIGHT-#{field.to_name.safe_key} input.card-content"
-  find( selector ).set value
+  find(selector).set value
 end
 
 When /^(?:|I )upload the (.+) "(.+)"$/ do |attachment_name, filename|
   script = "$('input[type=file]').css('opacity','1');"
   page.driver.browser.execute_script(script)
-  attach_file("card_#{attachment_name}", File.join(Wagn.gem_root,'features', 'support', filename))
+  file = File.join Wagn.gem_root, 'features', 'support', filename
+  attach_file "card_#{attachment_name}", file
 end
 
-Given /^(.*) (is|am) watching "([^\"]+)"$/ do |user, verb, cardname|
-  user = Card::Auth.current.name if user == "I"
+Given /^(.*) (is|am) watching "([^\"]+)"$/ do |user, _verb, cardname|
+  user = Card::Auth.current.name if user == 'I'
   signed_in_as user do
     step "the card #{cardname}+#{user}+*follow contains \"[[*always]]\""
   end
 end
 
-Given /^(.*) (is|am) not watching "([^\"]+)"$/ do |user, verb, cardname|
-  user = Card::Auth.current.name if user == "I"
+Given /^(.*) (is|am) not watching "([^\"]+)"$/ do |user, _verb, cardname|
+  user = Card::Auth.current.name if user == 'I'
   signed_in_as user do
     step "the card #{cardname}+#{user}+*follow contains \"[[*never]]\""
   end
 end
 
-
 When /I wait a sec/ do
   sleep 1
 end
@@ -162,45 +170,49 @@ When /^I wait until ajax response done$/ do
   end
 end
 
-Then /what/ do
-  save_and_open_page
-end
-
-Then /debug/ do
-  if RUBY_VERSION =~ /^2/
-    require 'pry'
-    binding.pry
-  else
-    debugger
-  end
-  nil
-end
-
-def create_card(username,cardtype,cardname,content="")
+# Then /what/ do
+#   save_and_open_page
+# end
+#
+# Then /debug/ do
+#   if RUBY_VERSION =~ /^2/
+#     require 'pry'
+#     binding.pry
+#   else
+#     debugger
+#   end
+#   nil
+# end
+
+def create_card username, cardtype, cardname, content=''
   signed_in_as(username) do
-    if cardtype=='Pointer'
+    if cardtype == 'Pointer'
       Card.create name: cardname, type: cardtype, content: content
     else
       visit "/card/new?card[name]=#{CGI.escape(cardname)}&type=#{cardtype}"
       yield if block_given?
-      click_button("Submit")
+      click_button 'Submit'
     end
   end
 end
 
 def signed_in_as username
-  sameuser = (username == "I" or Card::Auth.current.key == username.to_name.key)
+  sameuser = (username == 'I')
+  sameuser ||= (Card::Auth.current.key == username.to_name.key)
   was_signed_in = Card::Auth.current_id if Card::Auth.signed_in?
   unless sameuser
     step "I am signed in as #{username}"
   end
   yield
-  unless sameuser
-    step( was_signed_in ? "I am signed in as #{Card[was_signed_in].name}" : 'I follow "Sign out"' )
-  end
+  return if sameuser
+  msg = if was_signed_in
+          "I am signed in as #{Card[was_signed_in].name}"
+        else
+          'I follow "Sign out"'
+        end
+  step msg
 end
 
-
 When /^In (.*) I follow "([^\"]*)"$/ do |section, link|
   within scope_of(section) do
     click_link link
@@ -213,7 +225,14 @@ When /^In (.*) I click "(.*)"$/ do |section, link|
   end
 end
 
-When /^In (.*) I find link with class "(.*)" and click it$/ do |section, css_class|
+When /^I click "(.*)" within "(.*)"$/ do |link, selector|
+  within selector do
+    click_link link
+  end
+end
+
+link_re = /^In (.*) I find link with class "(.*)" and click it$/
+When link_re do |section, css_class|
   within scope_of(section) do
     find("a.#{css_class}").click
   end
@@ -224,6 +243,7 @@ When /^In (.*) I find link with icon "(.*)" and click it$/ do |section, icon|
     find("a > span.glyphicon-#{icon}").click
   end
 end
+
 When /^In (.*) I find button with icon "(.*)" and click it$/ do |section, icon|
   within scope_of(section) do
     find("button > span.glyphicon-#{icon}").click
@@ -231,11 +251,12 @@ When /^In (.*) I find button with icon "(.*)" and click it$/ do |section, icon|
 end
 
 Then /I submit$/ do
-    click_button("Submit")
+  click_button 'Submit'
 end
 
 When /^I open the main card menu$/ do
-  page.execute_script "$('#main .menu-slot .vertical-card-menu.show-on-hover .card-slot').show()"
+  slot = "$('#main .menu-slot .vertical-card-menu.show-on-hover .card-slot')"
+  page.execute_script "#{slot}.show()"
   page.find('#main .menu-slot .card-menu a').click
 end
 
@@ -243,43 +264,41 @@ When /^I close the modal window$/ do
   page.find('.modal-menu .close-modal').click
 end
 
-When /^I pick (.*)$/ do |menu_item|
-end
+# When /^I pick (.*)$/ do |menu_item|
+# end
 
 Then /the card (.*) should contain "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
-  within scope_of("main card content") do
+  within scope_of('main card content') do
     expect(page).to have_content(content)
   end
 end
 
 Then /the card (.*) should not contain "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
-  within scope_of("main card content") do
+  within scope_of('main card content') do
     expect(page).not_to have_content(content)
   end
 end
 
 Then /the card (.*) should point to "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
-  within scope_of("pointer card content") do
+  within scope_of('pointer card content') do
     expect(page).to have_content(content)
   end
 end
 
 Then /the card (.*) should not point to "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
-  within scope_of("pointer card content") do
+  within scope_of('pointer card content') do
     expect(page).not_to have_content(content)
   end
 end
 
-
-
 Then /^In (.*) I should see "([^\"]*)"$/ do |section, text|
   within scope_of(section) do
     if text.index('|')
-      expect(text.split('|').any? {|t| have_content(t)}).to be
+      expect(text.split('|').any? { |t| have_content(t) }).to be
     else
       expect(page).to have_content(text)
     end
@@ -292,19 +311,23 @@ Then /^In (.*) I should not see "([^\"]*)"$/ do |section, text|
   end
 end
 
-Then /^In (.*) I should (not )?see a ([^\"]*) with class "([^\"]*)"$/ do |selection, neg, element, selector|
+class_re = /^In (.*) I should (not )?see a ([^\"]*) with class "([^\"]*)"$/
+Then class_re do |selection, neg, element, selector|
   # checks for existence of a element with a class in a selection context
   element = 'a' if element == 'link'
   within scope_of(selection) do
-    page.send( ( neg ? :should_not : :should ), have_css( [ element, selector ] * '.' ) )
+    verb = neg ? :should_not : :should
+    page.send(verb, have_css([element, selector] * '.'))
   end
 end
 
-Then /^In (.*) I should (not )?see a ([^\"]*) with content "([^\"]*)"$/ do |selection, neg, element, content|
+content_re = /^In (.*) I should (not )?see a ([^\"]*) with content "([^\"]*)"$/
+Then content_re do |selection, neg, element, content|
   # checks for existence of a element with a class in a selection context
   element = 'a' if element == 'link'
   within scope_of(selection) do
-    page.send( ( neg ? :should_not : :should ), have_css( element, text: content ) )
+    verb = neg ? :should_not : :should
+    page.send(verb, have_css(element, text: content))
   end
 end
 
@@ -313,7 +336,9 @@ Then /^the "([^"]*)" field should contain "([^"]*)"$/ do |field, value|
 end
 
 Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
-  expect(field_labeled(field).element.search(".//option[@selected = 'selected']").inner_html).to match(/#{value}/)
+  element = field_labeled(field).element
+  selected = element.search ".//option[@selected = 'selected']"
+  expect(selected.inner_html).to match /#{value}/
 end
 
 When /^I press enter to search$/ do
@@ -333,7 +358,8 @@ Then /^I should see an image of size "(.+)" and type "(.+)"$/ do |size, type|
   find("img[src*='#{size}.#{type}']")
 end
 
-Then /^I should see a non-mod image of size "(.+)" and type "(.+)"$/ do |size, type|
+img_should = /^I should see a non-mod image of size "(.+)" and type "(.+)"$/
+Then img_should do |size, type|
   element = find("img[src*='#{size}.#{type}']")
   expect(element[:src]).to match(%r(/~\d+/))
 end
@@ -342,7 +368,13 @@ Then /^I should see "([^\"]*)" in color (.*)$/ do |text, css_class|
   page.has_css?(".diff-#{css_class}", text: text)
 end
 
+css_should = /^I should see css class "([^\"]*)" within "(.*)"$/
+Then css_should do |css_class, selector|
+  within selector do
+    find(css_class)
+  end
+end
+
 When /^I fill in "([^\"]*)" with$/ do |field, value|
   fill_in(field, with: value)
 end
-

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -66,7 +66,7 @@ group :test do
   gem 'spork', '>=0.9'
   gem 'rr'#, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
-
+  gem 'codeclimate-test-reporter', require: nil
   # gem 'guard-rspec', '~> 4.2'           # trigger test runs based on file edits,
                                           # currently not compatible with spring-watcher-listen
   if RUBY_PLATFORM =~ /darwin/

data/lib/wagn/mods_spec_helper.rb

@@ -1,4 +1,6 @@
 # -*- encoding : utf-8 -*-
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 require 'spork'
 
 ENV["RAILS_ENV"] = 'test'

data/rails/controllers/card_controller.rb

@@ -3,24 +3,23 @@
 require_dependency 'card'
 
 require_dependency 'wagn/exceptions'
-require_dependency 'card/mailer'  #otherwise Net::SMTPError rescues can cause problems when error raised comes before Card::Mailer is mentioned
+require_dependency 'card/mailer'  # otherwise Net::SMTPError rescues can cause
+# problems when error raised comes before Card::Mailer is mentioned
 
 class CardController < ActionController::Base
-
   include Card::Location
   include Recaptcha::Verify
 
   before_filter :per_request_setup, except: [:asset]
-  before_filter :load_id, only: [ :read ]
+  before_filter :load_id, only: [:read]
   before_filter :load_card, except: [:asset]
-  before_filter :refresh_card, only: [ :create, :update, :delete, :rollback ]
+  before_filter :refresh_card, only: [:create, :update, :delete, :rollback]
 
   layout nil
 
   attr_reader :card
 
-
-  #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   #  CORE METHODS
 
   def create
@@ -40,18 +39,18 @@ class CardController < ActionController::Base
   end
 
   def asset
-    Rails.logger.info "Routing assets through Card. Recommend symlink from Deck to Card gem using 'rake wagn:update_assets_symlink'"
+    Rails.logger.info 'Routing assets through Card. Recommend symlink from ' \
+                      'Deck to Card gem using "rake wagn:update_assets_symlink"'
     asset_path = Decko::Engine.paths['gem-assets'].existent.first
-    filename   = [ params[:filename], params[:format] ].join('.')
-    send_file_inside asset_path, filename , x_sendfile: true
+    filename   = [params[:filename], params[:format]].join('.')
+    send_file_inside asset_path, filename, x_sendfile: true
   end
 
-
   private
 
   # make sure that filename doesn't leave allowed_path using ".."
-  def send_file_inside(allowed_path, filename, options = {})
-    if filename.include? "../"
+  def send_file_inside allowed_path, filename, options={}
+    if filename.include? '../'
       raise Wagn::BadAddress
     else
       send_file File.join(allowed_path, filename), options
@@ -61,27 +60,29 @@ class CardController < ActionController::Base
   #-------( FILTERS )
 
   def per_request_setup
-    request.format = :html if !params[:format] #is this used??
+    request.format = :html if !params[:format] # is this used??
     Card::Cache.renew
     Card::Env.reset controller: self
     Card::Auth.set_current_from_session
 
-    if params[:id] && !params[:id].valid_encoding?  # slightly better way to handle encoding issues (than the rescue in load_id)
-                                                    # we should find the place where we produce these bad urls
+    if params[:id] && !params[:id].valid_encoding?
+      # slightly better way to handle encoding issues (than the rescue in
+      # load_id)
+      # we should find the place where we produce these bad urls
       params[:id] = params[:id].force_encoding('ISO-8859-1').encode('UTF-8')
     end
   end
 
-
   def load_id
-    params[:id] ||= case
+    params[:id] ||=
+      case
       when Card::Auth.needs_setup? && Card::Env.html?
         params[:card] = { type_id: Card.default_accounted_type_id }
         params[:view] = 'setup'
         ''
       when params[:card] && params[:card][:name]
         params[:card][:name]
-      when Card::Format.tagged( params[:view], :unknown_ok )
+      when Card::Format.tagged(params[:view], :unknown_ok)
         ''
       else
         Card.setting(:home) || 'Home'
@@ -90,25 +91,23 @@ class CardController < ActionController::Base
     raise Wagn::BadAddress
   end
 
-
   def load_card
-    @card = case params[:id]
-      when '*previous'
-        return card_redirect( Card::Env.previous_location )
-      else  # get by name
-        opts = params[:card] ? params[:card].clone : {}   # clone so that original params remain unaltered.  need deeper clone?
-        opts[:type] ||= params[:type] if params[:type]    # for /new/:type shortcut.  we should fix and deprecate this.
-        opts[:name] ||= params[:id].to_s.gsub( '_', ' ')  # move handling to Card::Name?
-
-        if params[:action] == 'create'
-          # FIXME we currently need a "new" card to catch duplicates (otherwise #save will just act like a normal update)
-          # I think we may need to create a "#create" instance method that handles this checking.
-          # that would let us get rid of this...
-          Card.new opts
-        else
-          mark = params[:id] || opts[:name]
-          Card.fetch mark, new: opts
-        end
+    if params[:id] == '*previous'
+      return card_redirect(Card::Env.previous_location)
+    end
+
+    opts = card_attr_from_params
+    @card =
+      if params[:action] == 'create'
+        # FIXME: we currently need a "new" card to catch duplicates (otherwise
+        # save will just act like a normal update)
+        # I think we may need to create a "#create" instance method that
+        # handles this checking.
+        # that would let us get rid of this...
+        Card.new opts
+      else
+        mark = params[:id] || opts[:name]
+        Card.fetch mark, new: opts
       end
     raise Card::NotFound unless @card
 
@@ -123,25 +122,16 @@ class CardController < ActionController::Base
     @card = card.refresh
   end
 
-
   protected
 
-  def ajax?
-    Card::Env.ajax?
-  end
-
-  def success
-    Card::Env[:success]
-  end
-
   # ----------( rendering methods ) -------------
 
   def card_redirect url
-    url = card_url url #make sure we have absolute url
+    url = card_url url # make sure we have absolute url
     if ajax?
       # lets client reset window location (not just receive redirected response)
       # formerly used 303 response, but that gave IE the fits
-      render json: {redirect: url}
+      render json: { redirect: url }
     else
       redirect_to url
     end
@@ -155,58 +145,45 @@ class CardController < ActionController::Base
 
   def render_success
     success.name_context = @card.cardname
-    if !ajax? || success.hard_redirect?
-      card_redirect success.to_url
-    elsif String === success.target
-      render text: success.target
-    else
-      if success.soft_redirect?
-        self.params = success.params
-      else
-        self.params.merge! success.params # #need tests. insure we get slot, main...
-      end
-      @card = success.target
-      @card.select_action_by_params params
-      show
-    end
-  end
+    return card_redirect success.to_url if !ajax? || success.hard_redirect?
+    return render text: success.target if success.target.is_a? String
 
+    @card = success.target
+    update_params_for_success
+    @card.select_action_by_params params
+    show
+  end
 
   def render_errors
-    #fixme - should prioritize certain error classes
+    # FIXME: should prioritize certain error classes
     code = nil
-    card.errors.each do |key, msg|
-      break if code = Card.error_codes[ key ]
+    card.errors.each do |key, _msg|
+      break if (code = Card.error_codes[key])
     end
-    view, status = code || [ :errors, 422]
+    view, status = code || [:errors, 422]
     show view, status
   end
 
-  def show view = nil, status = 200
-#    ActiveSupport::Notifications.instrument('card', message: 'CardController#show') do
+  def show view=nil, status=200
     card.action = :read
-    format = request.parameters[:format]
-    format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
+    card.content = card.last_draft_content if use_draft?
 
-    opts = ( params[:slot] || {} ).deep_symbolize_keys
     view ||= params[:view]
+    slot_opts = (params[:slot] || {}).deep_symbolize_keys
 
-    if params[:edit_draft] && card.drafts.present?
-      card.content = card.drafts.last.card_changes.last.value
-    end
+    format = format_from_params
     formatter = card.format(format.to_sym)
     result = card.run_callbacks :show do
-      formatter.show view, opts
+      formatter.show view, slot_opts
     end
     status = formatter.error_status || status
 
     deliver format, result, status
   end
 
-
   def deliver format, result, status
-    if format==:file && status==200
-      send_file *result
+    if format == :file && status == 200
+      send_file(*result)
     elsif status == 302
       card_redirect result
     else
@@ -222,27 +199,32 @@ class CardController < ActionController::Base
     @card ||= Card.new
     Card::Error.current = exception
 
-
-    view = case exception
+    view =
+      case exception
       ## arguably the view and status should be defined in the error class;
       ## some are redundantly defined in view
       when Card::Oops, Card::Query
         card.errors.add :exception, exception.message
-        # these error messages are visible to end users and are generally not treated as bugs.
+        # these error messages are visible to end users and are generally not
+        # treated as bugs.
         # Probably want to rename accordingly.
         :errors
       when Card::PermissionDenied
         :denial
-      when Card::NotFound, ActiveRecord::RecordNotFound, ActionController::MissingFile
+      when Card::NotFound, ActiveRecord::RecordNotFound,
+           ActionController::MissingFile
         :not_found
       when Wagn::BadAddress
         :bad_address
-      else #the following indicate a code problem and therefore require full logging
+      else
+        # the following indicate a code problem and therefore require full
+        # logging
         @card.notable_exception_raised
 
         if ActiveRecord::RecordInvalid === exception
           :errors
-        elsif Rails.logger.level == 0 # could also just check non-production mode...
+        # could also just check non-production mode...
+        elsif Rails.logger.level == 0
           raise exception
         else
           :server_error
@@ -252,9 +234,41 @@ class CardController < ActionController::Base
     show view
   end
 
+  def ajax?
+    Card::Env.ajax?
+  end
 
+  def success
+    Card::Env[:success]
+  end
 
-end
+  def card_attr_from_params
+    # clone so that original params remain unaltered.  need deeper clone?
+    opts = params[:card] ? params[:card].clone : {}
+    # for /new/:type shortcut.  we should fix and deprecate this.
+    opts[:type] ||= params[:type] if params[:type]
+    # move handling to Card::Name?
+    opts[:name] ||= params[:id].to_s.gsub('_', ' ')
+    opts
+  end
 
+  def format_from_params
+    return :file if params[:explicit_file]
+    format = request.parameters[:format]
+    return :file if !Card::Format.registered.member?(format) # unknown format
+    format
+  end
 
+  def update_params_for_success
+    if success.soft_redirect?
+      self.params = success.params
+    else
+      # need tests. insure we get slot, main...
+      self.params.merge! success.params
+    end
+  end
 
+  def use_draft?
+    params[:edit_draft] && card.drafts.present?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.16.10
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.9
+        version: 1.16.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.16.9
+        version: 1.16.10
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -86,6 +86,7 @@ files:
 - features/layouts.feature
 - features/navbox.feature
 - features/notifications.feature
+- features/paging.feature
 - features/pointer_inputs.feature
 - features/presetting_content.feature
 - features/reset_password.feature
@@ -767,6 +768,7 @@ test_files:
 - features/layouts.feature
 - features/navbox.feature
 - features/notifications.feature
+- features/paging.feature
 - features/pointer_inputs.feature
 - features/presetting_content.feature
 - features/reset_password.feature