RubyGems - landable - Versions diffs - 1.13.1 → 1.13.2 - Mend

landable 1.13.1 → 1.13.2

Files changed (175) hide show

data/.rubocop.yml +281 -0
data/.travis.yml +0 -1
data/CHANGELOG.md +5 -1
data/Gemfile +3 -4
data/README.md +2 -0
data/Rakefile +6 -3
data/app/controllers/concerns/landable/variables_concern.rb +9 -9
data/app/controllers/landable/api/access_tokens_controller.rb +7 -8
data/app/controllers/landable/api/assets_controller.rb +29 -26
data/app/controllers/landable/api/audits_controller.rb +6 -5
data/app/controllers/landable/api/configurations_controller.rb +1 -1
data/app/controllers/landable/api/directories_controller.rb +2 -2
data/app/controllers/landable/api/page_revisions_controller.rb +2 -4
data/app/controllers/landable/api/pages_controller.rb +39 -40
data/app/controllers/landable/api/template_revisions_controller.rb +1 -2
data/app/controllers/landable/api/templates_controller.rb +15 -14
data/app/controllers/landable/api/themes_controller.rb +15 -14
data/app/controllers/landable/api_controller.rb +10 -11
data/app/controllers/landable/public/pages_controller.rb +2 -2
data/app/controllers/landable/public/preview/page_revisions_controller.rb +2 -2
data/app/controllers/landable/public/preview/pages_controller.rb +1 -1
data/app/controllers/landable/public/sitemap_controller.rb +2 -2
data/app/decorators/landable/page_decorator.rb +3 -3
data/app/helpers/landable/pages_helper.rb +2 -2
data/app/helpers/landable/traffic_helper.rb +2 -4
data/app/models/concerns/landable/has_assets.rb +6 -9
data/app/models/concerns/landable/has_templates.rb +6 -7
data/app/models/concerns/landable/librarian.rb +5 -5
data/app/models/concerns/landable/table_name.rb +2 -2
data/app/models/landable/access_token.rb +1 -1
data/app/models/landable/asset.rb +8 -8
data/app/models/landable/asset_search_engine.rb +7 -8
data/app/models/landable/author.rb +2 -1
data/app/models/landable/category.rb +1 -3
data/app/models/landable/directory.rb +2 -2
data/app/models/landable/page.rb +44 -50
data/app/models/landable/page_revision.rb +27 -41
data/app/models/landable/page_search_engine.rb +5 -6
data/app/models/landable/search_engine.rb +2 -2
data/app/models/landable/template.rb +9 -11
data/app/models/landable/template_revision.rb +4 -14
data/app/models/landable/theme.rb +1 -1
data/app/models/landable/traffic/attribution.rb +3 -1
data/app/models/landable/traffic/page_view.rb +1 -1
data/app/models/landable/traffic/user_agent.rb +1 -1
data/app/models/landable/traffic/visit.rb +1 -1
data/app/responders/landable/api_responder.rb +5 -3
data/app/responders/landable/page_render_responder.rb +1 -1
data/app/serializers/landable/asset_serializer.rb +1 -1
data/app/serializers/landable/audit_serializer.rb +2 -3
data/app/serializers/landable/directory_serializer.rb +2 -2
data/app/serializers/landable/page_revision_serializer.rb +0 -1
data/app/serializers/landable/page_serializer.rb +5 -5
data/app/serializers/landable/template_serializer.rb +2 -2
data/app/services/landable/authentication_service.rb +1 -1
data/app/services/landable/registration_service.rb +3 -2
data/app/services/landable/render_service.rb +16 -18
data/app/services/landable/screenshot_service.rb +3 -4
data/app/services/landable/tidy_service.rb +32 -37
data/app/validators/path_validator.rb +1 -3
data/app/validators/url_validator.rb +4 -7
data/config/routes.rb +3 -6
data/db/migrate/20130510221424_create_landable_schema.rb +45 -56
data/db/migrate/20130909182713_landable_pages__add_updated_by.rb +2 -2
data/db/migrate/20130909182715_landable_page_revisions__break_out_snapshot.rb +9 -12
data/db/migrate/20131002220041_file_based_themes.rb +3 -3
data/db/migrate/20131008164204_create_head_tag_on_page.rb +4 -4
data/db/migrate/20131008193544_drop_status_codes_model.rb +1 -2
data/db/migrate/20131028145652_add_traffic_schema.rb +5 -5
data/db/migrate/20131101213623_add_dnt_column_to_visits.rb +1 -1
data/db/migrate/20131106185946_add_index_on_page_revisions_path.rb +1 -1
data/db/migrate/20131106193021_page_revisisons__path_status_code_index.rb +1 -1
data/db/migrate/20131121150902_add_attribution_id_to_unique_index.rb +2 -2
data/db/migrate/20131216214027_drop_browser_screenshot_tables.rb +3 -3
data/db/migrate/20140128170659_file_backed_templates.rb +1 -1
data/db/migrate/20140205193757_fix_status_codes.rb +3 -3
data/db/migrate/20140220170324_add_slug_to_categories.rb +1 -1
data/db/migrate/20140224205516_rename_traffic_schema.rb +7 -9
data/db/migrate/20140509190128_create_template_revisions.rb +13 -15
data/db/migrate/20140509192856_create_audits.rb +3 -3
data/db/migrate/20140602213937_path_response_time_view.rb +20 -19
data/features/step_definitions/asset_steps.rb +10 -12
data/features/step_definitions/core_api_steps.rb +29 -27
data/features/step_definitions/factory_steps.rb +16 -16
data/features/step_definitions/html_steps.rb +1 -1
data/features/step_definitions/liquid_steps.rb +8 -8
data/features/step_definitions/theme_steps.rb +4 -4
data/features/support/env.rb +5 -5
data/landable.gemspec +2 -2
data/lib/generators/landable/landable_generator.rb +2 -2
data/lib/generators/templates/landable.rb +1 -1
data/lib/landable.rb +7 -7
data/lib/landable/configuration.rb +10 -19
data/lib/landable/engine.rb +19 -19
data/lib/landable/error.rb +1 -3
data/lib/landable/layout.rb +6 -6
data/lib/landable/liquid/asset_tags.rb +3 -5
data/lib/landable/liquid/drops.rb +3 -8
data/lib/landable/liquid/filters.rb +1 -3
data/lib/landable/liquid/tags.rb +10 -10
data/lib/landable/migration.rb +30 -30
data/lib/landable/mime_types.rb +1 -1
data/lib/landable/partial.rb +2 -2
data/lib/landable/seeds.rb +3 -4
data/lib/landable/traffic.rb +4 -8
data/lib/landable/traffic/tracker.rb +48 -43
data/lib/landable/traffic/user_tracker.rb +15 -10
data/lib/landable/version.rb +1 -1
data/lib/schema_moves.rb +15 -16
data/lib/tasks/landable/cucumber.rake +46 -47
data/lib/tasks/landable/data.rake +13 -14
data/lib/tasks/landable/pgtap.rake +12 -18
data/lib/tasks/landable/seed.rake +4 -4
data/spec/concerns/landable/has_assets_spec.rb +15 -19
data/spec/concerns/landable/has_templates_spec.rb +10 -13
data/spec/concerns/landable/librarian.rb +4 -4
data/spec/concerns/landable/table_name_spec.rb +3 -5
data/spec/concerns/landable/traffic/table_name_spec.rb +2 -4
data/spec/controllers/concerns/landable/variables_concern_spec.rb +11 -10
data/spec/controllers/landable/api/assets_controller_spec.rb +15 -14
data/spec/controllers/landable/api/audits_controller_spec.rb +104 -102
data/spec/controllers/landable/api/categories_controller_spec.rb +36 -34
data/spec/controllers/landable/api/configuration_controller_spec.rb +14 -12
data/spec/controllers/landable/api/directories_controller_spec.rb +52 -50
data/spec/controllers/landable/api/page_revisions_controller_spec.rb +20 -18
data/spec/controllers/landable/api/pages_controller_spec.rb +204 -203
data/spec/controllers/landable/api/template_revisions_controller_spec.rb +20 -18
data/spec/controllers/landable/api/templates_controller_spec.rb +39 -37
data/spec/controllers/landable/api_controller_spec.rb +24 -26
data/spec/controllers/public/preview/page_revisions_controller_spec.rb +36 -34
data/spec/controllers/public/preview/pages_controller_spec.rb +32 -30
data/spec/controllers/public/sitemap_controller_spec.rb +19 -17
data/spec/decorators/page_decorator_spec.rb +9 -9
data/spec/dummy/app/helpers/application_helper.rb +1 -1
data/spec/dummy/config/application.rb +5 -6
data/spec/dummy/config/boot.rb +1 -1
data/spec/dummy/config/environments/test.rb +1 -1
data/spec/dummy/config/initializers/landable.rb +7 -6
data/spec/factories/asset.rb +1 -1
data/spec/factories/audit.rb +1 -1
data/spec/factories/authors.rb +1 -1
data/spec/factories/category.rb +1 -1
data/spec/factories/pages.rb +4 -4
data/spec/factories/template.rb +3 -3
data/spec/factories/theme.rb +2 -2
data/spec/helpers/pages_helper_spec.rb +5 -5
data/spec/lib/landable/configuration_spec.rb +2 -4
data/spec/lib/landable/event_publisher_spec.rb +1 -3
data/spec/lib/landable/layout_spec.rb +4 -4
data/spec/lib/landable/liquid_spec.rb +12 -14
data/spec/lib/landable/migration_spec.rb +4 -4
data/spec/lib/landable/partial_spec.rb +18 -18
data/spec/lib/landable/tracking_spec.rb +27 -29
data/spec/lib/landable/traffic_spec.rb +29 -33
data/spec/models/landable/access_token_spec.rb +1 -1
data/spec/models/landable/asset_spec.rb +9 -11
data/spec/models/landable/directory_spec.rb +7 -7
data/spec/models/landable/page/errors_spec.rb +1 -3
data/spec/models/landable/page_revision_spec.rb +23 -24
data/spec/models/landable/page_spec.rb +41 -42
data/spec/models/landable/template_revision_spec.rb +3 -3
data/spec/models/landable/template_spec.rb +11 -11
data/spec/models/landable/theme_spec.rb +2 -2
data/spec/models/landable/traffic/referer_spec.rb +3 -3
data/spec/responders/page_render_responder_spec.rb +0 -2
data/spec/routing/public_page_route_spec.rb +4 -5
data/spec/services/landable/authentication_service_spec.rb +7 -7
data/spec/services/landable/render_service_spec.rb +8 -8
data/spec/services/landable/screenshot_service_spec.rb +3 -3
data/spec/services/landable/tidy_service_spec.rb +20 -20
data/spec/spec_helper.rb +3 -3
data/spec/support/behaviors.rb +4 -4
data/spec/support/helpers.rb +1 -1
metadata +86 -35
checksums.yaml +0 -7

data/spec/controllers/landable/api/template_revisions_controller_spec.rb CHANGED Viewed

@@ -1,28 +1,30 @@
 require 'spec_helper'
-module Landable::Api
-  describe TemplateRevisionsController, json: true do
-    routes { Landable::Engine.routes }
+module Landable
+  module Api
+    describe TemplateRevisionsController, json: true do
+      routes { Landable::Engine.routes }
-    describe '#index' do
-      include_examples 'Authenticated API controller', :make_request
+      describe '#index' do
+        include_examples 'Authenticated API controller', :make_request
-      let(:template) { create :template }
+        let(:template) { create :template }
-      def make_request(template_id = template.id)
-        get :index, template_id: template_id
-      end
+        def make_request(template_id = template.id)
+          get :index, template_id: template_id
+        end
-      it "returns all of a template's revisions" do
-        template.publish! author: current_author
-        make_request
-        response.status.should == 200
-        last_json['template_revisions'].length.should == 1
-      end
+        it "returns all of a template's revisions" do
+          template.publish! author: current_author
+          make_request
+          response.status.should eq 200
+          last_json['template_revisions'].length.should eq 1
+        end
-      it "404s on page not found" do
-        make_request random_uuid
-        response.status.should == 404
+        it '404s on page not found' do
+          make_request random_uuid
+          response.status.should eq 404
+        end
       end
     end
   end

data/spec/controllers/landable/api/templates_controller_spec.rb CHANGED Viewed

@@ -1,42 +1,44 @@
 require 'spec_helper'
-module Landable::Api
-  describe TemplatesController, json: true do
-    routes { Landable::Engine.routes }
-    describe '#preview', json: false do
-      include_examples 'Authenticated API controller', :make_request
-      render_views
-      let(:theme) { create :theme, body: '<html><head>{% head_content %}</head><body>Theme content; page content: {{body}}</body></html>' }
-      before do
-        request.env['HTTP_ACCEPT'] = 'text/html'
-      end
-      def make_request(attributes = attributes_for(:template, theme_id: theme.id))
-        post :preview, template: attributes
-      end
-      it 'renders JSON' do
-        request.env['HTTP_ACCEPT'] = 'application/json'
-        make_request
-        response.status.should == 200
-        last_json['template']['preview'].should be_present
-      end
-      it 'renders the layout without content if the body is not present' do
-        request.env['HTTP_ACCEPT'] = 'application/json'
-        make_request attributes_for(:page, body: nil)
-        response.status.should == 200
-        last_json['template']['preview'].should include('body')
-      end
-      it 'renders without a layout if no theme is present' do
-        request.env['HTTP_ACCEPT'] = 'application/json'
-        make_request attributes_for(:page, body: 'raw content')
-        response.status.should == 200
-        last_json['template']['preview'].should include('raw content')
+module Landable
+  module Api
+    describe TemplatesController, json: true do
+      routes { Landable::Engine.routes }
+      describe '#preview', json: false do
+        include_examples 'Authenticated API controller', :make_request
+        render_views
+        let(:theme) { create :theme, body: '<html><head>{% head_content %}</head><body>Theme content; page content: {{body}}</body></html>' }
+        before do
+          request.env['HTTP_ACCEPT'] = 'text/html'
+        end
+        def make_request(attributes = attributes_for(:template, theme_id: theme.id))
+          post :preview, template: attributes
+        end
+        it 'renders JSON' do
+          request.env['HTTP_ACCEPT'] = 'application/json'
+          make_request
+          response.status.should eq 200
+          last_json['template']['preview'].should be_present
+        end
+        it 'renders the layout without content if the body is not present' do
+          request.env['HTTP_ACCEPT'] = 'application/json'
+          make_request attributes_for(:page, body: nil)
+          response.status.should eq 200
+          last_json['template']['preview'].should include('body')
+        end
+        it 'renders without a layout if no theme is present' do
+          request.env['HTTP_ACCEPT'] = 'application/json'
+          make_request attributes_for(:page, body: 'raw content')
+          response.status.should eq 200
+          last_json['template']['preview'].should include('raw content')
+        end
       end
     end
   end

data/spec/controllers/landable/api_controller_spec.rb CHANGED Viewed

@@ -21,7 +21,7 @@ describe Landable::ApiController, json: true do
     end
     def not_found
-      raise ActiveRecord::RecordNotFound
+      fail ActiveRecord::RecordNotFound
     end
     def xml_only
@@ -39,7 +39,7 @@ describe Landable::ApiController, json: true do
     end
     def other_pg_error
-      ActiveRecord::Base.connection.execute "LOL THIS IS NOT SQL AT ALL GUYS!"
+      ActiveRecord::Base.connection.execute 'LOL THIS IS NOT SQL AT ALL GUYS!'
     end
   end
@@ -70,47 +70,47 @@ describe Landable::ApiController, json: true do
       get :index, params
     end
-    it "sets current_author when valid" do
+    it 'sets current_author when valid' do
       make_request
-      controller.send(:current_author).should == author
+      controller.send(:current_author).should eq author
     end
-    it "must be in the HTTP Authorization header" do
+    it 'must be in the HTTP Authorization header' do
       headers.delete 'HTTP_AUTHORIZATION'
       make_request access_token: token.id
-      response.status.should == 401
+      response.status.should eq 401
     end
-    it "must belong to a valid Author username" do
+    it 'must belong to a valid Author username' do
       headers['HTTP_AUTHORIZATION'] = encode_basic_auth('wrong-username', token.id)
       make_request
-      response.status.should == 401
+      response.status.should eq 401
     end
-    it "must be an existing token ID" do
+    it 'must be an existing token ID' do
       headers['HTTP_AUTHORIZATION'] = encode_basic_auth(author.username, token.id.reverse)
       make_request
-      response.status.should == 401
+      response.status.should eq 401
     end
-    it "must not be expired" do
+    it 'must not be expired' do
       token.update_attributes(expires_at: 1.minute.ago)
       make_request
-      response.status.should == 401
+      response.status.should eq 401
     end
   end
   context 'rescues RecordNotFound' do
     it 'returns 404 Not Found' do
       get :not_found
-      response.status.should == 404
+      response.status.should eq 404
     end
   end
   context 'rescues RecordInvalid' do
     it 'returns 422 Unprocessable Entity' do
       get :record_invalid
-      response.status.should == 422
+      response.status.should eq 422
     end
     it 'renders ActiveModel::Errors as the JSON response' do
@@ -123,20 +123,20 @@ describe Landable::ApiController, json: true do
     it 'returns 406 Not Acceptable' do
       request.env['HTTP_ACCEPT'] = 'text/plain'
       get :xml_only
-      response.status.should == 406
+      response.status.should eq 406
     end
   end
   context 'rescues PG::Errors about invalid UUIDs' do
     it 'returns 404' do
       get :uuid_invalid
-      response.status.should == 404
+      response.status.should eq 404
     end
     it 're-raises any other PG::Error' do
-      expect {
+      expect do
         get :other_pg_error
-      }.to raise_error(PG::Error)
+      end.to raise_error(PG::Error)
     end
   end
@@ -149,13 +149,11 @@ describe Landable::ApiController, json: true do
       get :ok
       # sanity check
-      request.format.symbol.should == :xml
+      request.format.symbol.should eq :xml
-      controller.api_media.should == {
-        format: request.format.symbol,
-        version: Landable::VERSION::STRING,
-        param: nil,
-      }
+      controller.api_media.should eq(format: request.format.symbol,
+                                     version: Landable::VERSION::STRING,
+                                     param: nil)
     end
   end
@@ -168,8 +166,8 @@ describe Landable::ApiController, json: true do
     it 'should set X-Landable-Media-Type' do
       get :responder
-      response.status.should == 200
-      response.headers['X-Landable-Media-Type'].should == "landable.v#{Landable::VERSION::STRING}; format=json"
+      response.status.should eq 200
+      response.headers['X-Landable-Media-Type'].should eq "landable.v#{Landable::VERSION::STRING}; format=json"
     end
     context 'patch' do

data/spec/controllers/public/preview/page_revisions_controller_spec.rb CHANGED Viewed

@@ -1,41 +1,43 @@
 require 'spec_helper'
-module Landable::Public::Preview
-  describe PageRevisionsController do
-    routes { Landable::Engine.routes }
-    describe '#show' do
-      let(:author) { create :author }
-      let(:page) { create :page, body: '<p>hello</p>' }
-      let(:page_revision) do
-        page.publish! author: author
-        page.revisions.first
-      end
-      before(:each) do
-        # establish the tested-for revision
-        page_revision
-        2.times do |i|
-          page.update_attributes! body: "update #{i}"
-          page.publish! author: author
+module Landable
+  module Public
+    module Preview
+      describe PageRevisionsController do
+        routes { Landable::Engine.routes }
+        describe '#show' do
+          let(:author) { create :author }
+          let(:page) { create :page, body: '<p>hello</p>' }
+          let(:page_revision) do
+            page.publish! author: author
+            page.revisions.first
+          end
+          before(:each) do
+            # establish the tested-for revision
+            page_revision
+            2.times do |i|
+              page.update_attributes! body: "update #{i}"
+              page.publish! author: author
+            end
+          end
+          def make_request
+            get :show, id: page_revision.id
+          end
+          it 'renders the page revision' do
+            make_request
+            response.body.should include '<p>hello</p>'
+          end
+          it 'is available at /-/pr/:id' do
+            assert_recognizes({ controller: 'landable/public/preview/page_revisions', action: 'show', id: page_revision.id }, "/-/pr/#{page_revision.id}")
+          end
         end
       end
-      def make_request
-        get :show, id: page_revision.id
-      end
-      it 'renders the page revision' do
-        make_request
-        response.body.should include '<p>hello</p>'
-      end
-      it 'is available at /-/pr/:id' do
-        assert_recognizes({controller: 'landable/public/preview/page_revisions', action: 'show', id: page_revision.id}, "/-/pr/#{page_revision.id}")
-      end
     end
   end
 end

data/spec/controllers/public/preview/pages_controller_spec.rb CHANGED Viewed

@@ -1,36 +1,38 @@
 require 'spec_helper'
-module Landable::Public::Preview
-  describe PagesController do
-    routes { Landable::Engine.routes }
-    describe '#show' do
-      let(:page) { create :page, body: '<p>hello</p>' }
-      before(:each) do
-        page.publish! author: create(:author)
-        page.update_attributes! body: '<p>why hello there</p>'
-      end
-      def make_request
-        get :show, id: page.id
-      end
-      it 'renders the page in situ' do
-        make_request
-        response.body.should include '<p>why hello there</p>'
-      end
-      it 'renders the preview message' do
-        make_request
-        response.body.should include 'Preview Mode'
+module Landable
+  module Public
+    module Preview
+      describe PagesController do
+        routes { Landable::Engine.routes }
+        describe '#show' do
+          let(:page) { create :page, body: '<p>hello</p>' }
+          before(:each) do
+            page.publish! author: create(:author)
+            page.update_attributes! body: '<p>why hello there</p>'
+          end
+          def make_request
+            get :show, id: page.id
+          end
+          it 'renders the page in situ' do
+            make_request
+            response.body.should include '<p>why hello there</p>'
+          end
+          it 'renders the preview message' do
+            make_request
+            response.body.should include 'Preview Mode'
+          end
+          it 'is available at /-/p/:id' do
+            assert_recognizes({ controller: 'landable/public/preview/pages', action: 'show', id: page.id }, "/-/p/#{page.id}")
+          end
+        end
       end
-      it 'is available at /-/p/:id' do
-        assert_recognizes({controller: 'landable/public/preview/pages', action: 'show', id: page.id}, "/-/p/#{page.id}")
-      end
     end
   end
 end

data/spec/controllers/public/sitemap_controller_spec.rb CHANGED Viewed

@@ -1,25 +1,27 @@
 require 'spec_helper'
-module Landable::Public
-  describe SitemapController do
-    routes { Landable::Engine.routes }
+module Landable
+  module Public
+    describe SitemapController do
+      routes { Landable::Engine.routes }
-    it 'returns a 200 status' do
-      get :index
-      response.status.should == 200
-    end
+      it 'returns a 200 status' do
+        get :index
+        response.status.should == 200
+      end
-    it 'returns xml' do
-      get :index
-      response.content_type.should == 'application/xml'
-    end
+      it 'returns xml' do
+        get :index
+        response.content_type.should == 'application/xml'
+      end
-    it 'calls generate_sitemap with appropriate arguments' do
-      Landable::Page.should_receive(:generate_sitemap).with(host: 'test.host',
-                                                            protocol: 'https',
-                                                            exclude_categories: ['Testing'],
-                                                            sitemap_additional_paths: ['/terms.html']).and_call_original
-      get :index, format: :xml
+      it 'calls generate_sitemap with appropriate arguments' do
+        Landable::Page.should_receive(:generate_sitemap).with(host: 'test.host',
+                                                              protocol: 'https',
+                                                              exclude_categories: ['Testing'],
+                                                              sitemap_additional_paths: ['/terms.html']).and_call_original
+        get :index, format: :xml
+      end
     end
   end
 end