wagn 1.13.0 → 1.14.0.pre1

data/db/migrate_cards/20140725180118_config_card_updates.rb

@@ -1,12 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-class ConfigCardUpdates < ActiveRecord::Migration
-  include Wagn::MigrationHelper
+class ConfigCardUpdates < Wagn::Migration
   def up
-    contentedly do
-      raw_json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.13_config_text.json' )
-      json = JSON.parse raw_json
-      Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json", :pristine=>true
-    end
+    raw_json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.13_config_text.json' )
+    json = JSON.parse raw_json
+    Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json", :pristine=>true
   end
 end

data/db/migrate_cards/data/mailer/follower_notification_email.html

@@ -0,0 +1,9 @@
+<p>{{_|link}} was just <a href="{{_|url}}?view=history">{{_|last_action}}</a> by {{_user|link}}</p>
+
+<blockquote>{{_|list_of_changes}}</blockquote>
+
+<p>{{_|subedits}}</p>
+
+<p>You received this email because you're following <strong>{{_|followed}}</strong>.</p>
+
+<p><em>[[ {{_|unfollow_url}} | Unfollow ]] to stop receiving these emails.</em></p>

data/db/migrate_cards/data/mailer/follower_notification_email.txt

@@ -0,0 +1,11 @@
+"{{_|name}}" was just {{_|last_action}} by {{_user|name}}.
+
+{{_|list_of_changes}}
+
+{{_|subedits}}
+
+See the card: {{_|url}}
+
+You received this email because you're following "{{_|followed}}".
+
+Use this link to unfollow {{_|unfollow_url}}

data/db/migrate_cards/data/mailer/mail_config.json

@@ -0,0 +1,22 @@
+[
+  {
+    "name"      : "verification email",
+	  "codename"  : "verification_email",
+    "subject"   : "verification link for {{:title|core}}"
+  },
+  {
+    "name"    : "password reset email",
+	  "codename": "password_reset_email",
+    "subject" : "reset password for {{:title|core}}"
+  },
+  {
+    "name"    : "signup alert email",
+  	"codename": "signup_alert_email",
+    "subject" : "{{_|name}} signed up for {{:title|core}}"
+  },
+  {
+    "name"    : "follower notification email",
+  	"codename": "follower_notification_email",
+    "subject" : "{{_user|name}} {{_|last_action}} \"{{_|name}}\""
+  }
+]

data/db/migrate_cards/data/mailer/password_reset_email.html

@@ -0,0 +1,10 @@
+<div style="text-align:center">
+  <h1>Password reset for {{:title|core}}</h1>
+  
+  <p>Someone – you, we hope – asked to reset your password.</p>
+  
+  <p>Please <a href="{{_|reset_password_url}}">follow this link</a> to update your account details.</p>
+  
+  <p><em>Link will remain valid for {{_|reset_password_days}} days.</em></p>
+</div>
+

data/db/migrate_cards/data/mailer/password_reset_email.txt

@@ -0,0 +1,11 @@
+** Password reset for {{:title|core}} **
+
+Someone – you, we hope – asked to reset your password.  Please follow this link...
+
+  {{_|reset_password_url}}
+  
+...to update your account details.
+
+
+(Link will remain valid for {{_|reset_password_days}} days.)
+

data/db/migrate_cards/data/mailer/signup_alert_email.html

@@ -0,0 +1,7 @@
+<p>
+  {{_|name}} ({{+*account+*email|core}})
+  has <a href="{{_|url}}">signed up</a>
+  on {{:title|core}}.
+</p>
+
+<p><em>-- the machines running {{:title|core}}</em></p>

data/db/migrate_cards/data/mailer/signup_alert_email.txt

@@ -0,0 +1,5 @@
+{{_|name}} ({{+*account+*email|core}}) has signed up on {{:title|core}}.
+
+See {{_|name}}'s card: {{_|url}}
+
+-- the machines running {{:title|core}}

data/db/migrate_cards/data/mailer/verification_email.html

@@ -0,0 +1,9 @@
+<div style="text-align:center"> 
+
+  <h1>Thank you for signing up with {{*title|core}}!</h1>
+
+  <p>Please <a href="{{_|verify_url}}">follow this link</a> to verify this email address and activate your account.</p>
+
+  <p><em>Link will remain valid for {{_|verify_days}} days.</em></p>
+
+</div>

data/db/migrate_cards/data/mailer/verification_email.txt

@@ -0,0 +1,8 @@
+Thank you for signing up with {{:title|core}}!
+
+Please follow the link below to verify this email address and activate your account.
+
+{{_|verify_url}}
+(Link will remain valid for {{_|verify_days}} days.)
+
+

data/db/schema.rb

@@ -11,7 +11,36 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130411210957) do
+ActiveRecord::Schema.define(:version => 20141001105348) do
+
+  create_table "card_actions", :force => true do |t|
+    t.integer "card_id"
+    t.integer "card_act_id"
+    t.integer "super_action_id"
+    t.integer "action_type"
+    t.boolean "draft"
+  end
+
+  add_index "card_actions", ["card_act_id"], :name => "card_act_id_index"
+  add_index "card_actions", ["card_id"], :name => "card_id_index"
+
+  create_table "card_acts", :force => true do |t|
+    t.integer  "card_id"
+    t.integer  "actor_id"
+    t.datetime "acted_at"
+    t.string   "ip_address"
+  end
+
+  add_index "card_acts", ["actor_id"], :name => "actor_id_index"
+  add_index "card_acts", ["card_id"], :name => "card_id_index"
+
+  create_table "card_changes", :force => true do |t|
+    t.integer "card_action_id"
+    t.integer "field"
+    t.text    "value"
+  end
+
+  add_index "card_changes", ["card_action_id"], :name => "card_action_id_index"
 
   create_table "card_references", :force => true do |t|
     t.integer "referer_id",               :default => 0,  :null => false
@@ -51,6 +80,7 @@ ActiveRecord::Schema.define(:version => 20130411210957) do
     t.integer  "references_expired"
     t.boolean  "trash",               :null => false
     t.integer  "type_id",             :null => false
+    t.text     "db_content"
   end
 
   add_index "cards", ["key"], :name => "cards_key_uniq", :unique => true

data/features/conflict.feature

@@ -0,0 +1,39 @@
+@javascript
+Feature: Conflict
+  When I am editing a card and somebody else changes it at the same time I want to
+  get a helpful message to solve the conflict.
+
+  Background:
+    Given I am signed in as Joe Admin
+    And I create Phrase card "Duck Soup" with content "Laurel and Hardy"
+  
+  Scenario: Two edits on a card at the same time
+    When I edit "Duck Soup" filling in "Stan Hardy"
+    And I open a new window for Joe User
+    And I edit "Duck Soup" setting content to "Oliver Laurel"
+
+    # We still have Joe Admin's edit in the first window but we're globally signed in as Joe User.
+    # We resign-in as Joe Admin in Joe User's window so that we submit Joe Admin's edit as Joe Admin
+    And I am signed out
+    And I am signed in as Joe Admin  
+    And I close window
+    And I submit
+    Then I should see "Conflict!"
+    And I should see "Joe User has also been making changes."
+    And I should see "Oliver " in green
+    And I should see "Stan" in red
+
+  Scenario: Two edits on a card at the same time but with the same change
+    When I edit "Duck Soup" filling in "Stan Laurel"
+    And I open a new window for Joe User
+    And I edit "Duck Soup" setting content to "Stan Laurel"
+    And I am signed out
+    And I wait a sec
+    And I am signed in as Joe Admin  
+    And I close window
+    And I submit
+    Then I'm not sure what I should see but at the moment I get a exception.
+
+
+
+

data/features/flexmail.feature

@@ -1,54 +1,54 @@
-Feature: Flexmail
-  As a Wagneer
-  I want to be able to set up email configs
-  So that we can create emailing forms
-
-  Background:
-    Given I am signed in as Joe Admin
-    And I create Cardtype card "Testimony"
-    And I create Pointer card "Testimony+*type+*send" with content "[[Testemailconfig]]"
-    And I create card "Testimony+*type+*structure" with content
-      """
-      {{+name}} {{+email}} {{+Testimony}} {{+recipients}}
-      """
-    And I create Search card "search test+*right+*structure" with content "{"type":"User"}"
-#    And I create Basic card "Testemailconfig"
-    And I create Search card "Testemailconfig+*to" with content
-      """
-      {"referred_to_by":{"left":"_self","right":"recipients"}}
-      """
-    And I create Search card "Testemailconfig+*from" with content "{"left":"_self","right":"email"}"
-    And I create Phrase card "Testemailconfig+*subject" with content "Subjectimus"
-#    And I create Phrase card "Testemailconfig+*bcc"
-    And I create Basic card "Testemailconfig+*message" with content
-      """
-      Pleistocles, {{_self+name|core}} says: {{_self+Testimony|core}} {{_self+search test|core;item:name}}
-      buena,
-      Thaddeus
-      """
-
-    And I create Phrase card "A+email" with content "argumus@test.com"
-    And I create Phrase card "B+email" with content "tacitus@test.com"
-    # FIXME: apparently cucumber or webrat or something can't handle saving
-    # multiple line entries. Everything I've tried so far has resulted in
-    # truncation after the first line.  which fucking bites.
-    # so for now I will eunicize our tests and only check for one email delivery.
-    And I create Pointer card "List1" with content
-      """
-      [[A+email]]
-      [[B+email]]
-      """
-    And I am signed in as Joe User
-
-  Scenario: Submitting a new Testimony
-    Given I go to new Testimony
-    When I create Testimony card "MoanE" with plusses:
-      |name|email|Testimony|recipients|
-      |Lee|lee@user.net|This is outrageous|[[List1]]|
-    Then "argumus@test.com" should receive 1 email
-    When "argumus@test.com" opens the email with subject "Subjectimus"
-    And they should see the email delivered from "lee@user.net"
-    And they should see "Pleistocles" in the email body
-    And they should see "Lee" in the email body
-    And they should see "This is outrageous" in the email body
-
+#Feature: Flexmail
+#  As a Wagneer
+#  I want to be able to set up email configs
+#  So that we can create emailing forms
+#
+#  Background:
+#    Given I am signed in as Joe Admin
+#    And I create Cardtype card "Testimony"
+#    And I create Pointer card "Testimony+*type+*send" with content "[[Testemailconfig]]"
+#    And I create card "Testimony+*type+*structure" with content
+#      """
+#      {{+name}} {{+email}} {{+Testimony}} {{+recipients}}
+#      """
+#    And I create Search card "search test+*right+*structure" with content "{"type":"User"}"
+##    And I create Basic card "Testemailconfig"
+#    And I create Search card "Testemailconfig+*to" with content
+#      """
+#      {"referred_to_by":{"left":"_self","right":"recipients"}}
+#      """
+#    And I create Search card "Testemailconfig+*from" with content "{"left":"_self","right":"email"}"
+#    And I create Phrase card "Testemailconfig+*subject" with content "Subjectimus"
+##    And I create Phrase card "Testemailconfig+*bcc"
+#    And I create Basic card "Testemailconfig+*message" with content
+#      """
+#      Pleistocles, {{_self+name|core}} says: {{_self+Testimony|core}} {{_self+search test|core;item:name}}
+#      buena,
+#      Thaddeus
+#      """
+#
+#    And I create Phrase card "A+email" with content "argumus@test.com"
+#    And I create Phrase card "B+email" with content "tacitus@test.com"
+#    # FIXME: apparently cucumber or webrat or something can't handle saving
+#    # multiple line entries. Everything I've tried so far has resulted in
+#    # truncation after the first line.  which fucking bites.
+#    # so for now I will eunicize our tests and only check for one email delivery.
+#    And I create Pointer card "List1" with content
+#      """
+#      [[A+email]]
+#      [[B+email]]
+#      """
+#    And I am signed in as Joe User
+#
+#  Scenario: Submitting a new Testimony
+#    Given I go to new Testimony
+#    When I create Testimony card "MoanE" with plusses:
+#      |name|email|Testimony|recipients|
+#      |Lee|lee@user.net|This is outrageous|[[List1]]|
+#    Then "argumus@test.com" should receive 1 email
+#    When "argumus@test.com" opens the email with subject "Subjectimus"
+#    And they should see the email delivered from "lee@user.net"
+#    And they should see "Pleistocles" in the email body
+#    And they should see "Lee" in the email body
+#    And they should see "This is outrageous" in the email body
+#

data/features/notifications.feature

@@ -7,22 +7,24 @@ Feature: Notifications
     And I am signed in as Joe Admin
     When Joe User edits "Home" setting content to "Boo"
     Then Joe Admin should be notified that "Joe User updated \"Home\""
+    And the card Joe Admin+*following should contain "Home"
 # FIXME:need multiline matching
     #And He should see "was just edited by Joe User" in the email
     #And He should see "You received this email because you're watching Home" in the email
     When I follow "Unfollow" in the email
-    Then the card Home+*watchers should not contain "Joe Admin"
+    Then the card Joe Admin+*following should not contain "Home"
 
   Scenario: Watching a Type Card
     Given Joe Admin is watching "Phrase"
     And I am signed in as Joe Admin
     When Joe User creates Phrase card "Foo" with content "bar"
     Then Joe Admin should be notified that "Joe User created \"Foo\""
+    And the card Joe Admin+*following should contain "Phrase"
     # FIXME:need multiline matching
     #And He should see "was just added by Joe User" in the email
     #And He should see "You received this email because you're watching Phrase cards" in the email
     When I follow "Unfollow" in the email
-    Then the card Phrase+*watchers should not contain "Joe Admin"
+    Then the card Joe Admin+*following should not contain "Phrase"
 
   Scenario: Watching a Card
     Given Joe User is watching "Home"

data/features/reset_password.feature

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

data/features/step_definitions/wagn_steps.rb

@@ -77,6 +77,11 @@ When /^(.*) edits? "([^\"]*)" setting (.*) to "([^\"]*)"$/ do |username, cardnam
   end
 end
 
+When /^(.*) edits? "([^\"]*)" filling in "([^\"]*)"$/ do |username, cardname, content|
+  visit "/card/edit/#{cardname.to_name.url_key}"
+  fill_in 'card[content]', :with=>content
+end
+
 When /^(.*) edits? "([^\"]*)" with plusses:/ do |username, cardname, plusses|
   signed_in_as(username) do
     visit "/card/edit/#{cardname.to_name.url_key}"
@@ -125,7 +130,7 @@ end
 Given /^(.*) (is|am) watching "([^\"]+)"$/ do |user, verb, cardname|
   user = Card::Auth.current.name if user == "I"
   signed_in_as user do
-    step "the card #{cardname}+*watchers contains \"[[#{user}]]\""
+    step "the card #{user}+*following contains \"[[#{cardname}]]\""
   end
 end
 
@@ -134,6 +139,11 @@ When /I wait a sec/ do
   sleep 1
 end
 
+When /I wait (.+) seconds$/ do |period|
+  sleep period.to_i
+end
+
+
 Then /what/ do
   save_and_open_page
 end
@@ -186,6 +196,10 @@ When /^In (.*) I click "(.*)"$/ do |section, link|
   end
 end
 
+Then /I submit$/ do
+    click_button("Submit")
+end
+
 When /^I hover over the main menu$/ do
   page.execute_script "$('#main > .card-slot > .card-header > .card-menu-link').trigger('mouseenter')"
 end
@@ -248,8 +262,12 @@ Then /^I should see$/ do |text|
   page.should have_content(text)
 end
 
+Then /^I should see "([^\"]*)" in (.*)$/ do |text, css_class|
+  page.has_css?(".diff-#{css_class}", text: text)
+  #page.should have_content(text)
+end
+
 When /^I fill in "([^\"]*)" with$/ do |field, value|
   fill_in(field, :with => value)
 end
 
-

data/features/step_definitions/window_steps.rb

@@ -0,0 +1,23 @@
+When /^I open a new window for (.*)$/ do |account_name|
+str =
+<<END_TAG
+  window.open("", "#{account_name}", "height=600,width=800");
+END_TAG
+  page.execute_script(str)
+  page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+  accounted = Card[account_name]
+  visit "/update/:signin?card[subcards][%2B*email][content]=#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
+end
+
+When /I switch to (.+) window$/ do |window|
+  if window == 'first'
+    page.driver.browser.switch_to.window( page.driver.browser.window_handles.first )
+  elsif window == 'last'
+    page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+  end
+end
+
+When /^I close window$/ do
+  page.execute_script("window.close();")
+  page.driver.browser.switch_to.window( page.driver.browser.window_handles.last )
+end

data/features/support/env.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 ENV['RAILS_ENV'] = "cucumber"
 
+require File.expand_path( '../../../lib/wagn/simplecov_helper.rb', __FILE__ )
 require 'simplecov'