wagn 1.14.0.pre3 → 1.14.0

data/db/{migrate_cards → migrate_core_cards}/20130411191151_renaming_for_menu.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class RenamingForMenu < Wagn::Migration
+class RenamingForMenu < Wagn::CoreMigration
   def up
     renames = {
       '*content'    => '*structure',

data/db/{migrate_cards → migrate_core_cards}/20130411211600_delete_old_related_tab_cards.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class DeleteOldRelatedTabCards < Wagn::Migration
+class DeleteOldRelatedTabCards < Wagn::CoreMigration
   def up
     [
       '*related',

data/db/{migrate_cards → migrate_core_cards}/20130419215612_import_help_text.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-class ImportHelpText < Wagn::Migration
+class ImportHelpText < Wagn::CoreMigration
   def up
-    json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.11_help_text.json' )
-    data = JSON.parse json
+    dir = data_path '1.11_help_text.json' 
+    data = JSON.parse( File.read dir )
     data.each do |atom|
       c = atom['card']
       Card.merge c['name'], { :type=>c['type'], :content=>atom['views'][0]['parts'] }, :pristine=>true

data/db/{migrate_cards → migrate_core_cards}/20130823192433_add_style_cards.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class AddStyleCards < Wagn::Migration
+class AddStyleCards < Wagn::CoreMigration
   def up
     # TAKE "CSS" CODENAME FROM OLD *CSS CARD
     old_css = Card[:css]

data/db/{migrate_cards → migrate_core_cards}/20130910183318_move_styles_to_content.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-class MoveStylesToContent < Wagn::Migration
+class MoveStylesToContent < Wagn::CoreMigration
   def up
-    dir = "#{Wagn.gem_root}/db/migrate_cards/data/1.12_stylesheets"
+    dir = File.join data_path, "1.12_stylesheets"
     %w{ right_sidebar common classic_cards traditional }.each do |sheetname|
       Card["style: #{sheetname}"].update_attributes! :codename=>nil, :content=>File.read("#{dir}/#{sheetname}.scss")
     end

data/db/{migrate_cards → migrate_core_cards}/20130920214038_jsonize_tinymce.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class JsonizeTinymce < Wagn::Migration
+class JsonizeTinymce < Wagn::CoreMigration
   def up
     card = Card[:tiny_mce]
     cleaned_rows = card.content.strip.split( /\s*\,\s+/ ).map do |row|

data/db/{migrate_cards → migrate_core_cards}/20130920291703_update_stylesheets.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-class UpdateStylesheets < Wagn::Migration
+class UpdateStylesheets < Wagn::CoreMigration
   def up
-    dir = "#{Wagn.gem_root}/db/migrate_cards/data/1.12_stylesheets"
+    dir = File.join data_path, '1.12_stylesheets'
     %w{ common traditional }.each do |sheetname|
       card = Card["style: #{sheetname}"]
       if card && card.pristine?

data/db/{migrate_cards → migrate_core_cards}/20130927191728_account_events.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class AccountEvents < Wagn::Migration
+class AccountEvents < Wagn::CoreMigration
   def up
     aa = Card.fetch "#{ Card[ :signup ].name }+#{ Card[ :type ].name}+#{ Card[:accountable ].name}", :new=>{}
     aa.content = "1"

data/db/{migrate_cards → migrate_core_cards}/20131016172445_common_css_patch.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-class CommonCssPatch < Wagn::Migration
+class CommonCssPatch < Wagn::CoreMigration
   def up
-    dir = "#{Wagn.gem_root}/db/migrate_cards/data/1.12_stylesheets"
+    dir = File.join data_path, "1.12_stylesheets"
     card = Card["style: common"]
     if card && card.pristine?
       card.update_attributes! :content=>File.read("#{dir}/common.scss")

data/db/{migrate_cards → migrate_core_cards}/20140110193325_reset_account_request_type.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class ResetAccountRequestType < Wagn::Migration
+class ResetAccountRequestType < Wagn::CoreMigration
   def up
     arcard = Card[:signup]
     if arcard.type_code != :cardtype

data/db/{migrate_cards → migrate_core_cards}/20140307231621_user_data_to_cards.rb

@@ -3,7 +3,7 @@
 class User < ActiveRecord::Base
 end
 
-class UserDataToCards < Wagn::Migration
+class UserDataToCards < Wagn::CoreMigration
   
   def up
       

data/db/{migrate_cards → migrate_core_cards}/20140317035504_account_requests_to_signups.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class AccountRequestsToSignups < Wagn::Migration
+class AccountRequestsToSignups < Wagn::CoreMigration
   def up
 
     newname = 'Sign up'

data/db/{migrate_cards → migrate_core_cards}/20140512155840_add_script_cards.rb

@@ -20,7 +20,7 @@ class Card
   end
 end
 
-class AddScriptCards < Wagn::Migration
+class AddScriptCards < Wagn::CoreMigration
   def up    
     # JavaScript and CoffeeScript types
     card = Card.fetch "CoffeeScript", :new => {}

data/db/{migrate_cards → migrate_core_cards}/20140629222005_add_email_cards.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-class AddEmailCards < Wagn::Migration
+class AddEmailCards < Wagn::CoreMigration
   def up
     
     # change notification rules
@@ -38,7 +38,7 @@ class AddEmailCards < Wagn::Migration
 {{+*subject | titled}}
 {{+*html message | titled}}
 {{+*text message | titled}}
-{+*attach | titled}}
+{{+*attach | titled}}
 )
     
     c = Card.fetch '*message', :new=>{ }
@@ -54,8 +54,8 @@ class AddEmailCards < Wagn::Migration
     
     
     # create system email cards
-    dir = "#{Wagn.gem_root}/db/migrate_cards/data/mailer"
-    json = File.read( File.join( dir, 'mail_config.json' ))
+    dir = File.join data_path, 'mailer'
+    json = File.read( File.join( dir, 'mail_config.json' ) )
     data = JSON.parse(json)
     data.each do |mail|
       mail = mail.symbolize_keys!
@@ -124,7 +124,7 @@ class AddEmailCards < Wagn::Migration
     # 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}+*on create", :content=>send_rule.content, :type_code=>:pointer
+      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
   

data/db/migrate_core_cards/20140725180118_config_card_updates.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+class ConfigCardUpdates < Wagn::CoreMigration
+  def up
+    raw_json = File.read( data_path '1.13_config_text.json' )
+    json = JSON.parse raw_json
+    Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json"
+  end
+end

data/db/migrate_core_cards/20141111083921_delete_machine_output.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+class DeleteMachineOutput < Wagn::CoreMigration
+  def up
+    Card.search( :right => { :codename => 'machine_output' } ).each do |card|
+      card.delete!
+    end      
+  end
+end

data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+
+class ConfigDescriptionsEtc < Wagn::CoreMigration
+  def up
+    raw_json = File.read( data_path '1.14_config_descriptions_etc.json' )
+    json = JSON.parse raw_json
+    Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json"
+    
+    # fix missing +*from card
+    c = Card.fetch "follower notification email+#{Card[:from].name}", :new=>{}
+    c.content = Card[:wagn_bot].name
+    c.save!
+  end
+end

data/db/{migrate_cards → migrate_core_cards}/data/1.13_config_text.json

@@ -14,7 +14,7 @@
       {
         "name": "Sign up+description",
         "type": "Basic",
-        "content": "<p>[[Sign up]] cards represent not-yet-approved accounts.  When approved, they become [[User]] cards.  [[http://wagn.org/account|more]]</p>"
+        "content": "<p>[[Sign up]] cards represent not-yet-approved accounts. When approved, they become [[User]] cards.  [[http://wagn.org/account|more]]</p>"
       },
       {
         "name": "Config",

data/db/migrate_core_cards/data/1.14_config_descriptions_etc.json

@@ -0,0 +1,77 @@
+{
+  "url": "http://en.dwagn.org/export.json",
+  "timestamp": "2014-11-15 03:44:05 +0000",
+  "card": {
+    "name": "export",
+    "type": "Pointer",
+    "content": "[[Config]]\n[[*account]]\n[[Skin+description]]\n[[Sign up+description]]\n[[Toggle+description]]\n[[User+description]]\n[[Email_template+*type+*structure]]\n[[JavaScript+description]]\n[[CSS+description]]\n[[CoffeeScript+description]]\n[[Layout+description]]\n[[Email template+description]]\n[[SCSS+description]]",
+    "value": [
+      {
+        "name": "Config",
+        "type": "Basic",
+        "content": "<h1>Basics</h1>\r\n<div>Set your site title, home card, and logo image:</div>\r\n<blockquote>\r\n<div>{{*title|closed;type:Phrase}}</div>\r\n<div>{{*home|closed;type:Phrase}}</div>\r\n<div>{{*logo|closed;type:Image}}</div>\r\n</blockquote>\r\n<div> </div>\r\n<h1>Rules</h1>\r\n<div>Cards are configured by creating <em>rules</em>.  All rules impacting a given card can be accessed from its card menu via \"advanced\".</div>\r\n<div> </div>\r\n<div>Here are the site-wide defaults:</div>\r\n<div>\r\n<blockquote>{{*all|closed}}</blockquote>\r\n</div>\r\n<div><em>[[http://wagn.org/rules | More about rules.]]</em></div>\r\n<div> </div>\r\n<h1>Accounts</h1>\r\n<div>{{*accounts}}</div>\r\n<div> </div>\r\n<h1>Emails </h1>\r\n<div>Here are the current [[Email Templates]] for your site.</div>\r\n<blockquote>\r\n<div>{{Email Templates+*type+by update}} </div>\r\n</blockquote>"
+      },
+      {
+        "name": "*account",
+        "type": "Basic",
+        "content": "<div>When someone signs up, they create a [[Sign up]] card...</div>\r\n<blockquote>\r\n<div>{{Sign up|closed;title: Sign ups}}</div>\r\n</blockquote>\r\n<div>...that can be changed into a [[User]] card:</div>\r\n<blockquote>\r\n<div>{{User|closed}}</div>\r\n</blockquote>\r\n<div>Some important [[http://wagn.org/permissions|permissions]]:</div>\r\n<div>\r\n<ul>\r\n<li>When [[Anyone]] can [[*create|create]] a [[Sign up]] card, links to sign up will appear.</li>\r\n<li>When [[Anyone]] can [[*create|create]] a [[User]] card, each [[Sign up]] can be auto-approved with a verification email.</li>\r\n<li>If permission to [[*create|create]] a [[User]] is restricted, someone with that permission must approve each [[Sign up]] by hand.</li>\r\n</ul>\r\n</div>\r\n<div><em>[[http://wagn.org/account | More about accounts.]]</em></div>",
+        "codename": "account"
+      },
+      {
+        "name": "Skin+description",
+        "type": "Basic",
+        "content": "<p>A [[skin]] determines a page's look and feel.  [[http://wagn.org/Skins|more]]</p>"
+      },
+      {
+        "name": "Sign up+description",
+        "type": "Basic",
+        "content": "<p>[[Sign up]] cards represent not-yet-approved accounts. When approved, they become [[User]] cards. [[http://wagn.org/account|more]]</p>"
+      },
+      {
+        "name": "Toggle+description",
+        "type": "Basic",
+        "content": "<p>Toggles simply indicate yes or no. [[http://wagn.org/wagn/Toggle|more]].</p>"
+      },
+      {
+        "name": "User+description",
+        "type": "Basic",
+        "content": "<p>{{_l|name}} cards can support accounts, profile pages, and more. [[http://wagn.org/Users|more]]</p>"
+      },
+      {
+        "name": "Email template+*type+*structure",
+        "type": "Basic",
+        "content": "<p>{{+*from | labeled | link}} {{+*to | labeled | link}} {{+*cc | labeled | link}} {{+*bcc | labeled | link}} {{+*subject | titled}} {{+*html message | titled}} {{+*text message | titled}} {{+*attach | titled}}</p>"
+      },
+      {
+        "name": "JavaScript+description",
+        "type": "Basic",
+        "content": "<p>Create custom JavaScript for [[*script]] rules. [[http://wagn.org/JavaScript|more]]</p>"
+      },
+      {
+        "name": "CSS+description",
+        "type": "Basic",
+        "content": "<p>Customize styles for [[Skins]]. [[http://wagn.org/CSS|more]]</p>"
+      },
+      {
+        "name": "CoffeeScript+description",
+        "type": "Basic",
+        "content": "<p>Generate JavaScript for [[*script]] rules. [[http://wagn.org/CoffeeScript|more]]</p>"
+      },
+      {
+        "name": "Layout+description",
+        "type": "Basic",
+        "content": "<p>Organize webpages. [[http://wagn.org/Layout|more]]</p>"
+      },
+      {
+        "name": "Email template+description",
+        "type": "Basic",
+        "content": "<p>Design custom emails to be triggered by card actions.  [[http://wagn.org/actions|more]]</p>"
+      },
+      {
+        "name": "SCSS+description",
+        "type": "Basic",
+        "content": "<p>Customize styles for [[Skins]]. [[http://wagn.org/SCSS|more]]</p>"
+      }
+    ]
+  }
+}

data/db/{migrate_cards → migrate_core_cards}/data/mailer/follower_notification_email.html

@@ -6,4 +6,4 @@
 
 <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>
+<p><em><a href="{{_|unfollow_url}}">Unfollow</a> to stop receiving these emails.</em></p>

data/db/schema.rb

@@ -96,6 +96,12 @@ ActiveRecord::Schema.define(:version => 20141001105348) do
 
   add_index "schema_migrations_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
+  end
+
+  add_index "schema_migrations_deck_cards", ["version"], :name => "unique_schema_migrations_deck_cards", :unique => true
+
   create_table "sessions", :force => true do |t|
     t.string   "session_id"
     t.text     "data"

data/features/conflict.feature

@@ -28,11 +28,11 @@ Feature: Conflict
     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 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.
+    Then I should see "Conflict!"
+    And I should see "No difference between your changes and Joe User's version."
 
 
 

data/features/watch.feature

@@ -41,7 +41,7 @@ Feature: Watch interface
     Given Joe User is watching "User"
     And I go to card Joe User
     And I hover over the main menu
-    Then In the main card menu I should see "(following)"
+    Then In the main card menu I should see "(following)|unfollow"
 
 #too long for menu
 #

data/lib/card/act.rb

@@ -35,7 +35,7 @@ class Card
  #    end
     
     def action_on card_id
-      actions.find_by_card_id(card_id)
+      actions.where( :card_id=>card.id, :draft=>[nil, 0] ).first
     end
         
     def elapsed_time

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

@@ -21,6 +21,7 @@ class CardMigrationGenerator < ActiveRecord::Generators::Base
 
   def set_local_assigns!
     @migration_template = "card_migration.erb"
+    @migration_parent_class = options['core'] ? 'Wagn::CoreMigration' : 'Wagn::Migration'
     case file_name
     when /^(import)_(.*)(?:\.json)?/
       @migration_action = $1

data/lib/card/generators/card_migration/templates/card_migration.erb

@@ -1,9 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-class <%= migration_class_name %> < Wagn::Migration
+class <%= migration_class_name %> < <%= @migration_parent_class %>
   def up
-    <% if @migration_action == 'import' -%>
-      import_json "<%= @json_filename %>"
-    <% end -%>
+<% if @migration_action == 'import' -%>
+    import_json "<%= @json_filename %>"
+<% end -%>
+    
   end
 end

data/lib/wagn/application.rb

@@ -92,7 +92,7 @@ module Wagn
         add_gem_path paths, "config/routes",       :with => "config/routes.rb"
         add_gem_path paths, "db"
         add_gem_path paths, "db/migrate"
-        add_gem_path paths, "db/migrate_cards"
+        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'

data/lib/wagn/commands.rb

@@ -52,7 +52,7 @@ else
     parser = OptionParser.new do |parser|
       parser.banner = "Usage: wagn seed [options]\n\nCreate and seed the production database specified in config/database.yml\n\n"
       parser.on('--production','-p', 'seed production database (default)') do
-        envs = ['test']
+        envs = ['production']
       end
       parser.on('--test','-t', 'seed test database') do
         envs = ['test']

data/lib/wagn/core_migration.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+
+class Wagn::CoreMigration < Wagn::Migration
+  def migration_paths
+    Wagn::Migration.core_card_migration_paths
+  end
+  
+  def schema_mode
+    Wagn::Migration.schema_mode :card
+  end
+  
+  def import_json filename
+    Wagn.config.action_mailer.perform_deliveries = false
+    raw_json = File.read( data_path filename ) 
+    json = JSON.parse raw_json
+    Card.merge_list json["card"]["value"], :output_file=>File.join(data_path,"unmerged_#{ filename }")
+    #fixme - output file should not be in gem!
+  end
+end