card 1.16.10 → 1.16.11

data/mod/03_machines/lib/card/machine.rb

@@ -117,7 +117,6 @@ class Card
         host_class.event(
           "reset_machine_output_#{ event_suffix }".to_sym,
           after: :expire_related, on: :save
-          #after: :store_subcards, on: :save
         ) do
           reset_machine_output!
         end

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

@@ -2,31 +2,35 @@ format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
 
   view :new, perms: :create, tags: :unknown_ok do |args|
-    frame_and_form :create, args, 'main-success'=>'REDIRECT' do
+    frame_and_form :create, args, 'main-success' => 'REDIRECT' do
       [
-        _optional_render( :name_formgroup,     args ),
-        _optional_render( :type_formgroup,     args ),
-        _optional_render( :content_formgroup, args ),
-        _optional_render( :button_formgroup,   args )
+        _optional_render(:name_formgroup, args),
+        _optional_render(:type_formgroup, args),
+        _optional_render(:content_formgroup, args),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
 
-
   def default_new_args args
     hidden = args[:hidden] ||= {}
     hidden[:success] ||= card.rule(:thanks) || '_self'
-    hidden[:card   ] ||={}
+    hidden[:card] ||= {}
 
     args[:optional_help] ||= :show
 
     # name field / title
-    if !params[:name_prompt] and !card.cardname.blank?
+    if !params[:name_prompt] && !card.cardname.blank?
       # name is ready and will show up in title
       hidden[:card][:name] ||= card.name
     else
       # name is not ready; need generic title
-      args[:title] ||= "New #{ card.type_name unless card.type_id == Card.default_type_id }" #fixme - overrides nest args
+      args[:title] ||= if card.type_id == Card.default_type_id
+                         'New'
+                       else
+                         "New #{card.type_name}"
+                       end
+      # FIXME: - overrides nest args
       unless card.rule_card :autoname
         # prompt for name
         hidden[:name_prompt] = true unless hidden.has_key? :name_prompt
@@ -35,39 +39,43 @@ format :html do
     end
     args[:optional_name_formgroup] ||= :hide
 
-
     # type field
-    if ( !params[:type] and !args[:type] and
-        ( main? || card.simple? || card.is_template? ) and
-        Card.new( type_id: card.type_id ).ok? :create #otherwise current type won't be on menu
-      )
+    if !params[:type] &&
+       !args[:type] &&
+       (main? || card.simple? || card.is_template?) &&
+       Card.new(type_id: card.type_id).ok?(:create)
+      # otherwise current type won't be on menu
+
       args[:optional_type_formgroup] = :show
     else
       hidden[:card][:type_id] ||= card.type_id
       args[:optional_type_formgroup] = :hide
     end
 
-
-    cancel = if main?
-      { class: 'redirecter', href: Card.path_setting('/*previous') }
-    else
-      { class: 'slotter',    href: path( view: :missing         ) }
-    end
+    cancel =
+      if main?
+        { class: 'redirecter', href: Card.path_setting('/*previous') }
+      else
+        { class: 'slotter', href: path(view: :missing) }
+      end
 
     args[:buttons] ||= %{
-      #{ button_tag 'Submit', class: 'create-submit-button', disable_with: 'Submitting', situation: 'primary' }
-      #{ button_tag 'Cancel', type: 'button', class: "create-cancel-button #{cancel[:class]}", href: cancel[:href] }
+      #{button_tag 'Submit',
+                   class: 'create-submit-button',
+                   disable_with: 'Submitting',
+                   situation: 'primary'}
+      #{button_tag 'Cancel',
+                   type: 'button',
+                   class: "create-cancel-button #{cancel[:class]}",
+                   href: cancel[:href]}
     }
-
   end
 
-
-
   view :edit, perms: :update, tags: :unknown_ok do |args|
     frame_and_form :update, args.merge(optional_toolbar: :show) do
       [
-        _optional_render( :content_formgroup, args ),
-        _optional_render( :button_formgroup,   args )
+        _optional_render(:content_formgroup, args),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
@@ -98,13 +106,13 @@ format :html do
 
   view :confirm_rename do |args|
     referers = args[:referers]
-    dependents = card.dependents
+    descendants = card.descendants
     alert 'warning' do
       %{
         <h5>Are you sure you want to rename <em>#{card.name}</em>?</h5>
-        #{ %{ <h6>This change will...</h6> } if referers.any? || dependents.any? }
+        #{ %{ <h6>This change will...</h6> } if referers.any? || descendants.any? }
         <ul>
-          #{ %{<li>automatically alter #{ dependents.size } related name(s). </li>} if dependents.any? }
+          #{ %{<li>automatically alter #{ descendants.size } related name(s). </li>} if descendants.any? }
           #{ %{<li>affect at least #{referers.size} reference(s) to "#{card.name}".</li>} if referers.any? }
         </ul>
         #{ %{<p>You may choose to <em>update or ignore</em> the references.</p>} if referers.any? }

data/mod/05_standard/set/right/account.rb

@@ -7,47 +7,66 @@ card_accessor :salt
 card_accessor :status
 card_accessor :token
 
-def active?   ; status=='active'  end
-def blocked?  ; status=='blocked' end
-def built_in? ; status=='system'  end
-def pending?  ; status=='pending' end
-
+def active?;   status == 'active'  end
+def blocked?;  status == 'blocked' end
+def built_in?; status == 'system'  end
+def pending?;  status == 'pending' end
 
 def authenticate_by_token val
-  tcard = token_card                               or return :token_not_found
-  token == val                                     or return :incorrect_token
-  tcard.updated_at > Card.config.token_expiry.ago  or return :token_expired  # > means "after"
-  left and left.accountable?                       or return :illegal_account  #(overkill?)
-  Auth.as_bot { tcard.delete! }
-  left.id
+  tcard = token_card
+  error = token_error(tcard, val)
+  if error == :none
+    Auth.as_bot { tcard.delete! }
+    left.id
+  else
+    error
+  end
 end
 
+def token_error tcard, val
+  case
+  when !tcard
+    :token_not_found
+  when token != val
+    :incorrect_token
+  when tcard.updated_at <= Card.config.token_expiry.ago
+    # < means "before"
+    :token_expired
+  when !left || !left.accountable?
+    :illegal_account
+  else
+    :none
+  end
+end
 
 format do
-  view :verify_url do |args|
+  view :verify_url do
     card_url "update/#{card.cardname.left_name.url_key}?token=#{card.token}"
   end
 
-  view :verify_days do |args|
-    ( Card.config.token_expiry / 1.day ).to_s
+  view :verify_days do
+    (Card.config.token_expiry / 1.day).to_s
   end
 
-  view :reset_password_url do |args|
-    card_url "update/#{card.cardname.url_key}?reset_token=#{card.token_card.refresh(true).content}"
+  view :reset_password_url do
+    card_url "update/#{card.cardname.url_key}?" \
+             "reset_token=#{card.token_card.refresh(true).content}"
   end
 
-  view :reset_password_days do |args|
-    ( Card.config.token_expiry / 1.day ).to_s
+  view :reset_password_days do
+    (Card.config.token_expiry / 1.day).to_s
   end
 end
 
-
 format :html do
-
   view :raw do |args|
     content = []
-    content << "{{+#{Card[:email   ].name}|titled;title:email}}"    unless args[:no_email]
-    content << "{{+#{Card[:password].name}|titled;title:password}}" unless args[:no_password]
+    unless args[:no_email]
+      content << "{{+#{Card[:email].name}|titled;title:email}}"
+    end
+    unless args[:no_password]
+      content << "{{+#{Card[:password].name}|titled;title:password}}"
+    end
     content * ' '
   end
 

data/spec/models/card/cardtype_spec.rb

@@ -83,47 +83,31 @@ describe Card, "created without permission" do
   end
 end
 
-
-describe Card, "Normal card with dependents" do
+describe Card, 'Normal card with descendants' do
   before do
     @a = Card['A']
   end
-  it "should confirm that it has dependents" do
-    expect(@a.dependents.length).to be > 0
+
+  it 'should confirm that it has descendants' do
+    expect(@a.descendants.length).to be > 0
   end
-  it "should successfully have its type changed" do
+
+  it 'should successfully have its type changed' do
     Card::Auth.as_bot do
-      @a.type_id = Card::PhraseID;
+      @a.type_id = Card::PhraseID
       @a.save!
       expect(Card['A'].type_code).to eq(:phrase)
     end
   end
-  it "should still have its dependents after changing type" do
+  it 'should still have its descendants after changing type' do
     Card::Auth.as_bot do
       assert type_id = Card.fetch_id('cardtype_e')
-      @a.type_id = type_id; @a.save!
-      expect(Card['A'].dependents.length).to be > 0
-    end
-  end
-end
-
-
-=begin No extension any more, is there a modified version of this we need?
-describe Card, "Recreated Card" do
-  before do
-    Card::Auth.as_bot do
-    @ct = Card.create! name: 'Species', type: 'Cardtype'
-    @ct.delete!
-    @ct = Card.create! name: 'Species', type: 'Cardtype'
+      @a.type_id = type_id
+      @a.save!
+      expect(Card['A'].descendants.length).to be > 0
     end
   end
-
-  it "should have a cardtype extension" do
-    @ct.extension.should_not be_nil
-  end
-
 end
-=end
 
 describe Card, "New Cardtype" do
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.16.10
+  version: 1.16.11
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -262,6 +262,7 @@ files:
 - db/migrate/20141208132159_remove_present_from_reference_table.rb
 - db/migrate/20141216053032_better_index_names.rb
 - db/migrate/20150724210803_add_comment_to_actions.rb
+- db/migrate/20151105225559_more_space_for_db_content.rb
 - db/migrate_core_cards/20120611203506_rails_inflection_updates.rb
 - db/migrate_core_cards/20130411191151_renaming_for_menu.rb
 - db/migrate_core_cards/20130411211600_delete_old_related_tab_cards.rb