spree_pages 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be5106f5472ee19e3046f5efbe402465c4a0ff8d
-  data.tar.gz: 2854db9fbac114800340062cd7bd7874b55f010e
+SHA256:
+  metadata.gz: f999e0f6a38e2ae387badc6f1e5ca52abf07290d025686c4cd2e31caa7cb6071
+  data.tar.gz: 4e68af456716ee031b77a37006b97fbb4d68dd08a4e1e7e26c58767d5f66aacf
 SHA512:
-  metadata.gz: 06ee4a8872f42e0c6670fd9fece3f9deb31af9902f6d0d44acc073f45b9007cf394a9546ec47a3ee7fcdca8952c0a7c51e838287924bb9925b8d17cfa6b43b02
-  data.tar.gz: 1b08b4f3643c888d45935253767b7f3c7ea49b8c68e07282da1e2b23840939d9f5e873bae86c3814f1fa3302cfafff5198b2fb45fd311080f846bf62e53f22b8
+  metadata.gz: 800f43b9c67109819f9536d92dac1ef6fe16ba68e789896983fc12d5f7665f4c7178cba0f932bfe1e1c5616617fcd9fddf2a16aab3938e1564d0929dc46228ca
+  data.tar.gz: 5dc1e4103ac4714ce97cf4698e623064e5453a9a4b817c563fd24351c83fcd4d5ec4c200a7290d58ffb9583252110f0b63b541e1aefcb3a66198dd21eb91b5b2

data/README.md

@@ -80,4 +80,4 @@ If you'd like to contribute, please take a look at the
 [instructions](CONTRIBUTING.md) for installing dependencies and crafting a good
 pull request.
 
-Copyright (c) 2018 Abundance Labs, Inc., released under the New BSD License
+Copyright (c) 2018 Public Market Foundation, released under the New BSD License

data/app/controllers/spree/admin/pages_controller.rb

@@ -4,7 +4,7 @@ module Spree
       private
 
       def permitted_resource_params
-        params.require(:page).permit(%i[id title content slug meta_title meta_description meta_image live])
+        params.require(:page).permit(%i[title content slug meta_title meta_description meta_image live])
       end
     end
   end

data/app/models/spree/page.rb

@@ -14,12 +14,10 @@ module Spree
       self.slug = slug[1..-1] if slug.start_with?('/') # ensure that slugs don't start with a slash
     end
 
+    private
+
     def self.meta_image_sizes
       { large: '1200x630>', medium: '600x315>', small: '200x200>' }
     end
-
-    def self.meta_image_sizes_tags
-      meta_image_sizes.map { |style, sizes| [style, { width: sizes.split('x')[0], height: sizes.split('x')[1].tr('>', '') }] }.to_h
-    end
   end
 end

data/app/views/spree/pages/_og_meta_tags.html.erb

@@ -4,10 +4,6 @@
   <meta property="og:title" content="<%= page_meta_title %>">
   <meta property="og:description" content="<%= page.meta_description || meta_data[:description] %>">
   <% if page.meta_image.exists? %>
-    <% Spree::Page.meta_image_sizes.keys.each do |style| %>
-      <meta property="og:image" content="<%= page.meta_image.url(style) %>">
-      <meta property="og:image:width" content="<%= Spree::Page.meta_image_sizes_tags[style][:width] %>">
-      <meta property="og:image:height" content="<%= Spree::Page.meta_image_sizes_tags[style][:height] %>">
-    <% end %>
+    <meta property="og:image" content="<%= page.meta_image.url(:large) %>">
   <% end %>
 <% end %>

data/config/routes.rb

@@ -2,6 +2,7 @@ Spree::Core::Engine.add_routes do
   namespace :admin, path: Spree.admin_path do
     resources :pages
   end
+
   constraints(Spree::SpreePages::RoutesConstraints) do
     get '/(*path)', to: 'pages#show', as: 'page'
   end

data/lib/spree_pages/routes_contstraints.rb

@@ -5,7 +5,7 @@ module Spree
       def self.matches?(request)
         return false if request.path == '/' ||
                         request.path.starts_with?(Spree.admin_path) ||
-                        request.path =~ %r{\A\/+(account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+}
+                        request.path =~ %r{\A\/+(api|account|cart|checkout|content|login|pg\/|orders|products|s\/|session|signup|shipments|states|t\/|tax_categories|user)+}
         Spree::Page.find_by(slug: request.path[1..-1]).present?
       end
       # rubocop:enable Metrics/LineLength

data/lib/spree_pages/version.rb

@@ -10,7 +10,7 @@ module SpreePages
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spec/controllers/spree/admin/pages_controller_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe Spree::Admin::PagesController, type: :controller do
+  stub_authorization!
+
+  routes { Spree::Core::Engine.routes }
+
+  describe '#update' do
+    subject(:update_page) { put :update, params: { id: page.id, page: { title: new_page_title }} }
+
+    let(:new_page_title) { 'New page title' }
+    let(:page) { create(:page, title: 'Old page title') }
+
+    it 'updates page' do
+      expect {
+        update_page
+      }.to change { page.reload.title }.to new_page_title
+    end
+  end
+end

data/spec/factories/pages.rb

@@ -3,6 +3,13 @@ FactoryBot.define do
     title { generate(:random_string) }
     content { generate(:random_description) }
 
+    meta_title { generate(:random_string) }
+    meta_description { generate(:random_string) }
+
     sequence(:slug) { |n| "page#{n}" }
+
+    trait :with_image do
+      meta_image { File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg') }
+    end
   end
 end

data/spec/features/visit_pages_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Visits page', type: :feature do
-  before { create(:store, default: true) }
+  before { allow(Spree::Store).to receive(:default) { build_stubbed(:store) } }
 
   it 'correctly loads page' do
     spree_page = create(:page, slug: 'page')
@@ -20,4 +20,34 @@ RSpec.describe 'Visits page', type: :feature do
     visit spree.product_path(product)
     expect(page).to have_text product.name
   end
+
+  describe 'meta tags' do
+    let(:spree_page) { create(:page) }
+
+    before { visit spree.page_path(spree_page.slug) }
+
+    it 'includes meta name' do
+      expect(page).to have_css("meta[property='og:title'][content='#{spree_page.meta_title}']", visible: false)
+    end
+
+    it 'includes meta description' do
+      expect(page).to have_css("meta[property='og:description'][content='#{spree_page.meta_description}']", visible: false)
+    end
+
+    describe 'image' do
+      context 'without meta image' do
+        it 'does not include meta image' do
+          expect(page).not_to have_css("meta[property='og:image']", visible: false)
+        end
+      end
+
+      context 'with meta image' do
+        let(:spree_page) { create(:page, :with_image) }
+
+        it 'includes meta image' do
+          expect(page).to have_css("meta[property='og:image'][content='#{spree_page.meta_image.url(:large)}']", visible: false)
+        end
+      end
+    end
+  end
 end

data/spec/models/spree/page_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Spree::Page, type: :model do
-  let!(:page) { build_stubbed(:page) }
+  let(:page) { build_stubbed(:page) }
 
   describe 'factory' do
     it 'is valid' do
@@ -15,4 +15,12 @@ RSpec.describe Spree::Page, type: :model do
       expect(page.slug).to eq 'slash'
     end
   end
+
+  describe '#meta_image' do
+    subject(:image) { page.meta_image }
+
+    let(:page) { build_stubbed(:page, :with_image) }
+
+    it { expect(image.styles).to include(:large, :medium, :small) }
+  end
 end

data/spec/support/devise.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include Devise::Test::ControllerHelpers, type: :controller
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kozaev Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -282,6 +282,7 @@ files:
 - lib/spree_pages/routes_contstraints.rb
 - lib/spree_pages/version.rb
 - spec/.rubocop.yml
+- spec/controllers/spree/admin/pages_controller_spec.rb
 - spec/controllers/spree/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/visit_pages_spec.rb
@@ -289,6 +290,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/database_cleaner.rb
+- spec/support/devise.rb
 - spec/support/factory_bot.rb
 - spec/support/simplecov.rb
 - spree_pages.gemspec
@@ -313,11 +315,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple static pages for spree
 test_files:
+- spec/controllers/spree/admin/pages_controller_spec.rb
 - spec/controllers/spree/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/visit_pages_spec.rb
@@ -325,5 +328,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/database_cleaner.rb
+- spec/support/devise.rb
 - spec/support/factory_bot.rb
 - spec/support/simplecov.rb