card 1.96.7 → 1.96.8

data/lib/card/query.rb

@@ -36,13 +36,19 @@ class Card
   module Query
     require_dependency "card/query/card_query"
 
+    # After conversion, ATTRIBUTES is a Hash where the key is the attribute
+    # and the value is the attribute type:
+    # { id: :basic, name: :basic, key: :basic ...}
+    # This is used for rapid attribute type lookups in the interpretation phase.
     ATTRIBUTES = {
       # Each of the "basic" fields corresponds directly to a database field.
-      # their values are translated fairly directly into SQL-safe values
-      basic:           %w[id name key type_id content left_id right_id
+      # their values are translated fairly directly into SQL-safe values.
+      # (These are referred to as "properties" in WQL documentation. Need to
+      # reconcile #EFM)
+      basic:           %i[id name key type_id content left_id right_id
                           creator_id updater_id codename read_rule_id],
       # "Relational" values can involve tying multiple queries together
-      relational:      %w[type
+      relational:      %i[type
                           part left right
                           editor_of edited_by last_editor_of last_edited_by
                           creator_of created_by
@@ -56,17 +62,17 @@ class Card
                           found_by not sort match name_match complete
                           extension_type],
 
-      plus_relational: %w[plus left_plus right_plus],
-      conjunction:     %w[and or all any],
-      ignore:          %w[prepend append view params vars size]
+      plus_relational: %i[plus left_plus right_plus],
+      conjunction:     %i[and or all any],
+      ignore:          %i[prepend append view params vars size]
     }.each_with_object({}) do |pair, h|
-      pair[1].each { |v| h[v.to_sym] = pair[0] }
+      pair[1].each { |v| h[v] = pair[0] }
     end
 
     CONJUNCTIONS = { any: :or, in: :or, or: :or, all: :and, and: :and }.freeze
 
-    MODIFIERS = %w(conj return sort sort_as group dir limit offset)
-                .each_with_object({}) { |v, h| h[v.to_sym] = nil }
+    MODIFIERS = %i[conj return sort sort_as group dir limit offset]
+                .each_with_object({}) { |v, h| h[v] = nil }
 
     OPERATORS =
       %w(!= = =~ < > in ~).each_with_object({}) { |v, h| h[v] = v }.merge(

data/lib/card/query/abstract_query/tie.rb

@@ -95,6 +95,7 @@ class Card
           case val
           when Integer then val
           when String  then Card.fetch_id(val)
+          when Symbol  then Card::Codename.id(val)
           end
         end
       end

data/lib/card/query/card_query/interpretation.rb

@@ -58,7 +58,7 @@ class Card
         end
 
         def bad_attribute! attribute
-          raise Card::Error::BadQuery, "Invalid attribute #{attribute}"
+          raise Error::BadQuery, "Invalid attribute: #{attribute}"
         end
 
         def relate_compound key, val

data/lib/card/query/card_query/match_attributes.rb

@@ -49,9 +49,9 @@ class Card
         end
 
         # TODO: move sql to SqlStatement
-        def key_like pattern, no_junction=false
+        def key_like pattern, junction_ok=true
           conds = ["#{table_alias}.key LIKE #{quote pattern}"]
-          conds << "#{table_alias}.right_id is null" if no_junction
+          conds << "#{table_alias}.right_id is null" unless junction_ok
           # FIXME: -- this should really be more nuanced --
           # it includes all descendants after one plus
           conds.join " AND "

data/lib/card/query/card_query/normalization.rb

@@ -8,6 +8,8 @@ class Card
           clause.symbolize_keys!
           clause.each do |key, val|
             next if key.to_sym == :return
+            # when return values are relative, they are relative to the name of the
+            # card returned, not the context card
             clause[key] = normalize_value val
           end
           clause
@@ -18,16 +20,17 @@ class Card
           when Hash              then clause
           when String            then { key: clause.to_name.key }
           when Integer           then { id: clause }
-          else raise Card::Error::BadQuery, "Invalid query args #{clause.inspect}"
+          when Symbol            then { id: Card::Codename.id(clause) }
+          else raise Error::BadQuery, "Invalid clause: #{clause.inspect}"
           end
         end
 
         def normalize_value val
           case val
-          when Integer, Float, Symbol, Hash then val
+          when Integer, Float, Hash, Symbol then val
           when String                       then normalize_string_value val
           when Array                        then normalize_array_value val
-          else raise Card::Error::BadQuery, "unknown WQL value type: #{val.class}"
+          else raise Error::BadQuery, "Invalid value type: #{val.class} (#{val.inspect})"
           end
         end
 

data/lib/card/query/value.rb

@@ -15,8 +15,9 @@ class Card
       def parse_value rawvalue
         case rawvalue
         when String, Integer then ["=", rawvalue]
+        when Symbol          then ["=", rawvalue.to_s]
         when Array           then parse_array_value rawvalue
-        else raise("Invalid Condition Clause #{rawvalue}.inspect}")
+        else raise Error::BadQuery, "Invalid property value: #{rawvalue.inspect}"
         end
       end
 
@@ -27,7 +28,7 @@ class Card
 
       def canonicalize_operator
         unless (target = OPERATORS[@operator.to_s])
-          raise Card::Error::BadQuery, "Invalid Operator #{@operator}"
+          raise Error::BadQuery, "Invalid operator: #{@operator}"
         end
         @operator = target
       end

data/lib/card/set/event/delayed_event.rb

@@ -35,6 +35,7 @@ class Card
 
         class IntegrateWithDelayJob < ApplicationJob
           def perform act_id, card, card_attribs, env, auth, method_name
+            Card::Cache.renew_persistent
             card.deserialize_for_active_job! card_attribs
             ActManager.contextualize_delayed_event act_id, card, env, auth do
               card.send method_name

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

@@ -27,7 +27,7 @@ event :set_default_salt, :prepare_to_validate, on: :create do
 end
 
 event :set_default_status, :prepare_to_validate, on: :create do
-  default_status = Auth.needs_setup? ? "active" : "pending"
+  default_status = left&.try(:default_account_status) || "active"
   add_subfield :status, content: default_status
 end
 
@@ -54,7 +54,7 @@ end
 
 event :reset_token do
   token = generate_token
-  Auth.as_bot { token_card.update_attributes! content: token }
+  Auth.as_bot { token_card.update! content: token }
   token
 end
 
@@ -65,7 +65,7 @@ end
 
 event :send_reset_password_token do
   Auth.as_bot do
-    token_card.update_attributes! content: generate_token
+    token_card.update! content: generate_token
   end
   Card[:password_reset_email].deliver self, to: email
 end
@@ -180,16 +180,8 @@ format :html do
       {{+#{:password.cardname}|titled;title:password}})
   end
 
-  view :edit do
-    voo.structure = true
+  before :content_formgroup do
     voo.edit_structure = [[:email, "email"], [:password, "password"]]
-    super()
-  end
-
-  view :edit_in_form do
-    voo.structure = true
-    voo.edit_structure = [[:email, "email"], [:password, "password"]]
-    super()
   end
 end
 

data/mod/account/set/type/signup.rb

@@ -105,6 +105,10 @@ format :html do
   end
 end
 
+def default_account_status
+  "pending"
+end
+
 event :activate_by_token, :validate, on: :update,
                                      when: proc { |c| c.has_token? } do
   abort :failure, "no field manipulation mid-activation" if subcards.present?

data/mod/account/spec/set/all/account_spec.rb

@@ -91,18 +91,18 @@ RSpec.describe Card::Set::All::Account do
       let(:account) {card.account}
 
       it "handles email updates" do
-        card.update_attributes! "+*account" => { "+*email" => "joe@user.co.uk" }
+        card.update! "+*account" => { "+*email" => "joe@user.co.uk" }
         expect(account.email).to eq("joe@user.co.uk")
       end
 
       it "lets Wagn Bot block accounts", as_bot: true do
-        card.account.status_card.update_attributes! content: "blocked"
+        card.account.status_card.update! content: "blocked"
         expect(account.blocked?).to be_truthy
       end
 
       it "does not allow a user to block or unblock himself" do
         expect do
-          account.status_card.update_attributes! content: "blocked"
+          account.status_card.update! content: "blocked"
         end.to raise_error(ActiveRecord::RecordInvalid,
                            "Validation failed: Permission denied You don't have "\
                          "permission to change the status of your own account")

data/mod/account/spec/set/right/account_spec.rb

@@ -2,17 +2,21 @@
 
 RSpec.describe Card::Set::Right::Account do
   describe "#create" do
+    let(:dummy_account_args) do
+      {
+        name: "TmpUser",
+        "+*account" => {
+          "+*email" => "tmpuser@wagn.org",
+          "+*password" => "tmp_pass"
+        }
+      }
+    end
+
     context "valid user" do
       # note - much of this is tested in account_request_spec
       before do
         Card::Auth.as_bot do
-          @user_card = Card.create!(
-            name: "TmpUser",
-            type_id: Card::UserID,
-            "+*account" => {
-              "+*email" => "tmpuser@wagn.org", "+*password" => "tmp_pass"
-            }
-          )
+          @user_card = Card.create! dummy_account_args.merge(type_id: Card::UserID)
         end
       end
 
@@ -23,15 +27,18 @@ RSpec.describe Card::Set::Right::Account do
     end
 
     it "checks accountability of 'accounted' card" do
-      @unaccountable = Card.create(
-        name: "BasicUnaccountable",
-        "+*account" => {
-          "+*email" => "tmpuser@wagn.org",
-          "+*password" => "tmp_pass"
-        }
-      )
-      error_msg = @unaccountable.errors["+*account"].first
-      expect(error_msg).to eq("not allowed on this card")
+      unaccountable = Card.create(dummy_account_args)
+      expect(unaccountable.errors["+*account"].first).to eq("not allowed on this card")
+    end
+
+    it "works for any accountable card -- not just User type" do
+      Card::Auth.as_bot do
+        rule_name = Card::Name[%i[basic type accountable]]
+        Card.create! name: rule_name, content: "1"
+      end
+
+      accountable = Card.create(dummy_account_args)
+      expect(accountable.errors).to be_empty
     end
 
     it "requires email" do
@@ -107,19 +114,19 @@ RSpec.describe Card::Set::Right::Account do
     end
   end
 
-  describe "#update_attributes" do
+  describe "#update" do
     before do
       @account = Card::Auth.find_account_by_email("joe@user.com")
     end
 
     it "resets password" do
-      @account.password_card.update_attributes!(content: "new password")
+      @account.password_card.update!(content: "new password")
       authenticated = Card::Auth.authenticate "joe@user.com", "new password"
       assert_equal @account, authenticated
     end
 
     it "does not rehash password when updating email" do
-      @account.email_card.update_attributes! content: "joe2@user.com"
+      @account.email_card.update! content: "joe2@user.com"
       authenticated = Card::Auth.authenticate "joe2@user.com", "joe_pass"
       assert_equal @account, authenticated
     end
@@ -135,7 +142,7 @@ RSpec.describe Card::Set::Right::Account do
       Card::Auth.current_id = Card::AnonymousID
     end
 
-    let(:trigger_reset) { @account.update_attributes! trigger: :reset_password }
+    let(:trigger_reset) { @account.update! trigger: :reset_password }
 
     it "authenticates with correct token" do
       expect(Card::Auth.current_id).to eq(Card::AnonymousID)

data/mod/account/spec/set/right/email_spec.rb

@@ -33,19 +33,19 @@ describe Card::Set::Right::Email do
 
       it "downcases email" do
         Card::Auth.as_bot do
-          @email_card.update_attributes! content: "QuIrE@example.com"
+          @email_card.update! content: "QuIrE@example.com"
           expect(@email_card.db_content).to eq("quire@example.com")
         end
       end
 
       it "requires valid email" do
-        @email_card.update_attributes content: "boop"
+        @email_card.update content: "boop"
         expect(@email_card.errors[:content].first)
           .to match(/must be valid address/)
       end
 
       it "requires unique email" do
-        @email_card.update_attributes content: "joe@user.com"
+        @email_card.update content: "joe@user.com"
         expect(@email_card.errors[:content].first).to match(/must be unique/)
       end
     end

data/mod/account/spec/set/right/password_spec.rb

@@ -5,9 +5,9 @@ describe Card::Set::Right::Password do
     @account = Card::Auth.find_account_by_email("joe@user.com")
   end
 
-  describe "#update_attributes" do
+  describe "#update" do
     it "encrypts password" do
-      @account.password_card.update_attributes! content: "new password"
+      @account.password_card.update! content: "new password"
       expect(@account.password).not_to eq("new password")
       authenticated = Card::Auth.authenticate "joe@user.com", "new password"
       assert_equal @account, authenticated
@@ -15,7 +15,7 @@ describe Card::Set::Right::Password do
 
     it "validates password" do
       password_card = @account.password_card
-      password_card.update_attributes content: "2b"
+      password_card.update content: "2b"
       expect(password_card.errors[:password]).not_to be_empty
     end
 
@@ -31,8 +31,7 @@ describe Card::Set::Right::Password do
       end
 
       it "does not break email editing" do
-        @account.update_attributes! subcards: { "+*password" => "",
-                                                "+*email" => "joe2@user.com" }
+        @account.update! subcards: { "+*password" => "", "+*email" => "joe2@user.com" }
         expect(@account.email).to eq("joe2@user.com")
         expect(@account.password).not_to be_empty
       end

data/mod/account/spec/set/self/signin_spec.rb

@@ -32,20 +32,20 @@ RSpec.describe Card::Set::Self::Signin do
 
   context "#update" do
     it "triggers signin with valid credentials" do
-      @card.update_attributes! "+*email" => "joe@admin.com",
-                               "+*password" => "joe_pass"
+      @card.update! "+*email" => "joe@admin.com",
+                    "+*password" => "joe_pass"
       expect(Card::Auth.current).to eq(Card["joe admin"])
     end
 
     it "does not trigger signin with bad email" do
-      @card.update_attributes! "+*email" => "schmoe@admin.com",
-                               "+*password" => "joe_pass"
+      @card.update! "+*email" => "schmoe@admin.com",
+                    "+*password" => "joe_pass"
       expect(@card.errors[:signin].first).to match(/Unrecognized email/)
     end
 
     it "does not trigger signin with bad password" do
-      @card.update_attributes! "+*email" => "joe@admin.com",
-                               "+*password" => "joe_fail"
+      @card.update! "+*email" => "joe@admin.com",
+                    "+*password" => "joe_fail"
       expect(@card.errors[:signin].first).to match(/Wrong password/)
     end
   end
@@ -53,13 +53,12 @@ RSpec.describe Card::Set::Self::Signin do
   context "#reset password" do
     it "is triggered by an update" do
       # Card['joe admin'].account.token.should be_nil FIXME:  this should be t
-      @card.update_attributes! "+*email" => "joe@admin.com"
+      @card.update! "+*email" => "joe@admin.com"
       expect(Card["joe admin"].account.token).not_to be_nil
     end
 
     it "returns an error if email is not found" do
-      @card.update_attributes! "+*email" => "schmoe@admin.com",
-                               trigger: :send_reset_password_token
+      @card.update! "+*email" => "schmoe@admin.com", trigger: :send_reset_password_token
       expect(@card.errors[:email].first).to match(/not recognized/)
     end
   end

data/mod/account/spec/set/type/signup_spec.rb

@@ -82,7 +82,7 @@ describe Card::Set::Type::Signup do
     it "is activated by an update" do
       Card::Env.params[:token] = @token
       @signup = Card.fetch "big bad wolf"
-      @signup.update_attributes({})
+      @signup.update({})
       # puts @signup.errors.full_messages * "\n"
       expect(@signup.errors).to be_empty
       expect(@signup.type_id).to eq(Card::UserID)
@@ -96,7 +96,7 @@ describe Card::Set::Type::Signup do
       @account.token_card.expire
       Card::Env.params[:token] = @token
       @signup = Card.fetch "big bad wolf"
-      result = @signup.update_attributes!({})
+      result = @signup.update!({})
       # successfully completes save
       expect(result).to eq(true)
       @account.reload
@@ -176,7 +176,7 @@ describe Card::Set::Type::Signup do
   context "a welcome email card exists" do
     before do
       Card::Auth.as_bot do
-        Card[:welcome_email].update_attributes!(
+        Card[:welcome_email].update!(
           subcards: { "+*subject" => "welcome",
                       "+*html_message" => "Welcome {{_self|name}}" }
         )

data/mod/admin/spec/set/self/admin_spec.rb

@@ -14,7 +14,7 @@ describe Card::Set::Self::Admin do
     def run_admin_task task
       Card::Auth.as_bot do
         Card::Env.params[:task] = task
-        admin.update_attributes({})
+        admin.update({})
       end
     end
 
@@ -46,8 +46,8 @@ describe Card::Set::Self::Admin do
       it "triggers deleting old revisions (with right params)" do
         Card::Auth.as_bot do
           a = Card["A"]
-          a.update_attributes! content: "a new day"
-          a.update_attributes! content: "another day"
+          a.update! content: "a new day"
+          a.update! content: "another day"
           expect(a.actions.count).to eq(3)
           run_admin_task :clear_history
           expect(a.actions.count).to eq(1)
@@ -61,7 +61,7 @@ describe Card::Set::Self::Admin do
     #     puts a.references_out.count
     #     Card::Env.params[:task] = :repair_references
     #     puts a.references_out.count
-    #     @all.update_attributes({})
+    #     @all.update({})
     #     puts a.references_out.count
     #
     #   end