card 1.20.2 → 1.20.3

data/mod/standard/set/all/rich_html/wrapper.rb

@@ -109,6 +109,7 @@ format :html do
           [
             _optional_render_header,
             frame_help,
+            _optional_render(:flash),
             wrap_body { yield }
           ]
         end
@@ -130,9 +131,10 @@ format :html do
   end
 
   # alert_types: 'success', 'info', 'warning', 'danger'
-  def alert alert_type, dismissable=false
+  def alert alert_type, dismissable=false, disappear=false
     classes = ["alert", "alert-#{alert_type}"]
     classes << "alert-dismissible " if dismissable
+    classes << "_disappear" if disappear
 
     wrap_with :div, class: classy(classes), role: "alert" do
       [(alert_close_button if dismissable), output(yield)]

data/mod/standard/set/self/search.rb

@@ -1,14 +1,19 @@
 include_set Abstract::SearchParams
 
-format do
-  def extra_paging_path_args
-    vars = query_with_params.vars
-    return {} unless vars.is_a? Hash
-    vars.each_with_object({}) do |(key, value), hash|
-      hash["_#{key}"] = value
-    end
-  end
+def query_args args={}
+  return super unless keyword_contains_wql? args
+  args.merge parse_keyword_wql(args)
+end
+
+def parse_keyword_wql args
+  parse_json_query(args[:vars][:keyword])
+end
+
+def keyword_contains_wql? hash
+  hash[:vars] && (keyword = hash[:vars][:keyword]) && keyword =~ /^\{.+\}$/
+end
 
+format do
   def default_search_params
     hash = super
     hash[:vars] = params[:vars] || {}
@@ -18,9 +23,24 @@ format do
     end
     hash
   end
+
+  view :search_error, cache: :never do
+    sr_class = search_with_params.class.to_s
+
+    # don't show card content; not very helpful in this case
+    %(#{sr_class} :: #{search_with_params.message})
+  end
 end
 
 format :html do
+  def extra_paging_path_args
+    vars = query_with_params.vars
+    return {} unless vars.is_a? Hash
+    vars.each_with_object({}) do |(key, value), hash|
+      hash["_#{key}"] = value
+    end
+  end
+
   view :title, cache: :never do
     vars = root.search_params[:vars]
     if vars && vars[:keyword]

data/mod/standard/set/type/search_type.rb

@@ -3,19 +3,21 @@ include_set Abstract::WqlSearch
 
 format do
   view :core, cache: :never do
-    _render(
-      case search_with_params
-      when Exception          then :search_error
-      when Integer            then :search_count
-      when @mode == :template then :raw
-      else                         :card_list
-      end
-    )
+    _render search_result_view
   end
 
   def chunk_list
     :query
   end
+
+  def search_result_view
+    case search_with_params
+    when Exception          then :search_error
+    when Integer            then :search_count
+    when @mode == :template then :raw
+    else                         :card_list
+    end
+  end
 end
 
 format :json do

data/mod/standard/spec/set/all/rich_html/editing_spec.rb

@@ -7,7 +7,8 @@ describe Card::Set::All::RichHtml::Editing do
 
   def assert_active_toolbar_pill view, content, related_view=false
     view_selector = related_view ? "related" : view
-    assert_view_select @mycard.render(view), "div[class~='card-slot #{view_selector}-view']" do
+    assert_view_select @mycard.render(view),
+                       "div[class~='card-slot #{view_selector}-view']" do
       assert_select 'nav[class="slotter toolbar navbar navbar-inverse"]' do
         assert_select 'ul[class="nav navbar-nav nav-pills"]' do
           assert_select 'li[class~="active"] > a', content

data/mod/standard/spec/set/all/rich_html/form_spec.rb

@@ -10,10 +10,10 @@ describe Card::Set::All::RichHtml::Form do
       expect(@card.format.type_field).to match(/<option [^>]*selected/)
       tf = @card.format.type_field(no_current_type: true)
       expect(tf).not_to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(29)
+      expect(tf.scan(/<option /).length).to eq(31)
       tf = @card.format.type_field
       expect(tf).to match(/<option [^>]*selected/)
-      expect(tf.scan(/<option /).length).to eq(29)
+      expect(tf.scan(/<option /).length).to eq(31)
     end
 
     it "gets type list" do

data/mod/standard/spec/set/self/search_spec.rb

@@ -1,5 +1,12 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Self::Search do
-  # SPECSTUB
+  def keyword_search value
+    Card::Env.params[:vars] = { keyword: value }
+    Card[:search].format.search_with_params
+  end
+
+  it "processes wql" do
+    expect(keyword_search('{"type":"user"}')).to include Card["Joe User"]
+  end
 end

data/mod/standard/spec/set/type/phrase_spec.rb

@@ -2,6 +2,7 @@
 
 describe Card::Set::Type::Phrase do
   it "has special editor" do
-    assert_view_select render_editor("Phrase"), 'input[type="text"][class~="card-content"]'
+    assert_view_select render_editor("Phrase"),
+                       'input[type="text"][class~="card-content"]'
   end
 end

data/mod/twitter/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gem "twitter"

data/mod/twitter/db/migrate_cards/20170305112346_add_twitter_cards.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+
+class AddTwitterCards < Card::Migration
+  def up
+    ensure_card name: "Twitter template", codename: "twitter_template",
+                type_id: Card::CardtypeID
+    ensure_card name: "*message", codename: "message"
+
+    [["*consumer key", "consumer_key"],
+     ["*consumer secret", "consumer_secret"],
+     ["*access token", "access_token"],
+     ["*access secret", "access_secret"]].each do |name, key|
+      ensure_trait name, codename: key,
+                         default: { type_id: Card::PhraseID },
+                         read: "Administrator"
+    end
+
+    Card::Cache.reset_all
+
+    ensure_card name: [:twitter_template, :type, :structure],
+                content: structure
+  end
+
+  def structure
+    ["*message", "*consumer key", "*consumer secret", "*access token",
+     "*access secret"].map do |name|
+      "{{+#{name}}}"
+    end.join "\n"
+  end
+end

data/mod/twitter/set/type/twitter_template.rb

@@ -0,0 +1,22 @@
+card_reader :consumer_key
+card_reader :consumer_secret
+card_reader :access_token
+card_reader :access_secret
+
+card_reader :message
+
+require 'twitter'
+
+def deliver args={}
+  client.update message_card.contextual_content(args[:context])
+end
+
+def client
+  @client ||=
+    ::Twitter::REST::Client.new do |config|
+      config.consumer_key = consumer_key
+      config.consumer_secret = consumer_secret
+      config.access_token = access_token
+      config.access_token_secret = access_secret
+    end
+end

data/spec/lib/card/query/sorting_spec.rb

@@ -0,0 +1,68 @@
+describe Card::Query, "sorting" do
+  subject do
+    Card::Query.run @query.reverse_merge return: :name, sort: :name
+  end
+
+  it "sorts by create" do
+    Card.create! name: "classic bootstrap skin head"
+    # classic skin head is created more recently than classic skin,
+    # which is in the seed data
+    @query = { sort: "create", name: [:match, "classic bootstrap skin"] }
+    is_expected.to eq(
+                     ["classic bootstrap skin", "classic bootstrap skin head"]
+                   )
+  end
+
+  it "sorts by name" do
+    @query = { name: %w(in B Z A Y C X), sort: "name", dir: "desc" }
+    is_expected.to eq(%w(Z Y X C B A))
+  end
+
+  it "sorts by content" do
+    @query = { name: %w(in Z T A), sort: "content" }
+    is_expected.to eq(%w(A Z T))
+  end
+
+  it "plays nice with match" do
+    @query = { match: "Z", type: "Basic", sort: "content" }
+    is_expected.to eq(%w(A B Z))
+  end
+
+  it "sorts by plus card content" do
+    Card::Auth.as_bot do
+      c = Card.fetch("Setting+*self+*table of contents")
+      c.content = "10"
+      c.save
+      Card.create! name: "Basic+*type+*table of contents", content: "3"
+
+      @query = {
+        right_plus: "*table of contents",
+        sort: { right: "*table_of_contents" },
+        sort_as: "integer"
+      }
+      is_expected.to eq(%w(*all Basic+*type Setting+*self))
+    end
+  end
+
+  it "sorts by count" do
+    Card::Auth.as_bot do
+      @query = {
+        name: [:in, "*always", "*never", "*edited"],
+        sort: { right: "*follow", item: "referred_to", return: "count" }
+      }
+      is_expected.to eq(["*never", "*edited", "*always"])
+    end
+  end
+
+  #  it 'sorts by update' do
+  #    # do this on a restricted set so it won't change every time we
+  #    #  add a card..
+  #    Card::Query.run(
+  #    match: 'two', sort: 'update', dir: 'desc'
+  #    ).map(&:name).should == ['One+Two+Three', 'One+Two','Two','Joe User']
+  #    Card['Two'].update_attributes! content: 'new bar'
+  #    Card::Query.run(
+  #    match: 'two', sort: 'update', dir: 'desc'
+  #    ).map(&:name).should == ['Two','One+Two+Three', 'One+Two','Joe User']
+  #  end
+end

data/spec/lib/card/query_spec.rb

@@ -419,71 +419,6 @@ RSpec.describe Card::Query do
     end
   end
 
-  describe "order" do
-    it "sorts by create" do
-      Card.create! name: "classic bootstrap skin head"
-      # classic skin head is created more recently than classic skin,
-      # which is in the seed data
-      @query = { sort: "create", name: [:match, "classic bootstrap skin"] }
-      is_expected.to eq(
-        ["classic bootstrap skin", "classic bootstrap skin head"]
-      )
-    end
-
-    it "sorts by name" do
-      @query = { name: %w(in B Z A Y C X), sort: "name", dir: "desc" }
-      is_expected.to eq(%w(Z Y X C B A))
-    end
-
-    it "sorts by content" do
-      @query = { name: %w(in Z T A), sort: "content" }
-      is_expected.to eq(%w(A Z T))
-    end
-
-    it "plays nice with match" do
-      @query = { match: "Z", type: "Basic", sort: "content" }
-      is_expected.to eq(%w(A B Z))
-    end
-
-    it "sorts by plus card content" do
-      Card::Auth.as_bot do
-        c = Card.fetch("Setting+*self+*table of contents")
-        c.content = "10"
-        c.save
-        Card.create! name: "Basic+*type+*table of contents", content: "3"
-
-        @query = {
-          right_plus: "*table of contents",
-          sort: { right: "*table_of_contents" },
-          sort_as: "integer"
-        }
-        is_expected.to eq(%w(*all Basic+*type Setting+*self))
-      end
-    end
-
-    it "sorts by count" do
-      Card::Auth.as_bot do
-        @query = {
-          name: [:in, "*always", "*never", "*edited"],
-          sort: { right: "*follow", item: "referred_to", return: "count" }
-        }
-        is_expected.to eq(["*never", "*edited", "*always"])
-      end
-    end
-
-    #  it 'sorts by update' do
-    #    # do this on a restricted set so it won't change every time we
-    #    #  add a card..
-    #    Card::Query.run(
-    #    match: 'two', sort: 'update', dir: 'desc'
-    #    ).map(&:name).should == ['One+Two+Three', 'One+Two','Two','Joe User']
-    #    Card['Two'].update_attributes! content: 'new bar'
-    #    Card::Query.run(
-    #    match: 'two', sort: 'update', dir: 'desc'
-    #    ).map(&:name).should == ['Two','One+Two+Three', 'One+Two','Joe User']
-    #  end
-  end
-
   describe "match" do
     it "reachs content and name via shortcut" do
       @query = { match: "two" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 1.20.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -237,6 +237,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.99.1
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: Cards are wiki-inspired data atoms."Cardists" use links, nests, types,
   patterned names, queries, views, events, and rules to create rich structures.
 email:
@@ -258,6 +286,7 @@ files:
 - config/initializers/01_core_extensions/module.rb
 - config/initializers/01_core_extensions/object.rb
 - config/initializers/01_core_extensions/persistent_identifiers.rb
+- config/initializers/02_patches/active_record.rb
 - config/initializers/02_patches/better_errors.rb
 - config/initializers/02_patches/kaminari.rb
 - config/initializers/core_extensions.rb
@@ -342,6 +371,7 @@ files:
 - db/migrate_core_cards/20161102202156_tweak_recaptcha_setting_cards.rb
 - db/migrate_core_cards/20161103154836_update_keys.rb
 - db/migrate_core_cards/20170209132834_email_test_context.rb
+- db/migrate_core_cards/20170314175313_add_notification_event_card.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -491,6 +521,7 @@ files:
 - lib/card/set/basket.rb
 - lib/card/set/event.rb
 - lib/card/set/format.rb
+- lib/card/set/format/haml_views.rb
 - lib/card/set/helpers.rb
 - lib/card/set/i18n_scope.rb
 - lib/card/set/inheritance.rb
@@ -870,41 +901,6 @@ files:
 - mod/developer/set/right/debug.rb
 - mod/developer/spec/set/all/event_viz_spec.rb
 - mod/developer/spec/set/right/debug_spec.rb
-- mod/email/format/email_html_format.rb
-- mod/email/format/email_text_format.rb
-- mod/email/lib/card/follow_option.rb
-- mod/email/set/abstract/test_context.rb
-- mod/email/set/all/email_html.rb
-- mod/email/set/all/email_text.rb
-- mod/email/set/all/follow.rb
-- mod/email/set/all/notify.rb
-- mod/email/set/all/observer.rb
-- mod/email/set/right/bcc.rb
-- mod/email/set/right/cc.rb
-- mod/email/set/right/follow.rb
-- mod/email/set/right/follow_fields.rb
-- mod/email/set/right/followers.rb
-- mod/email/set/right/following.rb
-- mod/email/set/right/from.rb
-- mod/email/set/right/html_message.rb
-- mod/email/set/right/subject.rb
-- mod/email/set/right/text_message.rb
-- mod/email/set/right/to.rb
-- mod/email/set/self/always.rb
-- mod/email/set/self/created.rb
-- mod/email/set/self/edited.rb
-- mod/email/set/self/follow.rb
-- mod/email/set/self/follow_defaults.rb
-- mod/email/set/self/never.rb
-- mod/email/set/type/email_template.rb
-- mod/email/set/type/email_template/email_config.rb
-- mod/email/set/type_plus_right/user/follow.rb
-- mod/email/spec/set/all/follow_spec.rb
-- mod/email/spec/set/all/notify_spec.rb
-- mod/email/spec/set/all/observer_spec.rb
-- mod/email/spec/set/right/followers_spec.rb
-- mod/email/spec/set/right/following_spec.rb
-- mod/email/spec/set/self/follow_defaults_spec.rb
 - mod/history/lib/card/act.rb
 - mod/history/lib/card/act/act_renderer.rb
 - mod/history/lib/card/act/act_renderer/absolute_act_renderer.rb
@@ -971,8 +967,48 @@ files:
 - mod/machines/spec/set/type/skin_spec.rb
 - mod/machines/spec/shared_examples/machine.rb
 - mod/machines/spec/shared_examples/machine_input.rb
+- mod/notifications/format/email_html_format.rb
+- mod/notifications/format/email_text_format.rb
+- mod/notifications/lib/card/follow_option.rb
+- mod/notifications/set/abstract/test_context.rb
+- mod/notifications/set/all/email_html.rb
+- mod/notifications/set/all/email_text.rb
+- mod/notifications/set/all/follow.rb
+- mod/notifications/set/all/observer.rb
+- mod/notifications/set/all/send_notifications.rb
+- mod/notifications/set/all/show_notifications.rb
+- mod/notifications/set/right/bcc.rb
+- mod/notifications/set/right/cc.rb
+- mod/notifications/set/right/follow.rb
+- mod/notifications/set/right/follow_fields.rb
+- mod/notifications/set/right/followers.rb
+- mod/notifications/set/right/following.rb
+- mod/notifications/set/right/from.rb
+- mod/notifications/set/right/html_message.rb
+- mod/notifications/set/right/subject.rb
+- mod/notifications/set/right/text_message.rb
+- mod/notifications/set/right/to.rb
+- mod/notifications/set/self/always.rb
+- mod/notifications/set/self/created.rb
+- mod/notifications/set/self/edited.rb
+- mod/notifications/set/self/follow.rb
+- mod/notifications/set/self/follow_defaults.rb
+- mod/notifications/set/self/never.rb
+- mod/notifications/set/type/email_template.rb
+- mod/notifications/set/type/email_template/email_config.rb
+- mod/notifications/set/type/notification_template.rb
+- mod/notifications/set/type_plus_right/user/follow.rb
+- mod/notifications/spec/set/all/follow_spec.rb
+- mod/notifications/spec/set/all/notify_spec.rb
+- mod/notifications/spec/set/all/observer_spec.rb
+- mod/notifications/spec/set/right/followers_spec.rb
+- mod/notifications/spec/set/right/following_spec.rb
+- mod/notifications/spec/set/self/follow_defaults_spec.rb
+- mod/notifications/spec/set/type/notification_template_spec.rb
 - mod/pointer/db/migrate_cards/20160804112340_add_pointer_cards.rb
 - mod/pointer/lib/javascript/script_pointer_config.js.coffee
+- mod/pointer/set/abstract/00_paging.rb
+- mod/pointer/set/abstract/00_paging/paging_links.rb
 - mod/pointer/set/abstract/01_pointer.rb
 - mod/pointer/set/abstract/01_pointer/edit.rb
 - mod/pointer/set/abstract/code_pointer.rb
@@ -1061,8 +1097,6 @@ files:
 - mod/standard/file/logo/image-small.png
 - mod/standard/set/abstract/01_search_params.rb
 - mod/standard/set/abstract/search.rb
-- mod/standard/set/abstract/search/paging.rb
-- mod/standard/set/abstract/search/paging/paging_links.rb
 - mod/standard/set/abstract/wql_search.rb
 - mod/standard/set/all/comment.rb
 - mod/standard/set/all/error.rb
@@ -1116,7 +1150,6 @@ files:
 - mod/standard/spec/format/rss_format_spec.rb
 - mod/standard/spec/format/xml_format_spec.rb
 - mod/standard/spec/set/all/comment_spec.rb
-- mod/standard/spec/set/all/email_html_spec.rb
 - mod/standard/spec/set/all/error_spec.rb
 - mod/standard/spec/set/all/history_spec.rb
 - mod/standard/spec/set/all/links_spec.rb
@@ -1155,6 +1188,9 @@ files:
 - mod/tinymce_editor/set/abstract/tinymce_editor.rb
 - mod/tinymce_editor/set/self/script_tinymce.rb
 - mod/tinymce_editor/set/self/script_tinymce_config.rb
+- mod/twitter/Gemfile
+- mod/twitter/db/migrate_cards/20170305112346_add_twitter_cards.rb
+- mod/twitter/set/type/twitter_template.rb
 - spec/config/initializers/core_extensions_spec.rb
 - spec/lib/card/action_spec.rb
 - spec/lib/card/auth_spec.rb
@@ -1172,6 +1208,7 @@ files:
 - spec/lib/card/loader_spec.rb
 - spec/lib/card/migration/import_spec.rb
 - spec/lib/card/name_spec.rb
+- spec/lib/card/query/sorting_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set/trait_spec.rb
@@ -1444,6 +1481,7 @@ test_files:
 - spec/lib/card/loader_spec.rb
 - spec/lib/card/migration/import_spec.rb
 - spec/lib/card/name_spec.rb
+- spec/lib/card/query/sorting_spec.rb
 - spec/lib/card/query_spec.rb
 - spec/lib/card/reference_spec.rb
 - spec/lib/card/set/trait_spec.rb