refinerycms-contacts 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 038cb8af15c36018df5d7ed4dc9f4241245369dd
+  data.tar.gz: bf086c33cfc9c70ed5637ef488e19f6ddf0bdba8
+SHA512:
+  metadata.gz: 9dbdfadc90ab1da15d896954cbbbe9ea64752fff159b1b89199191c7335fc961ac246caaf9047179656358ad472a8353e8e2e2136cc54070c9b076f5a80c45e4
+  data.tar.gz: c954f401856440d299b0612f862db5d441a98f10fd6aa677ca6cf3ca75f097ac293715453ff17a3364fba905c1fc605eeaa1d90fb4fbfd4ccd821802d80d1118

data/.gitignore

@@ -0,0 +1,3 @@
+.idea/*
+.rvmrc
+spec/dummy/*

data/Gemfile

@@ -1,73 +1,45 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gemspec
-
-gem 'refinerycms', '~> 2.0.3'
-gem 'refinerycms-i18n', '~> 2.0.2'
+gem "refinerycms-authentication-devise", '~> 1.0.4'
 
-# Database Configuration
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'jruby-openssl'
-end
+gemspec
 
-platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2'
-  gem 'pg'
-end
+gem 'refinerycms', '~> 3.0.5'
 
 group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.3'
-  gem 'guard-rspec', '~> 0.7.0'
+  gem 'refinerycms-testing', '~> 3.0.5'
+end
 
+# Add the default visual editor, for now.
+gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']
 
-  platforms :mswin, :mingw do
-    gem 'win32console', '~> 1.3.0'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
+group :test do
+  gem 'pry'
+  gem 'launchy'
+  gem 'poltergeist'
+  gem 'selenium-webdriver'
+  gem 'capybara-screenshot'
+end
 
-  platforms :ruby do
-    gem 'spork', '~> 0.9.0'
-    gem 'guard-spork', '~> 0.5.2'
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '~> 0.9.0'
-        gem 'ruby_gntp', '~> 0.3.4'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '~> 0.8.8'
-        gem 'libnotify',  '~> 0.7.2'
-        gem 'therubyracer', '~> 0.10.0'
-      end
-    end
-  end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'ruby_gntp', '~> 0.3.4'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '~> 0.8.8'
-        gem 'libnotify',  '~> 0.7.2'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
 end
 
-# Gems used only for assets and not required
-# in production environments by default.
+# Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
   gem 'coffee-rails'
-  gem 'uglifier'
 end
 
-gem 'jquery-rails', '~> 2.0.0'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Gemfile.lock

@@ -0,0 +1,304 @@
+PATH
+  remote: .
+  specs:
+    refinerycms-contacts (0.2.0)
+      recaptcha (~> 0.3.4)
+      refinerycms-core (~> 3.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts_as_indexed (0.8.3)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    awesome_nested_set (3.0.3)
+      activerecord (>= 4.0.0, < 5)
+    babosa (1.0.2)
+    bcrypt (3.1.11)
+    builder (3.2.2)
+    capybara (2.4.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    capybara-screenshot (1.0.14)
+      capybara (>= 1.0, < 3)
+      launchy
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cliver (0.3.2)
+    coderay (1.1.1)
+    coffee-rails (4.2.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.2.x)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.4)
+    database_cleaner (1.3.0)
+    decorators (2.0.2)
+      railties (>= 4.0.0, < 5.1)
+    devise (3.5.10)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      responders
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    diff-lcs (1.2.5)
+    diffy (3.1.0)
+    dragonfly (1.0.12)
+      addressable (~> 2.3)
+      multi_json (~> 1.0)
+      rack (>= 1.3.0)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    ffi (1.9.14)
+    font-awesome-sass (4.7.0)
+      sass (>= 3.2)
+    friendly_id (5.1.0)
+      activerecord (>= 4.0.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    globalize (5.0.1)
+      activemodel (>= 4.2.0, < 4.3)
+      activerecord (>= 4.2.0, < 4.3)
+    i18n (0.7.0)
+    jquery-rails (4.2.2)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    nokogiri (1.7.0)
+      mini_portile2 (~> 2.1.0)
+    orm_adapter (0.5.0)
+    pg (0.19.0)
+    poltergeist (1.12.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      websocket-driver (>= 0.2.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    public_suffix (2.0.4)
+    rack (1.6.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-i18n (4.0.9)
+      i18n (~> 0.7)
+      railties (~> 4.0)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    recaptcha (0.3.6)
+    refinerycms (3.0.5)
+      refinerycms-core (= 3.0.5)
+      refinerycms-images (= 3.0.5)
+      refinerycms-pages (= 3.0.5)
+      refinerycms-resources (= 3.0.5)
+    refinerycms-authentication-devise (1.0.4)
+      actionmailer (~> 4.2, >= 4.2.0)
+      devise (~> 3.0, >= 3.2.4)
+      friendly_id (~> 5.1.0)
+      refinerycms-core (~> 3.0, >= 3.0.0)
+    refinerycms-core (3.0.5)
+      actionpack (>= 4.2.3, < 5.0)
+      activerecord (>= 4.2.3, < 5.0)
+      awesome_nested_set (~> 3.0.0)
+      coffee-rails (~> 4.0, >= 4.0.0)
+      decorators (~> 2.0.0)
+      font-awesome-sass (>= 4.3.0, < 5.0)
+      jquery-rails (>= 2.3.0)
+      jquery-ui-rails (~> 5.0.0)
+      railties (>= 4.2.3, < 5.0)
+      refinerycms-i18n (~> 3.0.0)
+      sass-rails (>= 4.0, < 5.1)
+      truncate_html (~> 0.9)
+      will_paginate (~> 3.0.2)
+      zilch-authorisation
+    refinerycms-i18n (3.0.1)
+      rails-i18n (~> 4.0.1)
+      routing-filter (>= 0.4.0)
+    refinerycms-images (3.0.5)
+      dragonfly (~> 1.0.0)
+      globalize (>= 4.0.0, < 5.2)
+      refinerycms-core (= 3.0.5)
+    refinerycms-pages (3.0.5)
+      awesome_nested_set (~> 3.0.0)
+      babosa (!= 0.3.6)
+      diffy (~> 3.1.0)
+      friendly_id (>= 5.1.0, < 5.3)
+      globalize (>= 4.0.0, < 5.2)
+      refinerycms-core (= 3.0.5)
+      seo_meta (~> 2.0.0.rc.1)
+      speakingurl-rails (~> 8.0.0)
+    refinerycms-resources (3.0.5)
+      acts_as_indexed (~> 0.8.0)
+      dragonfly (~> 1.0.0)
+      globalize (>= 4.0.0, < 5.2)
+      refinerycms-core (= 3.0.5)
+    refinerycms-testing (3.0.5)
+      capybara (~> 2.4.3)
+      database_cleaner (~> 1.3.0)
+      factory_girl_rails (~> 4.6.0)
+      refinerycms-core (= 3.0.5)
+      rspec-rails (~> 3.0)
+    refinerycms-wymeditor (1.1.0)
+      refinerycms-core (>= 3.0.0, < 5.0)
+    responders (2.3.0)
+      railties (>= 4.2.0, < 5.1)
+    routing-filter (0.6.0)
+      actionpack (>= 4.2, < 5.1)
+      activesupport (>= 4.2, < 5.1)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubyzip (1.2.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.0.5)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+    seo_meta (2.0.0.rc.1)
+      railties (>= 3.0.0)
+    slop (3.6.0)
+    speakingurl-rails (8.0.2)
+      railties (>= 3.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.12)
+    thor (0.19.4)
+    thread_safe (0.3.5)
+    tilt (2.0.5)
+    truncate_html (0.9.3)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    warden (1.2.6)
+      rack (>= 1.0)
+    websocket (1.2.3)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    will_paginate (3.0.12)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+    zilch-authorisation (0.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcpostgresql-adapter
+  activerecord-jdbcsqlite3-adapter
+  capybara-screenshot
+  coffee-rails
+  launchy
+  pg
+  poltergeist
+  pry
+  refinerycms (~> 3.0.5)
+  refinerycms-authentication-devise (~> 1.0.4)
+  refinerycms-contacts!
+  refinerycms-testing (~> 3.0.5)
+  refinerycms-wymeditor (~> 1.0, >= 1.0.6)
+  sass-rails
+  selenium-webdriver
+  sqlite3
+
+BUNDLED WITH
+   1.13.7

data/Rakefile

@@ -13,8 +13,9 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
-load File.expand_path('../tasks/testing.rake', __FILE__)
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec
+

data/app/controllers/refinery/contacts/admin/contacts_controller.rb

@@ -4,10 +4,14 @@ module Refinery
       class ContactsController < ::Refinery::AdminController
         include ContactsHelper
         helper :"refinery/contacts/admin/contacts"
-        cache_sweeper ContactSweeper
 
         crudify :'refinery/contacts/contact', :xhr_paging => true
 
+        protected
+
+        def contact_params
+          params.require(:contact).permit(:title, :street, :city, :zip_code, :homepage, :company, :province, :country, :tel1, :tel2, :tel3, :fax, :position, :mails_attributes => [:id, :mail, :_destroy ])
+        end
       end
     end
   end

data/app/models/refinery/contact_page.rb

@@ -5,7 +5,5 @@ module Refinery
     belongs_to :page, :polymorphic => true
 
 
-    attr_accessible :page_id, :page_type, :contact_id , :contact_info
-
   end
 end

data/app/models/refinery/contacts/contact.rb

@@ -2,16 +2,12 @@ module Refinery
   module Contacts
     class Contact < Refinery::Core::BaseModel
       has_many :mails
-      default_scope order("position DESC")
+      default_scope -> {order("position DESC")}
 
       accepts_nested_attributes_for :mails, :allow_destroy => true
 
       self.table_name = 'refinery_contacts'
 
-      attr_accessible :title, :street, :city, :zip_code, :homepage, :company, :province, :country, :tel1, :tel2, :tel3, :fax, :position, :mails_attributes
-
-      acts_as_indexed :fields => [:title, :street, :city, :zip_code, :province, :country, :tel1, :tel2, :tel3, :fax]
-
       validates :title, :presence => true, :uniqueness => true
       validates_format_of :homepage, :with => URI.regexp(['http','https']), :allow_blank => true
     end

data/app/models/refinery/contacts/mail.rb

@@ -3,9 +3,6 @@ module Refinery
     class Mail < Refinery::Core::BaseModel
       belongs_to :contact
 
-      attr_accessible :mail, :position
-
-      acts_as_indexed :fields => [:mail]
 
       validates_format_of :mail, :with => /.+@.+\..+/i , :allow_blank => false
 

data/app/views/refinery/contacts/admin/contacts/_mail_fields.html.erb

@@ -1,6 +1,6 @@
 <div class='field'>
   <%= f.label :mail %>
-  <%= f.text_field :mail %>
+  <%= f.text_field :mail, :class=>"mail_field" %>
 
   <%= f.hidden_field :_destroy  %>
   <%= link_to t('.remove'), '#', :class=>"remove_fields" %>

data/app/views/refinery/contacts/contacts/_form.html.erb

@@ -1,14 +1,13 @@
 <% if @page.mails.present?  %>
     <%= form_for (flash[:mail_message].present?) ? flash[:mail_message] : Refinery::Contacts::MailMessage.new ,
-                 :url=> deliver_contacts_mail_messages_path,
-                 :validate => true  do |f| %>
+                 :url=> deliver_contacts_mail_messages_path  do |f| %>
 
         <%= render  'refinery/contacts/contacts/success_info' %>
         <%= render  'refinery/contacts/contacts/error_info' %>
 
         <div class="field ">
           <%= f.label :recipient_id %>
-          <%= f.collection_select :recipient_id, @page.mails.obfuscated, :id, :mail, { :prompt=> ((@page.mails.length > 1) ? true : false) } %>
+          <%= f.collection_select :recipient_id, @page.mails, :id, :mail, { :prompt=> ((@page.mails.length > 1) ? true : false) } %>
         </div>
 
 

data/config/routes.rb

@@ -4,7 +4,7 @@ Refinery::Core::Engine.routes.append do
   namespace :contacts, :path => '' do
     resources :mail_messages, :only => :deliver do
       collection do
-        post :deliver, :as => :deliver
+        post :deliver
       end
     end
   end

data/db/seeds.rb

@@ -1,4 +1,4 @@
-(Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
+(Refinery::I18n.frontend_locales ).each do |lang|
   I18n.locale = lang
 
   if defined?(Refinery::User)

data/lib/refinery/contacts/engine.rb

@@ -16,9 +16,6 @@ module Refinery
           plugin.name = "contacts"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.contacts_admin_contacts_path }
           plugin.pathname = root
-          plugin.activity = {
-            :class_name => :'refinery/contacts/contact'
-          }
           
         end
       end

data/lib/refinery/contacts/extensions/pages_extension.rb

@@ -30,7 +30,6 @@ module Refinery
             end
           end
 
-          attr_accessible :contact_page
         end
       end
     end

data/lib/refinery/contacts/version.rb

@@ -2,8 +2,8 @@ module Refinery
   module Contacts
     class Version
       @major = 0
-      @minor = 1
-      @tiny  = '2'
+      @minor = 2
+      @tiny  = '0'
 
       class << self
         attr_reader :major, :minor, :tiny

data/readme.md

@@ -6,7 +6,7 @@ Attach contact form to any page with contact information
 
 ## Requirements
 
-This version supports Rails 3.2.x and Refinery CMS ~> 2.0.9. (Should work with ~> 2.0.0, not tested)
+This version supports Rails 4.2.x and Refinery CMS ~> 3.0.0.
 
 ## Features
 
@@ -38,7 +38,7 @@ Gem is translated to slovak and english.
 Open up your ``Gemfile`` and add at the bottom this line:
 
 ```ruby
-gem 'refinerycms-contacts', '~> 0.1.0'
+gem 'refinerycms-contacts', '~> 0.2.0'
 ```
 
 Now, run
@@ -65,6 +65,18 @@ Seed your database:
 rake db:seed
 ```
 
+Override PagesContoller to get strong params work
+
+```ruby
+rake refinery:override controller=admin/pages_controller
+```
+
+Open that file, find function permitted_page_params and append
+
+```ruby
+contact_page: [:contact_id,:contact_info]
+```
+
 ### Assets + views
 
 If you don't have Chosen JS included in your backend yet, append this code to your_app/config/initializers/refinery/core.rb
@@ -152,7 +164,6 @@ rake assets:precompile
 ## Todo list
 
 * add js pop-up in page's tab to allow create contact "in-place" instead of clicking through menu
-* tests :(
 
 ## Code
 
@@ -164,7 +175,10 @@ rake assets:precompile
 * reCaptcha validation shows errors both for incorrect-captcha-sol and verification_failed key
 
 ## Testing
-TODO
+* cd to this engine path
+* bundle install
+* rake refinery:testing:dummy_app
+* rake spec
 
 ## License
 

data/refinerycms-contacts.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   #s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency             'refinerycms-core',    '~> 2.0.9' # should work ~> 2.0.0 , not tested
-  s.add_dependency             'recaptcha'
+  s.add_dependency             'refinerycms-core',    '~> 3.0.5'
+  s.add_dependency             'recaptcha', '~> 0.3.4'
 
   # Development dependencies (usually used for testing)
-  # s.add_development_dependency 'refinerycms-testing', '~> 2.0.9'
+   s.add_development_dependency 'refinerycms-testing', '~> 3.0.5'
 end

data/spec/{support/factories/refinery → factories}/contacts.rb

@@ -1,7 +1,7 @@
-
 FactoryGirl.define do
   factory :contact, :class => Refinery::Contacts::Contact do
-    sequence(:title) { |n| "refinery#{n}" }
+    title "Title"
+    homepage "http://www.matho.sk"
   end
 end
 

data/spec/factories/mail_message.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :mail_message, :class => Refinery::Contacts::Mail do
+    name "Nazov"
+    recipient_id 1
+    subject "subject"
+    text "text"
+    sender_mail "martin.markech@matho.sk"
+
+  end
+end
+

data/spec/{support/factories/refinery → factories}/mails.rb

@@ -1,7 +1,6 @@
-
 FactoryGirl.define do
   factory :mail, :class => Refinery::Contacts::Mail do
-    sequence(:mail) { |n| "refinery#{n}" }
+    mail "martin.markech@matho.sk"
   end
 end
 

data/spec/factories/user.rb

@@ -0,0 +1,27 @@
+FactoryGirl.define do
+  factory :authentication_devise_user, :class => Refinery::Authentication::Devise::User do
+    sequence(:username) { |n| "refinery#{n}" }
+    sequence(:email) { |n| "refinery#{n}@example.com" }
+    password  "refinerycms"
+    password_confirmation "refinerycms"
+  end
+
+  factory :authentication_devise_refinery_user, :parent => :authentication_devise_user do
+    roles { [ ::Refinery::Authentication::Devise::Role[:refinery] ] }
+
+    after(:create) do |user|
+      ::Refinery::Plugins.registered.each_with_index do |plugin, index|
+        user.plugins.create(:name => plugin.name, :position => index)
+      end
+    end
+  end
+
+  factory :authentication_devise_refinery_superuser, :parent => :authentication_devise_refinery_user do
+    roles {
+      [
+          ::Refinery::Authentication::Devise::Role[:refinery],
+          ::Refinery::Authentication::Devise::Role[:superuser]
+      ]
+    }
+  end
+end

data/spec/features/manage_contact_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe "manage contact items", :type => :feature, js: true do
+  refinery_login_with_devise :authentication_devise_refinery_superuser
+
+  describe "new/create" do
+    it "allows to create contact" do
+      visit refinery.new_contacts_admin_contact_path
+
+      fill_in "Title", :with => "Creators"
+
+
+      find(:xpath, "//a[@class='add_fields'][1]").click
+      find(:xpath, "//a[@class='add_fields'][1]").click
+
+
+      find(:xpath, "(//input[@class='mail_field'])[1]").set("martin.markech@matho.sk")
+      find(:xpath, "(//input[@class='mail_field'])[2]").set("martin.markech2@matho.sk")
+
+      #save_and_open_page
+
+      fill_in "Company", :with => "Company s.r.o"
+      fill_in "Street", :with => "Street"
+      fill_in "City", :with => "Bratislava"
+      fill_in "Zip Code", :with => "82103"
+      fill_in "Province", :with => "Province"
+      fill_in "Country", :with => "Slovakia"
+      fill_in "Homepage (starts with http://)", :with => "http://www.matho.sk"
+      fill_in "Tel1", :with => "+421900000000"
+
+
+      click_button "Save"
+
+      expect(page).to have_content("'Creators' was successfully added.")
+
+      expect(Refinery::Contacts::Contact.count).to eq(1)
+      expect(Refinery::Contacts::Mail.count).to eq(2)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,55 +1,32 @@
-def setup_environment
-  # Configure Rails Environment
-  ENV["RAILS_ENV"] ||= 'test'
-
-  if File.exist?(dummy_path = File.expand_path('../dummy/config/environment.rb', __FILE__))
-    require dummy_path
-  elsif File.dirname(__FILE__) =~ %r{vendor/extensions}
-    # Require the path to the refinerycms application this is vendored inside.
-    require File.expand_path('../../../../../config/environment', __FILE__)
-  end
-
-  require 'rspec/rails'
-  require 'capybara/rspec'
-
-  Rails.backtrace_cleaner.remove_silencers!
-
-  RSpec.configure do |config|
-    config.mock_with :rspec
-    config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.filter_run :focus => true
-    config.run_all_when_everything_filtered = true
-  end
-end
+require 'rubygems'
+
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= 'test'
+
+require File.expand_path("../dummy/config/environment", __FILE__)
+
+require 'rspec/rails'
+require 'capybara/rspec'
+require 'capybara-screenshot/rspec'
 
-def each_run
-  Rails.cache.clear
-  ActiveSupport::Dependencies.clear
-  FactoryGirl.reload
-
-  # Requires supporting files with custom matchers and macros, etc,
-  # in ./support/ and its subdirectories including factories.
-  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
-    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
-  }.flatten.sort.each do |support_file|
-    require support_file
-  end
+Capybara::Screenshot.autosave_on_failure = false
+
+Rails.backtrace_cleaner.remove_silencers!
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
-# If spork is available in the Gemfile it'll be used but we don't force it.
-unless (begin; require 'spork'; rescue LoadError; nil end).nil?
-  Spork.prefork do
-    # Loading more in this block will cause your tests to run faster. However,
-    # if you change any configuration or code from libraries loaded here, you'll
-    # need to restart spork for it take effect.
-    setup_environment
-  end
-
-  Spork.each_run do
-    # This code will be run each time you run your specs.
-    each_run
-  end
-else
-  setup_environment
-  each_run
+# set javascript driver for capybara
+require 'capybara/poltergeist'
+Capybara.javascript_driver = :poltergeist
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories including factories.
+([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+  Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+}.flatten.sort.each do |support_file|
+  require support_file
 end

metadata

@@ -1,55 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-contacts
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Martin Markech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 3.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
-  name: refinerycms-core
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
+  name: recaptcha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+- !ruby/object:Gem::Dependency
+  name: refinerycms-testing
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.5
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: recaptcha
+        version: 3.0.5
 description: Ruby on Rails Contacts extension for Refinery CMS
 email: martin.markech@matho.sk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".idea/.generators"
+- ".idea/.rakeTasks"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/refinerycms-contacts.iml"
+- ".idea/runConfigurations/Development__refinerycms_contacts.xml"
+- ".idea/runConfigurations/Production__refinerycms_contacts.xml"
+- ".idea/runConfigurations/spec__refinerycms_contacts.xml"
+- ".idea/runConfigurations/test__refinerycms_contacts.xml"
+- ".idea/vcs.xml"
+- ".idea/workspace.xml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.md
 - Rakefile
@@ -67,7 +89,6 @@ files:
 - app/models/refinery/contacts/mail.rb
 - app/models/refinery/contacts/mail_message.rb
 - app/models/refinery/contacts/table_less_model.rb
-- app/sweepers/refinery/contacts/admin/contact_sweeper.rb
 - app/views/refinery/admin/pages/tabs/contacts/_contacts.html.erb
 - app/views/refinery/admin/pages/tabs/contacts/_contacts_bar.html.erb
 - app/views/refinery/admin/pages/tabs/contacts/_form.html.erb
@@ -111,37 +132,35 @@ files:
 - readme.md
 - refinerycms-contacts.gemspec
 - script/rails
-- spec/models/refinery/contacts/contact_spec.rb
-- spec/models/refinery/contacts/mail_spec.rb
-- spec/requests/refinery/contacts/admin/contacts_spec.rb
-- spec/requests/refinery/contacts/admin/mails_spec.rb
+- spec/factories/contacts.rb
+- spec/factories/mail_message.rb
+- spec/factories/mails.rb
+- spec/factories/user.rb
+- spec/features/manage_contact_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories/refinery/contacts.rb
-- spec/support/factories/refinery/mails.rb
 - tasks/rspec.rake
 - tasks/testing.rake
 homepage: http://github.com/Matho/refinerycms-contacts
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attach contact form to any page in Refinery CMS
 test_files: []

data/app/sweepers/refinery/contacts/admin/contact_sweeper.rb

@@ -1,22 +0,0 @@
-module Refinery
-  module Contacts
-    module Admin
-      class ContactSweeper < ActionController::Caching::Sweeper
-=begin
-# Because of server-side error rendering, caching is commented.
-        observe Contact
-
-
-        def sweep(contact)
-          expire_fragment("refinery/contacts/contact/#{contact.id}")
-        end
-
-
-        alias_method :after_create,  :sweep
-        alias_method :after_update,  :sweep
-        alias_method :after_destroy, :sweep
-=end
-      end
-    end
-  end
-end

data/spec/models/refinery/contacts/contact_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-module Refinery
-  module Contacts
-    describe Contact do
-      describe "validations" do
-        subject do
-          FactoryGirl.create(:contact,
-          :title => "Refinery CMS")
-        end
-
-        it { should be_valid }
-        its(:errors) { should be_empty }
-        its(:title) { should == "Refinery CMS" }
-      end
-    end
-  end
-end

data/spec/models/refinery/contacts/mail_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-module Refinery
-  module Contacts
-    describe Mail do
-      describe "validations" do
-        subject do
-          FactoryGirl.create(:mail,
-          :mail => "Refinery CMS")
-        end
-
-        it { should be_valid }
-        its(:errors) { should be_empty }
-        its(:mail) { should == "Refinery CMS" }
-      end
-    end
-  end
-end

data/spec/requests/refinery/contacts/admin/contacts_spec.rb

@@ -1,101 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-describe Refinery do
-  describe "Contacts" do
-    describe "Admin" do
-      describe "contacts" do
-        login_refinery_user
-
-        describe "contacts list" do
-          before do
-            FactoryGirl.create(:contact, :title => "UniqueTitleOne")
-            FactoryGirl.create(:contact, :title => "UniqueTitleTwo")
-          end
-
-          it "shows two items" do
-            visit refinery.contacts_admin_contacts_path
-            page.should have_content("UniqueTitleOne")
-            page.should have_content("UniqueTitleTwo")
-          end
-        end
-
-        describe "create" do
-          before do
-            visit refinery.contacts_admin_contacts_path
-
-            click_link "Add New Contact"
-          end
-
-          context "valid data" do
-            it "should succeed" do
-              fill_in "Title", :with => "This is a test of the first string field"
-              click_button "Save"
-
-              page.should have_content("'This is a test of the first string field' was successfully added.")
-              Refinery::Contacts::Contact.count.should == 1
-            end
-          end
-
-          context "invalid data" do
-            it "should fail" do
-              click_button "Save"
-
-              page.should have_content("Title can't be blank")
-              Refinery::Contacts::Contact.count.should == 0
-            end
-          end
-
-          context "duplicate" do
-            before { FactoryGirl.create(:contact, :title => "UniqueTitle") }
-
-            it "should fail" do
-              visit refinery.contacts_admin_contacts_path
-
-              click_link "Add New Contact"
-
-              fill_in "Title", :with => "UniqueTitle"
-              click_button "Save"
-
-              page.should have_content("There were problems")
-              Refinery::Contacts::Contact.count.should == 1
-            end
-          end
-
-        end
-
-        describe "edit" do
-          before { FactoryGirl.create(:contact, :title => "A title") }
-
-          it "should succeed" do
-            visit refinery.contacts_admin_contacts_path
-
-            within ".actions" do
-              click_link "Edit this contact"
-            end
-
-            fill_in "Title", :with => "A different title"
-            click_button "Save"
-
-            page.should have_content("'A different title' was successfully updated.")
-            page.should have_no_content("A title")
-          end
-        end
-
-        describe "destroy" do
-          before { FactoryGirl.create(:contact, :title => "UniqueTitleOne") }
-
-          it "should succeed" do
-            visit refinery.contacts_admin_contacts_path
-
-            click_link "Remove this contact forever"
-
-            page.should have_content("'UniqueTitleOne' was successfully removed.")
-            Refinery::Contacts::Contact.count.should == 0
-          end
-        end
-
-      end
-    end
-  end
-end

data/spec/requests/refinery/contacts/admin/mails_spec.rb

@@ -1,101 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-describe Refinery do
-  describe "Contacts" do
-    describe "Admin" do
-      describe "mails" do
-        login_refinery_user
-
-        describe "mails list" do
-          before do
-            FactoryGirl.create(:mail, :mail => "UniqueTitleOne")
-            FactoryGirl.create(:mail, :mail => "UniqueTitleTwo")
-          end
-
-          it "shows two items" do
-            visit refinery.contacts_admin_mails_path
-            page.should have_content("UniqueTitleOne")
-            page.should have_content("UniqueTitleTwo")
-          end
-        end
-
-        describe "create" do
-          before do
-            visit refinery.contacts_admin_mails_path
-
-            click_link "Add New Mail"
-          end
-
-          context "valid data" do
-            it "should succeed" do
-              fill_in "Mail", :with => "This is a test of the first string field"
-              click_button "Save"
-
-              page.should have_content("'This is a test of the first string field' was successfully added.")
-              Refinery::Contacts::Mail.count.should == 1
-            end
-          end
-
-          context "invalid data" do
-            it "should fail" do
-              click_button "Save"
-
-              page.should have_content("Mail can't be blank")
-              Refinery::Contacts::Mail.count.should == 0
-            end
-          end
-
-          context "duplicate" do
-            before { FactoryGirl.create(:mail, :mail => "UniqueTitle") }
-
-            it "should fail" do
-              visit refinery.contacts_admin_mails_path
-
-              click_link "Add New Mail"
-
-              fill_in "Mail", :with => "UniqueTitle"
-              click_button "Save"
-
-              page.should have_content("There were problems")
-              Refinery::Contacts::Mail.count.should == 1
-            end
-          end
-
-        end
-
-        describe "edit" do
-          before { FactoryGirl.create(:mail, :mail => "A mail") }
-
-          it "should succeed" do
-            visit refinery.contacts_admin_mails_path
-
-            within ".actions" do
-              click_link "Edit this mail"
-            end
-
-            fill_in "Mail", :with => "A different mail"
-            click_button "Save"
-
-            page.should have_content("'A different mail' was successfully updated.")
-            page.should have_no_content("A mail")
-          end
-        end
-
-        describe "destroy" do
-          before { FactoryGirl.create(:mail, :mail => "UniqueTitleOne") }
-
-          it "should succeed" do
-            visit refinery.contacts_admin_mails_path
-
-            click_link "Remove this mail forever"
-
-            page.should have_content("'UniqueTitleOne' was successfully removed.")
-            Refinery::Contacts::Mail.count.should == 0
-          end
-        end
-
-      end
-    end
-  end
-end