card 1.16.15 → 1.17.0

data/mod/05_standard/set/self/head.rb

@@ -21,8 +21,8 @@ format :html do
   def head_title
     title = root.card && root.card.name
     title = nil if title.blank?
-    title = params[:action] if title == '*placeholder'
-    %(<title>#{title ? "#{title} - " : ''}#{ Card.setting :title }</title>)
+    title = params[:action] if title=='*placeholder'
+    %(<title>#{title ? "#{title} - " : ''}#{ Card.global_setting :title }</title>)
   end
 
   def head_buttons
@@ -101,7 +101,7 @@ format :html do
       #{ javascript_tag do varvals * ';' end  }
       #{ @js_tag if @js_tag }
       <!--[if lt IE 9]>#{ javascript_include_tag ie9_card.machine_output_url if ie9_card }<![endif]-->
-      #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.setting(:tiny_mce).to_s }')" } }
+      #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.global_setting(:tiny_mce).to_s }')" } }
       #{ google_analytics_head_javascript }
       <script type="text/javascript">
         $('document').ready(function() {
@@ -111,22 +111,23 @@ format :html do
     HTML
   end
 
+
   def google_analytics_head_javascript
-    if (ga_key = Card.setting("*google analytics key")) # FIXME: escape this?
-      <<-HTML
-        <script type="text/javascript">
-          var _gaq = _gaq || [];
-          _gaq.push(['_setAccount', '#{ga_key}']);
-          _gaq.push(['_trackPageview']);
-          (function() {
-            var ga = document.createElement('script');
-            ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0];
-            s.parentNode.insertBefore(ga, s);
-          })();
-        </script>
-      HTML
-    end
+    return unless (ga_key = Card.global_setting(:google_analytics_key))
+    <<-JAVASCRIPT
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', '#{ga_key}']);
+        _gaq.push(['_trackPageview']);
+        (function() {
+          var ga = document.createElement('script');
+          ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0];
+          s.parentNode.insertBefore(ga, s);
+          s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
+    JAVASCRIPT
   end
 end

data/mod/05_standard/set/type/signup.rb

@@ -1,4 +1,3 @@
-
 format :html do
   def default_new_args args
     super args

data/mod/05_standard/spec/set/all/account_spec.rb

@@ -2,7 +2,6 @@
 
 describe Card::Set::All::Account do
   describe 'accountable?' do
-
     it 'should be false for cards with *accountable rule off' do
       expect(Card['A'].accountable?).to eq(false)
     end
@@ -10,21 +9,22 @@ describe Card::Set::All::Account do
     it 'should be 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]]'
+        Card.create name: '*account+*right+*create',
+                    content: '[[Anyone Signed In]]'
       end
       expect(Card['A'].accountable?).to eq(true)
     end
-
   end
 
-  describe "parties" do
-
-    it "for Wagn Bot" do
+  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])
+      expect(Card::Auth.current.parties.sort).to eq(
+        [Card::WagnBotID, Card::AnyoneSignedInID, Card::AdministratorID]
+      )
     end
 
-    it "for Anonymous" do
+    it 'for Anonymous' do
       Card::Auth.current_id = Card::AnonymousID
       expect(Card::Auth.current.parties.sort).to eq([Card::AnonymousID])
     end
@@ -35,7 +35,7 @@ describe Card::Set::All::Account do
         @parties = @joe_user_card.parties # note: must be called to test resets
       end
 
-      it "should initially have only auth and self " do
+      it 'should initially have only auth and self ' do
         expect(@parties).to eq([Card::AnyoneSignedInID, @joe_user_card.id])
       end
 
@@ -43,20 +43,28 @@ describe Card::Set::All::Account 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::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
+        Card::Cache.restore
+        # simulate new request
+        # clears local cache, where, eg, @parties would still be cached on card
 
-        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)
+        Card::Auth.current_id = Card::Auth.current_id
+        # simulate new request
+        # current_id assignment clears several class variables
 
-        # @joe_user_card.refresh(force=true).parties.should == new_parties   # should work, but now superfluous?
+        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
 
   describe 'among?' do
@@ -65,27 +73,23 @@ describe Card::Set::All::Account do
     end
   end
 
-
-  describe "'+*email'" do
+  describe '+*email' do
     it 'should create a card and account card' do
       jadmin = Card['joe admin']
-      Card::Auth.current_id = jadmin.id #simulate login to get correct from address
-      ja_email = jadmin.account.email
+      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[ 'joe@new.com' ]
+      u = Card::Auth['joe@new.com']
 
       expect(c.account).to eq(u)
       expect(c.type_id).to eq(Card::UserID)
-=begin
-      email = ActionMailer::Base.deliveries.last
-      email.to.should == ['joe@new.com']
-      email.subject.should == 'Hey Joe!'
-      email.from.should == [ ja_email ]
-=end
     end
   end
 
@@ -93,20 +97,20 @@ describe Card::Set::All::Account do
     before do
       @card = Card['Joe User']
     end
-    it "should handle email updates" do
-      @card.update_attributes! '+*account'=>{ '+*email'=>'joe@user.co.uk' }
+
+    it 'should handle email updates' do
+      @card.update_attributes! '+*account' => { '+*email' => 'joe@user.co.uk' }
       expect(@card.account.email).to eq('joe@user.co.uk')
     end
 
-    it "should let Wagn Bot block accounts" do
+    it 'should let 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
       end
     end
 
-
-    it "should not allow a user to block or unblock himself" do
+    it 'should not allow a user to block or unblock himself' do
       expect do
         @card.account.status_card.update_attributes! content: 'blocked'
       end.to raise_error
@@ -114,24 +118,21 @@ describe Card::Set::All::Account do
     end
   end
 
-  describe "#read_rules" do
+  describe '#read_rules' do
     before(:all) do
       @read_rules = Card['joe_user'].read_rules
     end
 
-
-    it "*all+*read should apply to Joe User" do
+    it '*all+*read should apply to Joe User' do
       expect(@read_rules.member?(Card.fetch('*all+*read').id)).to be_truthy
     end
 
-    it "9 more should apply to Joe Admin" do
+    it '13 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 + 9)
+        expect(ids.length).to eq(@read_rules.size + 13)
       end
     end
-
   end
-
 end

data/mod/05_standard/spec/set/right/account_spec.rb

@@ -58,7 +58,8 @@ describe Card::Set::Right::Account do
     end
 
     it 'contains deck title' do
-      expect(@mail.parts[0].body.raw_source).to match(Card.setting(:title))
+      body = @mail.parts[0].body.raw_source
+      expect(body).to match(Card.global_setting(:title))
     end
 
     it 'contains link to verify account' do
@@ -82,7 +83,8 @@ describe Card::Set::Right::Account do
     end
 
     it 'contains deck title' do
-      expect(@mail.parts[0].body.raw_source).to match(Card.setting(:title))
+      body = @mail.parts[0].body.raw_source
+      expect(body).to match(Card.global_setting(:title))
     end
 
     it 'contains password resset link' do

data/mod/05_standard/spec/set/type/search_type_spec.rb

@@ -49,4 +49,12 @@ describe Card::Set::Type::SearchType do
     end
 
   end
+  context 'rss format' do
+    it 'render rss without errors' do
+      search_card = Card.create type: 'Search', name: 'Asearch',
+                                content: %{{"id":"1"}}
+      rss = search_card.format(:rss).render_feed
+      expect(rss).to have_tag('title', text: 'Wagn Bot')
+    end
+  end
 end

data/mod/05_standard/spec/set/type/signup_spec.rb

@@ -47,7 +47,8 @@ describe Card::Set::Type::Signup do
 
     it 'sends email with an appropriate link' do
       @mail = ActionMailer::Base.deliveries.last
-      expect(@mail.parts[0].body.raw_source).to match(Card.setting(:title))
+      body = @mail.parts[0].body.raw_source
+      expect(body).to match(Card.global_setting(:title))
     end
 
     it 'creates an authenticable token' do
@@ -90,21 +91,25 @@ describe Card::Set::Type::Signup do
 
   context 'signup (with approval)' do
     before do
-      # NOTE: by default Anonymous does not have permission to create User cards.
+      # NOTE: by default Anonymous does not have permission
+      # to create User cards.
       Mail::TestMailer.deliveries.clear
       Card::Auth.current_id = Card::AnonymousID
-      @signup = Card.create! name: 'Big Bad Wolf', type_id: Card::SignupID,
-        '+*account'=>{ '+*email'=>'wolf@wagn.org', '+*password'=>'wolf' }
+      @signup = Card.create! name: 'Big Bad Wolf',
+                             type_id: Card::SignupID,
+                             '+*account' => {
+                               '+*email' => 'wolf@wagn.org',
+                               '+*password' => 'wolf'
+                             }
       @account = @signup.account
     end
 
-
     it 'should create all the necessary cards, but no token' do
       expect(@signup.type_id).to eq(Card::SignupID)
       expect(@account.email).to eq('wolf@wagn.org')
       expect(@account.status).to eq('pending')
       expect(@account.salt).not_to eq('')
-      expect(@account.password.length).to be > 10 #encrypted
+      expect(@account.password.length).to be > 10 # encrypted
     end
 
     it 'should not create a token' do
@@ -119,16 +124,13 @@ describe Card::Set::Type::Signup do
         expect(body).to include(@signup.name)
         expect(body).to include('wolf@wagn.org')
       end
-
     end
 
     it 'does not send verification email' do
       expect(Mail::TestMailer.deliveries[-2]).to be_nil
     end
 
-
     context 'approval with token' do
-
       it 'should create token' do
         Card::Env.params[:approve_with_token] = true
         Card::Auth.as 'joe_admin'
@@ -137,11 +139,9 @@ describe Card::Set::Type::Signup do
         @signup.save!
         expect(@signup.account.token).to be_present
       end
-
     end
 
     context 'approval without token' do
-
       it 'should create token' do
         Card::Env.params[:approve_without_token] = true
         Card::Auth.as 'joe_admin'
@@ -153,20 +153,27 @@ describe Card::Set::Type::Signup do
         expect(@signup.account.status).to eq('active')
       end
     end
-
   end
 
   context 'a welcome email card exists' do
     before do
       Card::Auth.as_bot do
-        Card.create! name: 'welcome email', subcards: {'+*subject'=>'welcome',
-                     '+*html_message'=>'Welcome {{_self|name}}'}, type_id: Card::EmailTemplateID
+        Card.create! name: 'welcome email',
+                     type_id: Card::EmailTemplateID,
+                     subcards: {
+                       '+*subject' => 'welcome',
+                       '+*html_message' => 'Welcome {{_self|name}}'
+                     }
       end
       Mail::TestMailer.deliveries.clear
-      @signup = Card.create! name: 'Big Bad Sheep', type_id: Card::SignupID,
-        '+*account'=>{'+*email'=>'sheep@wagn.org', '+*password'=>'sheep'}
-
+      @signup = Card.create! name: 'Big Bad Sheep',
+                             type_id: Card::SignupID,
+                             '+*account' => {
+                               '+*email' => 'sheep@wagn.org',
+                               '+*password' => 'sheep'
+                             }
     end
+
     it 'sends welcome email when account is activated' do
       @signup.run_phase :approve do
         @signup.activate_account

data/mod/06_bootstrap/set/all/bootstrap/helper.rb

@@ -137,7 +137,7 @@ format :html do
     item_options = options.delete(:items) || {}
     wrap_with :ul, options  do
       content.map do |item|
-        content_tag :li, item, item_options
+        content_tag :li, item.html_safe, item_options
       end.join "\n"
     end
   end

data/spec/lib/card/cache_spec.rb

@@ -1,121 +1,115 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Cache do
-  describe "with nil store" do
+  describe 'with nil store' do
     before do
-      expect(Card::Cache).to receive(:generate_cache_id).exactly(2).times.and_return("cache_id")
-      @cache = Card::Cache.new prefix: "prefix"
+      @cache = Card::Cache.new prefix: 'prefix'
     end
 
-    describe "#basic operations" do
-      it "should work" do
-        @cache.write("a", "foo")
-        expect(@cache.read("a")).to eq("foo")
-        @cache.fetch("b") { "bar" }
-        expect(@cache.read("b")).to eq("bar")
+    describe '#basic operations' do
+      it 'should work' do
+        @cache.write('a', 'foo')
+        expect(@cache.read('a')).to eq('foo')
+        @cache.fetch('b') { 'bar' }
+        expect(@cache.read('b')).to eq('bar')
         @cache.reset
       end
     end
   end
 
-  describe "with same cache_id" do
+  describe 'with same cache_id' do
     before :each do
-      @store = ActiveSupport::Cache::MemoryStore.new
-      expect(Card::Cache).to receive(:generate_cache_id).and_return("cache_id")
-      @cache = Card::Cache.new store: @store, prefix: "prefix"
+      @hard = ActiveSupport::Cache::MemoryStore.new
+      @cache = Card::Cache.new store: @hard, prefix: 'prefix'
     end
 
-    it "#read" do
-      expect(@store).to receive(:read).with("prefix/cache_id/foo")
-      @cache.read("foo")
+    it '#read' do
+      expect(@hard).to receive(:read).with('prefix/foo')
+      @cache.read('foo')
     end
 
-    it "#write" do
-      expect(@store).to receive(:write).with("prefix/cache_id/foo", "val")
-      @cache.write("foo", "val")
-      expect(@cache.read('foo')).to eq("val")
+    it '#write' do
+      expect(@hard).to receive(:write).with('prefix/foo', 'val')
+      @cache.write('foo', 'val')
+      expect(@cache.read('foo')).to eq('val')
     end
 
-    it "#fetch" do
-      block = Proc.new { "hi" }
-      expect(@store).to receive(:fetch).with("prefix/cache_id/foo", &block)
-      @cache.fetch("foo", &block)
+    it '#fetch' do
+      block = Proc.new { 'hi' }
+      expect(@hard).to receive(:fetch).with('prefix/foo', &block)
+      @cache.fetch('foo', &block)
     end
 
-    it "#delete" do
-      expect(@store).to receive(:delete).with("prefix/cache_id/foo")
-      @cache.delete "foo"
+    it '#delete' do
+      expect(@hard).to receive(:delete).with('prefix/foo')
+      @cache.delete 'foo'
     end
 
-    it "#write_local" do
-      @cache.write_local('a', 'foo')
-      expect(@cache.read("a")).to eq('foo')
-      expect(@store).not_to receive(:write)
-      expect(@cache.store.read("a")).to eq(nil)
+    it '#soft.write' do
+      @cache.soft.write('a', 'foo')
+      expect(@cache.read('a')).to eq('foo')
+      expect(@hard).not_to receive(:write)
+      expect(@cache.hard.read('a')).to eq(nil)
     end
   end
 
-  it "#reset" do
-    expect(Card::Cache).to receive(:generate_cache_id).and_return("cache_id1")
-    @store = ActiveSupport::Cache::MemoryStore.new
-    @cache = Card::Cache.new store: @store, prefix: "prefix"
-    expect(@cache.prefix).to eq("prefix/cache_id1/")
-    @cache.write("foo","bar")
-    expect(@cache.read("foo")).to eq("bar")
+  it '#reset' do
+    @hard = ActiveSupport::Cache::MemoryStore.new
+    @cache = Card::Cache.new store: @hard, prefix: 'prefix'
+    expect(@cache.hard.prefix).to eq('prefix/')
+    @cache.write('foo','bar')
+    expect(@cache.read('foo')).to eq('bar')
 
     # reset
-    expect(Card::Cache).to receive(:generate_cache_id).and_return("cache_id2")
     @cache.reset
-    expect(@cache.prefix).to eq("prefix/cache_id2/")
-    expect(@cache.store.read("prefix/cache_id")).to eq("cache_id2")
-    expect(@cache.read("foo")).to be_nil
+    expect(@cache.hard.prefix).to eq('prefix/')
+    expect(@cache.read('foo')).to be_nil
 
-    cache2 = Card::Cache.new store: @store, prefix: "prefix"
-    expect(cache2.prefix).to eq("prefix/cache_id2/")
+    cache2 = Card::Cache.new store: @hard, prefix: 'prefix'
+    expect(cache2.hard.prefix).to eq('prefix/')
   end
 
-  describe "with file store" do
+  describe 'with file store' do
     before do
       cache_path = "#{Wagn.root}/tmp/cache"
       unless File.directory?(cache_path)
         FileUtils.mkdir_p(cache_path)
       end
-      @store = ActiveSupport::Cache::FileStore.new cache_path
+      @hard = ActiveSupport::Cache::FileStore.new cache_path
 
-      @store.clear
-      #cache_path = cache_path + "/prefix"
-      #p = Pathname.new(cache_path)
-      #p.mkdir if !p.exist?
+      @hard.clear
+      # cache_path = cache_path + '/prefix'
+      # p = Pathname.new(cache_path)
+      # p.mkdir if !p.exist?
       #
-      #root_dirs = Dir.entries(cache_path).reject{|f| ['.', '..'].include?(f)}
-      #files_to_remove = root_dirs.collect{|f| File.join(cache_path, f)}
-      #FileUtils.rm_r(files_to_remove)
-
-      expect(Card::Cache).to receive(:generate_cache_id).exactly(2).times.and_return("cache_id1")
-      @cache = Card::Cache.new store: @store, prefix: "prefix"
+      # root_dirs = Dir.entries(cache_path).reject{|f| ['.', '..'].include?(f)}
+      # files_to_remove = root_dirs.collect{|f| File.join(cache_path, f)}
+      # FileUtils.rm_r(files_to_remove)
+      @cache = Card::Cache.new store: @hard, prefix: 'prefix'
     end
 
-    describe "#basic operations with special symbols" do
-      it "should work" do
-        @cache.write('%\\/*:?"<>|', "foo")
-        cache2 = Card::Cache.new store: @store, prefix: "prefix"
-        expect(cache2.read('%\\/*:?"<>|')).to eq("foo")
+    describe '#basic operations with special symbols' do
+      it 'should work' do
+        @cache.write('%\\/*:?"<>|', 'foo')
+        cache2 = Card::Cache.new store: @hard, prefix: 'prefix'
+        expect(cache2.read('%\\/*:?"<>|')).to eq('foo')
         @cache.reset
       end
     end
 
-    describe "#basic operations with non-latin symbols" do
-      it "should work" do
-        @cache.write('(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén', "foo")
-        @cache.write('русский', "foo")
-        cache3 = Card::Cache.new store: @store, prefix: "prefix"
-        expect(cache3.read('(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén')).to eq("foo")
-        expect(cache3.read('русский')).to eq("foo")
+    describe '#basic operations with non-latin symbols' do
+      it 'should work' do
+        @cache.write('(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén', 'foo')
+        @cache.write('русский', 'foo')
+        cache3 = Card::Cache.new store: @hard, prefix: 'prefix'
+        cached = cache3.read '(汉语漢語 Hànyǔ; 华语華語 Huáyǔ; 中文 Zhōngwén'
+        expect(cached).to eq('foo')
+        expect(cache3.read('русский')).to eq('foo')
         @cache.reset
       end
     end
 
-    describe "#tempfile" do
+    describe '#tempfile' do
       # TODO
     end
   end