RubyGems - refinerycms-inquiries - Versions diffs - 3.1.0 → 4.0.0 - Mend

refinerycms-inquiries 3.1.0 → 4.0.0

Files changed (15) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +1 -1
data.tar.gz.sig +0 -0
data/.travis.yml +3 -2
data/Gemfile +17 -6
data/app/controllers/refinery/inquiries/admin/inquiries_controller.rb +1 -1
data/app/controllers/refinery/inquiries/admin/settings_controller.rb +1 -1
data/bin/rails +9 -3
data/certs/parndt.pem +14 -14
data/config/locales/ru.yml +2 -0
data/db/migrate/20101208082840_create_inquiries.rb +1 -1
data/refinerycms-inquiries.gemspec +4 -4
data/spec/features/refinery/inquiries/mailer_spec.rb +1 -0
metadata +31 -25
metadata.gz.sig +0 -0

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ddb0e6c028b0f09330b4acbaf76bc8ceed1d9d
-  data.tar.gz: 486b3df780a2b9784ba0a1fa464037a1900ceb2e
+  metadata.gz: 9ab506a2254d9ac6e5fbfff3d931aa7a3af9574a
+  data.tar.gz: 7f37e5362c3a012ed33f54c101ceab5668cd567d
 SHA512:
-  metadata.gz: fd919f169f626caf18e06f165b91618e89b6713087024976ea929e2c1f6b6b83961b8bbacf9b2e44a1a57b8cdbfc8e7e9747b14f8370a33a025b253f08750ba5
-  data.tar.gz: d04451a99c47567cdbe5fd275b685a917316236fcec87b8691ec1dd1051c87699ec8e9a3371985d1a1200c85c89614d4887610bb53bed08ebec3316a06cda0fc
+  metadata.gz: b3d0ed0390005dd4f6e21c002487f519bf99655fb7150471d5c766802b066b214272c02b0746bed666fd16a5db7fb3011c62492ec74148991d113041b5df1d4f
+  data.tar.gz: 1e6f1d25c4f198c5baaa0d4add25123040c81cc890f60496d37166a2ed8e32022fcb5e0a829b89325a1540b56905100da585bb526a7c9c179d22302ef8273602

checksums.yaml.gz.sig CHANGED

	@@ -1 +1 @@
1	- (~~��:�~~[~~mg�~~
1	+ .�V��5�\|�̴��a�p�?z�_��O��;��>�j,��C��ܚz=� �j�&*d��Q��(�t��ek%o�ʚM-Ci�?uU�3UC��L�mc.qB�v�&3�3k�gaW)�M�'$e�o�w��TՉ�p��1��$=q��zR��@��'��`��!��2��4͔�5I>��[

data.tar.gz.sig CHANGED

Binary file

data/.travis.yml CHANGED

@@ -25,5 +25,6 @@ env:
   - DB=postgresql
   - DB=mysql
 rvm:
-  - 2.1
-  - 2.0.0
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8

data/Gemfile CHANGED

@@ -2,12 +2,20 @@ source 'https://rubygems.org'
 gemspec
-gem 'refinerycms', ["~> 3.0", ">= 3.0.3"]
-gem 'refinerycms-settings', "~> 3.0"
+git "https://github.com/refinery/refinerycms", branch: "master" do
+  gem "refinerycms"
+  group :test do
+    gem "refinerycms-testing"
+  end
+end
+group :development do
+  gem 'listen'
+end
 group :test do
-  gem 'refinerycms-testing', ["~> 3.0", ">= 3.0.3"]
-  gem 'capybara-email', '~> 2.4.0'
+  gem 'capybara-email', '~> 2.5'
   gem 'poltergeist'
 end
@@ -29,8 +37,11 @@ if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
 end
 # Refinery/rails should pull in the proper versions of these
-gem 'sass-rails'
-gem 'coffee-rails'
+group :assets do
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
+end
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)

data/app/controllers/refinery/inquiries/admin/inquiries_controller.rb CHANGED

@@ -27,7 +27,7 @@ module Refinery
           find_inquiry
           @inquiry.toggle!(:spam)
-          redirect_to :back
+          redirect_back fallback_location: root_path
         end
         protected

data/app/controllers/refinery/inquiries/admin/settings_controller.rb CHANGED

@@ -16,7 +16,7 @@ module Refinery
           unless request.xhr? or from_dialog?
             redirect_back_or_default(refinery.inquiries_admin_inquiries_path)
           else
-            render text: "<script type='text/javascript'>parent.window.location = '#{refinery.inquiries_admin_inquiries_path}';</script>"
+            render html: "<script type='text/javascript'>parent.window.location = '#{refinery.inquiries_admin_inquiries_path}';</script>".html_safe
           end
         end

data/bin/rails CHANGED

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)
+begin
+  load File.join(File.expand_path('../../',  __FILE__), 'spec/dummy/bin/rails')
+rescue LoadError => load_error
+  warn "No dummy Rails application found! \n" \
+       "To create one in spec/dummy, please run: \n\n" \
+       "    rake refinery:testing:dummy_app"
+end

data/certs/parndt.pem CHANGED

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
 MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----

data/config/locales/ru.yml CHANGED

@@ -5,6 +5,8 @@ ru:
         title: Запросы
         description: Предоставляет форму обратной связи и хранит запросы
     inquiries:
+      spam_filter:
+        captcha_invalid: К сожалению, мы не смогли подтвердить, что вы не робот
       config:
         from_name: "%{name} - %{site_name}"
       inquiries:

data/db/migrate/20101208082840_create_inquiries.rb CHANGED

@@ -1,4 +1,4 @@
-class CreateInquiries < ActiveRecord::Migration
+class CreateInquiries < ActiveRecord::Migration[4.2]
   def up
     unless ::Refinery::Inquiries::Inquiry.table_exists?
       create_table :refinery_inquiries_inquiries, :force => true do |t|

data/refinerycms-inquiries.gemspec CHANGED

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name            = %q{refinerycms-inquiries}
-  s.version         = %q{3.1.0}
+  s.version         = %q{4.0.0}
   s.summary         = %q{Inquiry handling functionality for the Refinery CMS project.}
   s.description     = %q{Inquiry handling functionality extracted from Refinery CMS to allow you to have a contact form and manage inquiries in the Refinery backend.}
   s.homepage        = %q{http://refinerycms.com}
@@ -14,10 +14,10 @@ Gem::Specification.new do |s|
   s.files           = `git ls-files`.split("\n")
   s.test_files      = `git ls-files -- spec/*`.split("\n")
-  s.add_dependency  'refinerycms-core',     '~> 3.0.0'
-  s.add_dependency  'refinerycms-settings', '~> 3.0.0'
+  s.add_dependency  'refinerycms-core',     '~> 4.0'
+  s.add_dependency  'refinerycms-settings', '~> 4.0'
   s.add_dependency  'filters_spam',         '~> 0.2'
-  s.add_dependency  'actionmailer',        '~> 4.2.4'
+  s.add_dependency  'actionmailer',        ['>= 5.1.0', '< 5.2']
   s.add_dependency  'httpclient'
   s.cert_chain      = [File.expand_path("../certs/parndt.pem", __FILE__)]

data/spec/features/refinery/inquiries/mailer_spec.rb CHANGED

@@ -7,6 +7,7 @@ module Refinery
       before do
         FactoryGirl.create(:page, :link_url => Refinery::Inquiries.page_path_new)
+        allow(ActionMailer::Base).to receive(:delivery_method).and_return(:test)
         allow(Refinery::Inquiries::Setting).to receive(:notification_recipients)
           .and_return("rspec@refinerycms.com")

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-inquiries
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Uģis Ozols
@@ -14,25 +14,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  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
-  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
+  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
   -----END CERTIFICATE-----
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -40,28 +40,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: refinerycms-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: filters_spam
   requirement: !ruby/object:Gem::Requirement
@@ -80,16 +80,22 @@ dependencies:
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Inquiry handling functionality for the Refinery CMS project.

metadata.gz.sig CHANGED

Binary file