wagn 1.14.1 → 1.14.2

data/lib/wagn/tasks/wagn.rake

@@ -93,7 +93,7 @@ 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)
+      ActiveRecord::Schema.assume_migrated_upto_version Wagn::Version.schema(:core_cards), Wagn::Migration.paths( :core_cards )
     end
   end
 

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

@@ -1,11 +1,14 @@
 
 module ClassMethods
   def search spec
-    results = ::Card::Query.new(spec).run
-    if block_given? and Array===results
-      results.each { |result| yield result }
+    query = ::Card::Query.new(spec)
+    Wagn.with_logging nil, :search, spec, query.sql.strip do
+      results = query.run
+      if block_given? and Array===results
+        results.each { |result| yield result }
+      end
+      results
     end
-    results
   end
 
   def count_by_wql(spec)
@@ -28,7 +31,7 @@ def item_type
 end
 
 def include_item? cardname
-  ::Set.new(item_names.map{|name| name.to_name.key}).member? cardname.to_name.key
+  item_names.map{|name| name.to_name.key}.member? cardname.to_name.key
 end
 
 def extended_item_cards context = nil

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

@@ -24,7 +24,7 @@ def chunk_list #override to customize by set
 end
 
 def last_change_on(field, opts={})
-  where_sql =  'card_actions.card_id = :card_id AND field = :field AND (draft = 0 OR draft IS NULL)'
+  where_sql =  'card_actions.card_id = :card_id AND field = :field AND (draft is false OR draft IS NULL)'
   where_sql += if opts[:before]
     'AND card_action_id < :action_id'      
   elsif opts[:not_after]

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

@@ -21,45 +21,47 @@ module ClassMethods
   
   
   def fetch mark, opts={}
-    if String === mark
-      case mark
-      when /^\~(\d+)$/ # get by id
-        mark = $1.to_i 
-      when /^\:(\w+)$/ # get by codename
-        mark = $1.to_sym
+    Wagn.with_logging nil, :fetch, mark, 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
       end
-    end
-    mark = Card::Codename[mark] if Symbol === mark # id from codename
+      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?
-    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
+      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
+      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?
+      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
       end
-      card.name = mark.to_s if mark && mark.to_s != card.name
-    end
 
-    card.include_set_modules unless opts[:skip_modules]
-    card
+      card.include_set_modules unless opts[:skip_modules]
+      card
+    end
   end
   
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?

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

@@ -77,9 +77,9 @@ event :notify_followers, :after=>:extend, :when=>proc{ |c|
       end
     end
   rescue =>e  #this error handling should apply to all extend callback exceptions
-    Airbrake.notify e if Airbrake.configuration.api_key
     Rails.logger.info "\nController exception: #{e.message}"
-    Rails.logger.debug "BT: #{e.backtrace*"\n"}"
+    Card::Error.current = e
+    notable_exception_raised
   end
 end
   

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

@@ -116,6 +116,11 @@ def rescue_event e
 #  false
 end
 
+event :notable_exception_raised do
+  Rails.logger.debug "BT:  #{Card::Error.current.backtrace*"\n  "}"
+end
+
+
 def event_applies? opts
   if opts[:on]
     return false unless Array.wrap( opts[:on] ).member? @action

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

@@ -27,7 +27,7 @@ event :validate_delete, :before=>:approve, :on=>:delete do
   end
   
   undeletable_all_rules_tags = %w{ default style layout create read update delete }
-  if junction? and left.codename == 'all' and undeletable_all_rules_tags.member? right.codename
+  if junction? and l=left and l.codename == 'all' and undeletable_all_rules_tags.member? right.codename
     errors.add :delete, "#{name} is an indestructible rule"
   end
   

data/mod/02_basic_types/set/type/pointer.rb

@@ -114,6 +114,7 @@ format :html do
     select_tag("pointer_select", options_for_select(options, card.item_names.first), :class=>'pointer-select')
   end
 
+
   def pointer_option_description option
     pod_name = card.rule(:options_label) || 'description'
     dcard = Card[ "#{option.name}+#{pod_name}" ]
@@ -173,6 +174,9 @@ event :standardize_items, :before=>:approve, :on=>:save do
   end
 end
 
+def diff_args 
+  {:format => :pointer}
+end
 
 def item_cards args={}
   if args[:complete]

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

@@ -29,6 +29,12 @@ end
 
 format :html do
   view :editor, :mod=>PlainText::HtmlFormat
+
+  view :content_changes do |args|
+    %{
+      <pre>#{super(args)}</pre>
+    }
+  end
   
   view :core do |args|
     js = card.compile_coffee _render_raw
@@ -43,4 +49,8 @@ format do
   view :core do |args|
     process_content card.compile_coffee(_render_raw)
   end
+end
+
+def diff_args
+   {:format=>:text}
 end

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

@@ -25,6 +25,7 @@ def chunk_list  #turn off autodetection of uri's
   :inclusion_and_link
 end
 
+
 format :html do
   view :editor, :mod=>PlainText::HtmlFormat
   
@@ -33,4 +34,12 @@ format :html do
     # problems with including other css?
     process_content ::CodeRay.scan( _render_raw, :css ).div, :size=>:icon
   end
+  
+  view :content_changes, :mod=>CoffeeScript::HtmlFormat
+
+  
+end
+
+def diff_args
+   {:format=>:text}
 end

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

@@ -23,6 +23,7 @@ end
 format :html do
 
   view :editor, :mod=>PlainText::HtmlFormat
+  view :content_changes, :mod=>CoffeeScript::HtmlFormat
   
   view :core do |args|
     highlighted_js = ::CodeRay.scan( _render_raw, :js ).div
@@ -30,3 +31,7 @@ format :html do
   end
   
 end
+
+def diff_args
+   {:format=>:text}
+end

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

@@ -3,9 +3,13 @@ include Card::Set::Type::Css
 format :html do
   view :core, :mod=>Css::HtmlFormat
   view :editor, :mod=>PlainText::HtmlFormat
+  view :content_changes, :mod=>CoffeeScript::HtmlFormat
 end
   
-  
+def diff_args
+  {:format=>:text}
+end  
+
 format do
   view :core do |args|
     process_content compile_scss(_render_raw)
@@ -15,7 +19,9 @@ format do
     Sass.compile scss, :style=>style
   rescue =>e
     e
-  end 
+  end
+  
+
 end
 
 

data/mod/05_standard/set/all/history.rb

@@ -248,7 +248,7 @@ format :html do
       if hide_diff 
         new_name
       else
-        Card::Diff::DiffBuilder.new(old_name,new_name).complete
+        Card::Diff.complete(old_name,new_name)
       end
     else
       old_name
@@ -260,6 +260,9 @@ format :html do
     "(#{change})"
   end
   
+
+
+  
   view :content_changes do |args|
     if args[:hide_diff]
       args[:action].new_values[:content]
@@ -292,3 +295,9 @@ format :html do
       :class=>'slotter', :remote=>true )
   end
 end
+
+def diff_args
+  {:format=>:text}
+end
+
+

data/mod/05_standard/set/type/html.rb

@@ -14,3 +14,7 @@ end
 def chunk_list
   :references
 end
+
+def diff_args
+ {:format=>:raw}
+end

data/mod/05_standard/spec/set/all/base_spec.rb

@@ -30,7 +30,9 @@ describe Card::Set::All::Base do
     describe 'array' do
       it "of search items" do
         Card.create! :name => "n+a", :type=>"Number", :content=>"10"
+        sleep 1
         Card.create! :name => "n+b", :type=>"Phrase", :content=>"say:\"what\""
+        sleep 1
         Card.create! :name => "n+c", :type=>"Number", :content=>"30"
         c = Card.new :name => 'nplusarray', :content => "{{n+*children+by create|array}}"
         expect(c.format._render( :core )).to eq(%{["10", "say:\\"what\\"", "30"]})

data/mod/05_standard/spec/set/all/history_spec.rb

@@ -8,6 +8,18 @@ describe Card::Set::All::History do
       history = render_card :history, :name=>"A"
       assert_view_select history, 'div[class~="card-frame"]'
     end
+    
+    
+    describe '#action_summary' do
+      subject do 
+        first = Card.fetch('First')
+        first.format.render_action_summary
+      end
+      it 'should have a summary' do
+        assert_view_select subject, 'del[class="diffdel diff-red"]', :text=>'chicken' 
+        assert_view_select subject, 'ins[class="diffins diff-green"]', :text=>'chick'         
+      end
+    end
   end
   
   

data/mod/06_email/set/all/email_html.rb

@@ -3,7 +3,3 @@ format :email_html do
   view :closed_missing do |args| '' end
 end
 
-
-def clean_html?
-  false
-end

data/mod/06_email/set/type/email_template.rb

@@ -3,8 +3,12 @@ def clean_html?
 end
 
 def deliver args={}
-  mail = format.render_mail(args)
-  mail.deliver 
+  begin
+    mail = format.render_mail(args)
+    mail.deliver 
+  rescue Net::SMTPError => exception
+    errors.add :exception, exception.message 
+  end
 end
 
 def process_email_field field, args

data/spec/lib/card/diff_spec.rb

@@ -1,110 +1,210 @@
 # -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
-# require 'card/diff'
-# require 'diff'
-#
-# describe Card::Diff do
-#   include Card::Diff
-#
-#   before do
-#     @builder = Card::Diff::DiffBuilder.new 'old', 'new'
-#   end
-#
-#   it 'should start of tag' do
-#     assert @builder.start_of_tag?('<')
-#     assert(!@builder.start_of_tag?('>'))
-#     assert(!@builder.start_of_tag?('a'))
-#   end
-#
-#   it 'should end of tag' do
-#     assert @builder.end_of_tag?('>')
-#     assert(!@builder.end_of_tag?('<'))
-#     assert(!@builder.end_of_tag?('a'))
-#   end
-#
-#   it 'should whitespace' do
-#     assert @builder.whitespace?(" ")
-#     assert @builder.whitespace?("\n")
-#     assert @builder.whitespace?("\r")
-#     assert(!@builder.whitespace?("a"))
-#   end
-#
-#   it 'should convert html to list of words simple' do
-#     assert_equal(
-#         ['the', ' ', 'original', ' ', 'text'],
-#         @builder.convert_html_to_list_of_words('the original text'))
-#   end
-#
-#   it 'should convert html to list of words should separate endlines' do
-#     assert_equal(
-#         ['a', "\n", 'b', "\r", 'c'],
-#         @builder.convert_html_to_list_of_words("a\nb\rc"))
-#   end
-#
-#   it 'should convert html to list of words should not compress whitespace' do
-#     assert_equal(
-#         ['a', ' ', 'b', '  ', 'c', "\r \n ", 'd'],
-#         @builder.convert_html_to_list_of_words("a b  c\r \n d"))
-#   end
-#
-#   it 'should convert html to list of words should handle tags well' do
-#     assert_equal(
-#         ['<p>', 'foo', ' ', 'bar', '</p>'],
-#         @builder.convert_html_to_list_of_words("<p>foo bar</p>"))
-#   end
-#
-#   it 'should convert html to list of words interesting' do
-#     assert_equal(
-#         ['<p>', 'this', ' ', 'is', '</p>', "\r\n", '<p>', 'the', ' ', 'new', ' ', 'string',
-#          '</p>', "\r\n", '<p>', 'around', ' ', 'the', ' ', 'world', '</p>'],
-#         @builder.convert_html_to_list_of_words(
-#             "<p>this is</p>\r\n<p>the new string</p>\r\n<p>around the world</p>"))
-#   end
-#
-#   it 'should html diff simple' do
-#     a = 'this was the original string'
-#     b = 'this is the new string'
-#     assert_equal('this <del class="diffmod">was</del><ins class="diffmod">is</ins> the ' +
-#            '<del class="diffmod">original</del><ins class="diffmod">new</ins> string',
-#            diff(a, b))
-#   end
-#
-#   it 'should html diff with multiple paragraphs' do
-#     a = "<p>this was the original string</p>"
-#     b = "<p>this is</p>\r\n<p> the new string</p>\r\n<p>around the world</p>"
-#
-#     # Some of this expected result is accidental to implementation.
-#     # At least it's well-formed and more or less correct.
-#     assert_equal(
-#         "<p>this <del class=\"diffmod\">was</del><ins class=\"diffmod\">is</ins></p>"+
-#         "<ins class=\"diffmod\">\r\n</ins><p> the " +
-#         "<del class=\"diffmod\">original</del><ins class=\"diffmod\">new</ins>" +
-#         " string</p><ins class=\"diffins\">\r\n</ins>" +
-#         "<p><ins class=\"diffins\">around the world</ins></p>",
-#         diff(a, b))
-#   end
-#
-#   # FIXME this test fails (ticket #67, http://dev.instiki.org/ticket/67)
-#   it 'should html diff preserves endlines in pre' do
-#     a = "<pre>\na\nb\nc\n</pre>"
-#     b = "<pre>\n</pre>"
-#     assert_equal(
-#         "<pre>\n<del class=\"diffdel\">a\nb\nc\n</del></pre>",
-#         diff(a, b))
-#   end
-#
-#   it 'should html diff with tags' do
-#     a = ""
-#     b = "<div>foo</div>"
-#     assert_equal '<div><ins class="diffins">foo</ins></div>', diff(a, b)
-#   end
-#
-#   it 'should diff for tag change' do
-#     a = "<a>x</a>"
-#     b = "<b>x</b>"
-#     # FIXME sad, but true - this case produces an invalid XML. If handle this you can, strong your foo is.
-#     assert_equal '<a><b>x</a></b>', diff(a, b)
-#   end
-#
-# end
+require 'card/diff'
+
+describe Card::Diff do
+
+  def del text
+    "<del class='diffdel diff-red'>#{text}</del>"
+  end
+  def ins text
+    "<ins class='diffins diff-green'>#{text}</ins>"
+  end
+  def tag text
+    "&lt;#{text}&gt;"
+  end
+  def diff old_s, new_s, opts=@opts
+    Card::Diff.complete(old_s, new_s, opts)
+  end
+  
+  def summary old_s, new_s, opts=@opts
+    Card::Diff.summary(old_s, new_s, opts)
+  end
+  
+  
+  old_p = '<p>old</p>'
+  new_p = '<p>new</p>'
+  new_h = '<h1>new</h1>'
+  def p_diff
+    diff '<p>old</p>', '<p>new</p>'
+  end
+
+  describe 'traffic light' do
+    it 'is green for addition' do
+      a = "a"
+      b = "a b" 
+      db = Card::Diff::DiffBuilder.new(a,b)
+      expect(db.green?).to be_truthy
+      expect(db.red?).to be_falsey
+    end
+    it 'is red for deletion' do
+      a = "a"
+      b = "" 
+      db = Card::Diff::DiffBuilder.new(a,b)
+      expect(db.green?).to be_falsey
+      expect(db.red?).to be_truthy
+    end
+    it 'is green and red for change' do
+      a = "a"
+      b = "b" 
+      db = Card::Diff::DiffBuilder.new(a,b)
+      expect(db.green?).to be_truthy
+      expect(db.red?).to be_truthy
+    end
+    it 'is off for no change' do
+      a = "a"
+      b = "a" 
+      db = Card::Diff::DiffBuilder.new(a,b)
+      expect(db.green?).to be_falsey
+      expect(db.red?).to be_falsey
+    end
+  end
+  
+  
+  describe 'summary' do
+    before(:all) do
+      @opts = {:format=>:html}
+    end
+    
+    it 'omits unchanged text' do
+      a = "<p>this was the original string</p>"
+      b = "<p>this is the new string</p>" 
+      expect(summary a, b).to eq(
+        "...#{del 'was'}#{ins 'is'}...#{del 'original'}#{ins 'new'}..."
+      )
+    end
+    
+    it 'no ellipsis if changes fit exactly' do
+      a = "123"
+      b = "456" 
+      expect(summary a, b, :summary=>{:length=>6}).to eq(
+        "#{del '123'}#{ins '456'}"
+      )
+    end
+    
+    it 'green ellipsis if added text does not fit' do
+      a = "123"
+      b = "5678" 
+      expect(summary a, b, :summary=>{:length=>6}).to eq(
+        "#{del '123'}#{ins '...'}"
+      )
+    end
+    
+    it 'neutral ellipsis if complete change does not fit' do
+      a = "123 123"
+      b = "456 456" 
+      expect(summary a, b, :summary=>{:length=>9}).to eq(
+        "#{del '123'}#{ins '456'}..."
+      )
+    end
+    
+    it 'red ellipsis if deleted text partially fits' do
+      a = "123456"
+      b = "567" 
+      expect(summary a, b, :summary=>{:length=>4}).to eq(
+        "#{del '1...'}"
+      )
+    end
+    
+    it 'green ellipsis if added text partially fits' do
+      a = "1234"
+      b = "56789" 
+      expect(summary a, b, :summary=>{:length=>8}).to eq(
+        "#{del '1234'}#{ins '5...'}"
+      )
+    end
+    
+    it 'removes html tags' do
+      a = "<a>A</a>"
+      b = "<b>B</b>" 
+      expect(summary a, b, :format=>:html).to eq(
+        "#{del 'A'}#{ins 'B'}"
+      )
+    end
+    
+    it 'with html tags in raw format' do
+      a = "<a>1</a>"
+      b = "<b>1</b>" 
+      expect(summary a, b, :format=>:raw).to eq(
+        "#{del( tag 'a' )}#{ins(tag 'b')}...#{del( tag '/a' )}#{ins(tag '/b')}"
+      )
+    end
+    
+  end
+  
+  context "html format" do
+    before(:all) do
+      @opts = {:format=>:html}
+    end
+    
+    it "doesn't change a text without changes" do
+      text = "Hello World!\n How are you?"
+      expect(diff text, text).to eq(text)
+    end
+    it 'preserves html' do
+      expect(p_diff).to eq("<p>#{del 'old'}#{ins 'new'}</p>")
+    end
+    it 'ignores html changes' do
+      expect(diff old_p, new_h).to eq("<h1>#{del 'old'}#{ins 'new'}</h1>")
+    end
+    
+    it 'diff with multiple paragraphs' do
+      a = "<p>this was the original string</p>"
+      b = "<p>this is</p>\n<p> the new string</p>\n<p>around the world</p>" 
+
+      expect(diff a, b).to eq(
+          "<p>this #{del 'was'}#{ins 'is'}</p>"+
+          "\n<p> the " +
+          "#{del 'original'}#{ins 'new'}" +
+          " string</p>\n" +
+          "<p>#{ins 'around the world'}</p>"
+          )
+    end
+  end
+  
+  context "text format" do
+    before(:all) do
+      @opts = {:format=>:text}
+    end
+  
+    it 'removes html' do
+      expect(p_diff).to eq("#{del 'old'}#{ins 'new'}")
+    end
+    
+    it 'compares complete links' do
+      diff = Card::Diff.complete("[[A]]\n[[B]]", "[[A]]\n[[C]]", :format=>:html)
+      expect(diff).to eq( "[[A]]\n#{del '[[B]]'}#{ins '[[C]]'}")
+    end
+    
+    it 'compares complete inclusions' do
+      diff = Card::Diff.complete("{{A}}\n{{B}}", "{{A}}\n{{C}}", :format=>:html)
+      expect(diff).to eq( "{{A}}\n#{del '{{B}}'}#{ins '{{C}}'}")
+    end
+    
+  end
+  
+  context "raw format" do
+    before(:all) do
+      @opts = {:format=>:raw}
+    end
+  
+    it 'excapes html' do
+      expect(p_diff).to eq("#{tag 'p'}#{del 'old'}#{ins 'new'}#{tag '/p'}")
+    end
+    
+    it 'diff for tag change' do
+      expect(diff old_p, new_h).to eq( del("#{tag 'p'}old#{tag '/p'}") + ins("#{tag 'h1'}new#{tag '/h1'}") )
+    end    
+  end
+  
+  context 'pointer format' do
+    before(:all) do
+      @opts = {:format=>:pointer}
+    end
+    
+    it 'removes square brackets' do
+      expect(diff "[[Hello]]", "[[Hi]]").to eq( del('Hello') + ins('Hi') )
+    end 
+  end
+end