stratagem 0.1.8 → 0.1.9

data/lib/stratagem/crawler/site_model.rb

@@ -29,8 +29,8 @@ module Stratagem::Crawler
       self.edges << Edge.new(from,to,type)
     end
 
-    def add(route, response, invocations=[], model_changes={}, &block)
-      page = Page.new(self, response, invocations, model_changes, &block)
+    def add(route, request, response, invocations=[], model_changes={}, &block)
+      page = Page.new(self, request, response, invocations, model_changes, &block)
       self.pages << page
       page
     end
@@ -59,7 +59,7 @@ module Stratagem::Crawler
       {
         :from => from.object_id,
         :to => to.object_id,
-        :type => type
+        :relation_type => type
       }
     end
   end
@@ -75,36 +75,38 @@ module Stratagem::Crawler
     attr_accessor :redirected_to
     attr_accessor :document
 
-    def initialize(site_model, response, invocations, model_changes, &block)
+    def initialize(site_model, request, response, invocations, model_changes, &block)
       @site_model = site_model
       @invocations = invocations
       @model_changes = model_changes
-      init(response, &block)
+      init(request, response, &block)
     end
 
     def route
-      Stratagem::Model::Application.instance.routes.recognize(self)
+      @route ||= Stratagem::Model::Application.instance.routes.recognize(self)
     end
 
     def export
-      {
+      h = {
         :external_id => self.object_id,
         :url => url,
         :path => path,
-        :method => method,
+        :request_method => method,
         :redirected_to_page_external_id => redirected_to ? redirected_to.object_id : nil,
-        :route_external_id => route.object_id,
+        :route_external_id => route ? route.object_id : nil,
         :references => @invocations.map {|i| i.to_reference.export },
         :model_changes => Hash[@model_changes.map {|model,changes| [model.object_id, changes] }].to_json,
-        :parameters => response.request.parameters.to_json
+        :parameters => @request.parameters.to_json
       }
+      h
     end
 
-    def init(response, &block)
+    def init(request, response, &block)
+      @request = request.clone
       @response = response.clone
-      @url = response.request.url
-      @path = response.request.path
-      @method = response.request.method
+      @url = request.url
+      @path = request.path
+      @method = request.method
       @document = Nokogiri::HTML(response.body)
       self.redirected_to = block.call(response.redirect_url) if response.redirect?
     end
@@ -112,8 +114,8 @@ module Stratagem::Crawler
     def reload(&block)
       # TODO - should support all the verbs and params, but
       # hack together for now to reload the authenticity token
-      response = yield url
-      init(response) {|redirected_to| }
+      request,response = yield url
+      init(request, response) {|redirected_to| }
     end
 
     def redirected?

data/lib/stratagem/framework_extensions.rb

@@ -1,6 +1,17 @@
 module Stratagem::ApplicationExtensions; end
 
 require 'stratagem/framework_extensions/rails'
-require 'stratagem/framework_extensions/controllers'
+require 'stratagem/framework_extensions/method_invocation'
 require 'stratagem/framework_extensions/models'
 
+if (Stratagem.rails_3?)
+  require 'stratagem/framework_extensions/rails3/parameters'
+elsif (Stratagem.rails_2?)
+  require 'stratagem/framework_extensions/rails2/action_controller'
+  require 'stratagem/framework_extensions/rails2/action_mailer'
+else
+  raise "Unsupported Rails version #{Stratagem.rails_version}"
+end
+
+
+

data/lib/stratagem/framework_extensions/method_invocation.rb

@@ -0,0 +1,50 @@
+module Stratagem::ApplicationExtensions
+  class MethodInvocation
+    attr_accessor :method, :controller_path, :controller_action, :line_number, :model_instance, :model_class, :stack_trace, :args, :type
+
+    EQUALITY_ATTRS = [:method, :controller_path, :controller_action, :line_number, :model_class]
+
+    # TODO - refactor, ugly constructor is a result of quick port from Struct
+    def initialize(*args)
+      arg_keys = [:method, :controller_path, :controller_action, :line_number, :model_instance, :model_class, :stack_trace, :args, :type]
+      args.each_with_index do |val,i|
+        self.send("#{arg_keys[i].to_s}=", val)
+      end
+    end
+
+    def <=>(other)
+      e = self.==(other)
+      e ? 0 : 1
+    end
+    
+    def ==(other)
+      eql?(other)
+    end
+    
+    # override so that uniq works properly
+    def eql?(other)
+      EQUALITY_ATTRS.find {|key|
+        (self.send(key) != other.send(key))
+      }.nil?
+    end
+
+    def to_reference
+      app = Stratagem::Model::Application.instance
+      model = model_class ? app.models.find {|model| model.klass == model_class } : nil
+      controller = controller_path ? app.controllers.find {|controller| controller.path == controller_path } : nil
+      Stratagem::Model::Component::Reference.new(
+        :from_component => controller,
+        :to_component => model,
+        :function => controller_action,
+        :request_method => method, 
+        :line_number => line_number,
+        :reference_type => type,
+        :stack_trace => stack_trace
+      )
+    end
+
+    def print
+      puts "#{controller_path}.#{controller_action}:#{line_number} -> #{model_class.name}.#{method}"
+    end
+  end
+end

data/lib/stratagem/framework_extensions/models/adapters/active_model/detect.rb

@@ -1,4 +1,4 @@
-module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
+module Stratagem::ApplicationExtensions::Models::Adapters::ActiveRecord
   class Detect < Stratagem::ApplicationExtensions::Models::Detect
     def self.supports?(model)
       model.ancestors.include?(ActiveRecord::Base)

data/lib/stratagem/framework_extensions/models/adapters/active_model/extensions.rb

@@ -17,18 +17,27 @@ class ActiveRecord::Base
 
 end
 
-module ActiveRecord::Validations::ClassMethods
+class ActiveRecord::Base #Validations::ClassMethods
   @@removed_validators = []
-  
-  instance_methods.each do |m|
-    if (m =~ /^validates_/) && (m !~ /validates_each/)
-      alias_method "old_#{m}", m
-      undef_method m
-      puts "removing validator #{m}"
-      @@removed_validators << m.to_sym
-    end
-  end
-
+#   
+#   instance_methods.each do |m|
+#     if (m =~ /^validates_/) && (m !~ /validates_each/)
+#       alias_method "old_#{m}", m
+#       undef_method m
+#       puts "removing validator #{m}"
+#       @@removed_validators << m.to_sym
+# 
+# 
+#       new_method = %Q{
+#         def #{m.to_sym}(*args)
+#           stratagem.validator_called(method, args)
+#           puts "calling validator \#\{method.to_s\} with \#\{args.inspect\}"
+#           send("old_"+method.to_s, *args, &block)
+#         end}
+#       instance_eval new_method
+#     end
+#   end
+# 
   def removed_validators
     @@removed_validators
   end

data/lib/stratagem/framework_extensions/models/adapters/active_model/metadata.rb

@@ -1,4 +1,4 @@
-module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
+module Stratagem::ApplicationExtensions::Models::Adapters::ActiveRecord
 
   # prefix method names with  to avoid collision
   class Metadata
@@ -13,8 +13,12 @@ module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
     def relations(relation_type=nil) # :belongs_to, :has_many
       @relations ||= {}
       @relations[relation_type || :all] ||= model.reflect_on_all_associations(relation_type).map {|a|
-        Stratagem::ApplicationExtensions::Models::Metadata::StratagemAssociation.new(a.name.to_sym, a.association_foreign_key.to_sym, a.klass, a.macro, a.options)
-      }
+        begin
+          Stratagem::ApplicationExtensions::Models::Metadata::StratagemAssociation.new(a.name.to_sym, a.association_foreign_key.to_sym, a.klass, a.macro, a.options)
+        rescue
+          puts "ERROR: #{$!.message}"
+        end
+      }.compact
     end
 
     def unaccessible_attributes

data/lib/stratagem/framework_extensions/models/adapters/active_model/tracing.rb

@@ -1,4 +1,4 @@
-module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
+module Stratagem::ApplicationExtensions::Models::Adapters::ActiveRecord
   module Tracing
     def self.included(model)
       model.class_eval do
@@ -22,14 +22,17 @@ module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
         # enhance method missing
         class << self
           def method_missing(method, *args, &block)
-            if (self.removed_methods.include?(method.to_sym))
+            method = method.to_sym
+            if (self.removed_methods.include?(method))
               # puts "read invocation: #{self.name} -> #{method} -> #{args.inspect}" 
-              stratagem.read_invocation(method, args) if (@@removed_finder_methods.include?(method))
-              send("old_"+method.to_s, *args, &block)
-            elsif (self.removed_validators.include?(method.to_sym))
-              stratagem.validator_called(method, args)
-              puts "calling validator #{method.to_s} with #{args.inspect}"
+              if (@@removed_finder_methods.include?(method))# && ![:finder_needs_type_condition?].include?(method))
+                stratagem.read_invocation(method, args) 
+              end
               send("old_"+method.to_s, *args, &block)
+            # elsif (self.removed_validators.include?(method.to_sym))
+            #   stratagem.validator_called(method, args)
+            #   puts "calling validator #{method.to_s} with #{args.inspect}"
+            #   send("old_"+method.to_s, *args, &block)
             else
               old_method_missing(method, *args, &block)
             end
@@ -40,14 +43,13 @@ module Stratagem::ApplicationExtensions::Models::Adapters::ActiveModel
         
         def create_or_update(*args)
           alternate_model = nil
-          path,action,line,trace,index = stratagem.controller_trace(/active_record\/base\.rb/)
+          path,action,line,trace,index = stratagem.controller_trace(/\/active_record\/transactions\.rb/)
           if (index)
             model_path,model_action,model_line = find_model_path(trace,index)
             if (model_path)
               puts "WRITE INVOCATION - USING: #{model_path},#{model_action},#{model_line}"
               alternate_model = Stratagem::Model::Application.instance.models.find {|m| m.path == model_path }.klass
               action = model_action
-              puts alternate_model
             end
           end
 

data/lib/stratagem/framework_extensions/models/adapters/friendly_id/detect.rb

@@ -0,0 +1,12 @@
+module Stratagem::ApplicationExtensions::Models::Adapters::FriendlyId
+  class Detect < Stratagem::ApplicationExtensions::Models::Detect
+    def self.supports?(model)
+      begin
+        model.ancestors.include?(FriendlyId::ActiveRecordAdapter::SluggedModel) ||
+          model.ancestors.include?(FriendlyId::ActiveRecordAdapter::SimpleModel) 
+      rescue
+        false
+      end
+    end
+  end
+end

data/lib/stratagem/framework_extensions/models/adapters/friendly_id/metadata.rb

@@ -0,0 +1,21 @@
+module Stratagem::ApplicationExtensions::Models::Adapters::FriendlyId
+
+  # prefix method names with  to avoid collision
+  class Metadata
+    def initialize(model)
+      @model = model
+    end
+
+    def exclude_attributes_for_mocking
+      # open id
+      attrs = @model.stratagem.attribute_names.select {|a|
+        (a =~ /friendly_id/)
+      }
+      attrs << :friendly_id_config
+      attrs << :cached_slug
+
+      attrs.uniq
+    end
+  end
+
+end

data/lib/stratagem/framework_extensions/models/adapters/friendly_id/tracing.rb

@@ -0,0 +1,4 @@
+module Stratagem::ApplicationExtensions::Models::Adapters::FriendlyId
+  module Tracing
+  end
+end

data/lib/stratagem/framework_extensions/models/annotations.rb

@@ -1,30 +1,7 @@
 # Defines the stratagem namespace attached to the model
 module Stratagem::ApplicationExtensions::Models
-  MethodInvocation = Struct.new(:method, :controller_path, :controller_action, :line_number, :model_instance, :model_class, :stack_trace, :args, :type)
   ValidatorDefinition = Struct.new(:validation, :field, :args, :model_class)
 
-  # Ability to convert a MethodInvocation object to a Reference object. Sort of a hack.
-  module MethodInvocationToReference
-    def to_reference
-      app = Stratagem::Model::Application.instance
-      model = model_class ? app.models.find {|model| model.klass == model_class } : nil
-      controller = controller_path ? app.controllers.find {|controller| controller.path == controller_path } : nil
-      Stratagem::Model::Component::Reference.new(
-        :from_component => controller,
-        :to_component => model,
-        :function => controller_action,
-        :method => method, 
-        :line_number => line_number,
-        :reference_type => type,
-        :stack_trace => stack_trace
-      )
-    end
-  end
-  MethodInvocation.class_eval do
-    include MethodInvocationToReference
-  end
-  
-  
   class InstanceAnnotations
     include Mocking
 
@@ -48,7 +25,7 @@ module Stratagem::ApplicationExtensions::Models
     class << self
       def configure(model)
         puts "configuring #{model.name}"
-
+        
         # add the stratagem namespace
         model.class_eval do 
           def self.stratagem

data/lib/stratagem/framework_extensions/models/tracing.rb

@@ -38,14 +38,20 @@ module Stratagem::ApplicationExtensions::Models
 
     def read_invocation(method, *args)
       # ensure that the read did not stem from a write operation
-      path,action,line,trace,index = controller_trace(/active_record\/base\.rb/)
-      invocation(method, args, read_invocations, :read) unless (action =~ /create/) || (action =~ /update/) || (action =~ /save/)
+
+      # the first line in the stack trace will be StrataGem instrumentation
+      # if the second line is active record then the invocation was called from another invocation
+      # and should be ignored
+      unless (caller()[1].include?('active_record/base.rb'))
+        path,action,line,trace,index = controller_trace(/active_record\/base\.rb/)
+        invocation(method, args, read_invocations, :read) unless (action =~ /create/) || (action =~ /update/) || (action =~ /save/)
+      end
     end
 
     def invocation(method, args, enumeration, type, object=nil, alternate_model=nil)
       path,action,line,trace,index = controller_trace
       args = args.first if args && (args.size == 1) && (args.first.kind_of?(Array))
-      add_invocation enumeration, MethodInvocation.new(method, path, action, line, object, alternate_model || model, caller, args, type) if (path)
+      add_invocation enumeration, Stratagem::ApplicationExtensions::MethodInvocation.new(method, path, action, line, object, alternate_model || model, caller, args, type) if (path)
     end
 
     def controller_trace(regex = /_controller\.rb/)

data/lib/stratagem/framework_extensions/rails.rb

@@ -1,8 +1,2 @@
 module Rails
-  def self.stratagem_rails_version
-    rails_version = Rails.version.split('.')
-    rails_version << 0 while rails_version.size < 3
-    rails_version.pop while rails_version.size > 3
-    rails_version.join.to_i
-  end
 end

data/lib/stratagem/framework_extensions/rails3/parameters.rb

@@ -0,0 +1,14 @@
+module ActionDispatch
+  module Http
+    module Parameters
+      alias_method :rails_parameters, :parameters
+      undef_method :parameters
+
+      def parameters
+        params = rails_parameters
+        params.enable_auditing
+        params
+      end
+    end
+  end
+end

data/lib/stratagem/interface/browser.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 require 'sinatra'
-require 'erb'
+# require 'erb'
 
+set :public, File.dirname(__FILE__) + '/public'
+set :views, File.dirname(__FILE__) + '/views'
 set :run, false
 enable :sessions
 disable :logging

data/lib/stratagem/model/application.rb

@@ -34,6 +34,8 @@ module Stratagem::Model
       references = @controllers.map {|c| c.references }.flatten.map {|r| r.export }.uniq
       h = {
         :rails_version => rails_version,
+        :rails_environment => Rails.env,
+        :rails_root => Rails.root,
         :models => @models.export, 
         :controllers => @controllers.export, 
         :routes => @routes.export, 
@@ -43,12 +45,12 @@ module Stratagem::Model
         :site_model => crawler ? crawler.export : nil,
         :references => references
       }
-      p h
+      puts h.to_json
       h
     end
 
     def rails_version
-      Rails.stratagem_rails_version
+      Stratagem.rails_version
     end
   end
 
@@ -134,7 +136,7 @@ module Stratagem::Model
   end
 
   class RouteContainer < ComponentContainer
-    def recognize(page, method=nil)
+    def recognize(page, method = :get)
       path = nil
       if (page.kind_of?(Stratagem::Crawler::Page))
         method = page.method
@@ -142,9 +144,7 @@ module Stratagem::Model
       else
         path = page
       end
-      #ActionController::Routing::Routes.recognize_path('http://www.example.com/user_sessions/new', {:method => :get})
-      route = ActionController::Routing::Routes.routes.find {|r| r.recognize(path, {:method => method}) }
-      self.find {|r| r.route == route }
+      self.find {|r| r.responds_to?(path, method) }
     end
   end