decko 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69a705d159befd136026205b4023c37694e92e0
-  data.tar.gz: f8183b7062dc891b0c26792967bbaa9ba443c573
+  metadata.gz: a8459312b88bb6f76877b8f0e3a5792e5610ed60
+  data.tar.gz: 10096d5ead09136f7c016a8b441d45aa01690d19
 SHA512:
-  metadata.gz: aa8968d82b45b4b5b90709082603f9e02023002d73bf4ca70dd4e60829baa380532fb9be5ec627093ce9a2bf7dbfa0aac6752bde2b46ad9066fa18529d964acf
-  data.tar.gz: f7f7bbde5063c892a97f93fd8b3837ef07c4a6478003ffdf2180bd629f8300c39946f28ba8a927bb646abe54a0380d489ff976a155722c7052a0e1401094e638
+  metadata.gz: a2125a4799b751e4ade6c8edfe19dfc45aa785b3c2fa14e64324f29c72cace3d96a2494ae9bb568e518eb4f8bf81377eae715678ae0bf8eb51cb4282a26a6657
+  data.tar.gz: ba6c4f15324aed3d5f1b18dffc15f4ddcedd0e894ce44c27beed232cbdb8f8866aa8367accafd4f11b53eb366194284cf068e92cb4c1723659c373469b1560cf

data/features/attach.feature

@@ -4,7 +4,6 @@ Feature: File Upload
 
   Background:
     Given I am signed in as Joe Admin
-    And I wait for ajax response
 
   Scenario: Block creating a new empty file
     When I go to new File
@@ -12,53 +11,37 @@ Feature: File Upload
     And I press "Submit"
     Then I should see "Problems with"
     And I should see "is missing"
-    And I wait for ajax response
 
   Scenario: Uploading a file
     When I go to new File
     And I upload the file "file.txt"
-    And I wait for ajax response
     Then I should see "file.txt 9 Bytes"
     When I press "Delete"
     Then I should see "Add File..."
     When I upload the file "file.txt"
-    And I wait for ajax response
-    And I wait 3 seconds
     And I fill in "card_name" with "a test file"
     And I press "Submit"
-    And I wait 2 seconds
     Then I should see "Download a test file"
-    And I wait for ajax response
 
   Scenario: Uploading and changing an image
     When I go to new Image
     And I upload the image "image.png"
-    And I wait for ajax response
-    And I wait 3 seconds
     Then I should see "image.png 34.3 KB"
     And I fill in "card_name" with "a test image"
     And I press "Submit"
-    And I wait 3 seconds
     Then I should see an image of size "large" and type "png"
     And I edit "a test image"
     And I upload the image "image2.jpg"
-    And I wait for ajax response
-    And I wait 3 seconds
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
-    And I wait 3 seconds
     Then I should see an image of size "large" and type "jpg"
-    And I wait for ajax response
 
   Scenario: Changing a coded image
     When I edit "*logo"
     And I upload the image "image2.jpg"
-    And I wait for ajax response
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
-    And I wait for ajax response
     Then I should see a non-coded image of size "large" and type "jpg"
-    And I wait for ajax response
 
   Scenario: uploading a file as a field in a form
     When I go to  "/new Cardtype"
@@ -67,13 +50,10 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait for ajax response
     Then I should see "image.png 34.3 KB"
     And I press "Submit"
     Then I should see an image of size "medium" and type "png"
-    And I wait for ajax response
 
   Scenario: updating a file as a field in a form
     When I go to  "/new Cardtype"
@@ -82,17 +62,13 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait for ajax response
     And I press "Submit"
     And I edit "Vignesh has a complicated relationship"
     And I upload the image "image2.jpg"
-    And I wait for ajax response
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
     Then I should see an image of size "medium" and type "jpg"
-    And I wait for ajax response
 
   Scenario: submit a form without updating a file
     When I go to  "/new Cardtype"
@@ -101,9 +77,7 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait for ajax response
     And I press "Submit"
     And I edit "Vignesh has a complicated relationship"
     And I press "Submit"

data/features/layouts.feature

@@ -10,6 +10,7 @@ Feature: Layouts
     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"

data/features/navbox.feature

@@ -7,20 +7,20 @@ Feature: Navbox
     Given I go to the homepage
     And I fill in "_keyword" with "Joe"
 # possible to use placeholder?
-    And I wait a sec
+#    And I wait a sec
     Then I should see "Joe Camel"
     And I should see "JoeNow"
     Then I press enter to search
 #When I follow "search: Joe"
 # fixme: unable to click link so far...
-    And I wait a sec
+#    And I wait a sec
     Then I should see "Search results"
 
   Scenario: wql search
     Given I go to the homepage
     And I fill in "_keyword" with '{"type":"User"}'
     Then I press enter to search
-    And I wait a sec
+#    And I wait a sec
     Then I should see "Search results"
     And I should see "Big Brother"
 

data/features/notifications.feature

@@ -1,7 +1,7 @@
 @javascript @delayed-jobs
 Feature: Notifications
-  In order for Wagn to be a more effective communication platform
-  Users should be able to track changes to Wagn cards from their email
+  In order for Decko to be a more effective communication platform
+  Users should be able to track changes to Decko cards from their email
 
   Scenario: Watching a Card
     Given Joe Admin is watching "All Eyes On Me+*self"

data/features/pointer_inputs.feature

@@ -11,11 +11,9 @@ Feature: Pointer Inputs
 
   Scenario: Creating a card with select input
     Given I create Phrase card "friends+*right+*input" with content "select"
-    And I wait for ajax response
     When I go to card "Joe User+friends"
     And I select "Joe Camel" from "Content"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
 
@@ -25,7 +23,6 @@ Feature: Pointer Inputs
     When I edit "Joe User"
     And I select "Joe Admin" from "+friends"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User"
     Then I should see "Joe Admin"
 
@@ -34,7 +31,6 @@ Feature: Pointer Inputs
     When I go to card "Joe User+friends"
     And I select "Joe Camel" from "Content"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
 
@@ -52,7 +48,6 @@ Feature: Pointer Inputs
     When I go to card "Joe User+friends"
     And I choose "Joe Camel"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
 
@@ -64,13 +59,11 @@ Feature: Pointer Inputs
     Then I should see "boom yow yow"
     And I check "Joe Camel"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User+friends"
     Then I should see "Joe Camel"
     And I edit "Joe User+friends"
     And I uncheck "Joe Camel"
     And I press "Submit"
-    And I wait for ajax response
     And I go to card "Joe User+friends"
     Then I should not see "Joe Camel"
 

data/features/presetting_content.feature

@@ -7,6 +7,7 @@ Feature: Presetting content
     Given I am signed in as Joe User
     And I go to new Book presetting name to "Harry Potter" and author to "JK Rowling"
     And I press "Submit"
+    And I wait for ajax response
     When I go to card "Harry Potter+author"
     Then I should see "JK Rowling"
 

data/features/reference.feature

@@ -19,7 +19,7 @@ Feature: Reference
     And I wait for ajax response
     And I press "Rename and Update"
     And I wait for ajax response
-    And I wait 2 seconds
+    And I wait 4 seconds
     Then I go to card "Kawaii Man"
     And I should see "Srivigneshwar"
 

data/features/reset_password.feature

@@ -13,6 +13,7 @@ Feature: Reset password
     And I follow "RESET PASSWORD"
     And I enter "joe@user.com" into "*email"
     And I press "Reset my password"
+    And I wait 4 seconds
     Then "joe@user.com" should receive an email with subject "reset password for My Wagn"
     
     When I open the email

data/features/signup.feature

@@ -1,13 +1,20 @@
+@javascript
+
 Feature: Signing up
   In order to be able to contribute content and be credited for my contributions
   As a content editor
   I want to signup for an account
 
   Background:
-    # By default Wagns are configured to require approval
+    Given I am signed in as "Joe Admin"
+    And I edit "Sign up+*type+*captcha"
+    And I uncheck "Content"
+    And I press "Submit"
+        # By default Wagns are configured to require approval
+    Given Joe Admin creates Pointer card "User+*type+*create" with content "[[Anyone]]"
+
 
   Scenario: Signing up (without approval) and then signing out and back in
-    Given Joe Admin creates Pointer card "User+*type+*create" with content "[[Anyone]]"
     And I am signed out
     #This is the needed permission configuration to allow signups without approval
 
@@ -25,6 +32,7 @@ Feature: Signing up
     Then I should see "Wanna B"
     And "Wanna B" should be signed in
 
+
     When I go to the home page
     And I follow "Sign out"
     Then I should not see "Wanna B"
@@ -35,7 +43,11 @@ Feature: Signing up
     And I press "Sign in"
     Then I should see "Wanna B"
     And "Wanna B" should be signed in
-  Scenario: Signing up with approval
+
+
+  #Scenario: Signing up with approval
+    #Given I am signed out
+
     #When I go to card "AccountRequest"
     #And In the main card content I click "Wanna B"
     #When In the main card content I click "Invite Wanna B"

data/features/step_definitions/email_steps.rb

@@ -193,9 +193,7 @@ Then /^save and open all raw emails$/ do
 end
 
 Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
-  Timeout.timeout(Capybara.default_max_wait_time) do
-    sleep(0.5) while page.evaluate_script("jQuery.active") != 0
-  end
+  wait_for_ajax
   Delayed::Worker.new.work_off
   email = address_for_user username
   begin
@@ -207,9 +205,7 @@ Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
 end
 
 Then /^No notification should be sent$/ do
-  Timeout.timeout(Capybara.default_max_wait_time) do
-    sleep(0.5) while page.evaluate_script("jQuery.active") != 0
-  end
+  wait_for_ajax
   Delayed::Worker.new.work_off
   expect(all_emails).to be_empty
 end

data/features/step_definitions/wagn_steps.rb

@@ -157,6 +157,7 @@ When /^(?:|I )upload the (.+) "(.+)"$/ do |attachment_name, filename|
   Capybara.ignore_hidden_elements = false
   attach_file "card_#{attachment_name}", find_file(filename)
   Capybara.ignore_hidden_elements = true
+  wait_for_ajax
 end
 
 def find_file filename
@@ -191,17 +192,16 @@ end
 
 def wait_for_ajax
   Timeout.timeout(Capybara.default_max_wait_time) do
-    begin
-      sleep(0.5) until finished_all_ajax_requests?
-    rescue Selenium::WebDriver::Error::UnknownError
-      sleep(2) # HACK: to fix the issue that in layout.feature jQuery
-      # after the layout change is not defined
-    end
+    sleep(0.5) until finished_all_ajax_requests?
   end
 end
 
 def finished_all_ajax_requests?
-  page.evaluate_script("jQuery.active").zero?
+  jquery_undefined? || page.evaluate_script("jQuery.active").zero?
+end
+
+def jquery_undefined?
+  page.evaluate_script("typeof(jQuery) === 'undefined'")
 end
 
 When /^I wait for ajax response$/ do

data/features/step_definitions/web_steps.rb

@@ -42,6 +42,7 @@ end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
   fill_in(field, with: value)
+  wait_for_ajax if @javascript && field == "card_name"
 end
 
 When /^(?:|I )fill in "([^"]*)" with '([^']*)'$/ do |field, value|

data/features/support/env.rb

@@ -29,12 +29,12 @@ Before("@no-db-clean-between-scenarios") do |scenario|
   $feature_seeded.add scenario.feature.name
 end
 
-Before("~@background-jobs", "~@delayed-jobs", "~@javascript") do
+Before("not @background-jobs", "not @delayed-jobs", "not @javascript") do
  DatabaseCleaner.strategy = :transaction
  DatabaseCleaner.start
 end
 
-After("~@background-jobs", "~@delayed-jobs", "~@javascript") do
+After("not @background-jobs", "not @delayed-jobs", "not @javascript") do
  DatabaseCleaner.clean
 end
 
@@ -46,6 +46,10 @@ Before("@javascript") do
   @javascript = true
 end
 
+Before do
+  Capybara.page.current_window.resize_to(1440, 900)
+end
+
 require "cucumber/rails"
 Cucumber::Rails::Database.autorun_database_cleaner = false
 # require "test_after_commit"
@@ -53,6 +57,7 @@ Cucumber::Rails::Database.autorun_database_cleaner = false
 Capybara.register_driver :selenium do |app|
   Capybara::Selenium::Driver.new(app, browser: :chrome)
 end
+Capybara.default_driver = :selenium
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd

data/features/support/wagn_env.rb

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

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

@@ -9,6 +9,8 @@ end
 Decko.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.view_cache = false
+
   config.eager_load = false
 
   # In the development environment your application's code is reloaded on

data/lib/decko/generators/decko/decko_generator.rb

@@ -5,8 +5,6 @@ class DeckoGenerator < Rails::Generators::AppBase
 
   source_root File.expand_path("../templates", __FILE__)
 
-  argument :deck_path, required: false
-
   class_option :database,
                type: :string, aliases: "-d", default: "mysql",
                desc: "Preconfigure for selected database " \
@@ -130,8 +128,9 @@ class DeckoGenerator < Rails::Generators::AppBase
       Interactive.new(options, destination_root).run
     else
       puts "Now:
-1. Run `decko seed` to seed your database (see db configuration in config/database.yml).
-2. Run `decko server` to start your server"
+1. Run `cd #{File.basename(destination_root)}` to move your new deck directory
+2. Run `decko seed` to seed your database (see db configuration in config/database.yml).
+3. Run `decko server` to start your server"
     end
   end
 

data/lib/decko/generators/decko/templates/config/routes.erb

@@ -1,10 +1,12 @@
 # -*- encoding : utf-8 -*-
 
 Decko.application.routes.draw do
+  rel_root = Cardio.config.relative_url_root
 <% if @include_jasmine_engine %>
   if !Rails.env.production? && Object.const_defined?( :JasmineRails )
-    mount Object.const_get(:JasmineRails).const_get(:Engine) => "<%= deck_path %>/specs"
+    engine = Object.const_get(:JasmineRails).const_get :Engine
+    mount engine => "#{rel_root}/specs"
   end
 <% end %>
-  mount Decko::Engine => '<%= deck_path %>/'
+  mount Decko::Engine => "#{rel_root}/"
 end

data/lib/decko/response.rb

@@ -20,7 +20,7 @@ module Decko
       elsif format.is_a?(Card::Format::FileFormat) && status == 200
         send_file(*result)
       else
-        render body: result.html_safe,
+        render body: result.to_s.html_safe,
                status: status,
                content_type: format.mime_type
       end

data/lib/decko/tasks/decko.rake

@@ -87,8 +87,6 @@ namespace :decko do
     Rake::Task["decko:update_assets_symlink"].invoke
   end
 
-
-
   desc "set symlink for assets"
   task :update_assets_symlink do
     assets_path = File.join(Rails.public_path, "assets")

data/rails/application-routes.rb

@@ -1,6 +1,8 @@
 Decko.application.routes.draw do
+  rel_root = Cardio.config.relative_url_root
   if !Rails.env.production? && Object.const_defined?(:JasmineRails)
-    mount Object.const_get(:JasmineRails).const_get(:Engine) => "/specs"
+    engine = Object.const_get(:JasmineRails).const_get :Engine
+    mount engine => "#{rel_root}/specs"
   end
-  mount Decko::Engine => "/"
+  mount Decko::Engine => "#{rel_root}/"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-08 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'
+        version: 1.92.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.92'
+        version: 1.92.1
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org