wagn 1.14.0 → 1.14.1

data/db/migrate/20141121172918_rename_card_migration_table.rb

@@ -0,0 +1,8 @@
+class RenameCardMigrationTable < ActiveRecord::Migration
+  def self.up
+    rename_table :schema_migrations_cards, :schema_migrations_core_cards
+  end 
+  def self.down
+    rename_table :schema_migrations_core_cards, :schema_migrations_cards
+  end
+end

data/db/migrate_core_cards/20140629222005_add_email_cards.rb

@@ -119,14 +119,6 @@ class AddEmailCards < Wagn::CoreMigration
       email_config_card.delete!
     end
     
-    
-    
-    # move old send rule to on_create
-    #fields = %w( to from cc bcc subject message attach )
-    Card.search(:right=>"*send").each do |send_rule|
-      Card.create! :name=>"#{send_rule.left_name}+*on create", :content=>send_rule.content, :type_code=>:pointer
-      send_rule.delete  #@ethn: keep old rule for safety reasons?
-    end
   
     # the new following rule
     Card.create! :name => '*following', :type_code=>:pointer, :codename=>'following'

data/db/migrate_core_cards/20141119001955_make_symlinks_relative.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+
+class MakeSymlinksRelative < Wagn::Migration
+  def up
+    Wagn.paths['files'].each do |file_path| 
+      files = Dir.glob(File.join file_path, '**', '*')
+      symlinks = files.select {|f| File.symlink? f }
+      symlinks.each do |symlink|
+        base = File.basename( File.readlink(symlink) )
+        File.delete symlink
+        File.symlink base, symlink
+      end
+    end
+  end
+end

data/db/migrate_core_cards/20141120120605_fix_notification_html_message.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+
+class FixNotificationHtmlMessage < Wagn::CoreMigration
+  def up
+    codename = :follower_notification_email
+    dir = File.join data_path, 'mailer'
+    html_message = Card[codename].fetch :trait=>'html_message'
+    html_message.update_attributes! :content=>File.read( File.join( dir, "#{codename}.html" ))
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141001105348) do
+ActiveRecord::Schema.define(:version => 20141121172918) do
 
   create_table "card_actions", :force => true do |t|
     t.integer "card_id"
@@ -90,11 +90,11 @@ ActiveRecord::Schema.define(:version => 20141001105348) do
   add_index "cards", ["right_id"], :name => "index_cards_on_tag_id"
   add_index "cards", ["type_id"], :name => "card_type_index"
 
-  create_table "schema_migrations_cards", :id => false, :force => true do |t|
+  create_table "schema_migrations_core_cards", :id => false, :force => true do |t|
     t.string "version", :null => false
   end
 
-  add_index "schema_migrations_cards", ["version"], :name => "unique_schema_migrations_cards", :unique => true
+  add_index "schema_migrations_core_cards", ["version"], :name => "unique_schema_migrations_cards", :unique => true
 
   create_table "schema_migrations_deck_cards", :id => false, :force => true do |t|
     t.string "version", :null => false

data/db/version.txt

@@ -0,0 +1 @@
+20141121172918

data/db/version_core_cards.txt

@@ -0,0 +1 @@
+20141120120605

data/features/{watch.feature → follow.feature}

@@ -26,8 +26,9 @@ Feature: Watch interface
     Given Joe User is watching "Home"
     And I am on the homepage
     And I hover over the main menu
-    And In the main card menu I click "following"
-    #note: turns to "unfollow on mouseover"
+    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
     Then In the main card menu I should see "follow"
     And the card Joe User+*following should not contain "Home"
 

data/features/notifications.feature

@@ -3,16 +3,16 @@ Feature: Notifications
   Users should be able to track changes to Wagn cards from their email
 
   Scenario: Watching a Card
-    Given Joe Admin is watching "Home"
+    Given Joe Admin is watching "All Eyes On Me"
     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"
+    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 "Home"
+    Then the card Joe Admin+*following should not contain "All Eyes On Me"
 
   Scenario: Watching a Type Card
     Given Joe Admin is watching "Phrase"

data/features/setup.feature

@@ -18,7 +18,7 @@ Feature: Setting up
     And I press "Set up"
     Then I should see "The Newber"
     
-    When I go to card "The Newber\+\*roles"
+    When I go to card "The Newber+*roles"
     Then I should see "Administrator"
 
     When I follow "Sign out"

data/features/step_definitions/email_steps.rb

@@ -50,16 +50,16 @@ end
 #
 
 Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails?$/ do |address, amount|
-  unread_emails_for(address).size.should == parse_email_count(amount)
+  expect(unread_emails_for(address).size).to eq(parse_email_count(amount))
 end
 
 Then /^(?:I|they|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amount|
-  mailbox_for(address).size.should == parse_email_count(amount)
+  expect(mailbox_for(address).size).to eq(parse_email_count(amount))
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([^"]*?)"$/ do |address, amount, subject|
 #  address = address_for_user address
-  unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size.should == parse_email_count(amount)
+  expect(unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size).to eq(parse_email_count(amount))
 end
 
 Then /^(?:I|they|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|
@@ -88,31 +88,31 @@ end
 #
 
 Then /^(?:I|they) should see "([^"]*?)" in the email subject$/ do |text|
-  current_email.should have_subject(text)
+  expect(current_email).to have_subject(text)
 end
 
 Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
-  current_email.should have_subject(Regexp.new(text))
+  expect(current_email).to have_subject(Regexp.new(text))
 end
 
 Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
-  current_email.body.should include(text)
+  expect(current_email.body).to include(text)
 end
 
 Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
-  current_email.body.should =~ Regexp.new(text)
+  expect(current_email.body).to match(Regexp.new(text))
 end
 
 Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
-  current_email.should be_delivered_from(text)
+  expect(current_email).to be_delivered_from(text)
 end
 
 Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
-  current_email.should have_header(name, text)
+  expect(current_email).to have_header(name, text)
 end
 
 Then /^(?:I|they) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
-  current_email.should have_header(name, Regexp.new(text))
+  expect(current_email).to have_header(name, Regexp.new(text))
 end
 
 #
@@ -120,28 +120,28 @@ end
 #
 
 Then /^(?:I|they) should see (an|no|\d+) attachments? with the email$/ do |amount|
-  current_email_attachments.size.should == parse_email_count(amount)
+  expect(current_email_attachments.size).to eq(parse_email_count(amount))
 end
 
 Then /^there should be (an|no|\d+) attachments? named "([^"]*?)"$/ do |amount, filename|
-  current_email_attachments.select { |a| a.original_filename == filename }.size.should == parse_email_count(amount)
+  expect(current_email_attachments.select { |a| a.original_filename == filename }.size).to eq(parse_email_count(amount))
 end
 
 Then /^attachment (\d+) should be named "([^"]*?)"$/ do |index, filename|
-  current_email_attachments[(index.to_i - 1)].original_filename.should == filename
+  expect(current_email_attachments[(index.to_i - 1)].original_filename).to eq(filename)
 end
 
 Then /^there should be (an|no|\d+) attachments? of type "([^"]*?)"$/ do |amount, content_type|
-  current_email_attachments.select { |a| a.content_type == content_type }.size.should == parse_email_count(amount)
+  expect(current_email_attachments.select { |a| a.content_type == content_type }.size).to eq(parse_email_count(amount))
 end
 
 Then /^attachment (\d+) should be of type "([^"]*?)"$/ do |index, content_type|
-  current_email_attachments[(index.to_i - 1)].content_type.should == content_type
+  expect(current_email_attachments[(index.to_i - 1)].content_type).to eq(content_type)
 end
 
 Then /^all attachments should not be blank$/ do
   current_email_attachments.each do |attachment|
-    attachment.size.should_not == 0
+    expect(attachment.size).not_to eq(0)
   end
 end
 
@@ -196,11 +196,11 @@ Then /^(.*) should be notified that "(.*)"$/ do |username, subject|
 end
 
 Then /^No notification should be sent$/ do
-  all_emails.should be_empty
+  expect(all_emails).to be_empty
 end
 
 
 def address_for_user username
   card_with_acct = username=='I' ? Auth.current : Card[username]
   card_with_acct ? card_with_acct.account.email : username
-end
+end

data/features/step_definitions/wagn_steps.rb

@@ -196,6 +196,12 @@ When /^In (.*) I click "(.*)"$/ do |section, link|
   end
 end
 
+When /^In (.*) I find link with class "(.*)" and click it$/ do |section, css_class|
+  within scope_of(section) do
+    find("a.#{css_class}").click
+  end
+end
+
 Then /I submit$/ do
     click_button("Submit")
 end
@@ -210,30 +216,30 @@ end
 Then /the card (.*) should contain "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
   within scope_of("main card content") do
-    page.should have_content(content)
+    expect(page).to have_content(content)
   end
 end
 
 Then /the card (.*) should not contain "([^\"]*)"$/ do |cardname, content|
   visit path_to("card #{cardname}")
   within scope_of("main card content") do
-    page.should_not have_content(content)
+    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('|')
-      text.split('|').any? {|t| have_content(t)}.should be
+      expect(text.split('|').any? {|t| have_content(t)}).to be
     else
-      page.should have_content(text)
+      expect(page).to have_content(text)
     end
   end
 end
 
 Then /^In (.*) I should not see "([^\"]*)"$/ do |section, text|
   within scope_of(section) do
-    page.should_not have_content(text)
+    expect(page).not_to have_content(text)
   end
 end
 
@@ -246,11 +252,11 @@ Then /^In (.*) I should (not )?see a ([^\"]*) with class "([^\"]*)"$/ do |select
 end
 
 Then /^the "([^"]*)" field should contain "([^"]*)"$/ do |field, value|
-  field_labeled(field).value.should =~ /#{value}/
+  expect(field_labeled(field).value).to match(/#{value}/)
 end
 
 Then /^"([^"]*)" should be selected for "([^"]*)"$/ do |value, field|
-  field_labeled(field).element.search(".//option[@selected = 'selected']").inner_html.should =~ /#{value}/
+  expect(field_labeled(field).element.search(".//option[@selected = 'selected']").inner_html).to match(/#{value}/)
 end
 
 When /^I press enter to search$/ do
@@ -259,7 +265,7 @@ end
 
 ## variants of standard steps to handle """ style quoted args
 Then /^I should see$/ do |text|
-  page.should have_content(text)
+  expect(page).to have_content(text)
 end
 
 Then /^I should see "([^\"]*)" in (.*)$/ do |text, css_class|

data/features/step_definitions/web_steps.rb

@@ -126,11 +126,11 @@ When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
 end
 
 Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  page.should have_content(text)
+  expect(page).to have_content(text)
 end
 
 Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  page.should_not have_content(text)
+  expect(page).to_not have_content(text)
 end
 
 

data/lib/card/action.rb

@@ -46,8 +46,8 @@ class Card
     belongs_to :act,  :foreign_key=>:card_act_id, :inverse_of=>:actions 
     has_many   :changes, :foreign_key=>:card_action_id, :inverse_of=>:action, :dependent=>:delete_all
     
-    belongs_to :super_action, class_name: "Action", :inverse_of=>:sub_actions
-    has_many   :sub_actions,  class_name: "Action", :inverse_of=>:super_action
+    belongs_to :super_action, :class_name=> "Action", :inverse_of=>:sub_actions
+    has_many   :sub_actions,  :class_name=> "Action", :inverse_of=>:super_action
     
     scope :created_by, lambda { |actor_id| joins(:act).where('card_acts.actor_id = ?', actor_id) }
     

data/lib/card/codename.rb

@@ -20,29 +20,35 @@ class Card
 
       def reset_cache
         @@codehash = nil
+        cache.write 'CODEHASH', nil
       end
 
       #only used in migration
       def bootdata hash
         @@codehash = hash
       end
-
-
+      
+  
       private
+      
+      def cache
+        Wagn::Cache[Codename]
+      end
 
       def load_hash
-        @@codehash = {}
-        sql = 'select id, codename from cards where codename is not NULL'
-        ActiveRecord::Base.connection.select_all(sql).each do |row|
-          #FIXME: remove duplicate checks, put them in other tools
-          code, cid = row['codename'].to_sym, row['id'].to_i
-          if @@codehash.has_key?(code) or @@codehash.has_key?(cid)
-            warn "dup code ID:#{cid} (#{@@codehash[code]}), CD:#{code} (#{@@codehash[cid]})"
+        @@codehash = cache.read('CODEHASH') || begin
+          codehash = {}
+          sql = 'select id, codename from cards where codename is not NULL'
+          ActiveRecord::Base.connection.select_all(sql).each do |row|
+            #FIXME: remove duplicate checks, put them in other tools
+            code, cid = row['codename'].to_sym, row['id'].to_i
+            if codehash.has_key?(code) or codehash.has_key?(cid)
+              warn "dup code ID:#{cid} (#{codehash[code]}), CD:#{code} (#{codehash[cid]})"
+            end
+            codehash[code] = cid; codehash[cid] = code
           end
-          @@codehash[code] = cid; @@codehash[cid] = code
+          cache.write 'CODEHASH', codehash
         end
-
-        @@codehash
       end
     end
     

data/lib/card/generators/card_migration/card_migration_generator.rb

@@ -8,7 +8,8 @@ class CardMigrationGenerator < ActiveRecord::Generators::Base
     desc: "Create card migration for wagn core"
 
   def create_migration_file
-    root = options['core'] ? Wagn::Migration.card_migration_paths.first : Wagn::Migration.deck_card_migration_paths.first
+    migration_type = options['core'] ? :core_cards : :deck_cards
+    root = Wagn::Migration.paths(migration_type).first
     set_local_assigns!
     migration_template @migration_template, File.join( root, "#{file_name}.rb")
   end

data/lib/wagn/application.rb

@@ -89,7 +89,7 @@ module Wagn
         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 => "config/routes.rb"
+        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"

data/lib/wagn/cache.rb

@@ -119,6 +119,15 @@ module Wagn
     def read_local key
       @local[key]
     end
+    
+    def write_variable key, variable, value
+      key = @prefix + key
+      if @store and object = @store.read(key)
+        object.instance_variable_set "@#{ variable }", value
+        @store.write key, object
+      end
+      value
+    end
 
     def write key, value
       @store.write(@prefix + key, value) if @store

data/lib/wagn/core_migration.rb

@@ -2,11 +2,11 @@
 
 class Wagn::CoreMigration < Wagn::Migration
   def migration_paths
-    Wagn::Migration.core_card_migration_paths
+    Wagn::Migration.paths :core_cards
   end
   
   def schema_mode
-    Wagn::Migration.schema_mode :card
+    Wagn::Migration.schema_mode :core_cards
   end
   
   def import_json filename

data/lib/wagn/generators/wagn/wagn_generator.rb

@@ -29,8 +29,7 @@ class WagnGenerator < Rails::Generators::AppBase
 ## should probably eventually use rails-like AppBuilder approach, but this is a first step.  
   def dev_setup  
     if options['core-dev']
-      @wagn_path = options['gem-path'] || ask("Enter the path to your local wagn installation: ")
-      #@wagndev_path = ask "Please enter the path to your local wagn-dev installation (leave empty to use the wagn-dev gem): "
+      @wagn_path = options['gem-path'] || ask("Enter the path to your local wagn gem installation: ")
       @spec_path = @wagn_path
       @spec_helper_path = File.join @spec_path, 'spec', 'spec_helper'
       @features_path = File.join @wagn_path, 'features/'  # ending slash is important in order to load support and step folders

data/lib/wagn/migration.rb

@@ -1,31 +1,25 @@
 # -*- encoding : utf-8 -*-
 
 class Wagn::Migration < ActiveRecord::Migration
-  def self.core_card_migration_paths
-    Wagn.paths['db/migrate_core_cards'].to_a
-  end
-  
-  def self.deck_card_migration_paths
-    Wagn.paths['db/migrate_deck_cards'].to_a
+  def self.paths type
+    Wagn.paths["db/migrate#{schema_suffix type}"].to_a
   end
   
   def self.schema_suffix type
-    case type
-    when :core_cards then '_cards'
-    when :deck_cards then '_deck_cards'
-    else ''
-    end
+    Wagn::Version.schema_suffix type
   end
   
   def self.schema_mode type
     new_suffix = Wagn::Migration.schema_suffix type
-    
     original_suffix = ActiveRecord::Base.table_name_suffix
+    
     ActiveRecord::Base.table_name_suffix = new_suffix
     yield
     ActiveRecord::Base.table_name_suffix = original_suffix
   end
   
+  
+  
   def contentedly &block
     Wagn::Cache.reset_global
     Wagn::Migration.schema_mode '' do
@@ -61,11 +55,11 @@ class Wagn::Migration < ActiveRecord::Migration
   
     
   def schema_mode
-    Wagn::Migration.schema_mode :deck
+    Wagn::Migration.schema_mode :deck_cards
   end
   
   def migration_paths
-    Wagn::Migration.deck_card_migration_paths
+    Wagn::Migration.paths :deck_cards
   end