card 1.19.6 → 1.20.0

data/spec/models/card/validation_spec.rb

@@ -1,30 +1,30 @@
 # -*- encoding : utf-8 -*-
 
 describe Card, "validate name" do
-  it "should error on name with /" do
+  it "errors on name with /" do
     @c = Card.create name: "testname/"
     expect(@c.errors[:name]).not_to be_blank
   end
 
-  it "should error on junction name  with /" do
+  it "errors on junction name  with /" do
     @c = Card.create name: "jasmin+ri/ce"
     expect(@c.errors[:name]).not_to be_blank
   end
 
-  it "shouldn't create any new cards when name invalid" do
+  it "does not create any new cards when name invalid" do
     original_card_count = Card.count
     @c = Card.create name: "jasmin+ri/ce"
     expect(Card.count).to eq(original_card_count)
   end
 
-  it "should not allow empty name" do
+  it "does not allow empty name" do
     @c = Card.new name: ""
     expect(@c.valid?).to eq(false)
     expect(@c.errors[:name]).not_to be_blank
   end
 
   # maybe the @c.key= should just throw an error, but now it doesn't take anyway
-  it "should not allow mismatched name and key" do
+  it "does not allow mismatched name and key" do
     @c = Card.new name: "Test"
     @c.key = "foo"
     # @c.key.should == 'test'

data/spec/models/card_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card do
   describe "test data" do
-    it "should be findable by name" do
+    it "is findable by name" do
       expect(Card["Wagn Bot"].class).to eq(Card)
     end
   end
@@ -15,18 +15,18 @@ describe Card do
       end
     end
 
-    it "should not have errors"        do expect(@b.errors.size).to eq(0)        end
-    it "should have the right class"   do expect(@c.class).to    eq(Card)        end
-    it "should have the right key"     do expect(@c.key).to      eq("new_card")  end
-    it "should have the right name"    do expect(@c.name).to     eq("New Card")  end
-    it "should have the right content" do expect(@c.content).to  eq("Great Content") end
+    it "does not have errors"        do expect(@b.errors.size).to eq(0)        end
+    it "has the right class"   do expect(@c.class).to    eq(Card)        end
+    it "has the right key"     do expect(@c.key).to      eq("new_card")  end
+    it "has the right name"    do expect(@c.name).to     eq("New Card")  end
+    it "has the right content" do expect(@c.content).to  eq("Great Content") end
 
-    it "should have the right content" do
+    it "has the right content" do
       expect(@c.db_content).to eq("Great Content")
       expect(@c.content).to eq("Great Content")
     end
 
-    it "should be findable by name" do
+    it "is findable by name" do
       expect(Card["New Card"].class).to eq(Card)
     end
   end
@@ -39,17 +39,17 @@ describe Card do
       end
     end
 
-    it "should have 2 actions"  do
+    it "has 2 actions"  do
       expect(@c.actions.count).to eq(2)
     end
 
-    it "should have original action" do
+    it "has original action" do
       expect(@c.nth_action(1).value :db_content).to eq("basiccontent")
     end
   end
 
   describe "created a virtual card when missing and has a template" do
-    it "should be flagged as virtual" do
+    it "is flagged as virtual" do
       expect(Card.new(name: "A+*last edited").virtual?).to be_truthy
     end
   end
@@ -76,7 +76,7 @@ describe "basic card tests" do
     assert_equal card1.right, card2.right
   end
 
-  it "should remove cards" do
+  it "removes cards" do
     forba = Card.create! name: "Forba"
     torga = Card.create! name: "TorgA"
     torgb = Card.create! name: "TorgB"
@@ -107,7 +107,7 @@ describe "basic card tests" do
   #   alpha.attribute_card('beta').should be_instance_of(Card)
   # end
 
-  it "should create cards" do
+  it "creates cards" do
     alpha = Card.new name: "alpha", content: "alpha"
     expect(alpha.content).to eq("alpha")
     alpha.save
@@ -115,7 +115,7 @@ describe "basic card tests" do
     assert_stable alpha
   end
 
-  it "should not find nonexistent" do
+  it "does not find nonexistent" do
     expect(Card["no such card+no such tag"]).to be_nil
     expect(Card["HomeCard+no such tag"]).to be_nil
   end

data/spec/spec_helper.rb

@@ -37,7 +37,11 @@ end
 CardSpecLoader.helper
 
 class ActiveSupport::Logger
-  def rspec msg
-    Thread.current["logger-output"] << msg
+  def rspec msg, console_text=nil
+    if Thread.current["logger-output"]
+      Thread.current["logger-output"] << msg
+    else
+      puts console_text || msg
+    end
   end
 end

data/spec/support/card_spec_helper.rb

@@ -29,20 +29,30 @@ class Card
     end
 
     def debug_assert_view_select view_html, *args, &block
-      Rails.logger.rspec <<-HTML
-        #{CodeRay.scan(Nokogiri::XML(view_html, &:noblanks).to_s, :html).div}
-        <style>
-          .CodeRay {
-            background-color: #FFF;
-            border: 1px solid #CCC;
-            padding: 1em 0px 1em 1em;
-          }
-          .CodeRay .code pre { overflow: auto }
-        </style>
-      HTML
+      log_html view_html
       assert_view_select view_html, *args, &block
     end
 
+    def log_html html
+      parsed = CodeRay.scan(Nokogiri::XML(html, &:noblanks).to_s, :html)
+      if Rails.logger.respond_to? :rspec
+        Rails.logger.rspec "#{parsed.div}#{CODE_RAY_STYLE}"
+      else
+        puts parsed.text
+      end
+    end
+
+    CODE_RAY_STYLE = <<-HTML
+      <style>
+        .CodeRay {
+          background-color: #FFF;
+          border: 1px solid #CCC;
+          padding: 1em 0px 1em 1em;
+        }
+        .CodeRay .code pre { overflow: auto }
+      </style>
+    HTML
+
     def users
       SharedData::USERS.sort
     end

data/spec/support/helper/card_helper.rb

@@ -54,13 +54,20 @@ class Card
       rescue NameError
       end
 
-      def format_with_set set, format_type=:base
+      def with_set set
         set = include_set_in_test_set(set) if set.abstract_set?
-
         singleton_class.send :include, set
+        yield set if block_given?
+        self
+      end
+
+      def format_with_set set, format_type=:base
         format = format format_type
-        format.singleton_class.send :include, set_format_class(set, format_type)
-        yield format
+        with_set set do |extended_set|
+          format_class = set_format_class(extended_set, format_type)
+          format.singleton_class.send :include, format_class
+        end
+        block_given? ? yield(format) : format
       end
 
       def set_format_class set, format_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.19.6
+  version: 1.20.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: 1.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: 1.0.0.rc
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -223,8 +237,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.99.1
-description: Cards are data atoms grouped into Sets to which Rules can apply. Cards
-  can formatted with Views and transformed with Events.
+description: Cards are wiki-inspired data atoms."Cardists" use links, nests, types,
+  patterned names, queries, views, events, and rules to create rich structures.
 email:
 - info@wagn.org
 executables: []
@@ -243,6 +257,8 @@ files:
 - config/initializers/01_core_extensions/hash.rb
 - 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/better_errors.rb
 - config/initializers/02_patches/kaminari.rb
 - config/initializers/core_extensions.rb
 - config/initializers/inflections.rb
@@ -323,6 +339,8 @@ files:
 - db/migrate_core_cards/20160811115836_rename_stats_to_admin.rb
 - db/migrate_core_cards/20160908154210_add_trash_card.rb
 - db/migrate_core_cards/20160914132636_fix_mod_files.rb
+- db/migrate_core_cards/20161102202156_tweak_recaptcha_setting_cards.rb
+- db/migrate_core_cards/20161103154836_update_keys.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
@@ -412,7 +430,6 @@ files:
 - lib/card/cache/persistent.rb
 - lib/card/cache/prepopulate.rb
 - lib/card/cache/temporary.rb
-- lib/card/cache/view_cache.rb
 - lib/card/codename.rb
 - lib/card/content.rb
 - lib/card/content/chunk.rb
@@ -445,10 +462,15 @@ files:
 - lib/card/migration/core.rb
 - lib/card/migration/import.rb
 - lib/card/migration/import/import_data.rb
+- lib/card/migration/import/import_data/card_attributes.rb
+- lib/card/migration/import/import_data/card_content.rb
+- lib/card/migration/import/merger.rb
 - lib/card/mod/dirs.rb
 - lib/card/mod/loader.rb
 - lib/card/model/save_helper.rb
 - lib/card/name.rb
+- lib/card/name/fields_and_traits.rb
+- lib/card/name/variants.rb
 - lib/card/name/view_name.rb
 - lib/card/query.rb
 - lib/card/query/attributes.rb
@@ -477,6 +499,12 @@ files:
 - lib/card/subcards.rb
 - lib/card/tasks/card.rake
 - lib/card/version.rb
+- lib/card/view.rb
+- lib/card/view/cache.rb
+- lib/card/view/fetch.rb
+- lib/card/view/options.rb
+- lib/card/view/stub.rb
+- lib/card/view/visibility.rb
 - lib/cardio.rb
 - lib/cardio/schema.rb
 - lib/generators/card.rb
@@ -522,6 +550,9 @@ files:
 - mod/ace_editor/set/self/script_ace_config.rb
 - mod/admin/set/self/admin.rb
 - mod/admin/set/self/admin_info.rb
+- mod/admin/set/self/recaptcha_private_key.rb
+- mod/admin/set/self/recaptcha_proxy.rb
+- mod/admin/set/self/recaptcha_public_key.rb
 - mod/admin/set/self/trash.rb
 - mod/admin/set/self/version.rb
 - mod/admin/spec/set/self/admin_spec.rb
@@ -633,6 +664,16 @@ files:
 - mod/bootstrap/file/yeti_skin_image/image-medium.png
 - mod/bootstrap/file/yeti_skin_image/image-original.png
 - mod/bootstrap/file/yeti_skin_image/image-small.png
+- mod/bootstrap/lib/bootstrap.rb
+- mod/bootstrap/lib/bootstrap/basic_tags.rb
+- mod/bootstrap/lib/bootstrap/component.rb
+- mod/bootstrap/lib/bootstrap/component/form.rb
+- mod/bootstrap/lib/bootstrap/component/horizontal_form.rb
+- mod/bootstrap/lib/bootstrap/component/layout.rb
+- mod/bootstrap/lib/bootstrap/component/panel.rb
+- mod/bootstrap/lib/bootstrap/component_loader.rb
+- mod/bootstrap/lib/bootstrap/delegate.rb
+- mod/bootstrap/lib/bootstrapper.rb
 - mod/bootstrap/lib/javascript/bootstrap.js
 - mod/bootstrap/lib/javascript/bootstrap.min.js
 - mod/bootstrap/lib/javascript/bootstrap_modal_wagn.js
@@ -708,9 +749,10 @@ files:
 - mod/bootstrap/lib/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
 - mod/bootstrap/lib/stylesheets/bootstrap_cards.scss
 - mod/bootstrap/lib/stylesheets/smartmenu.css
+- mod/bootstrap/set/all/bootstrap/accordion.rb
 - mod/bootstrap/set/all/bootstrap/form.rb
 - mod/bootstrap/set/all/bootstrap/helper.rb
-- mod/bootstrap/set/all/bootstrap/layout.rb
+- mod/bootstrap/set/all/bootstrap/navbar.rb
 - mod/bootstrap/set/all/bootstrap/table.rb
 - mod/bootstrap/set/all/bootstrap/tabs.rb
 - mod/bootstrap/set/all/bootstrap/wrapper.rb
@@ -721,6 +763,8 @@ files:
 - mod/bootstrap/set/self/script_mods.rb
 - mod/bootstrap/set/self/smartmenu_css.rb
 - mod/bootstrap/set/self/smartmenu_js.rb
+- mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb
+- mod/bootstrap/spec/set/all/bootstrap/bootstrap_spec.rb
 - mod/bootstrap/spec/set/all/bootstrap/form_spec.rb
 - mod/bootstrap/spec/set/all/bootstrap/layout_spec.rb
 - mod/carrierwave/Gemfile
@@ -738,12 +782,13 @@ files:
 - mod/carrierwave/spec/lib/carrier_wave/file_card_uploader_spec.rb
 - mod/carrierwave/spec/set/type/file_spec.rb
 - mod/carrierwave/spec/set/type/image_spec.rb
-- mod/core/chunk/include.rb
 - mod/core/chunk/link.rb
 - mod/core/chunk/literal.rb
+- mod/core/chunk/nest.rb
 - mod/core/chunk/query_reference.rb
 - mod/core/chunk/reference.rb
 - mod/core/chunk/uri.rb
+- mod/core/chunk/view_stub.rb
 - mod/core/format/data_format.rb
 - mod/core/format/html_format.rb
 - mod/core/format/text_format.rb
@@ -756,6 +801,7 @@ files:
 - mod/core/set/abstract/code_file.rb
 - mod/core/set/all/actify.rb
 - mod/core/set/all/active_card.rb
+- mod/core/set/all/assign_attributes.rb
 - mod/core/set/all/collection.rb
 - mod/core/set/all/content.rb
 - mod/core/set/all/debug.rb
@@ -778,12 +824,10 @@ files:
 - mod/core/set/all/states.rb
 - mod/core/set/all/subcards.rb
 - mod/core/set/all/templating.rb
-- mod/core/set/all/tracked_attributes.rb
 - mod/core/set/all/trash.rb
 - mod/core/set/all/type.rb
 - mod/core/set/all/update_read_rules.rb
 - mod/core/set/all/utils.rb
-- mod/core/set/all/view_cache.rb
 - mod/core/set_pattern/01_all.rb
 - mod/core/set_pattern/02_all_plus.rb
 - mod/core/set_pattern/03_type.rb
@@ -856,10 +900,16 @@ files:
 - 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
+- mod/history/lib/card/act/act_renderer/relative_act_renderer.rb
 - mod/history/lib/card/action.rb
+- mod/history/lib/card/action/action_renderer.rb
 - mod/history/lib/card/action/admin.rb
 - mod/history/lib/card/action/differ.rb
 - mod/history/lib/card/change.rb
+- mod/history/set/all/act_view.rb
+- mod/history/set/all/action_view.rb
 - mod/history/set/all/actions.rb
 - mod/history/set/all/content_history.rb
 - mod/history/set/all/history.rb
@@ -920,6 +970,7 @@ files:
 - mod/pointer/set/abstract/01_pointer.rb
 - mod/pointer/set/abstract/01_pointer/edit.rb
 - mod/pointer/set/abstract/code_pointer.rb
+- mod/pointer/set/right/options.rb
 - mod/pointer/set/self/script_editors.rb
 - mod/pointer/set/self/script_mods.rb
 - mod/pointer/set/self/script_pointer_config.rb
@@ -1002,6 +1053,11 @@ files:
 - mod/standard/file/logo/image-medium.png
 - mod/standard/file/logo/image-original.png
 - 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
 - mod/standard/set/all/links.rb
@@ -1012,6 +1068,7 @@ files:
 - mod/standard/set/all/rich_html/header.rb
 - mod/standard/set/all/rich_html/menu.rb
 - mod/standard/set/all/rich_html/modal.rb
+- mod/standard/set/all/rich_html/new.rb
 - mod/standard/set/all/rich_html/toolbar.rb
 - mod/standard/set/all/rich_html/wrapper.rb
 - mod/standard/set/right/discussion.rb
@@ -1057,6 +1114,7 @@ files:
 - mod/standard/spec/set/all/links_spec.rb
 - mod/standard/spec/set/all/rich_html/editing_spec.rb
 - mod/standard/spec/set/all/rich_html/form_spec.rb
+- mod/standard/spec/set/all/rich_html/toolbar_spec.rb
 - mod/standard/spec/set/all/rich_html/wrapper_spec.rb
 - mod/standard/spec/set/right/when_created_spec.rb
 - mod/standard/spec/set/right/when_last_edited_spec.rb
@@ -1346,7 +1404,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1357,7 +1415,7 @@ rubyforge_project:
 rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
-summary: an atomic, set-driven content engine
+summary: a surprisingly simple content nesting engine
 test_files:
 - spec/config/initializers/core_extensions_spec.rb
 - spec/lib/card/action_spec.rb