wagn 1.14.1 → 1.14.2

data/lib/card/exceptions.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Error < StandardError #code problem
+    cattr_accessor :current
   end
   
   class Oops < Error # wagneer problem (rename!)
@@ -36,4 +37,5 @@ class Card
     end
 
   end
+  
 end

data/lib/card/format.rb

@@ -183,7 +183,9 @@ class Card
         @current_view = view = ok_view canonicalize_view( view ), args       
         args = default_render_args view, args
         with_inclusion_mode view do
-          send "_view_#{ view }", args
+          Wagn.with_logging card.name, :view, view, args do
+            send "_view_#{ view }", args
+          end
         end
       end
     rescue => e
@@ -244,9 +246,9 @@ class Card
       if Rails.env =~ /^cucumber|test$/
         raise e
       else
-        controller.send :notify_airbrake, e if Airbrake.configuration.api_key
         Rails.logger.info "\nError rendering #{error_cardname} / #{view}: #{e.class} : #{e.message}"
-        Rails.logger.debug "BT:  #{e.backtrace*"\n  "}"
+        Card::Error.current = e
+        card.notable_exception_raised
         rendering_error e, view
       end
     end

data/lib/card/query.rb

@@ -27,6 +27,7 @@ class Card::Query
   end
 
   def run
+#    puts "~~~~~~~~~~~~~~\nCARD SPEC =\n#{@card_spec.rawspec}\n\n-----\n\nSQL=\n#{sql}"
     rows = ActiveRecord::Base.connection.select_all( sql )
     retrn = query[:return].present? ? query[:return].to_s : 'card'
     case retrn 
@@ -66,10 +67,9 @@ class Card::Query
     end
 
     def to_s
-      "(
-select #{fields.reject(&:blank?).join(', ')} from #{tables} #{joins.join(' ')}
-where #{conditions.reject(&:blank?).join(' and ')} #{group} #{order} #{limit} #{offset}
-)"
+      select = fields.reject(&:blank?) * ', '
+      where = conditions.reject(&:blank?) * ' and '
+      ['(SELECT', select, 'FROM', tables, joins, 'WHERE', where, group, order, limit, offset, ')'].compact * ' '
     end
   end
 

data/lib/card/query/card_spec.rb

@@ -17,7 +17,7 @@ class Card
       CONJUNCTIONS = { :any=>:or, :in=>:or, :or=>:or, :all=>:and, :and=>:and }
     
       attr_reader :sql, :query, :rawspec, :selfname
-      attr_accessor :joins
+      attr_accessor :joins, :join_count
 
       class << self
         def build query
@@ -185,7 +185,7 @@ class Card
       #~~~~~~ RELATIONAL
 
       def type val
-        merge field(:type_id) => id_or_subspec(val)
+        restrict :type_id, val
       end
 
       def part val
@@ -193,12 +193,13 @@ class Card
         subcondition :left=>val, :right=>right, :conj=>:or
       end
 
+      
       def left val
-        merge field(:left_id) => id_or_subspec(val)
+        restrict :left_id, val
       end
     
       def right val
-        merge field(:right_id) => id_or_subspec(val)
+        restrict :right_id, val
       end
       
       def editor_of val
@@ -210,19 +211,19 @@ class Card
       end
       
       def last_editor_of val
-        merge field(:id) => subspec(val, :return=>'updater_id')
+        restrict_by_join :id, val, :return=>'updater_id'
       end
 
       def last_edited_by val
-        merge field(:updater_id) => id_or_subspec(val)
+        restrict :updater_id, val
       end    
 
       def creator_of val
-        merge field(:id)=>subspec(val,:return=>'creator_id')
+        restrict_by_join :id, val, :return=>'creator_id'
       end
 
       def created_by val
-        merge field(:creator_id) => id_or_subspec(val)
+        restrict :creator_id, val
       end
 
       def member_of val
@@ -236,18 +237,21 @@ class Card
 
       #~~~~~~ PLUS RELATIONAL
 
-      def left_plus(val)
-        part_spec, junc_spec = val.is_a?(Array) ? val : [ val, {} ]
-        merge( field(:id) => subspec(junc_spec, :return=>'right_id', :left =>part_spec))
+      def left_plus val
+        junction :left, val
       end
 
-      def right_plus(val)
-        part_spec, junc_spec = val.is_a?(Array) ? val : [ val, {} ]
-        merge( field(:id) => subspec(junc_spec, :return=>'left_id', :right=> part_spec ))
+      def right_plus val
+        junction :right, val
       end
 
-      def plus(val)
-        subcondition( { :left_plus=>val, :right_plus=>val.deep_clone }, :conj=>:or )
+      def plus val
+        any( { :left_plus=>val, :right_plus=>val.deep_clone } )
+      end
+      
+      def junction side, val
+        part_spec, junction_spec = val.is_a?(Array) ? val : [ val, {} ]
+        restrict_by_join :id, junction_spec, side=>part_spec, :return=>"#{ side==:left ? :right : :left}_id"
       end
     
     
@@ -280,23 +284,23 @@ class Card
           unless c && [SearchTypeID,SetID].include?(c.type_id)
             raise BadQuery, %{"found_by" value needs to be valid Search, but #{c.name} is a #{c.type_name}}
           end
-          found_by_spec = CardSpec.new(c.get_spec).rawspec
-          merge(field(:id) => subspec(found_by_spec))
+          restrict_by_join :id, CardSpec.new(c.get_spec).rawspec
         end
       end
   
       def not val
-        merge field(:id) => subspec( val, {:return=>'id'}, negate=true )
+        subselect = CardSpec.build(:return=>:id, :_parent=>self).merge(val).to_sql
+        join_alias = add_join :not, subselect, :id, :id, :side=>'LEFT'        
+        merge field(:cond) => SqlCond.new("#{join_alias}.id is null")
       end
 
       def sort val
         return nil if @parent
         val[:return] = val[:return] ? safe_sql(val[:return]) : 'db_content'
-        @mods[:sort] =  "t_sort.#{val[:return]}"
         item = val.delete(:item) || 'left'
 
         if val[:return] == 'count'
-          cs_args = { :return=>'count', :group=>'sort_join_field' }
+          cs_args = { :return=>'count', :group=>'sort_join_field', :_parent=>self }
           @mods[:sort] = "coalesce(#{@mods[:sort]},0)"
           case item
           when 'referred_to'
@@ -316,7 +320,9 @@ class Card
         end
 
         cs.sql.fields << "#{cs.table_alias}.#{join_field} as sort_join_field"
-        add_join :sort, cs.to_sql, :id, :sort_join_field, :side=>'LEFT'
+        join_table = add_join :sort, cs.to_sql, :id, :sort_join_field, :side=>'LEFT'
+        @mods[:sort] = "#{join_table}.#{val[:return]}"
+        
       end
 
       def match(val)
@@ -345,8 +351,9 @@ class Card
       end
 
       def extension_type val
-        # DEPRECATED!!!       
-        add_join :usr, :users, :id, :card_id
+        # DEPRECATED LONG AGO!!!
+        Rails.logger.info "using DEPRECATED extension_type in WQL" 
+        merge field(:right_plus) => AccountID
       end
     
 
@@ -367,8 +374,16 @@ class Card
       end
 
       def add_join(name, table, cardfield, otherfield, opts={})
-        join_alias = "#{table_alias}_#{name}"
-        @joins[join_alias] = "#{opts[:side]} JOIN #{table} AS #{join_alias} ON #{table_alias}.#{cardfield} = #{join_alias}.#{otherfield}"
+        root.join_count = root.join_count.to_i + 1
+        join_alias = "#{name}_#{root.join_count}"
+        on = "#{table_alias}.#{cardfield} = #{join_alias}.#{otherfield}"
+        is_subselect = !table.is_a?( Symbol )
+        
+        if @mods[:conj] == 'or' and is_subselect
+          opts[:side] ||= 'LEFT'
+          merge field(:cond) => SqlCond.new(on)
+        end
+        @joins[join_alias] = ["\n  ", opts[:side], 'JOIN', table, 'AS', join_alias, 'ON', on, "\n"].compact.join ' '
         join_alias
       end
 
@@ -376,11 +391,11 @@ class Card
         @fields ||= {}
         @fields[name] ||= 0
         @fields[name] += 1
-        "#{ name }:#{ @fields[name] }"
+        "#{ name }_#{ @fields[name] }"
       end
 
       def field_root key
-        key.to_s.gsub /\:\d+/, ''
+        key.to_s.gsub /\_\d+/, ''
       end
 
       def subcondition(val, args={})
@@ -388,34 +403,34 @@ class Card
         cardspec = CardSpec.build( args )
         merge field(:cond) => cardspec.merge(val)
         self.joins.merge! cardspec.joins
-      end
-
-      # def revision_spec(field, linkfield, val)
-#         card_select = CardSpec.build(:_parent=>self, :return=>'id').merge(val).to_sql
-#         add_join :ed, "(select distinct #{field} from card_revisions where #{linkfield} in #{card_select})", :id, field
-#       end
-      
+      end      
       
       def action_spec(field, linkfield, val)
         card_select = CardSpec.build(:_parent=>self, :return=>'id').merge(val).to_sql
         sql =  "(SELECT DISTINCT #{field} AS join_card_id FROM card_acts INNER JOIN card_actions ON card_acts.id = card_act_id "
-        sql += " WHERE #{linkfield} IN #{card_select} AND (draft=0 OR draft IS NULL))"
+        sql += " JOIN (#{card_select}) AS ss ON #{linkfield}=ss.id AND (draft is false OR draft is null))"
         add_join :ac, sql, :id, :join_card_id
       end
 
-
-      def subspec(spec, additions={ :return=>'id'}, negate=false)
-        additions = additions.merge(:_parent=>self)
-        operator = negate ? 'not in' : 'in'
-        ValueSpec.new([operator,CardSpec.build(additions).merge(spec)], self)
+      def id_from_spec spec
+        case spec
+        when Integer ; spec
+        when String  ; Card.fetch_id(spec)
+        end
       end
-
-      def id_or_subspec spec
-        id = case spec
-          when Integer ; spec
-          when String  ; Card.fetch_id(spec)
-          end
-        id or subspec spec
+            
+      def restrict id_field, val, opts={}
+        if id = id_from_spec(val)
+          merge field(id_field) => id
+        else
+          restrict_by_join id_field, val, opts
+        end
+      end
+      
+      def restrict_by_join id_field, val, opts={}
+        opts.reverse_merge!(:return=>:id, :_parent=>self)
+        subselect = CardSpec.build(opts).merge(val).to_sql
+        add_join "card_#{id_field}", subselect, id_field, opts[:return]
       end
     
       #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -425,8 +440,11 @@ class Card
 
       def to_sql *args
         sql.conditions << basic_conditions
-
-        return "(" + sql.conditions.last + ")" if @mods[:return]=='condition'
+        
+        if @mods[:return]=='condition'
+          conds = sql.conditions.last
+          return conds.blank? ? nil : "(#{conds})"
+        end
     
         if pconds = permission_conditions
           sql.conditions << pconds
@@ -451,7 +469,7 @@ class Card
       end
   
       def basic_conditions
-        @spec.map { |key, val| val.to_sql field_root(key) }.join " #{ current_conjunction } "
+        @spec.map { |key, val| val.to_sql field_root(key) }.compact.join " #{ current_conjunction } "
       end
   
       def current_conjunction

data/lib/card/set.rb

@@ -135,8 +135,9 @@ class Card
 
         define_method event do
           run_callbacks event do
-            #puts event
-            send final_method
+            Wagn.with_logging self.name, :event, event, opts do
+              send final_method
+            end
           end
         end
       end

data/lib/wagn.rb

@@ -1,10 +1,9 @@
 # should be able to move these to more appropriate places
-
 WAGN_GEM_ROOT = File.expand_path('../..', __FILE__)
 
 module Wagn
 
-  class << self
+  class << self    
     def root
       Rails.root
     end
@@ -25,9 +24,22 @@ module Wagn
       WAGN_GEM_ROOT
     end
     
+    def with_logging cardname, method, message, details, &block
+      if Wagn.config.performance_logger and 
+         Wagn.config.performance_logger[:methods] and 
+         Wagn.config.performance_logger[:methods].include? method        
+        Wagn::Log.start_block :cardname=>cardname, :method=>method, :message=>message, :details=>details
+        result = block.call
+        Wagn::Log.finish_block
+        result
+      else
+        block.call
+      end
+    end
+    
     def future_stamp
       ## used in test data
       @@future_stamp ||= Time.local 2020,1,1,0,0,0
     end
   end
-end
+end

data/lib/wagn/all.rb

@@ -1,16 +1,14 @@
 require 'rails/all'
 
+require 'builder'
 require 'htmlentities'
 require 'recaptcha'
-require 'airbrake'
 require 'RMagick'
 require 'paperclip'
 require 'coderay'
 require 'haml'
 require 'kaminari'
 require 'diff/lcs'
-require 'diffy'
-#require 'scheduler_daemon'
 
 require 'wagn/application'
 

data/lib/wagn/application.rb

@@ -9,6 +9,14 @@ if defined?(Bundler)
   # Bundler.require(:default, :assets, Rails.env)
 end
 
+module ActiveSupport::BufferedLogger::Severity
+  WAGN = UNKNOWN + 1
+  
+  def wagn progname, &block
+    add(WAGN, nil, progname, &block)
+  end
+end
+
 
 module Wagn
   class Application < Rails::Application
@@ -28,7 +36,7 @@ module Wagn
     end
     
     initializer :load_mod_initializers,  :after => :load_wagn_config_initializers do
-      paths.add 'mod-initializers', :with=>'mod', :glob=>"**/initializers/*.rb"
+      paths.add 'mod-initializers', :with=>'mod', :glob=>"**{,/*/**}/initializers/*.rb"
       config.paths['mod-initializers'].existent.sort.each do |initializer|
         load(initializer)
       end
@@ -76,6 +84,7 @@ module Wagn
         config.token_expiry          = 2.days
         config.revisions_per_page    = 10
         config.request_logger        = false
+        config.performance_logger    = false
         
         config
       end

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -65,7 +65,7 @@ group :test do
 
   # CUKES see features dir
   gem 'cucumber-rails', '~> 1.3', :require=>false # feature-driven-development suite
-  gem 'capybara', '~> 2.2.1'                     # note, selectors were breaking when we used 2.0.1
+  gem 'capybara', '~> 2.4.4'                    
   gem 'selenium-webdriver', '~> 2.39'
 #  gem 'capybara-webkit'
   gem 'launchy'                                # lets cucumber launch browser windows
@@ -97,3 +97,8 @@ group :debug do
 	end
 end
 <% end %>
+
+Dir.glob(File.join(File.dirname(__FILE__), '*','**{,/*/**}','Gemfile')).each do |gemfile|
+  instance_eval(File.read(gemfile))
+end
+

data/lib/wagn/log.rb

@@ -0,0 +1,69 @@
+
+class Wagn::Log  
+  TAB_SIZE = 2
+  @@log = []
+  @@last_toplevel_card = nil
+  
+  class << self
+    
+    # args: 
+    # :method  => :view|:event|:fetch|:search
+    # :cardname, :message, :details
+    def start_block args  
+      level = @@log.last ? @@log.last[:level] + 1 : 1
+      @@log << args.merge( :start => Time.now, :level=>level, :subtree =>[] )
+    end
+    
+    def finish_block
+      log = @@log.pop
+      duration = (Time.now - log[:start]) * 1000
+      return if limit = Wagn.config.performance_logger[:limit] and limit > 0 and duration < limit
+        
+      log_msg = "#{ indent log[:level] }(%d.2ms) #{ log[:method] }: #{ log[:message] }" % duration
+      log_msg += details log if Wagn.config.performance_logger[:details] 
+      log_msg += subtree log
+      
+      if log_parent = @@log.last
+        if sibling = log_parent[:subtree].last and ( sibling[:card] == log[:cardname] or not log[:cardname] )
+          sibling[:lines] << log_msg
+        else
+          log_parent[:subtree] << {:card=>log[:cardname], :lines=>[log_msg]}
+        end
+      else
+        if log[:cardname] and @@last_toplevel_card != log[:cardname]
+          @@last_toplevel_card = log[:cardname]
+          Rails.logger.wagn log[:cardname]
+        end
+        Rails.logger.wagn log_msg
+      end
+    end
+    
+    
+    def indent level, args={}
+       res = (' '*TAB_SIZE + '|') * level
+       res += args[:no_link] ? '  ' : '--'
+    end
+    
+    def details log
+      if log[:details]
+        ", " + log[:details].to_s.gsub( "\n", "\n#{ indent( log[:level]+1, :no_link=>true) }" )  
+      else
+        ''
+      end
+    end
+    
+    def subtree log
+      if log[:subtree].present?
+        "\n" + log[:subtree].map do |subentry| 
+            msg = subentry[:card] ? "#{ indent(log[:level]) }#{ subentry[:card] }\n" : ''        
+            msg += subentry[:lines].join("\n")
+          end.join("\n")
+      else
+        ''
+      end
+    end
+    
+  end
+  
+end
+