monet 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b14506b0fca47138eb6897ffad50b1cee94c9b9
-  data.tar.gz: e552c2598df336e6b7b28908658ba0d6a6d3d393
+  metadata.gz: bd82504151954e9dec64d70da527bf9d6973b2aa
+  data.tar.gz: 67a18681fd090836de4c7d4285afbd8e59c1b67e
 SHA512:
-  metadata.gz: cd45f113bb3bd8be08d0079233511a5a19ade5e4525c95b82c7c67852d7ea93bd028ee121b7e1c7b8920bd2d9a660782abcde3f4f2f09176b497727630889113
-  data.tar.gz: df875d3a0769da6e43fbbcf060555b66348ca6c416dbef60b52ed411596785b6d82d32ad15e5ed9fe194d2f4b2b8335da2eb31491915d8634c892c27bd1ba2a6
+  metadata.gz: 9ec8e7217fedd9b53d186da3ec9b06e2b6d0be26db4b7cabe5365a8d5779e5c03ae517e571cee12f8e951a6e4d63fb92fdadcf63e5d8374c1202b8a798082b5a
+  data.tar.gz: 7baca87ebf4ec4e08e5575cdfcd0cebe26eaca652adbfdf9b6ad81a476ffe94857d2286283f1ddb0d9a8ad7a93da9d41b1d2a4bdcac76623294a5a17c4ad60fd

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 1.9.3
   - rbx
 
+script: bundle exec rake test

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 The basic gem requires a config file that is called in an app initializer or via the built-in rake task. This config primarily exists to give the gem a list of paths it needs to collect and either baseline or compare to previous baselines. This config might look something like this:
 
 ```ruby
-Monet.config do |config|
+config = Monet.config do |config|
   config.driver = :poltergeist
   config.dimensions = [1440,900]
 
@@ -36,24 +36,55 @@ Monet.config do |config|
 end
 ```
 
+You can also use a yaml file and load it later
+
+```yaml
+:driver: :poltergeist
+:dimensions:
+  - 1024
+
+:base_url: "http://lance.com"
+
+:compare_type: Highlight
+:map:
+  - "/"
+  - "/aboutus"
+  - "/littleleague"
+```
+
+You can then use the config to run the capture and comparison toolset:
+
+```ruby
+Monet.capture(config)
+Monet.compare(config)
+```
+
+There are also rake tasks for this
+
+```
+rake run ./config.yaml
+```
+
 ## Process
 
-Captures are saved into the following structure:
+Captures are saved into the following structure by default:
 
 ```
+/baselines
 /captures
-	/baselines
-	/captures
 ```
 
 - /captures is where the current capture run images are stored, pre-comparison with baseline.
 - /baselines is where all current baseline images are stored. persistent in-between capture runs.
 
+You can set these params using the `baseline_dir` and `captures_dir` options.
+
 During the capture process, any new captures that do not have a match found in baselines to compare with are considered new baselines.
 Any images that match baseline are discarded.
 Any images that flag differences, are flagged for review.
 
 Review involves checking flagged images and marking as
+
 1. discard
 2. flag as issue
 3. accept as new baseline

data/lib/monet.rb

@@ -23,6 +23,10 @@ module Monet
       control.run
     end
 
+    def config(&block)
+      Monet::Config.config block
+    end
+
     def load_config(options)
       Monet::Config.build_config(options)
     end

data/lib/monet/path_router.rb

@@ -41,7 +41,7 @@ module Monet
     # takes a path, returns the URL used to generate the image
     def route_path(path)
       url = path.split("/").last
-      path = url.split('>')[1..-1].join("/").gsub(/-\d+\.png/, "")
+      path = url.split('|')[1..-1].join("/").gsub(/-\d+\.png/, "")
 
       "#{@base_url}/#{path}"
     end
@@ -53,7 +53,7 @@ module Monet
 
     private
     def image_name(base_dir, path, width)
-      name = normalize_path(path).gsub(/\//, '>')
+      name = normalize_path(path).gsub(/\//, '|')
       "#{base_dir}/#{host}/#{name}-#{width}.png"
     end
 

data/lib/monet/tasks.rb

@@ -1,8 +1,11 @@
 require 'monet'
 
 namespace :monet do
-  task :clean do
-    config = Monet::Config.load
+  desc "clean out the baseline directory"
+  task :clean, :path do |t, args|
+    args.with_defaults(path: './config.yaml')
+
+    config = Monet::Config.load args[:path]
     Monet.clean config
   end
 
@@ -11,8 +14,10 @@ namespace :monet do
   end
 
   desc "Run the baseline comparison"
-  task :run do
-    config = Monet::Config.load
+  task :run, :path do |t, args|
+    args.with_defaults(path: './config.yaml')
+
+    config = Monet::Config.load args[:path]
     Monet.capture config
     Monet.compare config
   end

data/lib/monet/version.rb

@@ -1,3 +1,3 @@
 module Monet
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/capture_spec.rb

@@ -32,20 +32,20 @@ describe Monet::Capture do
   context "converts name properly" do
     Given(:capture_agent) { Monet::Capture.new(capture_dir: path, base_url: url, dimensions: [900]) }
     When { capture_agent.capture("/") }
-    Then { File.exist?("#{path}/google.com/google.com>-900.png").should be_true }
+    Then { File.exist?("#{path}/google.com/google.com|-900.png").should be_true }
   end
 
   context "captures all dimensions requested" do
     Given(:capture_agent) { Monet::Capture.new(capture_dir: path, base_url: url, dimensions: [900, 1400]) }
     When { capture_agent.capture("/") }
-    Then { File.exist?("#{path}/google.com/google.com>-900.png").should be_true }
-    Then { File.exist?("#{path}/google.com/google.com>-1400.png").should be_true }
+    Then { File.exist?("#{path}/google.com/google.com|-900.png").should be_true }
+    Then { File.exist?("#{path}/google.com/google.com|-1400.png").should be_true }
   end
 
   context "prepends default protocol if missing" do
     Given(:capture_agent) { Monet::Capture.new(capture_dir: path, base_url: "http://www.facebook.com") }
     When { capture_agent.capture('/') }
-    Then { File.exist?("#{path}/www.facebook.com/www.facebook.com>-1024.png").should be_true }
+    Then { File.exist?("#{path}/www.facebook.com/www.facebook.com|-1024.png").should be_true }
   end
 
 end

data/spec/path_router_spec.rb

@@ -20,31 +20,31 @@ describe Monet::PathRouter do
 
   context "full url to path" do
     When(:path) { router.route_url("http://google.com/space/manager", 900) }
-    Then { path.should == "#{capture}/google.com/google.com>space>manager-900.png" }
+    Then { path.should == "#{capture}/google.com/google.com|space|manager-900.png" }
   end
 
   context "url path to path" do
     When(:path) { router.route_url_path("/space/manager", 900) }
-    Then { path.should == "#{capture}/google.com/google.com>space>manager-900.png"}
+    Then { path.should == "#{capture}/google.com/google.com|space|manager-900.png"}
   end
 
   context "path to url" do
-    When(:url) { router.route_path("#{capture}/google.com/google.com>space>manager-900.png") }
+    When(:url) { router.route_path("#{capture}/google.com/google.com|space|manager-900.png") }
     Then { url.should == "http://google.com/space/manager" }
   end
 
   context "path to baseline from url" do
     When(:path) { router.url_to_baseline("http://google.com/space/manager", 900) }
-    Then { path.should == "#{baseline}/google.com/google.com>space>manager-900.png" }
+    Then { path.should == "#{baseline}/google.com/google.com|space|manager-900.png" }
   end
 
   context "path to baseline from path" do
     When(:path) { router.url_path_to_baseline("/space/manager", 900) }
-    Then { path.should == "#{baseline}/google.com/google.com>space>manager-900.png" }
+    Then { path.should == "#{baseline}/google.com/google.com|space|manager-900.png" }
   end
 
   context "capture path to baseline path" do
-    When(:path) { router.capture_to_baseline("#{capture}/google.com/google.com>space>manager-900.png") }
-    Then { path.should == "#{baseline}/google.com/google.com>space>manager-900.png" }
+    When(:path) { router.capture_to_baseline("#{capture}/google.com/google.com|space|manager-900.png") }
+    Then { path.should == "#{baseline}/google.com/google.com|space|manager-900.png" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monet
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Luke van der Hoeven