spree_pages 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f999e0f6a38e2ae387badc6f1e5ca52abf07290d025686c4cd2e31caa7cb6071
-  data.tar.gz: 4e68af456716ee031b77a37006b97fbb4d68dd08a4e1e7e26c58767d5f66aacf
+  metadata.gz: 9573f9b763c23a7b6114698dd3513b0b1919d851b8f2f2e039a53a1c345f12b4
+  data.tar.gz: a5a91903024705297a92b17463aea167adc9601cb4ae62ac0e58ee7225202496
 SHA512:
-  metadata.gz: 800f43b9c67109819f9536d92dac1ef6fe16ba68e789896983fc12d5f7665f4c7178cba0f932bfe1e1c5616617fcd9fddf2a16aab3938e1564d0929dc46228ca
-  data.tar.gz: 5dc1e4103ac4714ce97cf4698e623064e5453a9a4b817c563fd24351c83fcd4d5ec4c200a7290d58ffb9583252110f0b63b541e1aefcb3a66198dd21eb91b5b2
+  metadata.gz: 809b58b27f0a7d4055f1aad6ec1cf998cddfa03b656087c35023e1c8bab178da1a9e70b63a458fb74015a25fbd7c11098f62f48439579d7de3882b6263a838f3
+  data.tar.gz: 1bef45e14a3b632d429a5047bf87092d738104a80f07d9cebff5bdfcc3374f2850450543a116becdccfca7f3399f732f88980f455951b28ffde21e6d3d8aafc3

data/.codeclimate.yml

@@ -14,7 +14,7 @@ plugins:
     enabled: true
   rubocop:
     enabled: true
-    channel: rubocop-0-54 # https://github.com/codeclimate/codeclimate-rubocop/branches/all?utf8=%E2%9C%93&query=channel%2Frubocop
+    channel: rubocop-0-58 # https://github.com/codeclimate/codeclimate-rubocop/branches/all?utf8=%E2%9C%93&query=channel%2Frubocop
   # css
   csslint:
     enabled: true

data/README.md

@@ -1,11 +1,11 @@
-<!-- markdownlint-disable MD041 -->
-[![Build Status](https://travis-ci.org/public-market/spree_pages.svg?branch=master)](https://travis-ci.org/public-market/spree_pages)
-[![Maintainability](https://api.codeclimate.com/v1/badges/5af5e44f4cf49e9f6f9b/maintainability)](https://codeclimate.com/github/public-market/spree_pages/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/5af5e44f4cf49e9f6f9b/test_coverage)](https://codeclimate.com/github/public-market/spree_pages/test_coverage)
-<!-- markdownlint-enable MD041 -->
+![Abundance Labds](.github/AbundanceLabs_readme_banner.png)
 
 # Spree Pages
 
+[![Build Status](https://travis-ci.org/abundance-labs/spree_pages.svg?branch=master)](https://travis-ci.org/abundance-labs/spree_pages)
+[![Maintainability](https://api.codeclimate.com/v1/badges/091271e9215d80067064/maintainability)](https://codeclimate.com/github/abundance-labs/spree_pages/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/091271e9215d80067064/test_coverage)](https://codeclimate.com/github/abundance-labs/spree_pages/test_coverage)
+
 Simplified version of `spree_static_pages` without localisation overhead
 
 ## Installation
@@ -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 Public Market Foundation, released under the New BSD License
+Copyright (c) 2018 Abundance Labs, Inc., released under the New BSD License

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

@@ -1,10 +1,20 @@
 module Spree
   module Admin
     class PagesController < ResourceController
+      custom_callback(:update).before(:build_image)
+
       private
 
+      def build_image
+        @object.build_meta_image(attachment: permitted_meta_image_params[:meta_image])
+      end
+
       def permitted_resource_params
-        params.require(:page).permit(%i[title content slug meta_title meta_description meta_image live])
+        params.require(:page).permit(:title, :content, :slug, :meta_title, :meta_description, :live)
+      end
+
+      def permitted_meta_image_params
+        params.require(:page).permit(:meta_image)
       end
     end
   end

data/app/models/spree/page.rb

@@ -1,7 +1,6 @@
 module Spree
   class Page < ApplicationRecord
-    has_attached_file :meta_image, styles: ->(i) { i.instance.class.meta_image_sizes }
-    validates_attachment_content_type :meta_image, content_type: %r{\Aimage\/.*\z}
+    has_one :meta_image, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
 
     validates :title, :slug, :content, presence: true
     validates :slug, uniqueness: true
@@ -13,11 +12,5 @@ module Spree
     def remove_leading_slash_from_slug
       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
   end
 end

data/app/views/spree/admin/pages/_form.html.erb

@@ -32,13 +32,15 @@
         <%= f.text_field :meta_description, class: 'form-control' %>
       </div>
 
-      <div class="form-group">
-        <%= f.label :meta_image %>
+
+      <%= f.field_container :meta_image, class: ['form-group'] do %>
+        <%= f.label :meta_image, Spree.t(:meta_image) %>
         <%= f.file_field :meta_image %>
-        <% if resource.meta_image.exists? %>
+
+        <% if resource.meta_image %>
           <%= image_tag resource.meta_image.url(:small) %>
         <% end %>
-      </div>
+      <% end %>
 
       <div class="form-group">
         <%= f.label :live %>

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

@@ -3,7 +3,7 @@
   <meta name="title" content="<%= page_meta_title %>">
   <meta property="og:title" content="<%= page_meta_title %>">
   <meta property="og:description" content="<%= page.meta_description || meta_data[:description] %>">
-  <% if page.meta_image.exists? %>
+  <% if page.meta_image %>
     <meta property="og:image" content="<%= page.meta_image.url(:large) %>">
   <% end %>
 <% end %>

data/db/migrate/20181024132911_remove_meta_image_fields_from_spree_pages.rb

@@ -0,0 +1,5 @@
+class RemoveMetaImageFieldsFromSpreePages < ActiveRecord::Migration[5.2]
+  def change
+    remove_attachment :spree_pages, :meta_image
+  end
+end

data/lib/spree_pages/version.rb

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

data/spec/factories/pages.rb

@@ -6,10 +6,12 @@ FactoryBot.define do
     meta_title { generate(:random_string) }
     meta_description { generate(:random_string) }
 
+    meta_image { nil }
+
     sequence(:slug) { |n| "page#{n}" }
 
     trait :with_image do
-      meta_image { File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg') }
+      after(:create) { |page| page.create_meta_image(attachment: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg')) }
     end
   end
 end

data/spec/features/visit_pages_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe 'Visits page', type: :feature 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)
+          expect(page).to have_css("meta[property='og:image'][content='#{spree_page.reload.meta_image.url(:large)}']", visible: false)
         end
       end
     end

data/spec/models/spree/page_spec.rb

@@ -15,12 +15,4 @@ 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/spec_helper.rb

@@ -2,6 +2,7 @@ require_relative './support/simplecov'
 
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
+ENV['SPREE_USE_PAPERCLIP'] = 'true'
 
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
@@ -15,7 +16,6 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 # Requires factories and other useful helpers defined in spree_core.
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/controller_requests'
-require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 
 RSpec.configure do |config|

data/spec/support/factory_bot.rb

@@ -1,5 +1,6 @@
 require 'factory_bot'
 
+require 'spree/testing_support/factories'
 FactoryBot.find_definitions
 
 RSpec.configure do |config|

data/spree_pages.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'factory_bot'
   s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'mysql2', '0.4.10'
   s.add_development_dependency 'pg', '~> 0.18'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Kozaev Artem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -162,20 +162,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +225,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/AbundanceLabs_readme_banner.png"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -270,6 +257,7 @@ files:
 - db/migrate/20180319090554_create_pages.rb
 - db/migrate/20180321105816_add_meta_fields_to_pages.rb
 - db/migrate/20180321122609_add_live_to_spree_pages.rb
+- db/migrate/20181024132911_remove_meta_image_fields_from_spree_pages.rb
 - gemfiles/.bundle/config
 - gemfiles/spree_3_1.gemfile
 - gemfiles/spree_3_2.gemfile
@@ -286,6 +274,7 @@ files:
 - spec/controllers/spree/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/visit_pages_spec.rb
+- spec/fixtures/thinking-cat.jpg
 - spec/models/spree/page_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
@@ -315,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simple static pages for spree
@@ -324,6 +313,7 @@ test_files:
 - spec/controllers/spree/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/visit_pages_spec.rb
+- spec/fixtures/thinking-cat.jpg
 - spec/models/spree/page_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb