card 1.16.15 → 1.17.0

data/mod/01_core/spec/set/all/templating_spec.rb

@@ -1,111 +1,120 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Templating do
-
-  describe "#structurees" do
-    it "for User+*type+*structure should return all Users" do
+  describe '#structurees' do
+    it 'for User+*type+*structure should return all Users' do
       Card::Auth.as_bot do
-        c=Card.create(name: 'User+*type+*structure')
+        c = Card.create name: 'User+*type+*structure'
         users
 
-        expect(c.structuree_names.sort).to eq(["Big Brother", "Joe Admin", "Joe Camel", "Joe User", "John", "Narcissist", "No Count", "Optic fan", "Sample User", "Sara", "Sunglasses fan", "u1", "u2", "u3"])
+        expect(c.structuree_names.sort).to eq(
+          ['Big Brother', 'Joe Admin', 'Joe Camel', 'Joe User', 'John',
+           'Narcissist', 'No Count', 'Optic fan', 'Sample User', 'Sara',
+           'Sunglasses fan', 'u1', 'u2', 'u3'
+          ])
       end
     end
   end
 
-  it "#expire_structuree_references" do
-    #TESTME
-  end
-
-
-  describe "with right structure" do
+  describe 'with right structure' do
     before do
       Card::Auth.as_bot do
-        @bt = Card.create! name: "birthday+*right+*structure", type: 'Date', content: "Today!"
+        @bt = Card.create! name: 'birthday+*right+*structure',
+                           type: 'Date',
+                           content: 'Today!'
       end
-      @jb = Card.create! name: "Jim+birthday"
+      @jb = Card.create! name: 'Jim+birthday'
     end
 
-    it "should have default content" do
+    it 'should have default content' do
       expect(@jb.format._render_raw).to eq('Today!')
     end
 
-    it "should change type and content with template" do
+    it 'should change type and content with template' do
       Card::Auth.as_bot do
-        @bt.content = "Tomorrow"
+        @bt.content = 'Tomorrow'
         @bt.type = 'Phrase'
         @bt.save!
       end
-      jb = @jb.refresh force=true
-      expect(jb.format.render(:raw)).to eq('Tomorrow')
+      jb = @jb.refresh true
+      expect(jb.format.render :raw).to eq('Tomorrow')
       expect(jb.type_id).to eq(Card::PhraseID)
     end
 
-    it "should have type and content overridden by (new) type_plus_right set" do
+    it 'should have type and content overridden by (new) type_plus_right set' do
       Card::Auth.as_bot do
-        Card.create! name: 'Basic+birthday+*type plus right+*structure', type: 'PlainText', content: 'Yesterday'
+        Card.create! name: 'Basic+birthday+*type plus right+*structure',
+                     type: 'PlainText',
+                     content: 'Yesterday'
       end
-      jb = @jb.refresh force=true
+      jb = @jb.refresh true
       expect(jb.raw_content).to eq('Yesterday')
       expect(jb.type_id).to eq(Card::PlainTextID)
     end
   end
 
-
-  describe "with right default" do
+  describe 'with right default' do
     before do
       Card::Auth.as_bot  do
-        @bt = Card.create! name: "birthday+*right+*default", type: 'Date', content: "Today!"
+        @bt = Card.create! name: 'birthday+*right+*default',
+                           type: 'Date',
+                           content: 'Today!'
       end
       @bb = Card.new name: 'Bob+birthday'
-      @jb = Card.create! name: "Jim+birthday"
+      @jb = Card.create! name: 'Jim+birthday'
     end
 
-    it "should have default cardtype" do
+    it 'should have default cardtype' do
       expect(@jb.type_code).to eq(:date)
     end
 
-    it "should have default content" do
+    it 'should have default content' do
       expect(Card['Jim+birthday'].content).to eq('Today!')
     end
 
-    it "should apply to new cards" do
-      pb = Card.new name: "Pete+birthday"
+    it 'should apply to new cards' do
+      pb = Card.new name: 'Pete+birthday'
       expect(pb.raw_content).to eq('Today!')
       expect(pb.content).to eq('Today!')
     end
   end
 
-  describe "with type structure" do
+  describe 'with type structure' do
     before do
       Card::Auth.as_bot do
-        @dt = Card.create! name: "Date+*type+*structure", type: 'Basic', content: 'Tomorrow'
+        @dt = Card.create! name: 'Date+*type+*structure',
+                           type: 'Basic',
+                           content: 'Tomorrow'
       end
     end
 
-    it "should return templated content even if content is passed in" do
-      expect(Card.new(type: 'Date', content: '').format._render(:raw)).to eq('Tomorrow')
+    it 'should return templated content even if content is passed in' do
+      new_date_card = Card.new type: 'Date', content: ''
+      expect(new_date_card.format._render(:raw)).to eq('Tomorrow')
     end
 
     describe 'and right structure' do
       before do
         Card::Auth.as_bot do
-          Card.create name: "Jim+birthday", content: 'Yesterday'
-          @bt = Card.create! name: "birthday+*right+*structure", type: 'Date', content: "Today"
+          Card.create name: 'Jim+birthday', content: 'Yesterday'
+          @bt = Card.create! name: 'birthday+*right+*structure',
+                             type: 'Date',
+                             content: 'Today'
         end
       end
 
-      it "*right setting should override *type setting" do
+      it '*right setting should override *type setting' do
         expect(Card['Jim+birthday'].raw_content).to eq('Today')
       end
 
-      it "should defer to normal content when *structure rule's content is (exactly) '_self'" do
-        Card::Auth.as_bot { Card.create! name: 'Jim+birthday+*self+*structure', content: '_self' }
+      it 'should defer to normal content ' \
+         "when *structure rule's content is (exactly) '_self'" do
+        Card::Auth.as_bot do
+          Card.create! name: 'Jim+birthday+*self+*structure', content: '_self'
+        end
         expect(Card['Jim+birthday'].raw_content).to eq('Yesterday')
       end
     end
   end
-
 end
 
-

data/mod/01_core/spec/set/all/trash_spec.rb

@@ -48,7 +48,7 @@ describe Card::Set::All::Trash do
       )
       @signup.update_attributes!({})
     end
-    Card::Cache.reset_global
+    Card::Cache.reset_all
 
     Card::Auth.as_bot do
       expect(Card.search :right=>'*account').not_to be_empty

data/mod/01_history/set/all/actions.rb

@@ -46,7 +46,7 @@ def delete_old_actions
   Card::TRACKED_FIELDS.each do |field|
     # assign previous changes on each tracked field to the last action
     if (la = last_action) && !la.change_for(field).present? &&
-       (last_change = last_change_on(field))
+       (last_change = last_change_on field)
       # last_change comes as readonly record
       last_change = Card::Change.find(last_change.id)
       last_change.update_attributes!(card_action_id: last_action_id)

data/mod/02_basic_types/set/all/base.rb

@@ -6,8 +6,7 @@ format do
   end
 
   # NAME VIEWS
-  simple_args = { closed: true, perms: :none }
-  view :name, simple_args do |args|
+  view :name, closed: true, perms: :none do |args|
     return card.name unless args[:variant]
     args[:variant].split(/[\s,]+/).inject(card.name) do |name, variant|
       case variant.to_sym
@@ -30,11 +29,18 @@ format do
       end
     end
   end
-  view(:key,      simple_args) { card.key                            }
-  view(:title,    simple_args) { |args| args[:title] || card.name    }
-  view(:linkname, simple_args) { card.cardname.url_key               }
-  view(:url,      simple_args) { card_url _render_linkname           }
-  view(:url_link, simple_args) { web_link card_url(_render_linkname) }
+
+  view(:key,      closed: true, perms: :none) { card.key }
+  view(:linkname, closed: true, perms: :none) { card.cardname.url_key }
+  view(:url,      closed: true, perms: :none) { card_url _render_linkname }
+
+  view :title, closed: true, perms: :none do |args|
+    args[:title] || card.name
+  end
+
+  view :url_link, closed: true, perms: :none do
+    web_link card_url(_render_linkname)
+  end
 
   view :link, closed: true, perms: :none do |args|
     card_link(

data/mod/02_basic_types/set/all/rss.rb

@@ -1,7 +1,4 @@
-
-
 format :rss do
-
   attr_accessor :xml
 
   def initialize card, args
@@ -15,10 +12,10 @@ format :rss do
   end
 
   # FIXME: integrate this with common XML features when it is added
-  view :feed do |args|
+  view :feed do
     begin
-      @xml.instruct! :xml, version: "1.0"
-      @xml.rss version: "2.0" do
+      @xml.instruct! :xml, version: '1.0'
+      @xml.rss version: '2.0' do
         @xml.channel do
           @xml.title       render_feed_title
           @xml.description render_feed_description
@@ -35,41 +32,39 @@ format :rss do
     [card]
   end
 
-  view :feed_body do |args|
+  view :feed_body do |_args|
     render_feed_item_list
   end
 
   view :feed_item_list do |args|
     raw_feed_items(args).each do |item|
       @xml.item do
-        subformat(item).render_feed_item view_changes: (card.id==RecentID)  #FIXME! yuck.
+        # FIXME: yuck.
+        subformat(item).render_feed_item view_changes: (card.id == RecentID)
       end
     end
   end
 
-
-  view :feed_title do |args|
-    Card.setting(:title) + " : " + card.name.gsub(/^\*/,'')
+  view :feed_title do
+    Card.global_setting(:title) + ' : ' + card.name.gsub(/^\*/,'')
   end
 
   view :feed_item do |args|
     @xml.title card.name
     add_name_context
     @xml.description render((args[:view_changes] ? :change : :open_content))
-    @xml.pubDate card.revised_at.to_s(:rfc822)  #updated_at fails on virtual cards, because not all to_s's take args (just actual dates)
+    @xml.pubDate card.revised_at.to_s(:rfc822)  # updated_at fails on virtual
+    # cards, because not all to_s's take args (just actual dates)
     @xml.link render_url
     @xml.guid render_url
   end
 
+  view :feed_description do '' end
+  view :comment_box      do '' end
+  view :menu             do '' end
 
-  view :feed_description do |args| '' end
-  view :comment_box      do |args| '' end
-  view :menu             do |args| '' end
-
-
-  view :open,         { view: :titled, mod: All::Base::Format }
-  view :content,      { view: :core,   mod: All::Base::Format }
-  view :open_content, { view: :core,   mod: All::Base::Format }
-  view :closed,       { view: :link,   mod: All::Base::Format }
-
+  view :open,         view: :titled, mod: All::Base::Format
+  view :content,      view: :core,   mod: All::Base::Format
+  view :open_content, view: :core,   mod: All::Base::Format
+  view :closed,       view: :link,   mod: All::Base::Format
 end

data/mod/02_basic_types/set/type/plain_text.rb

@@ -1,10 +1,13 @@
 format :html do
 
   view :editor do |args|
-    text_area :content, rows: 5, class: 'card-content', "data-card-type-code"=>card.type_code
+    text_area :content,
+              rows: 5,
+              class: 'card-content',
+              'data-card-type-code' => card.type_code
   end
 
   view :core do |args|
-    process_content_object( CGI.escapeHTML _render_raw )
+    process_content_object(CGI.escapeHTML _render_raw)
   end
 end

data/mod/02_basic_types/spec/set/all/base_spec.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+require 'rspec-html-matchers'
 
 describe Card::Set::All::Base do
   describe 'handles view' do

data/mod/02_basic_types/spec/set/all/rss_spec.rb

@@ -2,20 +2,21 @@
 
 describe Card::Set::All::Rss do
   it 'should render recent.rss' do
-    rendered = Card[:recent].format(:rss).show( nil, {} )
+    rendered = Card[:recent].format(:rss).show(nil, {})
     expect(rendered).to match(/xml/)
   end
 
   it 'should handle faulty search queries' do
-    bad_search = Card.create! name: 'Bad Search', type: 'Search', content: 'not no search'
+    bad_search = Card.create! name: 'Bad Search',
+                              type: 'Search', content: 'not no search'
     rendered = bad_search.format(:rss).render_feed_body
-    expect(rendered).to have_tag("item",:text => /JSON::ParserError/)
+    expect(rendered).to have_tag('item', text: /JSON::ParserError/)
   end
 
   it 'should handle bad queries' do
-    bad_search = Card.create! :name=>'Bad Search', :type=>'Search', :content=>'{"found_by":"home"}'
+    bad_search = Card.create! name: 'Bad Search',
+                              type: 'Search', content: '{"found_by":"home"}'
     rendered = bad_search.format(:rss).render_feed_body
-    expect(rendered).to have_tag("item",:text => /Card::BadQuery/)
+    expect(rendered).to have_tag('item', text: /Card::BadQuery/)
   end
-
 end

data/mod/03_machines/lib/javascript/wagn.js.coffee

@@ -81,7 +81,7 @@ jQuery.fn.extend {
       if status == 409 #edit conflict
         @slot().find('.current_revision_id').val @slot().find('.new-current-revision-id').text()
       else if status == 449
-        @slot().find('.recaptcha-box').loadCaptcha()
+        @slot().find('g-recaptcha').reloadCaptcha()
 
   notify: (message) ->
     slot = @slot()
@@ -106,7 +106,10 @@ jQuery.fn.extend {
 
   isMain: -> @slot().parent('#main')[0]
 
-  loadCaptcha: -> Recaptcha.create wagn.recaptchaKey, this[0]
+  reloadCaptcha: ->
+    this[0].empty()
+    grecaptcha.render this[0],
+      sitekey: wagn.recaptchaKey
 
   autosave: ->
     slot = @slot()
@@ -189,9 +192,12 @@ $(window).ready ->
       opt.url = wagn.prepUrl opt.url, $(this).slot()
 
     if $(this).is('form')
-      if wagn.recaptchaKey and $(this).attr('recaptcha')=='on' and !($(this).find('.recaptcha-box')[0])
-         newCaptcha(this)
-         return false
+      if wagn.recaptchaKey and $(this).attr('recaptcha')=='on' and !($(this).find('.g-recaptcha')[0])
+        if $('.g-recaptcha')[0]  # if there is already a recaptcha on the page then we don't have to load the recaptcha script
+          addCaptcha(this)
+        else
+          initCaptcha(this)
+        return false
 
       if data = $(this).data 'file-data'
         # NOTE - this entire solution is temporary.
@@ -337,11 +343,18 @@ $(window).ready ->
 #   }
 
 
-newCaptcha = (form)->
-  recapUri = 'https://www.google.com/recaptcha/api/js/recaptcha_ajax.js'
-  recapDiv = $('<div class="recaptcha-box"></div>')
+initCaptcha = (form)->
+  recapDiv = $("<div class='g-recaptcha' data-sitekey='#{wagn.recaptchaKey}'></div>")
+  $(form).children().last().after recapDiv
+  recapUri = "https://www.google.com/recaptcha/api.js"
+  $.getScript recapUri  # renders the first element with "g-recaptcha" class when loaded
+
+# call this if the recaptcha script is already initialized (via initCaptcha)
+addCaptcha = (form)->
+  recapDiv = $('<div class="g-recaptcha"></div>')
   $(form).children().last().after recapDiv
-  $.getScript recapUri, -> recapDiv.loadCaptcha()
+  grecaptcha.render recapDiv,
+    sitekey: wagn.recaptchaKey
 
 snakeCase = (str)->
   str.replace /([a-z])([A-Z])/g, (match)-> match[0] + '_' + match[1].toLowerCase()

data/mod/03_machines/set/right/machine_output.rb

@@ -9,7 +9,7 @@ end
 format do
   view :not_found do |args|
     if update_machine_output_live?
-      Card::Cache.reset_global # FIXME: wow, this is overkill, no?
+      Card::Cache.reset_all # FIXME: wow, this is overkill, no?
       root.error_status = 302
       card.left.update_machine_output
       card_path card.left.machine_output_url

data/mod/04_settings/lib/card/setting.rb

@@ -1,29 +1,34 @@
 # -*- encoding : utf-8 -*-
 
-
 class Card
-
-  # Used to extend setting modules like Card::Set::Self::Create in the settings mod
+  # Used to extend setting modules like Card::Set::Self::Create in the
+  # settings mod
   module Setting
     # Let M = Card::Setting           (module)
     #     E = Card::Set::Self::Create (module extended with M)
-    #     O = Card["*create"]         (object)
-    attr_accessor :codename                                                # accessible in E
-    mattr_accessor :groups, :group_names, :user_specific                   # accessible in E and M
-    def self.extended(host_class)
-       host_class.mattr_accessor :restricted_to_type, :rule_type_editable  # accessible in E and O
+    #     O = Card['*create']         (object)
+    # accessible in E
+    attr_accessor :codename
+    # accessible in E and M
+    mattr_accessor :groups, :group_names, :user_specific
+    def self.extended host_class
+      # accessible in E and O
+      host_class.mattr_accessor :restricted_to_type, :rule_type_editable
     end
 
     @@group_names = {
-      templating:  "Templating",
-      permission:  "Permissions",
-      webpage:     "Webpage",
-      pointer:     "Pointer",
-      editing_cue: "Editing cues",
-      event:       "Events",
-      other:       "Other"
+      templating:  'Templating',
+      permission:  'Permissions',
+      webpage:     'Webpage',
+      pointer:     'Pointer',
+      editing_cue: 'Editing cues',
+      event:       'Events',
+      other:       'Other',
+      config:      'Config'
     }
-    @@groups = @@group_names.keys.each_with_object({}) { |key, groups| groups[key] = [] }
+    @@groups = @@group_names.keys.each_with_object({}) do |key, groups|
+                 groups[key] = []
+               end
     @@user_specific = ::Set.new
 
     def self.user_specific? codename
@@ -35,34 +40,43 @@ class Card
     end
 
     # usage:
-    # setting_opts group:              :permission | :event | ...
-    #              position:           <Fixnum> (starting at 1, default: add to end)
+    # setting_opts group:        :permission | :event | ...
+    #              position:     <Fixnum> (starting at 1, default: add to end)
     #              rule_type_editable: true | false (default: false)
     #              restricted_to_type: <cardtype> | [ <cardtype>, ...]
     def setting_opts opts
       group = opts[:group] || :other
       @@groups[group] ||= []
-      if opts[:position]
-        if @@groups[group][opts[:position]-1]
-          @@groups[group].insert(opts[:position]-1, self)
+      set_position group, opts[:position]
+
+      @codename = opts[:codename] ||
+                  name.match(/::(\w+)$/)[1].underscore.to_sym
+      self.rule_type_editable = opts[:rule_type_editable]
+      self.restricted_to_type =
+        if opts[:restricted_to_type]
+          type_ids = [opts[:restricted_to_type]].flatten.map do |cardtype|
+                       to_type_id(cardtype)
+                     end
+          ::Set.new(type_ids)
+        end
+      return unless opts[:user_specific]
+      @@user_specific << @codename
+    end
+
+    def set_position group, pos
+      if pos
+        if @@groups[group][pos - 1]
+          @@groups[group].insert(pos - 1, self)
         else
-          @@groups[group][opts[:position]-1] = self
+          @@groups[group][pos - 1] = self
         end
       else
         @@groups[group] << self
       end
-
-      @codename = opts[:codename] || self.name.match(/::(\w+)$/)[1].underscore.to_sym
-      self.rule_type_editable = opts[:rule_type_editable]
-      self.restricted_to_type = opts[:restricted_to_type] ? ::Set.new([opts[:restricted_to_type]].flatten.map{ |cardtype| to_type_id(cardtype) }) : false
-      if opts[:user_specific]
-        @@user_specific << @codename
-      end
     end
 
     def applies_to_cardtype type_id
-      !self.restricted_to_type or self.restricted_to_type.include? type_id
+      !restricted_to_type || restricted_to_type.include?(type_id)
     end
   end
 end
-