fluoride-analyzer 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29f99f8f8b407486d27622bb63af1b8bd604d87f
-  data.tar.gz: b29dacf810a25eb37374ac88532f2c09217cdd65
+  metadata.gz: 346f52ff1fd2fb22d297f582892ed92065498073
+  data.tar.gz: 5a722a444c509742fa9af7cf4aae28f34e96fe99
 SHA512:
-  metadata.gz: f6c30d82f0adbc6051ee083d9062233bd8a632832b343647acad1c97cd7a82fbb1308a11a4959be511ba29d648c859f84dd2964ffa05c8992d34bdabd8b14c93
-  data.tar.gz: 7c618c9bf042e2319e0ccb95a0fb00338a82a0daa4088827b0573df89748f0b7f0340f2cba3bf44051158a0ea1dbcc7bbf67869bf469ea428121b50b58a2430f
+  metadata.gz: 43c36586731fa31f93d4ecab90333d0e22720fd679e63bdb653186d34fb05da860a5ccae7df3d72b479cc9896df445e02e5ff46703086f4de43961001187476c
+  data.tar.gz: 031192dc1b4b66d5bba7b6928c22dfd568049014a459208ab773c1dd14a0d9451af627b1d35ab3a0aa0c183a5ba3513de997076e019f55c45e89cdecf65d6df0

data/lib/fluoride-analyzer/parser.rb

@@ -1,11 +1,13 @@
 require 'fluoride-analyzer'
 require 'rack'
 require 'yaml'
+require 'fluoride-analyzer/patterner'
+
 #Also: Rails and ActionDispatch::Request
 
 module Fluoride::Analyzer
   class Parser
-    attr_accessor :files, :limit, :target_path
+    attr_accessor :files, :limit
     attr_reader :exceptions, :results, :counts
 
     def initialize
@@ -19,7 +21,7 @@ module Fluoride::Analyzer
       @results = Hash.new do|results, pattern| #PATH PATTERN
         results[pattern] = Hash.new do |by_method, method| #METHOD
           by_method[method] = Hash.new do |records, status| #STATUS CODE
-          records[status] = Hash.new do |record, key| #formatted record
+            records[status] = Hash.new do |record, key| #formatted record
               record[key] = []
             end
           end
@@ -93,115 +95,6 @@ module Fluoride::Analyzer
       { 'post_params' => form_hash }
     end
 
-    RoutePattern = Struct.new(:route, :matches, :params, :path_spec, :segment_keys)
-
-    class Patterner
-      def self.for(rails_routes)
-        if rails_routes.respond_to? :recognize_path
-          Rails4.new(rails_routes)
-        else
-          Rails3.new(rails_routes)
-        end
-      end
-
-      def base_env
-        @base_env ||= {
-          "HTTP_REFERER" => '',
-          "HTTP_COOKIE" => '',
-          "HTTP_AUTHORIZATION" => '',
-          "REQUEST_METHOD" => "GET",
-          'HTTP_HOST' => '',
-          'SERVER_NAME' => '',
-          'SERVER_ADDR' => '',
-          'SERVER_PORT' => '80',
-          "SCRIPT_NAME" => '',
-          "QUERY_STRING" => '',
-          'rack.input' => '' #body
-        }
-      end
-
-      def initialize(rails_routes)
-        @rails_routes = rails_routes
-      end
-      attr_reader :rails_routes
-
-      def build_request(result_env)
-        ActionDispatch::Request.new(base_env.merge(request_env))
-      end
-
-      def route_map
-        @route_map ||=
-          begin
-            ad_routes_array   = rails_routes.routes
-            rack_routes_array = rails_routes.set.instance_eval{ @routes }
-            Hash[ rack_routes_array.zip(ad_routes_array) ]
-          end
-      end
-
-      def route_set
-        @route_set ||=
-          begin
-            set = rails_routes.set
-            set
-          end
-      end
-
-      class Rails3 < Patterner
-        def build(env)
-          req = build_request(env)
-          route, matches, params = route_set.recognize(req)
-
-          path_spec = :unrecognized
-          segment_keys = {}
-
-          if route_map.has_key?(route)
-            rails_route = route_map[route]
-            path_spec = rails_route.path
-            segment_keys = rails_route.segment_keys
-          end
-
-          RoutePattern.new(route, matches, params, path_spec, segment_keys)
-        end
-      end
-
-      class Rails4 < Patterner
-        def route_set
-          @route_set ||=
-            begin
-              set = Rails.application.routes.router
-              set
-            end
-        end
-
-        def build_request(request_env)
-          ActionDispatch::Request.new(base_env.merge(request_env))
-        end
-
-        def build(env)
-          req = build_request(env)
-          pattern = nil
-          route_set.recognize(req) do |route, matches, params|
-            rails_route = route_map[route]
-
-            path_spec = :unrecognized
-            segment_keys = {}
-
-            if route_map.has_key?(route)
-              rails_route = route_map[route]
-              path_spec = rails_route.path.spec.to_s
-              segment_keys = rails_route.segment_keys
-            end
-
-            pattern = RoutePattern.new(route, matches, params, path_spec, segment_keys)
-          end
-          if pattern.nil?
-            pattern = RoutePattern.new(nil,nil,nil,nil,nil)
-          end
-          pattern
-        end
-      end
-    end
-
     def patterner
       @patterner ||= Patterner.for(Rails.application.routes)
     end

data/lib/fluoride-analyzer/patterner.rb

@@ -0,0 +1,110 @@
+module Fluoride::Analyzer
+  RoutePattern = Struct.new(:route, :matches, :params, :path_spec, :segment_keys)
+
+  class Patterner
+    def self.for(rails_routes)
+      if rails_routes.respond_to? :recognize_path
+        Rails4.new(rails_routes)
+      else
+        Rails3.new(rails_routes)
+      end
+    end
+
+    def base_env
+      @base_env ||= {
+        "HTTP_REFERER" => '',
+        "HTTP_COOKIE" => '',
+        "HTTP_AUTHORIZATION" => '',
+        "REQUEST_METHOD" => "GET",
+        'HTTP_HOST' => '',
+        'SERVER_NAME' => '',
+        'SERVER_ADDR' => '',
+        'SERVER_PORT' => '80',
+        "SCRIPT_NAME" => '',
+        "QUERY_STRING" => '',
+        'rack.input' => '' #body
+      }
+    end
+
+    def initialize(rails_routes)
+      @rails_routes = rails_routes
+    end
+    attr_reader :rails_routes
+
+    def build_request(result_env)
+      ActionDispatch::Request.new(base_env.merge(request_env))
+    end
+
+    def route_map
+      @route_map ||=
+        begin
+          ad_routes_array   = rails_routes.routes
+          rack_routes_array = rails_routes.set.instance_eval{ @routes }
+          Hash[ rack_routes_array.zip(ad_routes_array) ]
+        end
+    end
+
+    def route_set
+      @route_set ||=
+        begin
+          set = rails_routes.set
+          set
+        end
+    end
+
+    class Rails3 < Patterner
+      def build(env)
+        req = build_request(env)
+        route, matches, params = route_set.recognize(req)
+
+        path_spec = :unrecognized
+        segment_keys = {}
+
+        if route_map.has_key?(route)
+          rails_route = route_map[route]
+          path_spec = rails_route.path
+          segment_keys = rails_route.segment_keys
+        end
+
+        RoutePattern.new(route, matches, params, path_spec, segment_keys)
+      end
+    end
+
+    class Rails4 < Patterner
+      def route_set
+        @route_set ||=
+          begin
+            set = Rails.application.routes.router
+            set
+          end
+      end
+
+      def build_request(request_env)
+        ActionDispatch::Request.new(base_env.merge(request_env))
+      end
+
+      def build(env)
+        req = build_request(env)
+        pattern = nil
+        route_set.recognize(req) do |route, matches, params|
+          rails_route = route_map[route]
+
+          path_spec = :unrecognized
+          segment_keys = {}
+
+          if route_map.has_key?(route)
+            rails_route = route_map[route]
+            path_spec = rails_route.path.spec.to_s
+            segment_keys = rails_route.segment_keys
+          end
+
+          pattern = RoutePattern.new(route, matches, params, path_spec, segment_keys)
+        end
+        if pattern.nil?
+          pattern = RoutePattern.new(nil,nil,nil,nil,nil)
+        end
+        pattern
+      end
+    end
+  end
+end

data/lib/fluoride-analyzer/rails/railtie.rb

@@ -3,12 +3,31 @@ require 'fluoride-analyzer'
 module Fluoride
   module Analyzer
     class Railtie < ::Rails::Railtie
-      #config.fluoride.directory = "fluoride-collector"
+      config.fluoride_path = %w{
+        .
+        ~/.config/fluoride
+        ~/.fluoride
+      }
 
       rake_tasks do
-        # load '/path/to/task'
-      end
+        require 'fluoride-analyzer/tasklib'
+
+        configs = Valise::define do
+          config.fluoride_path.each do |path|
+            ro path
+          end
+          ro(from_here("../../../default_configs"))
+
+          handle "*.yaml", :yaml, :hash_merge
+          handle "*.yml", :yaml, :hash_merge
+        end
 
+        analyzer_config = configs.contents("analyzer.yml")
+
+        Fluoride::Analyzer::Tasklib.new do |task|
+          task.from_hash(analyzer_config)
+        end
+      end
     end
   end
 end

data/lib/fluoride-analyzer/tasklib.rb

@@ -0,0 +1,67 @@
+require 'fluoride-analyzer/request-templater'
+require 'mattock'
+
+module Fluoride::Analyzer
+  class Tasklib < ::Mattock::Tasklib
+    default_namespace "fluoride:analyzer"
+
+    setting :limit, nil
+    dir( :fluoride, "fluoride",
+        path( :results, "results.yml"),
+        dir(  :request_recordings, "recorded-requests"),
+        dir(  :request_specs, "spec/requests"))
+
+    setting :recordings_list
+
+    def resolve_configuration
+      super
+      resolve_paths
+      self.recordings_list ||= FileList[ "#{request_recordings.abspath}/*.yml" ]
+    end
+
+    def define
+      in_namespace do
+        directory request_specs.abspath
+
+        desc "Delete and rebuild request specs based on Fluoride collections"
+        task :rebuild_request_specs => [:clobber_request_specs, :template_request_specs]
+
+        task :clobber_request_specs do
+          sh("rm -rf #{request_specs.abspath}/*")
+        end
+
+        file results.abspath => [:environment] + recordings_list do |task|
+          parser = Fluoride::Analyzer::Parser.new
+
+          recordings_list.find_all do |prereq|
+            next unless File.file?(prereq) && __FILE__ != prereq
+            parser.parse_stream(File.read(prereq))
+          end
+
+          parser.limit = limit
+
+          File.open(results.abspath, "w") do |target_file|
+            target_file.write(YAML.dump(parser.formatted_results))
+          end
+
+          puts "Found #{parser.formatted_results.keys.length} unique requests"
+        end
+
+        desc "Produce request specs that reproduce Fluoride collections"
+        task :template_request_specs => [request_specs.abspath, results.abspath] do
+          templater = Fluoride::Analyzer::RequestTemplater.new
+
+          templater.template_string = File::read(File::expand_path(
+            "../../../default_config/templates/request_spec.erb", __FILE__))
+          templater.results = YAML.load(File.read(results.abspath))
+          templater.go do |filename, contents|
+            path = File.join(request_specs.abspath, filename)
+            File.open(path, "w") do |spec_file|
+              spec_file.write(contents)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/railtie_spec.rb

@@ -2,26 +2,21 @@ require "action_controller/railtie"
 require 'fluoride-analyzer/rails'
 
 describe Fluoride::Analyzer::Railtie do
-
-  def config(app)
-
-  end
-
-  let :rails_application do
+  let! :rails_application do
     Class.new(::Rails::Application).tap do |app|
       app.configure do
         config.active_support.deprecation = :stderr
         config.eager_load = false
       end
-      config(app)
       app.initialize!
-    end
+    end.load_tasks
   end
 
   after :each do
     Rails.application = nil #because Rails has ideas of it's own, silly thing
   end
 
-  it "should add rake tasks"
-
+  it "should add rake tasks" do
+    expect(Rake::Task["fluoride:analyzer:rebuild_request_specs"]).not_to be_nil
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fluoride-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Judson Lester
 - Evan Down
+- Patricia Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mattock
@@ -42,32 +43,34 @@ dependencies:
 description: |2
     Part of the Fluoride suite - tools for making your black box a bit whiter
 email:
-- nyarly@gmail.com
+- judson@lrdesign.com
 - evan@lrdesign.com
+- patricia@lrdesign.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fluoride-analyzer/parser.rb
-- lib/fluoride-analyzer/exception-result.rb
-- lib/fluoride-analyzer/rails/railtie.rb
-- lib/fluoride-analyzer/group-context.rb
+- lib/fluoride-analyzer.rb
 - lib/fluoride-analyzer/config.rb
-- lib/fluoride-analyzer/request-templater.rb
+- lib/fluoride-analyzer/exception-result.rb
+- lib/fluoride-analyzer/exchange-result.rb
 - lib/fluoride-analyzer/group-collapser.rb
-- lib/fluoride-analyzer/rails.rb
+- lib/fluoride-analyzer/group-context.rb
+- lib/fluoride-analyzer/parser.rb
 - lib/fluoride-analyzer/pattern-collapser.rb
+- lib/fluoride-analyzer/pattern-context.rb
+- lib/fluoride-analyzer/patterner.rb
+- lib/fluoride-analyzer/rails.rb
+- lib/fluoride-analyzer/rails/railtie.rb
+- lib/fluoride-analyzer/request-processor.rb
+- lib/fluoride-analyzer/request-templater.rb
 - lib/fluoride-analyzer/request.rb
-- lib/fluoride-analyzer/tasks.rake
 - lib/fluoride-analyzer/result-collection.rb
-- lib/fluoride-analyzer/request-processor.rb
-- lib/fluoride-analyzer/pattern-context.rb
-- lib/fluoride-analyzer/exchange-result.rb
-- lib/fluoride-analyzer.rb
-- spec/result-templater.rb
+- lib/fluoride-analyzer/tasklib.rb
+- spec-help/gem-test-suite.rb
 - spec/railtie_spec.rb
 - spec/result-parser.rb
-- spec-help/gem-test-suite.rb
+- spec/result-templater.rb
 homepage: http://github.com/lrdesign/fluoride-analyzer
 licenses:
 - MIT
@@ -78,7 +81,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- fluoride-analyzer-0.0.1 Documentation
+- fluoride-analyzer-0.0.3 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -93,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Analysis of recorded requests

data/lib/fluoride-analyzer/tasks.rake

@@ -1,46 +0,0 @@
-require 'fluoride-analyzer/request-templater'
-
-FLUORIDE_PATH = 'fluoride-collector'
-LIMIT = 2000
-
-directory 'spec/requests'
-
-task :parse_fluoride => 'paths.yml'
-
-task :rebuild_request_specs => [:clobber_request_specs, :template_request_specs]
-
-task :clobber_request_specs do
-  sh("rm -rf spec/requests/*")
-end
-
-file 'results.yml' => FileList[ "#{FLUORIDE_PATH}/*.yml" ] do |task|
-  Rake::Task[:environment].invoke
-  parser = Fluoride::Analyzer::Parser.new
-
-  task.prerequisites.find_all do |prereq|
-    next unless File.file?(prereq) && __FILE__ != prereq
-    parser.parse_stream(File.read(prereq))
-  end
-
-  #parser.limit = LIMIT #XXX Uncomment to limit number of files parsed
-  parser.target_path = task.name
-
-  File.open(task.name, "w") do |target_file|
-    target_file.write(YAML.dump(parser.formatted_results))
-  end
-
-  puts "Found #{parser.formatted_results.keys.length} unique requests"
-end
-
-task :template_request_specs => ['spec/requests', 'results.yml'] do
-  templater = Fluoride::Analyzer::RequestTemplater.new
-
-  templater.template_string = File::read(File::expand_path("../../../templates/request_spec.erb", __FILE__))
-  templater.results = YAML.load(File.read('results.yml'))
-  templater.go do |filename, contents|
-    path = File.join("spec/requests", filename)
-    File.open(path, "w") do |spec_file|
-      spec_file.write(contents)
-    end
-  end
-end