decko 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1d40251dde9014b769f25491f95ceec087bc1f
-  data.tar.gz: d3689601443aee3e90c2da2b3fe85690bcd43a2f
+  metadata.gz: 953bbfc987bc5b3777a2aa3eac096a7637eb2248
+  data.tar.gz: 51d1f2f8032fbd00f56b97beb53076a5387aa751
 SHA512:
-  metadata.gz: 32a9536de63f6ec90c3431471ad888e7769de2751a6efe7d1230003f362db3d61a0dcb6af54bbdf0a0110f67005bfab602c037be53e53f1db1e7c5420c856a49
-  data.tar.gz: e01e70cec3d7234c69bc77d9b0297d81d1b4ead61d97eab5012b5fb5ee746d41cd455d580e4c68ea5c97210377a34c209bcd448efa3613b1052cb0a17f176cb6
+  metadata.gz: 564a3f49721deba98ae3de3c0f326da1861aaf8800bef5ebfc624d6b855e927cb4ec970b77096dae606237004258b204d9f1c8bc9dd248869e0d83ec281bdef6
+  data.tar.gz: 732ee8bebbedfd297aad152c368c5ca4bf478e66629f96dfcbe80b030126aac4c8b8a9e0fad5d099236edccac685d0dbeb74f9689a15364c7c2ee0039659e144

data/README.rdoc

@@ -17,7 +17,7 @@ Try it out with automated setup at Cloudstore[https://cldstr.com/wagn.org/wagn]
 
 ==System Requirements
 
-Ruby[http://www.ruby-lang.org/en/]:: version 2.2.2 or higher
+Ruby[http://www.ruby-lang.org/en/]:: version 2.3 or higher
 Bundler[http://gembundler.com/]:: version 1.0 or higher
 ImageMagick[http://www.imagemagick.org/]::
 A database engine:: Either MySQL[http://www.mysql.com/] or PostgreSQL[http://www.postgresql.org/]

data/decko.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3"
 
   [
     ["rails", "~> 5.1"],

data/features/layouts.feature

@@ -6,11 +6,8 @@ Feature: Layouts
 
   Background:
     Given I am signed in as Joe Admin
-    And I create HTML card "simple layout" with content "Simple Header {{_main}} Simple Footer"
+    And I create Layout card "simple layout" with content "Simple Header {{_main}} Simple Footer"
     And the card "*all+*layout" contains "[[simple layout]]"
-    And I create Pointer card "User+*type+*layout" with content "[[user layout]]"
-    And I create HTML card "user layout" with content "User Header {{_main}}"
-    And I wait for ajax response
 
   Scenario: I visit a Basic card with the simple layout
     When I go to card "*account links"
@@ -18,6 +15,9 @@ Feature: Layouts
     And I should see "Joe Admin"
 
   Scenario: I visit a User card with the user layout
+    Given I create Layout card "user layout" with content "User Header {{_main}}"
+    And I create Pointer card "User+*type+*layout" with content "[[user layout]]"
+    And I wait 1 seconds
     When I go to card "Joe User"
     Then I should see "User Header"
 

data/features/presetting_content.feature

@@ -1,6 +1,6 @@
 Feature: Presetting content
   In order to have an easy to use interface for creating cards
-  As a Wagneer
+  As a Decker
   I want to be able to create links specifying content for plus cards of templated cards
 
   Scenario: User age

data/features/reference.feature

@@ -1,7 +1,7 @@
 @javascript
 Feature: Reference
   In order to connect related cards
-  As a Wagneer
+  As a Decker
 
   Background:
     Given I am signed in as Joe Admin
@@ -10,16 +10,16 @@ Feature: Reference
   Scenario: Renaming a embed card
     When I create PlainText card "Vignesh" with content "Indian"
     And I wait for ajax response
-    And I wait 2 seconds
     And I create PlainText card "Kawaii Man" with content "[[Vignesh]]"
     And I wait for ajax response
+    Then I should see "Vignesh"
+    And I wait for ajax response
     And I go to rename "Vignesh"
     And I fill in "card_name" with "Srivigneshwar"
     And I press "Rename"
-    And I wait for ajax response
+    And I wait 2 seconds
     And I press "Rename and Update"
-    And I wait for ajax response
-    And I wait 4 seconds
+    And I wait 2 seconds
     Then I go to card "Kawaii Man"
     And I should see "Srivigneshwar"
 

data/features/rules.feature

@@ -1,7 +1,7 @@
 @javascript
 Feature: Set-based Rles
   In order to control settings in an efficient way
-  As a Wagneer
+  As a Decker
   I want to be able to control rules for sets of cards
 
   Background:

data/features/setup.feature

@@ -1,11 +1,11 @@
 Feature: Setting up
   In order to be able to start a new Wagn site
-  As a Wagneer
+  As a Decker
   I want to setup an initial account
   
   Background:
     
-  Scenario: Wagneer visits site for first time
+  Scenario: Decker visits site for first time
     Given site simulates setup need
 #done here bc cache gets cleared otherwise
   

data/features/step_definitions/wagn_steps.rb

@@ -186,7 +186,7 @@ When /I wait a sec/ do
   sleep 1
 end
 
-When /I wait (\d+) seconds$/ do |period|
+When /I wait (\d+) seconds?$/ do |period|
   sleep period.to_i
 end
 
@@ -293,6 +293,14 @@ Given /^Jobs are dispatched$/ do
   Delayed::Worker.new.work_off
 end
 
+Then /^No errors in the job queue$/ do
+  if (last = Delayed::Job.last) && (last.last_error)
+    puts last.last_error
+    expect(last.last_error).to be_blank
+  end
+end
+
+
 Then /I submit$/ do
   click_button "Submit"
 end

data/features/step_definitions/web_steps.rb

@@ -25,7 +25,7 @@ end
 
 When /^(?:|I )press "([^"]*)"$/ do |button|
   click_button(button)
-  wait_for_ajax if button == "Submit" && @javascript
+  wait_for_ajax if @javascript && (button == "Submit" || button =~ /rename/i)
 end
 
 When /^(?:|I )follow "([^"]*)"$/ do |link|
@@ -34,6 +34,7 @@ end
 
 When /^(?:|I )click on "([^"]*)"$/ do |link|
   click_link_or_button(link)
+  wait_for_ajax
 end
 
 When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link, parent|

data/features/structure.feature

@@ -1,7 +1,7 @@
 @javascript
 Feature: Structure Rules
   In order to have patterned content
-  As a Wagneer
+  As a Decker
   I want to manage structure through rules
 
   Background:

data/features/support/delayed_job.rb

@@ -1,5 +1,6 @@
+Card.config.active_job.queue_adapter = :delayed_job
+
 Before("@delayed-jobs") do
-  ActiveJob::Base.queue_adapter = :delayed_job
   Delayed::Worker.delay_jobs = true
 end
 

data/features/support/env.rb

@@ -20,7 +20,7 @@ $feature_seeded ||= ::Set.new
 # newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all
 # features/**/*.rb files.
-Before("@background-jobs, @delayed-jobs, @javascript") do |scenario|
+Before("@background-jobs or @delayed-jobs or @javascript") do |scenario|
   # DatabaseCleaner.strategy = :truncation
   Card.seed_test_db unless $feature_seeded.include?(scenario.feature.name)
 end
@@ -47,7 +47,7 @@ Before("@javascript") do
 end
 
 Before do
-  Capybara.page.current_window.resize_to(1440, 900)
+  Capybara.page.current_window.resize_to 1440, 1280
 end
 
 require "cucumber/rails"

data/features/support/wagn_env.rb

@@ -7,6 +7,5 @@ Capybara.configure do |config|
 end
 
 Before do
-  Card::Cache.reset_hard
-  Card::Cache.reset_soft
+  Card::Cache.reset
 end

data/features/table_of_contents.feature

@@ -1,7 +1,7 @@
 @javascript
 Feature: Table of Contents
   In order to add a table of contents to a card
-  As a Wagneer
+  As a Decker
   I want to be able to set a minimum header number
 
   Background:

data/features/toolbar.feature

@@ -1,7 +1,7 @@
 @javascript
 Feature: Toolbar
   In order to edit a card
-  As a Wagneer
+  As a Decker
   I want to be able to use the toolbar
 
 Background:

data/features/update_includers.feature

@@ -51,12 +51,14 @@ Feature: Updates for Children of watched cards
     When I edit "Banana" with plusses:
       |color|flavor|
       |spotted|mushy|
+    And I wait 1 second
     Then Joe Camel should be notified that "Joe User updated \"Banana\""
     When Joe Camel is watching "Banana+*self"
     And I wait a sec
     And I edit "Banana" with plusses:
       |color|flavor|
       |green|mushy|
+    And I wait 1 second
     Then Joe Camel should be notified that "Joe User updated \"Banana\""
     Given a clear email queue
     And I edit "Banana" with plusses:

data/lib/decko/application.rb

@@ -20,6 +20,10 @@ module Decko
       end
     end
 
+    initializer :load_card, after: :load_config_initializers, group: :all do
+       Card
+    end
+
     class << self
       def inherited base
         super
@@ -58,6 +62,7 @@ module Decko
         config.i18n.enforce_available_locales = true
         # config.active_record.raise_in_transactional_callbacks = true
 
+        config.allow_concurrency = false
         config.assets.enabled = false
         config.assets.version = "1.0"
 
@@ -71,7 +76,6 @@ module Decko
         paths = super
         Cardio.set_paths paths
 
-        paths["mod"] << "mod"
         paths.add "files"
 
         paths["app/models"] = []
@@ -82,8 +86,6 @@ module Decko
                    with: "rails/application-routes.rb"
         end
 
-        Cardio.set_mod_paths # really this should happen later
-
         paths
       end
     end

data/lib/decko/config/environments/test.rb

@@ -58,8 +58,6 @@ Decko.application.class.configure do
   # true in your test
   Delayed::Worker.delay_jobs = false
 
-
-
   # Use Pry instead of IRB
   silence_warnings do
     begin

data/lib/decko/generators/decko/templates/Gemfile

@@ -27,7 +27,7 @@ gem '<%= database_gemfile_entry.name %>'<%= %(, '#{database_gemfile_entry.versio
 group :test do
   gem 'rails-controller-testing'
   gem 'rspec'
-  gem 'rspec-rails'         # behavior-driven-development suite
+  gem 'rspec-rails', '~>3.6.1'         # behavior-driven-development suite
   gem 'spork', '>=0.9'
   gem 'rubocop'
   gem 'rubocop-decko'

data/lib/decko/generators/decko/templates/config/deck.yml

@@ -0,0 +1,10 @@
+defaults: &defaults
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

data/lib/decko/tasks/decko.rake

@@ -11,35 +11,27 @@ CARD_TASKS =
 
 link_task CARD_TASKS, from: :decko, to: :card
 
-namespace :decko do
+decko_namespace = namespace :decko do
   desc "create a decko database from scratch, load initial data"
   task :seed do
-    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-    puts "dropping"
-    # FIXME: this should be an option, but should not happen on standard
-    # creates!
-    begin
-      Rake::Task["db:drop"].invoke
-    rescue
-      puts "not dropped"
-    end
-
-    puts "creating"
-    Rake::Task["db:create"].invoke
-
-    puts "loading schema"
-    Rake::Task["db:schema:load"].invoke
+    seed
+  end
 
-    Rake::Task["decko:load"].invoke
+  desc "create a decko database from scratch, load initial data, don't reset the cache"
+  task :seed_without_reset do
+    # This variant is needed to generate test databases for decks
+    # with custom codenames.
+    # The cache reset loads the environment. That tends to fail
+    # because of missing codenames that are added after the intial decko seed.
+    seed with_cache_reset: false
   end
 
   desc "clear and load fixtures with existing tables"
   task reseed: :environment do
     ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
 
-    Rake::Task["decko:clear"].invoke
-
-    Rake::Task["decko:load"].invoke
+    decko_namespace["clear"].invoke
+    decko_namespace["load"].invoke
   end
 
   desc "empty the card tables"
@@ -54,23 +46,27 @@ namespace :decko do
 
   desc "Load bootstrap data into database"
   task :load do
+    decko_namespace["load_without_reset"].invoke
+    puts "reset cache"
+    system "bundle exec rake decko:reset_cache" # needs loaded environment
+  end
+
+  desc "Load bootstrap data into database but don't reset cache"
+  task :load_without_reset do
     require "decko/engine"
     puts "update card_migrations"
-    Rake::Task["decko:assume_card_migrations"].invoke
+    decko_namespace["assume_card_migrations"].invoke
 
     if Rails.env == "test" && !ENV["GENERATE_FIXTURES"]
       puts "loading test fixtures"
       Rake::Task["db:fixtures:load"].invoke
     else
       puts "loading bootstrap"
-      Rake::Task["decko:bootstrap:load"].invoke
+      decko_namespace["bootstrap:load"].invoke
     end
 
     puts "set symlink for assets"
-    Rake::Task["decko:update_assets_symlink"].invoke
-
-    puts "reset cache"
-    system "bundle exec rake decko:reset_cache" # needs loaded environment
+    decko_namespace["update_assets_symlink"].invoke
   end
 
   desc "update decko gems and database"
@@ -81,10 +77,10 @@ namespace :decko do
       FileUtils.rm_rf Decko.paths["tmp"].first, secure: true
     end
     Dir.mkdir Decko.paths["tmp"].first
-    Rake::Task["decko:migrate"].invoke
+    decko_namespace["migrate"].invoke
     # FIXME: remove tmp dir / clear cache
     puts "set symlink for assets"
-    Rake::Task["decko:update_assets_symlink"].invoke
+    decko_namespace["update_assets_symlink"].invoke
   end
 
   desc "set symlink for assets"
@@ -106,6 +102,28 @@ namespace :decko do
     Cardio.assume_migrated_upto_version :core_cards
   end
 
+  def seed with_cache_reset: true
+    ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+    # FIXME: this should be an option, but should not happen on standard
+    # creates!
+    begin
+      Rake::Task["db:drop"].invoke
+    rescue
+      puts "not dropped"
+    end
+
+    puts "creating"
+    Rake::Task["db:create"].invoke
+
+    puts "loading schema"
+
+    Rake::Task["db:schema:load"].invoke
+
+    load_task = "decko:load"
+    load_task << "_without_reset" unless with_cache_reset
+    Rake::Task[load_task].invoke
+  end
+
   namespace :emergency do
     task rescue_watchers: :environment do
       follower_hash = Hash.new { |h, v| h[v] = [] }

data/rails/controllers/card_controller.rb

@@ -60,13 +60,6 @@ class CardController < ActionController::Base
     Card::Machine.refresh_script_and_style if Rails.env.development?
     Card::Cache.renew
     Card::Env.reset controller: self
-    # unprotect_card_params!
-  end
-
-  def unprotect_card_params!
-    # FIXME:  always wear protection
-    return unless params[:card].is_a? ActionController::Parameters
-    params[:card].to_unsafe_h
   end
 
   def authenticate
@@ -99,11 +92,11 @@ class CardController < ActionController::Base
 
   def render_success
     success = Card::Env.success
-    success.name_context = @card.cardname
+    success.name_context = @card.name
     if !Card::Env.ajax? || success.hard_redirect?
       card_redirect success.to_url
     elsif success.target.is_a? String
-      render text: success.target
+      render! text: success.target
     else
       reset_card success.target
       show
@@ -118,10 +111,11 @@ class CardController < ActionController::Base
 
     view ||= params[:view]
     result = card.act do
-      format.page view, Card::Env.slot_opts
+      format.page self, view, Card::Env.slot_opts
     end
 
     status = format.error_status || status
+    # puts "RESULT: #{format.class}/#{status}"
     deliver format, result, status
   end
 

data/spec/javascripts/wagn_spec.coffee

@@ -1,5 +1,5 @@
 
-describe "Global Wagn variable", ->
+describe "Global decko variable", ->
   it "should be defined", ->
     expect(decko).toBeDefined
 
@@ -13,21 +13,21 @@ describe "card-form", ->
 
   it "should be able to populate the content field based on nearby selector", ->
     $('.tinymce-textarea').setContentField -> 1+2
-    expect($('.card-content')).toHaveValue '3'
+    expect($('.d0-card-content')).toHaveValue '3'
 
   it "should be able to populate all content fields in a form", ->
     $('form').setContentFields '.tinymce-textarea', -> 2+2
-    expect($('.card-content')).toHaveValue '4'
+    expect($('.d0-card-content')).toHaveValue '4'
 
   it "should be able to populate content fields from a map", ->
     $('form').setContentFieldsFromMap { '.tinymce-textarea': -> 3+2 }
-    expect($('.card-content')).toHaveValue '5'
+    expect($('.d0-card-content')).toHaveValue '5'
 
   it "should be able to find the slot from any element within", ->
-    expect($('.card-content').slot()).toHaveClass 'card-slot'
+    expect($('.d0-card-content').slot()).toHaveClass 'card-slot'
 
   it "should be able to populate slot from any element within", ->
-    $('.card-content').setSlotContent '<div class="card-slot">whoopee</div>'
+    $('.d0-card-content').setSlotContent '<div class="card-slot">whoopee</div>'
     expect($('.card-slot')).toHaveHtml 'whoopee'
 
 

data/test/performance/render_test.rb

@@ -5,6 +5,6 @@ require "rails/performance_test_help"
 class RenderTest < ActionDispatch::PerformanceTest
   Card
   def render_test
-    Card.new(name: "hi", content: "{{+plus1}} {{+plus2}} {{+plus3}}" .format).render :core
+    Card.new(name: "hi", content: "{{+plus1}} {{+plus2}} {{+plus3}}" .format).render! :core
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.92.2
+        version: 1.93.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.92.2
+        version: 1.93.0
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -151,6 +151,7 @@ files:
 - lib/decko/generators/decko/templates/config/databases/oracle.yml
 - lib/decko/generators/decko/templates/config/databases/postgresql.yml
 - lib/decko/generators/decko/templates/config/databases/sqlite3.yml
+- lib/decko/generators/decko/templates/config/deck.yml
 - lib/decko/generators/decko/templates/config/environment.rb
 - lib/decko/generators/decko/templates/config/routes.erb
 - lib/decko/generators/decko/templates/gitignore
@@ -769,7 +770,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="