wagn 1.14.7 → 1.14.8

data/lib/wagn/migration.rb

@@ -1,34 +1,59 @@
 # -*- encoding : utf-8 -*-
 
 class Wagn::Migration < ActiveRecord::Migration
-  def self.find_unused_name base_name
-    test_name = base_name
-    add = 1
-    while Card.exists?(test_name) do
-      test_name = "#{base_name}#{add}"
-      add +=1
+  @type = :deck_cards
+
+  class << self
+    
+    # Rake tasks use class methods, migrations use instance methods.
+    # To avoid repetition a lot of instance methods here just call class methods.
+    # The subclass Wagn::CoreMigration needs a different @type so we can't use a
+    # class variable @@type. It has to be a class instance variable.
+    # Migrations are subclasses of Wagn::Migration or Wagn::CoreMigration but they
+    # don't inherit the @type. The method below solves this problem.
+    def type 
+      @type || (ancestors[1] && ancestors[1].type)
+    end
+    
+    def find_unused_name base_name
+      test_name = base_name
+      add = 1
+      while Card.exists?(test_name) do
+        test_name = "#{base_name}#{add}"
+        add +=1
+      end
+      test_name
     end
-    test_name
-  end
 
-  def self.paths type
-    Wagn.paths["db/migrate#{schema_suffix type}"].to_a
-  end
+    def paths mig_type=type
+      Wagn.paths["db/migrate#{schema_suffix mig_type}"].to_a
+    end
   
-  def self.schema_suffix type
-    Wagn::Version.schema_suffix type
-  end
+    def schema_suffix mig_type=type
+      Wagn::Version.schema_suffix( mig_type )
+    end
   
-  def self.schema_mode type
-    new_suffix = Wagn::Migration.schema_suffix type
-    original_suffix = ActiveRecord::Base.table_name_suffix
+    def schema_mode mig_type=type
+      new_suffix = schema_suffix mig_type
+      original_suffix = ActiveRecord::Base.table_name_suffix
+    
+      ActiveRecord::Base.table_name_suffix = new_suffix
+      yield
+      ActiveRecord::Base.table_name_suffix = original_suffix
+    end
     
-    ActiveRecord::Base.table_name_suffix = new_suffix
-    yield
-    ActiveRecord::Base.table_name_suffix = original_suffix
-  end
-  
   
+    def data_path filename=nil
+      if filename
+        self.paths.each do |path|
+          path_to_file = File.join path, 'data', filename
+          return path_to_file if File.exists? path_to_file
+        end
+      else
+        File.join self.paths.first, 'data'
+      end
+    end
+  end
   
   def contentedly &block
     Wagn::Cache.reset_global
@@ -56,6 +81,7 @@ class Wagn::Migration < ActiveRecord::Migration
     end
   end
   
+
   def import_json filename
     Wagn.config.action_mailer.perform_deliveries = false
     raw_json = File.read( data_path filename ) 
@@ -63,13 +89,16 @@ class Wagn::Migration < ActiveRecord::Migration
     Card.merge_list json["card"]["value"], :output_file=>File.join(data_path,"unmerged_#{ filename }")
   end
   
+  def data_path filename=nil
+    self.class.data_path filename
+  end
     
   def schema_mode
-    Wagn::Migration.schema_mode :deck_cards
+    self.class.schema_mode 
   end
   
   def migration_paths
-    Wagn::Migration.paths :deck_cards
+    self.class.paths
   end
   
   

data/lib/wagn/tasks/wagn.rake

@@ -1,6 +1,14 @@
 
 WAGN_BOOTSTRAP_TABLES = %w{ cards card_actions card_acts card_changes card_references }
 
+def prepare_migration
+  Wagn::Cache.reset_global
+  Wagn.config.action_mailer.perform_deliveries = false
+  Card.reset_column_information
+  Card::Reference.reset_column_information  # this is needed in production mode to insure core db 
+                                            # structures are loaded before schema_mode is set
+end
+
 namespace :wagn do
   desc "create a wagn database from scratch"
   task :create do
@@ -93,8 +101,8 @@ namespace :wagn do
 
   desc 'insert existing card migrations into schema_migrations_cards to avoid re-migrating'
   task :assume_card_migrations do
-    Wagn::Migration.schema_mode :core_cards do
-      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:core_cards), Wagn::Migration.paths( :core_cards )
+    Wagn::CoreMigration.schema_mode  do
+      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:core_cards), Wagn::CoreMigration.paths
     end
   end
 
@@ -107,18 +115,11 @@ namespace :wagn do
     
     desc "migrate core cards"
     task :core_cards => :environment do
-      Wagn::Cache.reset_global
       ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
-      Wagn.config.action_mailer.perform_deliveries = false
-      Card.reset_column_information
-      Card::Reference.reset_column_information
-      
-       # this is needed in production mode to insure core db structures are loaded before schema_mode is set
-      
+      prepare_migration
+      paths = ActiveRecord::Migrator.migrations_paths = Wagn::CoreMigration.paths
     
-      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.paths(:core_cards)
-    
-      Wagn::Migration.schema_mode :core_cards do
+      Wagn::CoreMigration.schema_mode do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end
@@ -126,15 +127,11 @@ namespace :wagn do
     
     desc "migrate deck cards"
     task :deck_cards => :environment do
-      Wagn::Cache.reset_global
       ENV['SCHEMA'] ||= "#{Rails.root}/db/schema.rb"
-      Wagn.config.action_mailer.perform_deliveries = false
-      Card.reset_column_information # this is needed in production mode to insure core db structures are loaded before schema_mode is set
-      Card::Reference.reset_column_information
+      prepare_migration
+      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.paths
     
-      paths = ActiveRecord::Migrator.migrations_paths = Wagn::Migration.paths(:deck_cards)
-    
-      Wagn::Migration.schema_mode :deck_cards do
+      Wagn::Migration.schema_mode do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       end
@@ -146,6 +143,7 @@ namespace :wagn do
       Wagn.config.action_mailer.perform_deliveries = false
       
       stamp_file = Wagn::Version.schema_stamp_path( args[:type] )
+      
       Wagn::Migration.schema_mode args[:type] do
         version = ActiveRecord::Migrator.current_version
         if version.to_i > 0 and file = open(stamp_file, 'w')

data/mod/01_core/set/all/collection.rb

@@ -2,7 +2,7 @@
 module ClassMethods
   def search spec
     query = ::Card::Query.new(spec)
-    Wagn.with_logging :search, spec, :details=>query.sql.strip do
+    Wagn.with_logging :search, :message=>spec, :details=>query.sql.strip do
       results = query.run
       if block_given? and Array===results
         results.each { |result| yield result }

data/mod/01_core/set/all/content.rb

@@ -19,8 +19,11 @@ def raw_content
   structure ? template.db_content : db_content
 end
 
-def chunk_list #override to customize by set
-  :default
+
+format do
+  def chunk_list #override to customize by set
+    :default
+  end
 end
 
 def last_change_on(field, opts={})

data/mod/01_core/set/all/fetch.rb

@@ -19,49 +19,49 @@ module ClassMethods
   #     :new => {  card opts }      Return a new card when not found
   #
   
+
+  
   
   def fetch mark, opts={}
-    Wagn.with_logging(:fetch, mark, :details=>opts) do
-      if String === mark
-        case mark
-        when /^\~(\d+)$/ # get by id
-          mark = $1.to_i 
-        when /^\:(\w+)$/ # get by codename
-          mark = $1.to_sym
-        end
+    if String === mark
+      case mark
+      when /^\~(\d+)$/ # get by id
+        mark = $1.to_i 
+      when /^\:(\w+)$/ # get by codename
+        mark = $1.to_sym
       end
-      mark = Card::Codename[mark] if Symbol === mark # id from codename
+    end
+    mark = Card::Codename[mark] if Symbol === mark # id from codename
 
-      if mark.present?
-        card, mark, needs_caching = fetch_from_cache_or_db mark, opts # have existing
-      else
-        return unless opts[:new]
-      end
+    if mark.present?
+      card, mark, needs_caching = fetch_from_cache_or_db mark, opts # have existing
+    else
+      return unless opts[:new]
+    end
 
-      if Integer===mark
-        return if card.nil? || mark.nil?
+    if Integer===mark
+      return if card.nil? || mark.nil?
+    else
+      return card.renew(opts) if card and card.eager_renew?(opts)
+      if !card or card.type_id==-1 && clean_cache_opts?(opts)       # new (or improved) card for cache
+        needs_caching = true  
+        card = new_for_cache mark, opts
+      end  
+    end
+  
+    write_to_cache card if Card.cache && needs_caching
+  
+    if card.new_card?
+      if opts[:new]
+        return card.renew(opts) if !clean_cache_opts? opts
       else
-        return card.renew(opts) if card and card.eager_renew?(opts)
-        if !card or card.type_id==-1 && clean_cache_opts?(opts)       # new (or improved) card for cache
-          needs_caching = true  
-          card = new_for_cache mark, opts
-        end  
-      end
-    
-      write_to_cache card if Card.cache && needs_caching
-    
-      if card.new_card?
-        if opts[:new]
-          return card.renew(opts) if !clean_cache_opts? opts
-        else
-          return unless !opts[:skip_virtual] && card.virtual?
-        end
-        card.name = mark.to_s if mark && mark.to_s != card.name
+        return unless !opts[:skip_virtual] && card.virtual?
       end
-
-      card.include_set_modules unless opts[:skip_modules]
-      card
+      card.name = mark.to_s if mark && mark.to_s != card.name
     end
+
+    card.include_set_modules unless opts[:skip_modules]
+    card
   end
   
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?

data/mod/01_core/set/all/trash.rb

@@ -31,9 +31,9 @@ event :validate_delete, :before=>:approve, :on=>:delete do
     errors.add :delete, "#{name} is an indestructible rule"
   end
   
-  # if account && Card::Revision.find_by_creator_id( self.id )  #ask ethan
-  #   errors.add :delete, "Edits have been made with #{name}'s user account.\n  Deleting this card would mess up our revision records."
-  # end
+  if account && Card::Act.find_by_actor_id( self.id )
+    errors.add :delete, "Edits have been made with #{name}'s user account.\nDeleting this card would mess up our history."
+  end
 end
 
 event :validate_delete_children, :after=>:approve, :on=>:delete do

data/mod/01_core/set/all/type.rb

@@ -6,7 +6,8 @@ module ClassMethods
 end
 
 def type_card
-  Card[ type_id.to_i ]
+  return if type_id.nil?
+  Card.fetch type_id.to_i, :skip_modules=>true
 end
 
 def type_code
@@ -14,9 +15,11 @@ def type_code
 end
 
 def type_name
-  return if type_id.nil?
-  type_card = Card.fetch type_id.to_i, :skip_modules=>true, :skip_virtual=>true
-  type_card and type_card.name
+  type_card.try :name
+end
+
+def type_cardname
+  type_card.try :cardname
 end
 
 def type= type_name

data/mod/01_core/spec/set/all/tracked_attributes_spec.rb

@@ -9,7 +9,7 @@ module RenameMethods
       #:revisions   => card.actions.count,
       :referencers => card.referencers.map(&:name).sort,
       :referees => card.referees.map(&:name).sort,
-      :dependents  => card.dependents.map(&:id)
+      :dependents  => card.dependents.map(&:id).sort
     }
   end
 

data/mod/01_core/spec/set/all/trash_spec.rb

@@ -11,5 +11,24 @@ describe Card::Set::All::Trash do
       expect(Card[name]).to be
     end
   end
+  
+  it 'does not delete account with edits' do
+    Card::Auth.as_bot do
+      name = 'Joe User'
+      card = Card[name]
+      card.delete
+      expect(card.errors[:delete].first).to match("Edits have been made with #{name}'s user account")
+      expect(Card[name]).to be
+    end
+  end
+  
+  it 'deletes account without edits' do
+    Card::Auth.as_bot do
+      name = 'born to die'
+      card = Card.create! :name=>name, :type_code=>:user
+      card.delete
+      expect(Card[name]).not_to be
+    end
+  end
 
 end

data/mod/02_basic_types/spec/set/type/pointer_spec.rb

@@ -48,25 +48,35 @@ describe Card::Set::Type::Pointer do
    
   describe "html" do
     before do
-      Card::Auth.as_bot
-      @card_name = "nonexistingcardmustnotexistthisistherule"
-      @pointer = Card.create :name=>"tp", :type=>"pointer", :content=>"[[#{@card_name}]]"
+      Card::Auth.as_bot do
+        @card_name = "nonexistingcardmustnotexistthisistherule"
+        @pointer = Card.create :name=>"tp", :type=>"pointer", :content=>"[[#{@card_name}]]"
+        # similar tests for an inherited type of Pointer
+        @my_list = Card.create! :name=>'MyList', :type_id=>Card::CardtypeID
+        Card.create :name=>'MyList+*type+*default', :type_id=>Card::PointerID
+        @inherit_pointer = Card.create :name=>'ip', :type_id=>@my_list.id, :content=>"[[#{@card_name}]]"
+      end
     end
     it "should include nonexistingcardmustnotexistthisistherule in radio options" do
       option_html ="<input checked=\"checked\" class=\"pointer-radio-button\" id=\"pointer-radio-nonexistingcardmustnotexistthisistherule\" name=\"pointer_radio_button-tp\" type=\"radio\" value=\"nonexistingcardmustnotexistthisistherule\" />"
       @pointer.format.render_radio.should include(option_html)
+      option_html ="<input checked=\"checked\" class=\"pointer-radio-button\" id=\"pointer-radio-nonexistingcardmustnotexistthisistherule\" name=\"pointer_radio_button-ip\" type=\"radio\" value=\"nonexistingcardmustnotexistthisistherule\" />"
+      @inherit_pointer.format.render_radio.should include(option_html)
     end
     it "should include nonexistingcardmustnotexistthisistherule in checkbox options" do
       option_html = "<input checked=\"checked\" class=\"pointer-checkbox-button\" id=\"pointer-checkbox-nonexistingcardmustnotexistthisistherule\" name=\"pointer_checkbox\" type=\"checkbox\" value=\"nonexistingcardmustnotexistthisistherule\" />"
       @pointer.format.render_checkbox.should include(option_html)
+      @inherit_pointer.format.render_checkbox.should include(option_html)
     end
     it "should include nonexistingcardmustnotexistthisistherule in select options" do
       option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
       @pointer.format.render_select.should include(option_html)
+      @inherit_pointer.format.render_select.should include(option_html)
     end
     it "should include nonexistingcardmustnotexistthisistherule in multiselect options" do
       option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
       @pointer.format.render_multiselect.should include(option_html)
+      @inherit_pointer.format.render_multiselect.should include(option_html)
     end
   end
   describe "css" do

data/mod/03_machines/set/type/coffee_script.rb

@@ -21,9 +21,11 @@ def clean_html?
   false
 end
 
-def chunk_list  #turn off autodetection of uri's 
-                #TODO with the new format pattern this should be handled in the js format
-  :inclusion_only
+
+format do
+  def chunk_list  #turn off autodetection of uri's 
+    :inclusion_only
+  end
 end
 
 

data/mod/03_machines/set/type/css.rb

@@ -21,8 +21,10 @@ def clean_html?
   false
 end
 
-def chunk_list  #turn off autodetection of uri's 
-  :inclusion_and_link
+format do 
+  def chunk_list  #turn off autodetection of uri's 
+    :references
+  end
 end
 
 

data/mod/03_machines/set/type/java_script.rb

@@ -15,13 +15,14 @@ def clean_html?
   false
 end
 
-def chunk_list  #turn off autodetection of uri's 
-                #TODO with the new format pattern this should be handled in the js format
-  :inclusion_only
+
+format do
+  def chunk_list  #turn off autodetection of uri's 
+    :inclusion_only
+  end
 end
 
 format :html do
-
   view :editor, :mod=>PlainText::HtmlFormat
   view :content_changes, :mod=>CoffeeScript::HtmlFormat