card 1.91 → 1.92

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

@@ -14,7 +14,7 @@ view :editor do
 end
 
 view :raw do
-  "<em>encrypted</em>"
+  "<em>#{tr :encrypted}</em>"
 end
 
 event :encrypt_password, :store,
@@ -34,7 +34,7 @@ end
 event :validate_password, :validate,
       on: :save do
   unless content.length > 3
-    errors.add :password, "must be at least 4 characters"
+    errors.add :password, tr(:password_length)
   end
 end
 

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

@@ -1,5 +1,5 @@
 include All::Permissions::Accounts
 
 view :raw do |_args|
-  "Private data"
+  tr :private_data
 end

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

@@ -2,7 +2,7 @@ include All::Permissions::Accounts
 
 def ok_to_update
   if own_account? && !Auth.always_ok?
-    deny_because you_cant("change the status of your own account")
+    deny_because you_cant(tr(:deny_not_change_own_account))
   else
     super
   end

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

@@ -5,15 +5,15 @@ DURATIONS = "second|minute|hour|day|week|month|year".freeze
 card_accessor :expiration
 
 view :raw do
-  "Private data"
+  tr :private_data
 end
 
 def validate! token
   error =
     case
-    when !real?           then [:token_not_found, "no token found"]
-    when expired?         then [:token_expired, "expired token"]
-    when content != token then [:incorrect_token, "token mismatch"]
+    when !real?           then [:token_not_found, tr(:error_token_not_found)]
+    when expired?         then [:token_expired, tr(:error_token_expired)]
+    when content != token then [:incorrect_token, tr(:error_incorrect_token)]
     end
   errors.add *error if error
 end
@@ -46,6 +46,6 @@ def term_from_string string
   re_match = /^(\d+)[\.\s]*(#{DURATIONS})s?$/.match(string)
   number, unit = re_match.captures if re_match
 
-  raise Card::Error::Oops, "illegal expiration value (eg '2 days')" unless unit
+  raise Card::Error::Oops, tr(:exception_bad_expiration, example: '2 days') unless unit
   number.to_i.send unit
 end

data/mod/account/set/self/account_links.rb

@@ -41,7 +41,7 @@ format :html do
 
   def account_link_text purpose
     voo.title ||
-      I18n.t(purpose, scope: "mod.standard.set.self.account_links")
+      I18n.t(purpose, scope: "mod.account.set.self.account_links")
   end
 
   view :raw do

data/mod/account/set/self/signin.rb

@@ -10,7 +10,7 @@ format :html do
 
   # FIXME: need a generic solution for this
   view :title do
-    voo.title ||= I18n.t(:sign_in_title, scope: "mod.standard.set.self.signin")
+    voo.title ||= I18n.t(:sign_in_title, scope: "mod.account.set.self.signin")
     super()
   end
 
@@ -48,17 +48,17 @@ format :html do
   end
 
   def signin_button
-    text = I18n.t :sign_in, scope: "mod.standard.set.self.signin"
+    text = I18n.t :sign_in, scope: "mod.account.set.self.signin"
     button_tag text, situation: "primary"
   end
 
   def signup_link
-    text = I18n.t :or_sign_up, scope: "mod.standard.set.self.signin"
+    text = I18n.t :or_sign_up, scope: "mod.account.set.self.signin"
     subformat(Card[:account_links]).render :sign_up, title: text
   end
 
   def reset_password_link
-    text = I18n.t :reset_password, scope: "mod.standard.set.self.signin"
+    text = I18n.t :reset_password, scope: "mod.account.set.self.signin"
     reset_link = link_to_view :edit, text, path: { slot: { hide: :toolbar } }
     # FIXME: inline styling
     raw("<div style='float:right'>#{reset_link}</div>")
@@ -81,7 +81,7 @@ format :html do
   end
 
   view :edit_buttons do
-    text = I18n.t :reset_my_password, scope: "mod.standard.set.self.signin"
+    text = I18n.t :reset_my_password, scope: "mod.account.set.self.signin"
     button_tag text, situation: "primary"
   end
 
@@ -101,7 +101,7 @@ format :html do
 
   view :reset_password_success do
     # 'Check your email for a link to reset your password'
-    frame { I18n.t(:check_email, scope: "mod.standard.set.self.signin") }
+    frame { I18n.t(:check_email, scope: "mod.account.set.self.signin") }
   end
 end
 
@@ -134,7 +134,7 @@ def signin_error_message account
 end
 
 def i18n_signin key
-  I18n.t key, scope: "mod.standard.set.self.signin"
+  I18n.t key, scope: "mod.account.set.self.signin"
 end
 
 event :signin_success, after: :signin do

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

@@ -7,12 +7,12 @@ format :html do
   end
 
   view :new do
-    voo.title = invitation? ? "Invite" : "Sign up"
+    voo.title = invitation? ? tr(:invite) : tr(:sign_up)
     super()
   end
 
   def default_name_formgroup_args _args
-    voo.help = "usually first and last name"
+    voo.help = tr :first_last_help
   end
 
   view :content_formgroup do
@@ -42,7 +42,9 @@ format :html do
     end
   end
 
-  view :core do |_args|
+  # TODO: started to move this to haml
+  view :core, template: :haml do |_args|
+    # @tr_header_key = card.creator_id == AnonymousID ? :signed_up_on :
     return if card.new_card? # necessary?
     headings = []
     by_anon = card.creator_id == AnonymousID
@@ -53,7 +55,7 @@ format :html do
     if (account = card.account)
       headings += verification_info account
     else
-      headings << "ERROR: signup card missing account"
+      headings << tr(:missing_account)
     end
     <<-HTML
       <div class="invite-links">

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

@@ -4,22 +4,23 @@ include Basic
 attr_accessor :email
 
 format :html do
-  view :setup, tags: :unknown_ok,
-               perms: ->(_r) { Auth.needs_setup? } do |_args|
-    voo.title = "Welcome, Wagneer!"
-    voo.show! :help
-    voo.hide! :menu
-
-    Auth.as_bot do
-      frame_and_form :create do
-        [
-          setup_hidden_fields,
+  view :setup, tags: :unknown_ok, perms: ->(_r) { Auth.needs_setup? } do
+    with_nest_mode :edit do
+      voo.title = "Welcome, Carditect!"
+      voo.show! :help
+      voo.hide! :menu
+      Auth.as_bot { setup_form }
+    end
+  end
 
-          _render_name_formgroup(help: "usually first and last name"),
-          account_formgroup,
-          setup_form_buttons
-        ]
-      end
+  def setup_form
+    frame_and_form :create do
+      [
+        setup_hidden_fields,
+        _render_name_formgroup(help: "usually first and last name"),
+        account_formgroup,
+        setup_form_buttons
+      ]
     end
   end
 

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

@@ -1,139 +1,132 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Account do
+RSpec.describe Card::Set::All::Account do
   describe "accountable?" do
     it "is false for cards with *accountable rule off" do
       expect(Card["A"].accountable?).to eq(false)
     end
 
-    it "is true for cards with *accountable rule on" do
-      Card::Auth.as_bot do
-        Card.create name: "A+*self+*accountable", content: "1"
-        Card.create name: "*account+*right+*create",
-                    content: "[[Anyone Signed In]]"
-      end
+    it "is true for cards with *accountable rule on", as_bot: true do
+      Card.create name: "A+*self+*accountable", content: "1"
+      Card.create name: "*account+*right+*create",
+                  content: "[[Anyone Signed In]]"
       expect(Card["A"].accountable?).to eq(true)
     end
-  end
-
-  describe "parties" do
-    it "for Wagn Bot" do
-      Card::Auth.current_id = Card::WagnBotID
-      expect(Card::Auth.current.parties.sort).to eq(
-        [Card::WagnBotID, Card::AnyoneSignedInID, Card::AdministratorID]
-      )
-    end
 
-    it "for Anonymous" do
-      Card::Auth.current_id = Card::AnonymousID
-      expect(Card::Auth.current.parties.sort).to eq([Card::AnonymousID])
-    end
-
-    context "for Joe User" do
-      before do
-        @joe_user_card = Card::Auth.current
-        @parties = @joe_user_card.parties # note: must be called to test resets
+    describe "parties" do
+      it "for Wagn Bot", with_user: Card::WagnBotID do
+        expect(Card::Auth.current.parties.sort).to eq(
+                                                     [Card::WagnBotID, Card::AnyoneSignedInID, Card::AdministratorID]
+                                                   )
       end
 
-      it "initially has only auth and self " do
-        expect(@parties).to eq([Card::AnyoneSignedInID, @joe_user_card.id])
+      it "for Anonymous", with_user: Card::AnonymousID do
+        expect(Card::Auth.current.parties.sort).to eq([Card::AnonymousID])
       end
 
-      it "updates when new roles are set" do
-        roles_card = @joe_user_card.fetch trait: :roles, new: {}
-        r1 = Card["r1"]
-
-        Card::Auth.as_bot { roles_card.items = [r1.id] }
-        expect(Card["Joe User"].parties).to eq(@parties)
-        # local cache still has old parties
-        # (permission does not change mid-request)
-
-        Card::Cache.restore
-        # simulate new request
-        # clears local cache, where, eg, @parties would still be cached on card
-
-        Card::Auth.current_id = Card::Auth.current_id
-        # simulate new request
-        # current_id assignment clears several class variables
-
-        new_parties = [Card::AnyoneSignedInID, r1.id, @joe_user_card.id]
-        expect(Card["Joe User"].parties).to eq(new_parties)
-        # @parties regenerated, now with correct values
-
-        expect(Card::Auth.current. parties).to eq(new_parties)
-        # @joe_user_card.refresh(force=true).parties.should == new_parties
-        # should work, but now superfluous?
+      context "for Joe User" do
+        before do
+          @joe_user_card = Card::Auth.current
+          @parties = @joe_user_card.parties # note: must be called to test resets
+        end
+
+        it "initially has only auth and self " do
+          expect(@parties).to eq([Card::AnyoneSignedInID, @joe_user_card.id])
+        end
+
+        it "updates when new roles are set" do
+          roles_card = @joe_user_card.fetch trait: :roles, new: {}
+          r1 = Card["r1"]
+
+          Card::Auth.as_bot { roles_card.items = [r1.id] }
+          expect(Card["Joe User"].parties).to eq(@parties)
+          # local cache still has old parties
+          # (permission does not change mid-request)
+
+          Card::Cache.restore
+          # simulate new request
+          # clears local cache, where, eg, @parties would still be cached on card
+
+          Card::Auth.current_id = Card::Auth.current_id
+          # simulate new request
+          # current_id assignment clears several class variables
+
+          new_parties = [Card::AnyoneSignedInID, r1.id, @joe_user_card.id]
+          expect(Card["Joe User"].parties).to eq(new_parties)
+          # @parties regenerated, now with correct values
+
+          expect(Card::Auth.current.parties).to eq(new_parties)
+          # @joe_user_card.refresh(force=true).parties.should == new_parties
+          # should work, but now superfluous?
+        end
       end
     end
-  end
 
-  describe "among?" do
-    it "is true for self" do
-      expect(Card::Auth.current.among?([Card::Auth.current_id])).to be_truthy
+    describe "among?" do
+      it "is true for self" do
+        expect(Card::Auth.current.among?([Card::Auth.current_id])).to be_truthy
+      end
     end
-  end
 
-  describe "+*email" do
-    it "creates a card and account card" do
-      jadmin = Card["joe admin"]
-      Card::Auth.current_id = jadmin.id
-      # simulate login to get correct from address
+    describe "+*email" do
+      it "creates a card and account card" do
+        jadmin = Card["joe admin"]
+        Card::Auth.current_id = jadmin.id
+        # simulate login to get correct from address
 
-      Card::Env[:params] = { email: { subject: "Hey Joe!",
-                                      message: "Come on in." } }
-      Card.create! name: "Joe New",
-                   type_id: Card::UserID,
-                   "+*account" => { "+*email" => "joe@new.com" }
+        Card::Env[:params] = { email: { subject: "Hey Joe!",
+                                        message: "Come on in." } }
+        Card.create! name: "Joe New",
+                     type_id: Card::UserID,
+                     "+*account" => { "+*email" => "joe@new.com" }
 
-      c = Card["Joe New"]
-      u = Card::Auth.find_account_by_email("joe@new.com")
+        c = Card["Joe New"]
+        u = Card::Auth.find_account_by_email("joe@new.com")
 
-      expect(c.account).to eq(u)
-      expect(c.type_id).to eq(Card::UserID)
+        expect(c.account).to eq(u)
+        expect(c.type_id).to eq(Card::UserID)
+      end
     end
-  end
 
-  context "updates" do
-    before do
-      @card = Card["Joe User"]
-    end
+    context "updates" do
+      let(:card) {Card["Joe User"]}
+      let(:account) {card.account}
 
-    it "handles email updates" do
-      @card.update_attributes! "+*account" => { "+*email" => "joe@user.co.uk" }
-      expect(@card.account.email).to eq("joe@user.co.uk")
-    end
+      it "handles email updates" do
+        card.update_attributes! "+*account" => { "+*email" => "joe@user.co.uk" }
+        expect(account.email).to eq("joe@user.co.uk")
+      end
 
-    it "lets Wagn Bot block accounts" do
-      Card::Auth.as_bot do
-        @card.account.status_card.update_attributes! content: "blocked"
-        expect(@card.account.blocked?).to be_truthy
+      it "lets Wagn Bot block accounts", as_bot: true do
+        card.account.status_card.update_attributes! content: "blocked"
+        expect(account.blocked?).to be_truthy
       end
-    end
 
-    it "does not allow a user to block or unblock himself" do
-      expect do
-        @card.account.status_card.update_attributes! content: "blocked"
-      end.to raise_error(ActiveRecord::RecordInvalid,
-                         "Validation failed: Permission denied You don't have "\
+      it "does not allow a user to block or unblock himself" do
+        expect do
+          account.status_card.update_attributes! 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")
-      expect(@card.account.blocked?).to be_falsey
+        expect(account.blocked?).to be_falsey
+      end
     end
-  end
 
-  describe "#read_rules" do
-    before(:all) do
-      @read_rules = Card["joe_user"].read_rules
-    end
+    describe "#read_rules" do
+      before(:all) do
+        @read_rules = Card["joe_user"].read_rules
+      end
 
-    it "*all+*read should apply to Joe User" do
-      expect(@read_rules.member?(Card.fetch("*all+*read").id)).to be_truthy
-    end
+      it "*all+*read should apply to Joe User" do
+        expect(@read_rules.member?(Card.fetch("*all+*read").id)).to be_truthy
+      end
 
-    it "14 more should apply to Joe Admin" do
-      # includes lots of account rules...
-      Card::Auth.as("joe_admin") do
-        ids = Card::Auth.as_card.read_rules
-        expect(ids.length).to eq(@read_rules.size + 14)
+      it "18 more should apply to Joe Admin" do
+        # includes lots of account rules...
+        Card::Auth.as("joe_admin") do
+          ids = Card::Auth.as_card.read_rules
+          expect(ids.length).to eq(@read_rules.size + 18)
+        end
       end
     end
   end

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

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Right::Account do
+RSpec.describe Card::Set::Right::Account do
   describe "#create" do
     context "valid user" do
       # note - much of this is tested in account_request_spec

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

@@ -3,8 +3,8 @@
 describe Card::Set::Self::AccountLinks do
   it "has a 'my card' link" do
     account_links = render_card :core, name: "*account links"
-    assert_view_select account_links, 'span[id="logging"]' do
-      assert_select 'a[class=~"my-card-link"]', text: "Joe User"
+    expect(account_links).to have_tag 'span#logging' do
+      have_tag 'a[class=~"my-card-link"]', text: "Joe User"
     end
   end
 end