wagn 1.14.6 → 1.14.7

data/mod/03_machines/lib/stylesheets/jquery-ui-smoothness.css

@@ -1175,4 +1175,4 @@ body .ui-tooltip {
 	opacity: .3;
 	filter: Alpha(Opacity=30);
 	border-radius: 8px;
-}
+}

data/mod/03_machines/set/self/script_jquery_helper.rb

@@ -2,7 +2,8 @@
 view :raw do |args|
   # jquery.ui.all must be after jquery.mobile to override dialog weirdness *
   # jquery.ui.autocomplete must be after jquery.ui stuff 
-  js_files = %w( jquerymobile.js jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
+  # FIXME removed  jquerymobile.js. Doesn't work with the new jquery version
+  js_files = %w( jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
   js_files.map do |filename|
     File.read "#{Wagn.gem_root}/mod/03_machines/lib/javascript/#{filename}"
   end.join("\n")

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

@@ -57,7 +57,7 @@ end
 
 
 event :generate_token do
-  Digest::SHA1.hexdigest "--#{Time.now.to_s}--#{rand 10}--" 
+  Digest::SHA1.hexdigest "--#{Time.now.to_f}--#{rand 10}--" 
 end
 
 event :set_stamper, :before=>:approve do

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

@@ -1,6 +1,13 @@
+
+
 format do
-  view :closed_missing, :perms=>:none do |args| '' end
-  view :missing,        :perms=>:none do |args| '' end
+  view :closed_missing, :perms=>:none, :closed=>true do |args|
+    ''
+  end
+  
+  view :missing, :perms=>:none do |args|
+    ''
+  end
 
   view :not_found, :perms=>:none, :error_code=>404 do |args|
     %{ Could not find #{card.name.present? ? %{"#{card.name}"} : 'the card requested'}. }
@@ -19,11 +26,11 @@ format do
     %{ 404: Bad Address }
   end
 
-  view :too_deep, :perms=>:none do |args|
+  view :too_deep, :perms=>:none, :closed=>true do |args|
     %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
   end
 
-  view :too_slow, :perms=>:none do |args|
+  view :too_slow, :perms=>:none, :closed=>true do |args|
     %{ Timed out! #{ showname } took too long to load. }
   end 
 end

data/mod/05_standard/set/all/{header.rb → rich_html/header.rb}

@@ -1,6 +1,6 @@
 format :html do
   
-  view :toggle do |args|
+  view :toggle, :perms=>:none, :closed=>true do |args|
     verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open e } : %w{ close closed s } )
     
     view_link '', adjective, :title => "#{verb} #{card.name}",
@@ -18,7 +18,7 @@ format :html do
     }
   end
   
-  view :menu, :tags=>:unknown_ok do |args|
+  view :menu, :tags=>:unknown_ok, :perms=>:none, :closed=>true do |args|
     return _render_template_closer if args[:menu_hack] == :template_closer
     disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
     disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
@@ -51,10 +51,8 @@ format :html do
     %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
   end
 
-  view :menu_link do |args|
+  view :menu_link, :closed=>true, :perms=>:none do |args|
     '<a class="ui-icon ui-icon-gear"></a>'
   end
   
-
-  
-end
+end

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

@@ -0,0 +1,7 @@
+describe Card::Set::All::Error do
+  describe 'missing view' do
+    it "should prompt to add" do
+      expect(render_content('{{+cardipoo|open}}').match(/Add \<span/ )).not_to be_nil
+    end
+  end
+end

data/mod/05_standard/spec/set/all/{rich_html_spec.rb → rich_html/form_spec.rb}

@@ -1,12 +1,4 @@
-# -*- encoding : utf-8 -*-
-
-describe Card::Set::All::RichHtml do
-  describe 'missing view' do
-    it "should prompt to add" do
-      expect(render_content('{{+cardipoo|open}}').match(/Add \<span/ )).not_to be_nil
-    end
-  end
-  
+describe Card::Set::All::RichHtml::Form do  
   describe "type_list" do
     before do
       @card = Card['UserForm']  # no cards with this type
@@ -46,4 +38,4 @@ describe Card::Set::All::RichHtml do
       expect(no_edit_card.format.render_type).to match(/<a[^>]* class="([^"]*)?\bno-edit\b[^"]*"/)
     end
   end
-end
+end

data/mod/05_standard/spec/set/all/rich_html/wrapper_spec.rb

@@ -0,0 +1,26 @@
+describe Card::Set::All::RichHtml::Wrapper do  
+  context "full wrapping" do
+    before do
+      @ocslot = Card['A'].format
+    end
+
+    it "should have the appropriate attributes on open" do
+      assert_view_select @ocslot.render(:open), 'div[class="card-slot open-view card-frame ALL TYPE-basic SELF-a"]' do
+        assert_select 'h1[class="card-header"]' do
+          assert_select 'span[class="card-title"]'
+        end
+        assert_select 'div[class~="card-body"]'
+      end
+    end
+
+    it "should have the appropriate attributes on closed" do
+      v = @ocslot.render(:closed)
+      assert_view_select v, 'div[class="card-slot closed-view card-frame ALL TYPE-basic SELF-a"]' do
+        assert_select 'h1[class="card-header"]' do
+          assert_select 'span[class="card-title"]'
+        end
+        assert_select 'div[class~="closed-content card-content"]'
+      end
+    end
+  end
+end

data/spec/lib/wagn/log_spec.rb

@@ -0,0 +1,101 @@
+describe Wagn::Log::Request do
+  before do
+    controller = double()
+    allow(controller).to receive(:env) do
+      hash = {}
+      %w( REMOTE_ADDR REQUEST_METHOD REQUEST_URI HTTP_ACCEPT_LANGUAGE HTTP_REFERER).each do |key|
+        hash[key] = key
+      end
+      hash
+    end
+    card = double()
+    allow(card).to receive(:name) { 'cardname' }
+    allow(controller).to receive(:card) { card }
+    allow(controller).to receive(:action_name) { 'action_name' }
+    allow(controller).to receive(:params) { {'view' => 'view'} }
+    allow(controller).to receive(:status) { 'status' }
+    Wagn::Log::Request.write_log_entry controller
+  end
+  it 'creates csv file' do
+    expect(File.exist? Wagn::Log::Request.path).to be_truthy
+  end
+  
+  describe 'log file' do
+    subject { File.read Wagn::Log::Request.path }
+    
+    it { is_expected.to include 'REMOTE_ADDR' }
+    it { is_expected.to include 'REQUEST_METHOD' }
+    it { is_expected.to include 'view' }
+    it { is_expected.to include 'status' }
+    it { is_expected.to include 'cardname' }
+  end  
+end
+
+
+describe Wagn::Log::Performance do
+  def test_log 
+    Wagn::Log::Performance.start :method=>'test'
+    yield
+    Wagn::Log::Performance.stop  
+  end
+    
+  it 'logs searches if enabled' do
+    Wagn.config.performance_logger = { :methods=>[:search]}
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    expect(Rails.logger).to receive(:wagn).with(/search\:/).at_least(1)
+    test_log do
+      Card.search :name=>'all'
+    end
+  end
+  
+  it 'logs fetches if enabled' do
+    Wagn.config.performance_logger = { :methods=>[:fetch] }
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    expect(Rails.logger).to receive(:wagn).with(/fetch/).at_least(1)
+    test_log do
+      Card.fetch 'all'
+    end
+  end
+  
+  it 'logs views if enabled' do
+    Wagn.config.performance_logger = { :methods=>[:view]}
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    expect(Rails.logger).to receive(:wagn).with(/process: \*all/)
+    expect(Rails.logger).to receive(:wagn).with(/view\:/)
+    test_log do
+      Card[:all].format.render_raw
+    end
+  end
+  
+  it 'logs events if enabled' do
+    Wagn.config.performance_logger = { :methods=>[:event]}
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    expect(Rails.logger).to receive(:wagn).with(/process: c1/).once
+    expect(Rails.logger).to receive(:wagn).at_least(1).with(/    \|--\([\d.]+ms\) event\:/)
+    test_log do
+      Card::Auth.as_bot { Card.fetch('c1').update_attributes!(:content=>'c1') }
+    end
+  end
+  
+  it "doesn't log methods if disabled" do
+    Wagn.config.performance_logger = { :methods=>[]}
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    test_log do
+      Card::Auth.as_bot { Card.fetch('c1').update_attributes!(:content=>'c1') }
+      Card.search :name=>'all'
+      Card.fetch 'all'
+      Card[:all].format.render_raw
+    end
+  end
+  
+  it 'creates tree for nested method calls' do
+    Wagn.config.performance_logger = { :methods=>[:view]}
+    expect(Rails.logger).to receive(:wagn).with(/test/).once
+    expect(Rails.logger).to receive(:wagn).with(/  \|--\([\d.]+ms\) process: c1/)
+    expect(Rails.logger).to receive(:wagn).with(/    \|--\([\d.]+ms\) view\: core/)
+    expect(Rails.logger).to receive(:wagn).with(/      \|--\([\d.]+ms\) view\: raw/)
+    test_log do
+      Card['c1'].format.render_core
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.14.7
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -531,10 +531,32 @@ files:
 - mod/01_core/spec/set/all/trash_spec.rb
 - mod/01_core/spec/set/all/type_spec.rb
 - mod/01_core/spec/set/all/utils_spec.rb
+- mod/02_basic_types/format/css_format.rb
+- mod/02_basic_types/format/csv_format.rb
+- mod/02_basic_types/format/file_format.rb
+- mod/02_basic_types/format/js_format.rb
+- mod/02_basic_types/format/json_format.rb
+- mod/02_basic_types/format/rss_format.rb
+- mod/02_basic_types/format/xml_format.rb
+- mod/02_basic_types/set/all/all_css.rb
+- mod/02_basic_types/set/all/all_csv.rb
+- mod/02_basic_types/set/all/all_js.rb
+- mod/02_basic_types/set/all/base.rb
+- mod/02_basic_types/set/all/file.rb
+- mod/02_basic_types/set/all/json.rb
+- mod/02_basic_types/set/all/rss.rb
+- mod/02_basic_types/set/all/text.rb
 - mod/02_basic_types/set/type/plain_text.rb
 - mod/02_basic_types/set/type/pointer.rb
-- mod/02_basic_types/spec/set/plain_text_spec.rb
-- mod/02_basic_types/spec/set/pointer_spec.rb
+- mod/02_basic_types/spec/set/all/all_css_spec.rb
+- mod/02_basic_types/spec/set/all/all_csv_spec.rb
+- mod/02_basic_types/spec/set/all/base_spec.rb
+- mod/02_basic_types/spec/set/all/file_spec.rb
+- mod/02_basic_types/spec/set/all/json_spec.rb
+- mod/02_basic_types/spec/set/all/rss_spec.rb
+- mod/02_basic_types/spec/set/all/text_spec.rb
+- mod/02_basic_types/spec/set/type/plain_text_spec.rb
+- mod/02_basic_types/spec/set/type/pointer_spec.rb
 - mod/03_machines/lib/card/machine.rb
 - mod/03_machines/lib/card/machine_input.rb
 - mod/03_machines/lib/javascript/ace.js
@@ -655,35 +677,20 @@ files:
 - mod/05_standard/file/790/medium-6419.png
 - mod/05_standard/file/790/original-6419.png
 - mod/05_standard/file/790/small-6419.png
-- mod/05_standard/format/css_format.rb
-- mod/05_standard/format/csv_format.rb
-- mod/05_standard/format/file_format.rb
-- mod/05_standard/format/js_format.rb
-- mod/05_standard/format/json_format.rb
-- mod/05_standard/format/rss_format.rb
-- mod/05_standard/format/xml_format.rb
 - mod/05_standard/set/all/account.rb
-- mod/05_standard/set/all/all_css.rb
-- mod/05_standard/set/all/all_csv.rb
-- mod/05_standard/set/all/all_js.rb
 - mod/05_standard/set/all/attach.rb
-- mod/05_standard/set/all/base.rb
 - mod/05_standard/set/all/comment.rb
-- mod/05_standard/set/all/editing.rb
 - mod/05_standard/set/all/error.rb
 - mod/05_standard/set/all/event_viz.rb
-- mod/05_standard/set/all/file.rb
 - mod/05_standard/set/all/follow.rb
-- mod/05_standard/set/all/form.rb
-- mod/05_standard/set/all/header.rb
 - mod/05_standard/set/all/history.rb
-- mod/05_standard/set/all/json.rb
 - mod/05_standard/set/all/links.rb
 - mod/05_standard/set/all/observer.rb
-- mod/05_standard/set/all/rich_html.rb
-- mod/05_standard/set/all/rss.rb
-- mod/05_standard/set/all/text.rb
-- mod/05_standard/set/all/wrapper.rb
+- mod/05_standard/set/all/rich_html/content.rb
+- mod/05_standard/set/all/rich_html/editing.rb
+- mod/05_standard/set/all/rich_html/form.rb
+- mod/05_standard/set/all/rich_html/header.rb
+- mod/05_standard/set/all/rich_html/wrapper.rb
 - mod/05_standard/set/right/account.rb
 - mod/05_standard/set/right/email.rb
 - mod/05_standard/set/right/password.rb
@@ -732,21 +739,16 @@ files:
 - mod/05_standard/spec/format/rss_format_spec.rb
 - mod/05_standard/spec/format/xml_format_spec.rb
 - mod/05_standard/spec/set/all/account_spec.rb
-- mod/05_standard/spec/set/all/all_css_spec.rb
-- mod/05_standard/spec/set/all/all_csv_spec.rb
 - mod/05_standard/spec/set/all/attach_spec.rb
-- mod/05_standard/spec/set/all/base_spec.rb
 - mod/05_standard/spec/set/all/comment_spec.rb
 - mod/05_standard/spec/set/all/email_html_spec.rb
+- mod/05_standard/spec/set/all/error_spec.rb
 - mod/05_standard/spec/set/all/event_viz_spec.rb
-- mod/05_standard/spec/set/all/file_spec.rb
 - mod/05_standard/spec/set/all/follow_spec.rb
 - mod/05_standard/spec/set/all/history_spec.rb
-- mod/05_standard/spec/set/all/json_spec.rb
 - mod/05_standard/spec/set/all/observer_spec.rb
-- mod/05_standard/spec/set/all/rich_html_spec.rb
-- mod/05_standard/spec/set/all/rss_spec.rb
-- mod/05_standard/spec/set/all/text_spec.rb
+- mod/05_standard/spec/set/all/rich_html/form_spec.rb
+- mod/05_standard/spec/set/all/rich_html/wrapper_spec.rb
 - mod/05_standard/spec/set/right/account_spec.rb
 - mod/05_standard/spec/set/right/email_spec.rb
 - mod/05_standard/spec/set/right/password_spec.rb
@@ -1353,6 +1355,7 @@ files:
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
+- spec/lib/wagn/log_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb
@@ -1450,6 +1453,7 @@ test_files:
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
+- spec/lib/wagn/log_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/card/cardtype_spec.rb
 - spec/models/card/create_spec.rb