landable 1.13.1 → 1.13.2

data/spec/services/landable/render_service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Landable
   describe RenderService do
-    let(:page)  { build  :page, body: 'render test', theme: theme }
+    let(:page)  { build :page, body: 'render test', theme: theme }
     let(:theme) { create :theme }
 
     def render(*args)
@@ -15,24 +15,24 @@ module Landable
     it 'returns a string' do
       page.body = 'Hi mom'
       theme.body = '{{body}}'
-      render.should == 'Hi mom'
+      render.should eq 'Hi mom'
     end
 
     context 'without a theme' do
       it 'returns the bare page body' do
         page.theme = nil
-        render.should == page.body
+        render.should eq page.body
       end
 
       it 'returns the bare page body if the theme is defined, but has no liquid body template' do
         page.theme.body = nil
-        render.should == page.body
+        render.should eq page.body
       end
 
       it 'returns an empty string if there is also no page body' do
         page.theme = nil
         page.body = nil
-        render.should == ''
+        render.should eq ''
       end
     end
 
@@ -40,7 +40,7 @@ module Landable
       it 'renders the bare theme' do
         theme.body = 'foo {{body}}'
         page.body  = nil
-        render.should == 'foo '
+        render.should eq 'foo '
       end
     end
 
@@ -70,14 +70,14 @@ module Landable
       let(:page) { build :page, body: 'render test', path: 'foo.txt', theme: theme }
 
       it 'renders without a theme' do
-        render.should == 'render test'
+        render.should eq 'render test'
       end
 
       context 'previewing' do
         let(:rendered) { render(preview: true) }
 
         it 'renders with <pre> around the content' do
-          rendered.should == '<pre>render test</pre>'
+          rendered.should eq '<pre>render test</pre>'
         end
       end
     end

data/spec/services/landable/screenshot_service_spec.rb

@@ -16,8 +16,8 @@ module Landable
 
         it 'should return a file pointer to the downloaded screenshot' do
           Net::HTTP.should_receive(:post_form) do |uri, params|
-            uri.to_s.should == 'http://publicist.foo/api/services/screenshots'
-            params.should == {'screenshot[url]' => screenshot_url}
+            uri.to_s.should eq 'http://publicist.foo/api/services/screenshots'
+            params.should eq('screenshot[url]' => screenshot_url)
 
             double('response', code: '200', content_type: 'image/png', body: screenshot_content)
           end
@@ -25,7 +25,7 @@ module Landable
           screenshot = ScreenshotService.capture screenshot_url
 
           screenshot.should be_a Tempfile
-          screenshot.read.should == screenshot_content
+          screenshot.read.should eq screenshot_content
         end
       end
 

data/spec/services/landable/tidy_service_spec.rb

@@ -5,13 +5,13 @@ module Landable
     let(:service) { TidyService }
 
     describe '.tidyable?' do
-      after(:each) { service.class_variable_set :@@is_tidyable, nil }
+      after(:each) { service.instance_variable_set :@is_tidyable, nil }
 
       context 'when tidyable' do
         it 'should check on the availability of a `tidy` command' do
           Kernel.should_receive(:system).with('which tidy > /dev/null') { true }
           service.should be_tidyable
-          service.class_variable_get(:@@is_tidyable).should be_true
+          service.instance_variable_get(:@is_tidyable).should be_true
         end
       end
 
@@ -19,7 +19,7 @@ module Landable
         it 'should return false' do
           Kernel.should_receive(:system).with('which tidy > /dev/null') { false }
           service.should_not be_tidyable
-          service.class_variable_get(:@@is_tidyable).should be_false
+          service.instance_variable_get(:@is_tidyable).should be_false
         end
       end
     end
@@ -29,7 +29,7 @@ module Landable
         input = double
         output = double
         service.should_receive(:call).with(input, raise_on_error: true) { output }
-        service.call!(input).should == output
+        service.call!(input).should eq output
       end
     end
 
@@ -40,7 +40,7 @@ module Landable
           expect { service.call 'foo' }.to raise_error(StandardError)
         end
       end
-      
+
       context 'when tidyable' do
         before(:each) do
           service.should_receive(:tidyable?) { true }
@@ -51,22 +51,22 @@ module Landable
           output = double('output')
           result = double('result')
 
-          service.should_receive(:wrap_liquid) { |input| input }.ordered # passthrough; will test later
+          service.should_receive(:wrap_liquid) { |value| value }.ordered # passthrough; will test later
 
           mock_io = double('io')
           mock_io.should_receive(:puts).with(input).ordered
           mock_io.should_receive(:close_write).ordered
           mock_io.should_receive(:read) { output }
 
-          service.should_receive(:unwrap_liquid) { |input| input }.ordered # passthrough; will test later
+          service.should_receive(:unwrap_liquid) { |value| value }.ordered # passthrough; will test later
 
           # other setup
-          service.should_receive(:options) { ['one', 'two', 'three'] }
+          service.should_receive(:options) { %w(one two three) }
           IO.should_receive(:popen).with('tidy one two three', 'r+').and_yield(mock_io)
 
           TidyService::Result.should_receive(:new).with(output) { result }
 
-          service.call(input).should == result
+          service.call(input).should eq result
         end
 
         it 'should wrap known liquid tags before sending to tidy, and unwrap them after' do
@@ -81,13 +81,13 @@ module Landable
           IO.should_receive(:popen).and_yield(mock_io)
 
           # ensuring that the output == the input, modulo any new whitespace
-          service.call(original_string).to_s.gsub(/\s+/, ' ').should == original_string.gsub(/\s+/, ' ')
+          service.call(original_string).to_s.gsub(/\s+/, ' ').should eq original_string.gsub(/\s+/, ' ')
         end
 
         context 'raise_on_error is enabled' do
           it 'should raise TidyError when status is 2' do
             IO.should_receive(:popen)
-            $?.should_receive(:exitstatus) { 2 }
+            $CHILD_STATUS.should_receive(:exitstatus) { 2 }
 
             # meh, shouldn't have to do this. could use a refactor.
             service.should_receive(:wrap_liquid) { |input| input }
@@ -97,7 +97,7 @@ module Landable
 
           it 'should be cool when status is 1' do
             IO.should_receive(:popen)
-            $?.should_receive(:exitstatus) { 1 }
+            $CHILD_STATUS.should_receive(:exitstatus) { 1 }
 
             # meh, shouldn't have to do this. could use a refactor.
             service.should_receive(:wrap_liquid)   { |input| input }
@@ -112,8 +112,8 @@ module Landable
 
   module TidyService
     describe Result do
-
-      let(:result) { Result.new <<-eof
+      let(:result) do
+        Result.new <<-eof
 <html>
   <head>
     <link type="text/css" rel="stylesheet">
@@ -128,31 +128,31 @@ module Landable
   </body>
 </html>
 eof
-      }
+      end
 
       describe '#to_s' do
         it 'should return the string given on init' do
-          Result.new('foobar').to_s.should == 'foobar'
+          Result.new('foobar').to_s.should eq 'foobar'
         end
       end
 
       describe '#body' do
         it 'should return the de-indented contents of <body>' do
-          result.body.should == "<div>hello</div>\n<div>friend</div>"
+          result.body.should eq "<div>hello</div>\n<div>friend</div>"
         end
       end
 
       describe '#head' do
         it 'should return the de-indented contents of <head>' do
-          result.head.should == "<link type=\"text/css\" rel=\"stylesheet\">\n<title>sup</title>\n<style type=\"text/css\">\n  body {}\n</style>"
+          result.head.should eq "<link type=\"text/css\" rel=\"stylesheet\">\n<title>sup</title>\n<style type=\"text/css\">\n  body {}\n</style>"
         end
       end
 
       describe '#css' do
         it 'should return embedded and linked stylesheets from the head' do
-          result.css.should == "<link type=\"text/css\" rel=\"stylesheet\">\n\n<style type=\"text/css\">\n  body {}\n</style>"
+          result.css.should eq "<link type=\"text/css\" rel=\"stylesheet\">\n\n<style type=\"text/css\">\n  body {}\n</style>"
         end
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
 require 'simplecov'
 SimpleCov.start 'rails'
@@ -15,7 +15,7 @@ require 'faker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("../../spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join('../../spec/support/**/*.rb')].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
@@ -25,7 +25,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.order = "random"
+  config.order = 'random'
 
   config.include FactoryGirl::Syntax::Methods
   config.include Landable::Spec::CoreHelpers

data/spec/support/behaviors.rb

@@ -25,7 +25,7 @@ end
 
 shared_context 'JSON API endpoint', type: :request do
   before do
-    default_parameters[:format]    ||= 'json'
+    default_parameters[:format] ||= 'json'
     default_headers['HTTP_ACCEPT'] ||= 'application/json'
   end
 
@@ -45,7 +45,7 @@ shared_examples 'API authentication' do |request_method|
   it 'returns 401 if unauthorized' do
     default_headers.delete 'HTTP_AUTHORIZATION'
     send(request_method)
-    response.status.should == 401
+    response.status.should eq 401
   end
 end
 
@@ -78,7 +78,7 @@ end
 #       end
 #     end
 shared_examples 'Authenticated API controller' do |request_method|
-  raise ArgumentError.new("Method name required as argument") if request_method.nil?
+  fail(ArgumentError, 'Method name required as argument') if request_method.nil?
 
   before do
     use_access_token unless example.metadata[:auth] == false
@@ -102,6 +102,6 @@ shared_examples 'Authenticated API controller' do |request_method|
 
   it 'returns 401 if unauthorized', auth: false do
     send(request_method)
-    response.status.should == 401
+    response.status.should eq 401
   end
 end

data/spec/support/helpers.rb

@@ -7,7 +7,7 @@ module Landable
 
       def at_json(path, object = last_json)
         path.split('/').reduce object do |parent, key|
-          key = key.to_i if Array === parent
+          key = key.to_i if parent.is_a?(Array)
           parent.fetch key
         end
       end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
+  prerelease: 
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,20 +62,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,90 +94,103 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: lookup_by
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>'
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -195,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -202,6 +230,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -209,20 +238,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-schema
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -230,6 +262,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -237,71 +270,81 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: valid_attribute
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Landing page storage, rendering, tracking, and management API
@@ -316,6 +359,7 @@ files:
 - .hound.yml
 - .rbenv-gemsets
 - .rspec
+- .rubocop.yml
 - .ruby.yml
 - .travis.yml
 - CHANGELOG.md
@@ -674,26 +718,33 @@ files:
 homepage: https://github.com/enova/landable
 licenses:
 - MIT-LICENSE
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 953659550368963873
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 953659550368963873
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Mountable CMS engine for Rails
 test_files:
 - features/api/access_tokens.feature