refinerycms-core 2.1.5 → 3.0.0

data/lib/generators/refinery/cms/templates/config/database.yml.postgresql

@@ -15,7 +15,7 @@
 development:
   adapter: postgresql
   encoding: unicode
-  database: refinery_database_development
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_development
   pool: 5
   username: postgres
   password: postgres
@@ -42,7 +42,7 @@ development:
 test:
   adapter: postgresql
   encoding: unicode
-  database: refinery_database_test
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_test
   pool: 5
   username: postgres
   password: postgres
@@ -51,7 +51,7 @@ test:
 production:
   adapter: postgresql
   encoding: unicode
-  database: refinery_database_production
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_production
   pool: 5
   username: postgres
   password: postgres

data/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb

@@ -6,9 +6,16 @@ Refinery::Core.configure do |config|
   # When true this will force SSL redirection in all Refinery backend controllers.
   # config.force_ssl = <%= Refinery::Core.force_ssl.inspect %>
 
+  # Set the S3 options using means other than securely by environment variables.
+  # If you have to.
+  # config.s3_bucket_name = ENV['S3_BUCKET']
+  # config.s3_region = ENV['S3_REGION']
+  # config.s3_access_key_id = ENV['S3_KEY']
+  # config.s3_secret_access_key = ENV['S3_SECRET']
+
   # When true will use Amazon's Simple Storage Service instead of
   # the default file system for storing resources and images
-  config.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
+  config.s3_backend = config.s3_access_key_id.present? || config.s3_secret_access_key.present?
 
   # Use a custom Dragonfly storage backend instead of the default
   # file system for storing resources and images
@@ -34,15 +41,21 @@ Refinery::Core.configure do |config|
   # http://markevans.github.com/dragonfly/file.Configuration.html#Configuration
   # config.dragonfly_secret = <%= Refinery::Core.dragonfly_secret.inspect %>
 
-  # Add extra tags to the wymeditor whitelist e.g. = {'tag' => {'attributes' => {'1' => 'href'}}} or just {'tag' => {}}
-  # config.wymeditor_whitelist_tags = <%= Refinery::Core.wymeditor_whitelist_tags.inspect %>
-
   # Register extra javascript for backend
   # config.register_javascript "prototype-rails"
 
   # Register extra stylesheet for backend (optional options)
   # config.register_stylesheet "custom", :media => 'screen'
 
-  # Specify a different backend path than the default of /refinery.
+  # Specify a different backend path than the default of <%= Refinery::Core.backend_route.inspect %>.
+  # Make sure you clear the `tmp/cache` directory after changing this setting.
   # config.backend_route = <%= Refinery::Core.backend_route.inspect %>
+
+  # Specify a different Refinery::Core::Engine mount path than the default of <%= Refinery::Core.mounted_path.inspect %>.
+  # Make sure you clear the `tmp/cache` directory after changing this setting.
+  # config.mounted_path = <%= Refinery::Core.mounted_path.inspect %>
+
+  # Specify the order Refinery plugins appear in the admin view.
+  # Plugins in the list are placed, as ordered, before any plugins not in the list.
+  # config.plugin_priority = %w(refinery_pages refinery_images)
 end

data/lib/generators/refinery/dummy/dummy_generator.rb

@@ -22,7 +22,6 @@ module Refinery
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
-      opts[:old_style_hash] = true
 
       invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
     end
@@ -35,6 +34,9 @@ module Refinery
       template "rails/application.rb.erb", "#{dummy_path}/config/application.rb", :force => true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
       template "rails/Rakefile", "#{dummy_path}/Rakefile", :force => true
+      template "rails/application.js", "#{dummy_path}/app/assets/javascripts/application.js", :force => true
+      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon.png", :force => true
+      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon-precomposed.png", :force => true
     end
 
     def test_dummy_clean

data/lib/generators/refinery/dummy/templates/rails/application.js

@@ -0,0 +1,3 @@
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/lib/generators/refinery/dummy/templates/rails/application.rb.erb

@@ -9,6 +9,4 @@ require 'bundler/setup'
 # or test environments.
 Bundler.require *Rails.groups(:assets)
 
-require 'refinerycms'
-
 <%= application_definition %>

data/lib/generators/refinery/dummy/templates/rails/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  mount Refinery::Core::Engine, :at => "/"
+  mount Refinery::Core::Engine, :at => Refinery::Core.mounted_path
 end

data/lib/generators/refinery/engine/engine_generator.rb

@@ -1,8 +1,9 @@
-require 'rails/generators/named_base'
 require 'refinery/extension_generation'
+require 'refinery/generators/named_base'
+require 'refinery/generators/generated_attribute'
 
 module Refinery
-  class EngineGenerator < Rails::Generators::NamedBase
+  class EngineGenerator < Refinery::Generators::NamedBase
     source_root Pathname.new(File.expand_path('../templates', __FILE__))
 
     include Refinery::ExtensionGeneration

data/lib/generators/refinery/engine/templates/Gemfile

@@ -1,8 +1,14 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.1.0'
+git 'https://github.com/refinery/refinerycms.git', :branch => 'master' do
+  gem 'refinerycms'
+
+  group :development, :test do
+    gem 'refinerycms-testing'
+  end
+end
 
 # Database Configuration
 platforms :jruby do
@@ -19,8 +25,7 @@ platforms :ruby do
 end
 
 group :development, :test do
-  gem 'refinerycms-testing', '~> 2.1.0'
-
+  gem 'rspec-its' # for the model's validation tests.
   platforms :ruby do
     require 'rbconfig'
     if RbConfig::CONFIG['target_os'] =~ /linux/i

data/lib/generators/refinery/engine/templates/Rakefile

@@ -6,15 +6,14 @@ rescue LoadError
 end
 
 ENGINE_PATH = File.dirname(__FILE__)
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path "../spec/dummy/Rakefile", __FILE__
 
-if File.exists?(APP_RAKEFILE)
+if File.exists? APP_RAKEFILE
   load 'rails/tasks/engine.rake'
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
-Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
+Refinery::Testing::Railtie.load_dummy_tasks ENGINE_PATH
 
 load File.expand_path('../tasks/testing.rake', __FILE__)
 load File.expand_path('../tasks/rspec.rake', __FILE__)

data/lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb

@@ -5,9 +5,18 @@ module Refinery
 
         crudify :'refinery/<%= namespacing.underscore %>/<%= singular_name %>'<% if (title = attributes.detect { |a| a.type.to_s =~ /string|text/ }).present? and title.name != 'title' -%>,
                 :title_attribute => '<%= title.name %>'<% end -%><% if plural_name == singular_name -%>,
-                :redirect_to_url => :refinery_<%= namespacing.underscore %>_admin_<%= singular_name %>_index_path<% end %>,
-                :xhr_paging => true
+                :redirect_to_url => :refinery_<%= namespacing.underscore %>_admin_<%= singular_name %>_index_path<% end %>
 
+        private
+
+        # Only allow a trusted parameter "white list" through.
+        def <%= "#{singular_table_name}_params" %>
+          <%- if attributes_names.empty? -%>
+          params[:<%= singular_table_name %>]
+          <%- else -%>
+          params.require(:<%= singular_table_name %>).permit(<%= attributes.map { |attr| ":#{attr.column_name}" }.join(', ') %>)
+          <%- end -%>
+        end
       end
     end
   end

data/lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/plural_name_controller.rb.erb

@@ -2,8 +2,8 @@ module Refinery
   module <%= namespacing %>
     class <%= class_name.pluralize %>Controller < ::ApplicationController
 
-      before_filter :find_all_<%= plural_name %>
-      before_filter :find_page
+      before_action :find_all_<%= plural_name %>
+      before_action :find_page
 
       def index
         # you can use meta fields from your model instead (e.g. browser_title)

data/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb.erb

@@ -4,14 +4,9 @@ module Refinery
 <% if table_name == namespacing.underscore.pluralize -%>
       self.table_name = 'refinery_<%= plural_name %>'
 <% end %>
-      attr_accessible <%= names_for_attr_accessible.map { |n| ":#{n}" }.join(', ') %>, :position
 <% if localized? -%>
 
       translates <%= localized_attributes.map { |a| ":#{a.name}" }.join(', ') %>
-
-      class Translation
-        attr_accessible :locale
-      end
 <% end -%>
 <% if string_attributes.any? -%>
 
@@ -32,6 +27,11 @@ module Refinery
 
       belongs_to :<%= a.name %>, :class_name => '::Refinery::Resource'
 <% end -%>
+
+      # To enable admin searching, add acts_as_indexed on searchable fields, for example:
+      #
+      #   acts_as_indexed :fields => [:title]
+
     end
   end
 end

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_actions.html.erb

@@ -5,21 +5,16 @@
     </li>
   <%% end %>
   <li>
-    <%%= link_to t('.create_new'), refinery.new_<%= namespacing.underscore %>_admin_<%= singular_name %>_path,
-                 :class => "add_icon" %>
+    <%%= action_label :add, refinery.new_<%= namespacing.underscore %>_admin_<%= singular_name %>_path, t('.create_new') %>
   </li>
 <%% if !searching? && ::Refinery::<%= namespacing %>::Admin::<%= class_name.pluralize %>Controller.sortable? && ::Refinery::<%= namespacing %>::<%= class_name %>.many? %>
   <li>
-    <%%= link_to t('.reorder', :what => "<%= singular_name.titleize.pluralize %>"),
-                 refinery.<%= namespacing.underscore %>_admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
-                 :id => "reorder_action",
-                 :class => "reorder_icon" %>
-
-    <%%= link_to t('.reorder_done', :what => "<%= singular_name.titleize.pluralize %>"),
-                 refinery.<%= namespacing.underscore %>_admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
-                 :id => "reorder_action_done",
-                 :style => "display: none;",
-                 :class => "reorder_icon" %>
+    <%%= action_label :reorder,
+                     refinery.<%= namespacing.underscore %>_admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
+                     t('.reorder', what:  "<%= singular_name.titleize.pluralize %>"), id: 'reorder_action'%>
+    <%%= action_label :reorder_done,
+                     refinery.<%= namespacing.underscore %>_admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
+                      t('.reorder_done', what: "<%= singular_name.titleize.pluralize %>"), id: 'reorder_action_done', class: 'hidden'%>
   </li>
 <%% end %>
 </ul>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_form.html.erb

@@ -1,5 +1,5 @@
 <%
-  text_areas = attributes.reject{|a| a.field_type.to_s != 'text_area'}
+  text_areas = attributes.reject{ |a| a.field_type.to_s != 'text_area'}
   generated_text_areas = false
 -%>
 <%%= form_for [refinery, :<%= namespacing.underscore %>_admin, @<%= singular_name %>] do |f| -%>
@@ -12,30 +12,30 @@
               :current_locale => Globalize.locale %>
 <% end -%>
 <% attributes.each_with_index do |attribute, index| -%>
-<% if attribute.type.to_s == 'image' -%>
+<% if attribute.refinery_type == :image -%>
   <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
     <%%= render '/refinery/admin/image_picker',
                :f => f,
-               :field => :<%= "#{attribute.name}_id".gsub("_id_id", "_id") %>,
-               :image => @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %>,
+               :field => :<%= attribute.column_name %>,
+               :image => @<%= singular_name %>.<%= attribute.name %>,
                :toggle_image_display => false -%>
   </div>
 
-<% elsif attribute.type.to_s == 'resource' -%>
+<% elsif attribute.refinery_type == :resource -%>
   <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
     <%%= render '/refinery/admin/resource_picker',
                :f => f,
-               :field => :<%= "#{attribute.name}_id".gsub("_id_id", "_id") %>,
-               :resource => @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %> -%>
+               :field => :<%= attribute.column_name %>,
+               :resource => @<%= singular_name %>.<%= attribute.name %> -%>
   </div>
 
 <% elsif attribute.field_type.to_s == "text_area" and !generated_text_areas -%>
   <div class='field'>
     <%%= render '/refinery/admin/wysiwyg',
                 :f => f,
-                :fields => <%= text_areas.map{|t| t.name.to_sym}.inspect -%>,
+                :fields => <%= text_areas.map{ |t| t.name.to_sym}.inspect -%>,
                 :object => "<%= namespacing.underscore -%>/<%= singular_name -%>" -%>
   </div>
 

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_records.html.erb

@@ -4,12 +4,12 @@
     <%%= render '<%= plural_name %>' %>
   <%% else %>
     <p>
-      <%% unless searching? %>
+      <%% if searching? %>
+        <%%= t('no_results', :scope => 'refinery.admin.search') %>
+      <%% else %>
         <strong>
           <%%= t('.no_items_yet') %>
         </strong>
-      <%% else %>
-        <%%= t('no_results', :scope => 'refinery.admin.search') %>
       <%% end %>
     </p>
   <%% end %>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb

@@ -18,16 +18,11 @@
   </span>
   <span class='actions'>
     <% unless skip_frontend? %>
-    <%%= link_to refinery_icon_tag("application_go.png"), refinery.<%= namespacing.underscore %>_<%= singular_name %>_path(<%= singular_name %>),
-        :title => t('.view_live_html'),
-        :target => "_blank" %>
-    <% end %>
-    <%%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>),
-         :title => t('.edit') %>
-    <%%= link_to refinery_icon_tag("delete.png"), refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>),
-        :class => "cancel confirm-delete",
-        :title => t('.delete'),
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => <%= singular_name %>.<%= title_attribute %>),
-        :method => :delete %>
+      <%%= action_icon(:preview, refinery.<%= namespacing.underscore %>_<%= singular_name %>_path(<%= singular_name %>), t('.view_live_html')) %>
+    <%end %>
+    <%%= action_icon(:edit,    refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>), t('.edit') ) %>
+    <%%= action_icon(:delete,  refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>), t('.delete'),
+      { class: "cancel confirm-delete",
+        data: {confirm: t('message',  scope: 'refinery.admin.delete', title: <%=singular_name%>.<%=title_attribute %>)}}  ) %>
   </span>
 </li>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/index.html.erb

@@ -4,4 +4,4 @@
 <aside id='actions'>
   <%%= render 'actions' %>
 </aside>
-<%%= render '/refinery/admin/make_sortable', :tree => false if !searching? and ::Refinery::<%= namespacing %>::Admin::<%= class_name.pluralize %>Controller.sortable? and ::Refinery::<%= namespacing %>::<%= class_name %>.many? %>
+<%%= render '/refinery/admin/make_sortable', options: {tree: false} if !searching? and ::Refinery::<%= namespacing %>::Admin::<%= class_name.pluralize %>Controller.sortable? and ::Refinery::<%= namespacing %>::<%= class_name %>.many? %>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/plural_name/show.html.erb

@@ -7,11 +7,11 @@
   <section>
     <h1><%= attribute.name.titleize %></h1>
     <p>
-<% if attribute.type.to_s == 'image' -%>
-      <%%= image_fu @<%= singular_name %>.<%= attribute.name %>, nil %>
-<% elsif attribute.type.to_s == 'resource' -%>
+<% if attribute.refinery_type == :image -%>
+      <%%= image_fu @<%= singular_name %>.<%= attribute.name.gsub('_id', '') %>, nil %>
+<% elsif attribute.refinery_type == :resource -%>
       <%% if @<%= singular_name %>.<%= attribute.name %>.present? %>
-        <%%= link_to <%= "'#{attribute.name}'" %>, @<%= singular_name %>.<%= attribute.name %>.url %>
+        <%%= link_to <%= "'#{attribute.name}'" %>, @<%= singular_name %>.<%= attribute.name.gsub('_id', '') %>.url %>
       <%% else %>
         <%= attribute.name %>
       <%% end %>

data/lib/generators/refinery/engine/templates/db/migrate/1_create_namespace_plural_name.rb.erb

@@ -2,15 +2,8 @@ class Create<%= namespacing %><%= class_name.pluralize %> < ActiveRecord::Migrat
 
   def up
     create_table :refinery_<%= "#{namespacing.underscore}_" if table_name != namespacing.underscore.pluralize -%><%= table_name %> do |t|
-<%
-  attributes.each do |attribute|
-    # turn image or resource into what it was supposed to be which is an integer reference to an image or resource.
-    if attribute.type.to_s =~ /^(image|resource)$/
-      attribute.type = 'integer'
-      attribute.name = "#{attribute.name}_id".gsub("_id_id", "_id")
-    end
--%>
-      t.<%= attribute.type %> :<%= attribute.name %>
+<% attributes.each do |attribute| -%>
+      t.<%= attribute.type %> :<%= attribute.column_name %>
 <% end -%>
       t.integer :position
 

data/lib/generators/refinery/engine/templates/db/seeds.rb.erb

@@ -1,27 +1,21 @@
 Refinery::I18n.frontend_locales.each do |lang|
   I18n.locale = lang
 
-  if defined?(Refinery::User)
-    Refinery::User.all.each do |user|
-      if user.plugins.where(:name => 'refinerycms-<%= namespacing.underscore %>').blank?
-        user.plugins.create(:name => 'refinerycms-<%= namespacing.underscore %>',
-                            :position => (user.plugins.maximum(:position) || -1) +1)
-      end
-    end
-  end
+  Refinery::User.find_each do |user|
+    user.plugins.where(name: 'refinerycms-<%= namespacing.underscore %>').first_or_create!(
+      position: (user.plugins.maximum(:position) || -1) +1
+    )
+  end if defined?(Refinery::User)
 
 <% unless skip_frontend? -%>
-  url = "/<%= [(namespacing.underscore if namespacing.underscore != plural_name), plural_name].compact.join('/') %>"
-  if defined?(Refinery::Page) && Refinery::Page.where(:link_url => url).empty?
-    page = Refinery::Page.create(
-      :title => '<%= class_name.pluralize.underscore.titleize %>',
-      :link_url => url,
-      :deletable => false,
-      :menu_match => "^#{url}(\/|\/.+?|)$"
-    )
-    Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
-      page.parts.create(:title => default_page_part, :body => nil, :position => index)
+  Refinery::Page.where(link_url: (url = "/<%= [(namespacing.underscore if namespacing.underscore != plural_name), plural_name].compact.join('/') %>")).first_or_create!(
+    title: '<%= class_name.pluralize.underscore.titleize %>',
+    deletable: false,
+    menu_match: "^#{url}(\/|\/.+?|)$"
+  ) do |page|
+    Refinery::Pages.default_parts.each_with_index do |part, index|
+      page.parts.build title: part, body: nil, position: index
     end
-  end
+  end if defined?(Refinery::Page)
 <% end -%>
 end

data/lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb

@@ -11,10 +11,6 @@ module Refinery
           plugin.name = "<%= plural_name %>"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
           plugin.pathname = root
-          plugin.activity = {
-            :class_name => :'refinery/<%= namespacing.underscore %>/<%= singular_name %>'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>,
-            :title => '<%= title.name %>'<% end %>
-          }
           <% unless namespacing.underscore == plural_name -%>plugin.menu_match = %r{refinery/<%= namespacing.underscore %>/<%= plural_name %>(/.*)?$}<% end %>
         end
       end