wagn 1.14.9 → 1.15.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e661b341c8a71e483cd218c80a8b2e20033d0b
-  data.tar.gz: bf400c1756544a093fb3a1f9c2bc40d23bd19888
+  metadata.gz: bdf949be019dcb768fbf0b0422481ecd301803e0
+  data.tar.gz: 76d5ec5fa5a86d7085402c657e01b4f5d2fed4c7
 SHA512:
-  metadata.gz: c13311a967f128a8684e2c8eae810ac4386ae2e07320f0d567bfded8168c1981eca877d3c4a30301553685daaa0ff4070b7a0bd1f43ba27821b16efca39bc063
-  data.tar.gz: 42eccd892969a798788f4a1e0dbe5fe79a6af5815e0f659851795a2abef22a3b83b31f8e6d946bdd6889dcfd76a4b2f4a6a1a58efeecf8c21050ba0a5f16555e
+  metadata.gz: dc6393e65ad6bb87a1f98bb8d9971707ab115b0f7f54b8661fd25fc3ef5998fcff60a4d867d0bcae46299109ce431d243606c27c4f4e097d038f56df98e323a4
+  data.tar.gz: 0e5fee8eb58a735a1c475a851082974b27777b63dec4abbf9248ed0ab53dbd5c6b60f6850c340fb5c6f7403bf866f273ea6aa5d9d6130f08751369aef4653d27

data/features/conflict.feature

@@ -15,19 +15,21 @@ Feature: Conflict
     # 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 wait a sec
     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
+    And I should see "Oliver " in color green
+    And I should see "Stan" in color 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

data/features/follow.feature

@@ -1,45 +1,46 @@
 @javascript
-Feature: Watch interface
+Feature: Follow interface
   In order to make use of notifications
   As an Editor
-  I want simple watch interface on cards
+  I want simple follow interface on cards
 
   Background:
     Given I am signed in as Joe User
 
-  Scenario: Anonymous User should not see watch UI
+  Scenario: Anonymous User should not see follow UI
     Given I follow "Sign out"
     When I go to the homepage
     And I hover over the main menu
     Then I should not see "follow"
 
-  Scenario: Watching a Card
+  Scenario: Following a Card
+    Given Joe User is not watching "Home+*self"
     When I go to the homepage
     And I hover over the main menu
+    And In the main card menu I should not see "unfollow"
     And In the main card menu I click "follow"
-    Then In the main card menu I should see "following|unfollow"
-    # assumes focus still on that link.  otherwise "following"
-    # selenium behavior not totally consistent here.
-    And the card Joe User+*following should contain "Home"
-
-  Scenario: Unwatching a Card
-    Given Joe User is watching "Home"
+    And I hover over the main menu    
+    Then In the main card menu I should see "unfollow"
+    And the card Home+*self+Joe User+*follow should point to "always"
+    
+  Scenario: Unfollowing a Card
+    Given Joe User is watching "Home+*self"
+    And the card Home+*self+Joe User+*follow should point to "always"
     And I am on the homepage
     And I hover over the main menu
-    And In the main card menu I find link with class "watch-toggle-off" and click it
-    #note: the link name turns from "follwing" to "unfollow" on mouseover and because we don't control the mouse's position
-    #      this test randomly fails if we use the link name
+    And In the main card menu I click "unfollow"
+    And I hover over the main menu    
     Then In the main card menu I should see "follow"
-    And the card Joe User+*following should not contain "Home"
+    And the card Home+*self+Joe User+*follow should point to "never"
 
-  Scenario: Watching a Cardtype
+    
+  Scenario: Following a Cardtype
     When I go to card User
     And I hover over the main menu
-    And In the main card menu I should see "follow all"
-    And In the main card menu I should not see "|"
+    And In the main card menu I should see "follow"
 
-  Scenario: A Card whose Cardtype is Watched
-    Given Joe User is watching "User"
+  Scenario: A Card whose Cardtype is Followed
+    Given Joe User is watching "User+*type"
     And I go to card Joe User
     And I hover over the main menu
     Then In the main card menu I should see "(following)|unfollow"

data/features/notifications.feature

@@ -3,31 +3,30 @@ Feature: Notifications
   Users should be able to track changes to Wagn cards from their email
 
   Scenario: Watching a Card
-    Given Joe Admin is watching "All Eyes On Me"
-    And I am signed in as Joe Admin
+    Given Joe Admin is watching "All Eyes On Me+*self"
     When Joe User edits "All Eyes On Me" setting content to "Boo"
     Then Joe Admin should be notified that "Joe User updated \"All Eyes On Me\""
-    And the card Joe Admin+*following should contain "All Eyes On Me"
-# 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 Joe Admin+*following should not contain "All Eyes On Me"
+    And the card All Eyes On Me+*followers should point to "Joe Admin"
+    And I should see "was just updated by Joe User" in the email body
+    And I should see |You received this email because you're following "All Eyes On Me"| in the email body
+    When I am signed in as Joe Admin
+    And I follow "Unfollow" in the email
+    Then the card All Eyes On Me+*followers should not point to "Joe Admin"
 
   Scenario: Watching a Type Card
-    Given Joe Admin is watching "Phrase"
-    And I am signed in as Joe Admin
+    Given Joe Admin is watching "Phrase+*type"
     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 Joe Admin+*following should not contain "Phrase"
+    And the card Phrase+*type+*followers should point to "Joe Admin"
+    And I should see "was just created by Joe User" in the email body
+    #FIXME these double quotes are ugly
+    And I should see |You received this email because you're following "all "Phrases""| in the email body
+    When I am signed in as Joe Admin
+    And I follow "Unfollow" in the email
+    Then the card Phrase+*type+*followers should not point to "Joe Admin"
 
   Scenario: Watching a Card
-    Given Joe User is watching "Home"
+    Given Joe User is watching "Home+*self"
     When Joe Admin deletes "Home"
     Then Joe User should be notified that "Joe Admin deleted \"Home\""
 

data/features/step_definitions/email_steps.rb

@@ -95,12 +95,16 @@ Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
   expect(current_email).to have_subject(Regexp.new(text))
 end
 
-Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
-  expect(current_email.body).to include(text)
+Then /^(?:I|they) should see \|(.*)\| in the email body$/ do |text|
+  expect(current_email.text_part.body.raw_source).to include("#{text}")
 end
 
-Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
-  expect(current_email.body).to match(Regexp.new(text))
+Then /^(?:I|they) should see "(.*)" in the email body$/ do |text|
+  expect(current_email.text_part.body.raw_source).to include("#{text}")
+end
+
+Then /^(?:I|they) should see \/([^\/]*?)\/ in the email body$/ do |text|
+  expect(current_email.html_part.body).to match(Regexp.new(text))
 end
 
 Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
@@ -153,7 +157,7 @@ end
 # Interact with Email Contents
 #
 
-When /^(?:I|they) follow "([^"]*?)" in the email$/ do |link|
+When /^(?:I|they) follow "([^"]*?)" in the email$/ do |link|   # "<- stop textmate from treating the rest of the file as a string
   visit_in_email(link)
 end
 

data/features/step_definitions/wagn_steps.rb

@@ -103,12 +103,6 @@ When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content "(.*)"$/ do |usern
   end
 end
 
-When /^(.*) creates?\s*a?\s*([^\s]*) card "(.*)" with content$/ do |username, cardtype, cardname, content|
-  create_card(username, cardtype, cardname, content) do
-    fill_in("card[content]", :with=>content)
-  end
-end
-
 When /^(.*) creates?\s*([^\s]*) card "([^"]*)"$/ do |username, cardtype, cardname|
   create_card(username,cardtype,cardname)
 end
@@ -135,7 +129,14 @@ 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 #{user}+*following contains \"[[#{cardname}]]\""
+    step "the card #{cardname}+#{user}+*follow contains \"[[*always]]\""
+  end
+end
+
+Given /^(.*) (is|am) not watching "([^\"]+)"$/ do |user, verb, cardname|
+  user = Card::Auth.current.name if user == "I"
+  signed_in_as user do
+    step "the card #{cardname}+#{user}+*follow contains \"[[*never]]\""
   end
 end
 
@@ -233,6 +234,22 @@ Then /the card (.*) should not contain "([^\"]*)"$/ do |cardname, content|
   end
 end
 
+Then /the card (.*) should point to "([^\"]*)"$/ do |cardname, content|
+  visit path_to("card #{cardname}")
+  within scope_of("pointer card content") do
+    expect(page).to have_content(content)
+  end
+end
+
+Then /the card (.*) should not point to "([^\"]*)"$/ do |cardname, content|
+  visit path_to("card #{cardname}")
+  within scope_of("pointer card content") do
+    expect(page).not_to have_content(content)
+  end
+end
+
+
+
 Then /^In (.*) I should see "([^\"]*)"$/ do |section, text|
   within scope_of(section) do
     if text.index('|')
@@ -282,9 +299,8 @@ Then /^I should see$/ do |text|
   expect(page).to have_content(text)
 end
 
-Then /^I should see "([^\"]*)" in (.*)$/ do |text, css_class|
+Then /^I should see "([^\"]*)" in color (.*)$/ 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|

data/features/support/scopes.rb

@@ -5,12 +5,15 @@ module ScopeHelpers
 
     when /main card content/
       '#main > .card-slot > .card-content'
+      
+    when /pointer card content/
+      '#main > .card-slot > .card-content > .pointer-list'
 
     when /main card header/
       '#main > .card-slot > .card-header'
       
     when /main card menu/
-      '#main > .card-slot > .card-menu'
+      '#main > .card-slot > ul.card-menu'
 
     else
       raise "Can't find mapping from \"#{section}\" to a scope.\n" +

data/features/support/wagn_env.rb

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

data/features/update_includers.feature

@@ -1,15 +1,15 @@
 Feature: Updates for Children of watched cards
   In order to keep track of changes that are important to me
   As an Editor
-  I want to be notified when someone changes a child of a card I'm watching  #'
+  I want to be notified when someone changes a child of a card I'm watching
 
   #should this be in watch?
 
   Background:
     Given I am signed in as Joe User
     And I create Book card "Ulysses"
-    And Joe Camel is watching "Ulysses"
-    And Joe Admin is watching "Book"
+    And Joe Camel is watching "Ulysses+*self"
+    And Joe Admin is watching "Book+*type"
 
   Scenario: Watcher should be notified of updates to included plus card
     When I create card "Ulysses+author" with content "James Joyce"
@@ -46,12 +46,12 @@ Feature: Updates for Children of watched cards
     And I create Froot card "Banana" with plusses:
       |color|flavor|
       |yellow|sweet|
-    And Joe Camel is watching "Banana+color"
+    And Joe Camel is watching "Banana+color+*self"
     When I edit "Banana" with plusses:
       |color|flavor|
       |spotted|mushy|
     Then Joe Camel should be notified that "Joe User updated \"Banana\""
-    When Joe Camel is watching "Banana"
+    When Joe Camel is watching "Banana+*self"
     And I wait a sec
     And I edit "Banana" with plusses:
       |color|flavor|
@@ -67,7 +67,7 @@ Feature: Updates for Children of watched cards
   Scenario: Watching a plus card & including card on regular edit
     When I create card "Ulysses+author" with content "Joyce"
     Then Joe Camel should be notified that "Joe User created \"Ulysses\+author\""
-    When Joe Camel is watching "Ulysses+author"
+    When Joe Camel is watching "Ulysses+author+*self"
     And I edit "Ulysses+author" setting content to "Jim"
     Then Joe Camel should be notified that "Joe User updated \"Ulysses\+author\""
 

data/lib/decko/engine.rb

@@ -0,0 +1,58 @@
+
+require 'rails/all'
+require 'cardio'
+
+# TODO: Move these to modules that use them
+require 'htmlentities'
+require 'recaptcha'
+require 'airbrake'
+require 'coderay'
+require 'haml'
+require 'kaminari'
+require 'bootstrap-kaminari-views'
+require 'diff/lcs'
+require 'diffy'
+
+require 'wagn'
+
+module Decko
+
+  class Engine < ::Rails::Engine
+
+    paths.add "app/controllers", :with => 'rails/controllers', :eager_load => true
+    paths.add 'gem-assets',      :with => 'rails/assets'
+    paths.add 'config/routes',   :with => 'rails/engine-routes.rb'
+    paths.add 'lib/tasks',       :with => "#{::Wagn.gem_root}/lib/wagn/tasks", :glob => '**/*.rake'
+    paths.add 'lib/wagn/config/initializers',
+              :with => File.join( Wagn.gem_root, 'lib/wagn/config/initializers' ), :glob => "**/*.rb"
+
+    initializer 'decko.engine.load_config_initializers',  :after => :load_config_initializers do
+      paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
+        load(initializer)
+      end
+    end
+
+    initializer 'engine.copy_configs', :before => 'decko.engine.load_config_initializers' do
+      #this code should all be in Wagn somewhere, and it is now, gem-wize
+      #Ideally railties would do this for us, and this is needed for both use cases
+      Engine.paths['request_log']   = Wagn.paths['request_log']
+      Engine.paths['log']           = Wagn.paths['log']
+      Engine.paths['lib/tasks']     = Wagn.paths['lib/tasks']
+      Engine.paths['config/routes'] = Wagn.paths['config/routes']
+    end
+
+    initializer :connect_on_load do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.establish_connection(::Rails.env)
+      end
+      ActiveSupport.on_load(:after_initialize) do
+          begin
+           require_dependency 'card' unless defined?(Card)
+          rescue ActiveRecord::StatementInvalid => e
+            ::Rails.logger.warn "database not available[#{::Rails.env}] #{e}"
+          end
+      end
+    end
+  end
+end
+

data/lib/wagn.rb

@@ -23,22 +23,5 @@ module Wagn
     def gem_root
       WAGN_GEM_ROOT
     end
-    
-    def with_logging method, opts, &block
-      if Wagn::Log::Performance.enabled_method? method
-        Wagn::Log::Performance.with_timer(method, opts) do
-          block.call
-        end
-      else
-        block.call
-      end
-    end
-    
-    
-    def future_stamp
-      ## used in test data
-      @@future_stamp ||= Time.local 2020,1,1,0,0,0
-    end
   end
-  
 end

data/lib/wagn/all.rb

@@ -1,14 +1 @@
-require 'rails/all'
-
-require 'builder'
-require 'htmlentities'
-require 'recaptcha'
-require 'RMagick'
-require 'paperclip'
-require 'coderay'
-require 'haml'
-require 'kaminari'
-require 'diff/lcs'
-
 require 'wagn/application'
-

data/lib/wagn/application.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-require 'wagn/all'
-require 'active_support/core_ext/numeric/time'
+require 'decko/engine'
+
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))   
+  Bundler.require *Rails.groups(:assets => %w(development test))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -20,123 +20,85 @@ end
 
 module Wagn
   class Application < Rails::Application
-    
+
     initializer :load_wagn_environment_config, :before => :load_environment_config, :group => :all do
-      add_gem_path paths, "lib/wagn/config/environments", :glob => "#{Rails.env}.rb"   
+      add_path paths, "lib/wagn/config/environments", :glob => "#{Rails.env}.rb"
       paths["lib/wagn/config/environments"].existent.each do |environment|
         require environment
       end
     end
-    
+
+=begin
     initializer :load_wagn_config_initializers,  :before => :load_config_initializers do
-      add_gem_path paths, 'lib/wagn/config/initializers', :glob => "**/*.rb" 
+      add_path paths, 'lib/wagn/config/initializers', :glob => "**/*.rb"
       config.paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
         load(initializer)
       end
     end
-    
-    initializer :load_mod_initializers,  :after => :load_wagn_config_initializers do
-      paths.add 'mod-initializers', :with=>'mod', :glob=>"**{,/*/**}/initializers/*.rb"
-      config.paths['mod-initializers'].existent.sort.each do |initializer|
-        load(initializer)
-      end
-    end
-    
+=end
+
     class << self
       def inherited(base)
         Rails.application = base.instance
         Rails.application.add_lib_to_load_path!
         ActiveSupport.run_load_hooks(:before_configuration, base.instance)
-      end      
+      end
     end
-    
+
+    def add_path paths, path, options={}
+      root = options.delete(:root) || Wagn.gem_root
+      gem_path = File.join( root, path )
+      with = options.delete(:with)
+      with = with ? File.join(root, with) : gem_path
+      #warn "add gem path #{path}, #{with}, #{gem_path}, #{options.inspect}"
+      paths[path] = Rails::Paths::Path.new(paths, gem_path, with, options)
+    end
+
+
     def config
       @config ||= begin
         config = super
-        
+
+        Cardio.set_config config
+
         config.i18n.enforce_available_locales = true
-        
-        config.autoload_paths += Dir["#{Wagn.gem_root}/app/**/"]
-        config.autoload_paths += Dir["#{Wagn.gem_root}/lib/**/"]
-        config.autoload_paths += Dir["#{Wagn.gem_root}/mod/*/lib/**/"]
-        config.autoload_paths += Dir["#{Wagn.root}/mod/*/lib/**/"]
-        
+
+
         config.assets.enabled = false
         config.assets.version = '1.0'
-        
-        
+
         config.encoding              = "utf-8"
         config.filter_parameters    += [:password]
-        config.read_only             = !!ENV['WAGN_READ_ONLY']
-        config.allow_inline_styles   = false
         config.no_authentication     = false
         config.files_web_path        = 'files'
-        config.cache_store           = :file_store, 'tmp/cache'
-        
-        config.recaptcha_public_key  = nil
-        config.recaptcha_private_key = nil
-        config.recaptcha_proxy       = nil
-        
+
         config.email_defaults        = nil
-        config.override_host         = nil
-        config.override_protocol     = nil
-        
+
         config.token_expiry          = 2.days
         config.revisions_per_page    = 10
         config.request_logger        = false
         config.performance_logger    = false
-        
         config
       end
     end
     
-
     def paths
       @paths ||= begin
         paths = super
-        add_gem_path paths, "app",                 :eager_load => true, :glob => "*"
-        add_gem_path paths, "app/assets",          :glob => "*"
-        add_gem_path paths, "app/controllers",     :eager_load => true
-        add_gem_path paths, "lib/tasks",           :with => "lib/wagn/tasks", :glob => "**/*.rake"
-        add_gem_path paths, "config/routes",       :with => "lib/wagn/config/routes.rb"
-        add_gem_path paths, "db"
-        add_gem_path paths, "db/migrate"
-        add_gem_path paths, "db/migrate_core_cards"
-        add_gem_path paths, "db/seeds",            :with => "db/seeds.rb"        
-        add_gem_path paths, 'gem-mod',             :with => 'mod'
-        add_gem_path paths, 'gem-assets',          :with => 'public/assets'
+        Cardio.set_paths paths
+
+        paths.add 'files'
 
+        paths['mod'] << 'mod'
         paths['app/models'] = []
         paths['app/mailers'] = []
-        paths['app/views'] = File.join( Wagn.gem_root, 'lib/card' )
-        paths['local-mod'] = approot_is_gemroot? ? [] : 'mod'
-        
-        paths.add 'files'
-        paths.add 'tmp/set'
-        paths.add 'tmp/set_pattern'
-        paths.add 'db/migrate_deck_cards', :with=>'db/migrate_cards'
+
+        add_path paths, 'config/routes', :with => 'rails/application-routes.rb'
+
         paths
       end
     end
 
-    def approot_is_gemroot?
-      Wagn.gem_root.to_s == config.root.to_s
-    end
-    
-    def add_gem_path paths, path, options={}
-      gem_path        = File.join( Wagn.gem_root, path )
-      options[:with] &&= File.join( Wagn.gem_root, options[:with]) 
-      with = options[:with] || gem_path
-      paths[path] = Rails::Paths::Path.new(paths, gem_path, with, options)
-    end
-
-    def load_tasks(app=self)
-      super
-#      unless approot_is_gemroot?
-#        Rake::Task["db:schema:dump"].clear
-#      end
-      self
-    end
   end
 end