Merge branch 'master' into feature/consistent-dummy-app

Author: parndt

Gemfile

@@ -35,7 +35,7 @@ end
 if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   group :postgres, :postgresql do
     gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.rc1', platform: :jruby
-    gem 'pg', platform: :ruby
+    gem 'pg', '~> 0.21', platform: :ruby
   end
 end
 

contributing.md

@@ -33,4 +33,4 @@ inclusion.
 
 ## Links ##
 
-See also the [Contributing to Refinery](http://refinerycms.com/guides/contributing-to-refinery) guide.
+See also the [Contributing to Refinery](https://www.refinerycms.com/guides/contributing-to-refinery) guide.

core/app/views/refinery/_site_bar.html.erb

@@ -6,7 +6,7 @@
   <div id='site_bar'>
     <div id='site_bar_content' class='clearfix'>
 
-      <%= link_to 'http://refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
+      <%= link_to 'https://www.refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
         <%= image_tag 'refinery/refinery-cms-logo.svg', alt: 'Refinery CMS™' %>
       <% end %>
 

core/app/views/refinery/admin/_continue_editing.html.erb

@@ -1,3 +1,4 @@
 <%= f.submit t('.save_and_continue_editing'),
-             :id => "submit_continue_button",
-             :class => "wymupdate button" if f.object.persisted? %>
+             id: 'submit_continue_button',
+             class: 'wymupdate button',
+             data: { disable_with: false } if f.object.persisted? %>

core/app/views/refinery/admin/_form_actions.html.erb

@@ -1,8 +1,9 @@
 <%
   unless (hide_submit ||= false)
     submit_button_text  ||= t('.save')
-    submit_button_id    ||= "submit_button"
+    submit_button_id    ||= 'submit_button'
     submit_button_title ||= nil
+    submit_button_data  ||= { disable_with: false }
   end
 
   hide_cancel = from_dialog? unless defined?(hide_cancel).presence
@@ -12,8 +13,8 @@
     unless defined?(cancel_title)
       cancel_title = t('.cancel_lose_changes')
     end
-    cancel_button_id    ||= "cancel_button"
-    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, :plural => true)) : back)
+    cancel_button_id    ||= 'cancel_button'
+    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, plural: true)) : back)
   end
 
   continue_editing = defined?(continue_editing) ? continue_editing : (f.object.present? and f.object.persisted?)
@@ -28,7 +29,7 @@
     delete_button_text  ||= t('.delete')
     delete_title        ||= nil
     delete_confirmation ||= nil
-    delete_button_id    ||= "delete_button"
+    delete_button_id    ||= 'delete_button'
     # we have to use eval rather than refinery.send because this url may not exist for HTTP GET
     delete_url          ||= eval("refinery.#{Refinery.route_for_model(f.object.class)}(#{f.object.id})")
   end
@@ -38,37 +39,42 @@
 <input type='hidden' name='dialog' value='true' />
 <% end %>
 
-<div class='form-actions<%= ' form-actions-dialog' if from_dialog? %>'>
-  <div class='form-actions-left'>
+<%= content_tag :div, class: "form-actions#{' form-actions-dialog' if from_dialog?}" do %>
+  <%= content_tag :div, class: 'form-actions-left' do %>
     <%= submit_tag submit_button_text,
-                   :id => submit_button_id,
-                   :name => nil,
-                   :class => "wymupdate button",
-                   :tooltip => submit_button_title unless hide_submit %>
+                   id: submit_button_id,
+                   name: nil,
+                   class: 'wymupdate button',
+                   data: submit_button_data,
+                   tooltip: submit_button_title unless hide_submit %>
 
-    <%= render '/refinery/admin/continue_editing', :f => f if continue_editing -%>
+    <%= render '/refinery/admin/continue_editing', f: f if continue_editing -%>
     <%= hidden_field_tag :continue_editing, false if continue_editing %>
 
     <%= local_assigns[:before_cancel_button] -%>
 
-    <%= link_to(cancel_button_text, cancel_url,
-                :title => cancel_title,
-                :id => cancel_button_id,
-                :class => "close_dialog button") unless hide_cancel %>
+    <%= link_to cancel_button_text, cancel_url,
+                title: cancel_title,
+                id: cancel_button_id,
+                class: 'close_dialog button' unless hide_cancel %>
 
     <%= local_assigns[:after_cancel_button] -%>
-    <i id='spinner' class='loading_icon hidden_icon'></i>
-  </div>
-  <div class='form-actions-right'>
+
+    <%= content_tag :i, nil, id: 'spinner', class: 'loading_icon hidden_icon' %>
+  <% end %>
+
+  <%= content_tag :div, class: 'form-actions-right' do %>
     <%= local_assigns[:before_delete_button] -%>
-    <%= link_to(delete_button_text, delete_url,
-                :title => delete_title,
-                :id => delete_button_id,
-                :method => :delete,
-                :data => {
-                  :confirm => delete_confirmation
+
+    <%= link_to delete_button_text, delete_url,
+                title: delete_title,
+                id: delete_button_id,
+                method: :delete,
+                data: {
+                  confirm: delete_confirmation
                 },
-                :class => "button confirm-delete") unless hide_delete %>
+                class: 'button confirm-delete' unless hide_delete %>
+
     <%= local_assigns[:after_delete_button] -%>
-  </div>
-</div>
+  <% end %>
+<% end %>

core/lib/generators/refinery/cms/cms_generator.rb

@@ -1,3 +1,4 @@
+require 'mkmf'
 require 'pathname'
 require 'refinery/core/environment_checker'
 
@@ -78,14 +79,14 @@ def append_gitignore!
     def append_heroku_gems!
       production_gems = [
         "gem 'dragonfly-s3_data_store'",
-        "gem 'rails_12factor'",
-        "gem 'puma'"
+        "gem 'rails_12factor'"
       ]
+      production_gems << "gem 'puma'" unless destination_gemfile_has_puma?
       production_gems << "gem 'pg'" unless destination_gemfile_has_postgres?
 
       append_file "Gemfile", %Q{
 # The Ruby version is specified here so that Heroku uses the right version.
-ruby #{ENV['RUBY_VERSION'].inspect}
+ruby #{current_ruby_version.inspect}
 
 # Gems that have been added for Heroku support
 group :production do
@@ -94,6 +95,10 @@ def append_heroku_gems!
 }.sub("{{production_gems}}", production_gems.join("\n  "))
     end
 
+    def current_ruby_version
+      ENV['RUBY_VERSION'].presence || RUBY_VERSION
+    end
+
     def bundle!
       run 'bundle install'
     end
@@ -204,16 +209,24 @@ def forced_overwriting?
     end
 
     def destination_gemfile_has_postgres?
+      destination_gemfile_has_gem?('pg')
+    end
+
+    def destination_gemfile_has_puma?
+      destination_gemfile_has_gem?('puma')
+    end
+
+    def destination_gemfile_has_gem?(gem_name)
       destination_path.join('Gemfile').file? &&
-        destination_path.join('Gemfile').read =~ %r{gem ['"]pg['"]}
+        destination_path.join('Gemfile').read =~ %r{gem ['"]#{gem_name}['"]}
     end
 
     def heroku?
       options[:heroku].present?
     end
 
     def heroku_toolbelt_missing?
-      !!system("heroku --version")
+      find_executable("heroku").nil?
     end
 
     def manage_roadblocks!

core/lib/refinery/crud.rb

@@ -26,7 +26,7 @@ def self.default_options(model_name)
       {
         :conditions => '',
         :include => [],
-        :order => ('position ASC' if this_class.table_exists? && this_class.column_names.include?('position')),
+        :order => ('position ASC' if this_class.connected? && this_class.table_exists? && this_class.column_names.include?('position')),
         :paging => true,
         :per_page => false,
         :redirect_to_url => "refinery.#{Refinery.route_for_model(class_name.constantize, :plural => true)}",
@@ -67,7 +67,8 @@ def new
           end
 
           def create
-            if (@#{singular_name} = #{class_name}.create(#{singular_name}_params)).valid?
+            @#{singular_name} = #{class_name}.new(#{singular_name}_params)
+            if @#{singular_name}.save
               flash.notice = t(
                 'refinery.crudify.created',
                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'"

core/refinerycms-core.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary           = %q{Core extension for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most extensions}
   s.email             = %q{[email protected]}
-  s.homepage          = %q{http://refinerycms.com}
+  s.homepage          = %q{https://www.refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}

doc/guides/1 - Getting Started/2 - Getting Started.md

@@ -56,7 +56,7 @@ The extensions Refinery comes with are:
 
 ## Creating a new Refinery project
 
-![](/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTJfMDdfMTRfNjQ3X3JpY2tfYXN0bGV5X25ldmVyX2dvbm5hX2dpdmVfeW91X3VwLmpwZyJdXQ/rick-astley-never-gonna-give-you-up.jpg?sha=d5fdafec8a158121)
+![Never gonna give you up](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTJfMDdfMTRfNjQ3X3JpY2tfYXN0bGV5X25ldmVyX2dvbm5hX2dpdmVfeW91X3VwLmpwZyJdXQ/rick-astley-never-gonna-give-you-up.jpg?sha=d5fdafec8a158121)
 
 If you follow this guide, you'll create a Refinery site called `rickrockstar` that will have a custom design. Then you'll be ready to go further in the following guide and add events extension to allow Rick to tell his fans when his next gig is.
 
@@ -137,7 +137,7 @@ $ rails server
 
 This will fire up an instance of the built-in Rails web server by default (called WEBrick). To see your application in action, open a browser window and navigate to <http://localhost:3000/refinery>. You should be greeted with a screen prompting you to create your first Refinery user.
 
-![](/system/images/W1siZiIsIjIwMTIvMDMvMDQvMTRfMTFfMjRfOTkzX3NldF91cF95b3VyX2ZpcnN0X3VzZXIucG5nIl1d/set-up-your-first-user.png?sha=42b2ae6479070760)
+![Set up your first user](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTIvMDMvMDQvMTRfMTFfMjRfOTkzX3NldF91cF95b3VyX2ZpcnN0X3VzZXIucG5nIl1d/set-up-your-first-user.png?sha=42b2ae6479070760)
 
 __TIP__: To stop the web server, hit `Ctrl+C` in the terminal window where it's running.
 
@@ -151,7 +151,7 @@ Fill out the sign up form to create your first user. This will be the super user
 
 Once you've created your first user you'll see Refinery's admin.
 
-![](/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfNzIxX2Rhc2hib2FyZC5wbmciXV0/dashboard.png?sha=d05ed9da6bb78669)
+![Old Dashboard image](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfNzIxX2Rhc2hib2FyZC5wbmciXV0/dashboard.png?sha=d05ed9da6bb78669)
 
 ### Setting Your Site Name
 
@@ -173,13 +173,13 @@ Now you're setup, click around the various tabs in the backend and become famili
 
 ### Switching to your front-end
 
-![](/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTJfNTdfMDZfNDIyX3N3aXRjaF90b193ZWJzaXRlLnBuZyJdXQ/switch-to-website.png?sha=a13b44877a69739e)
+![Website Frontend](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTJfNTdfMDZfNDIyX3N3aXRjaF90b193ZWJzaXRlLnBuZyJdXQ/switch-to-website.png?sha=a13b44877a69739e)
 
 You're currently in the back-end Refinery site editor. To see the front-end site, click "Switch to your website".
 
 As you can see, Refinery is already displaying a basic menu and layout ready for you to customise.
 
-![](/system/images/W1siZiIsIjIwMTIvMDMvMjUvMjNfMjVfMThfNjg1X3JlZmluZXJ5X2RlZmF1bHRfZnJvbnRfZW5kX3NtYWxsLnBuZyJdXQ/refinery-default-front-end-small.png?sha=021f1e16d298eb86)
+![Default Basic Layout](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTIvMDMvMjUvMjNfMjVfMThfNjg1X3JlZmluZXJ5X2RlZmF1bHRfZnJvbnRfZW5kX3NtYWxsLnBuZyJdXQ/refinery-default-front-end-small.png?sha=021f1e16d298eb86)
 
 ### Customising the Design
 
@@ -234,7 +234,7 @@ As you can see we're going to render a view with some HTML5 tags and along with
 
 When you edit the About page you'll see something like this:
 
-![](/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfNDg5X2Fib3V0X3BhZ2VfZWRpdC5wbmciXV0/about_page_edit.png?sha=6d88aaa196ad01a2)
+![Editing the about page](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfNDg5X2Fib3V0X3BhZ2VfZWRpdC5wbmciXV0/about_page_edit.png?sha=6d88aaa196ad01a2)
 
 You'll notice two tabs on the page: "Body" and "Side Body". These are `PageParts`, or in other words, a single piece of content attached to this page that you can render in your view. There is a "Body" tab with some content on this screen. To render that same content in your view, put:
 
@@ -286,7 +286,7 @@ __TIP__: You can add CSS for specific pages by using their slug with `-page`. Th
 
 Now when you view your front-end at <http://localhost:3000/about> you'll notice your site has a grey background, with a horizontal menu and two white content areas.
 
-![](/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfMjI3X2RlZmF1bHRfZGVzaWduX3NtYWxsLnBuZyJdXQ/default-design-small.png?sha=84c3f6a40328b9a6)
+![Default design - small image](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfMjI3X2RlZmF1bHRfZGVzaWduX3NtYWxsLnBuZyJdXQ/default-design-small.png?sha=84c3f6a40328b9a6)
 
 ### What we just did
 

doc/guides/1 - Getting Started/3 - Generate an Extension to Use Your MVCs.md

@@ -11,9 +11,9 @@ __WARNING__: This guide is based on Refinery CMS 2.1.0 so some of the code shown
 
 ## Guide Assumptions
 
-This guide continues the Rick Rock Star example from the [Getting Started](/guide/getting-started/) guide. You will need to have Refinery installed and running as explained in that guide.
+This guide continues the Rick Rock Star example from the [Getting Started](/guides/getting-started/) guide. You will need to have Refinery installed and running as explained in that guide.
 
-This guide does not assume that you have any prior experience with Refinery beyond what is covered in the [Getting Started](/guide/getting-started/) guide, but it does assume that you are somewhat familiar with Rails. If you are not familiar with Rails, you will still be able to step through the guide but you may not fully understand all of the commands or code. Here are some resources to learn more about Rails:
+This guide does not assume that you have any prior experience with Refinery beyond what is covered in the [Getting Started](/guides/getting-started/) guide, but it does assume that you are somewhat familiar with Rails. If you are not familiar with Rails, you will still be able to step through the guide but you may not fully understand all of the commands or code. Here are some resources to learn more about Rails:
 
 * [Ruby on Rails](http://rubyonrails.org/)
 * [Ruby on Rails Guides for v3.2](http://guides.rubyonrails.org/v3.2.14/) - Note that these are the guides for Rails version `3.2` since that is the version Refinery requires.
@@ -47,7 +47,7 @@ Here is a list of the most often used field types and what they give you:
   -------------------- -------------------------------------------------------------------------------------------------------
 ```
 
-If you remember from the [Getting Started](/guide/getting-started/) guide, we told Rick that we'll give him an area to post up events he'll be at. Although we could technically create a new page in Refinery to add the event content there, areas that have special functionality are much better suited as an extension.
+If you remember from the [Getting Started](/guides/getting-started/) guide, we told Rick that we'll give him an area to post up events he'll be at. Although we could technically create a new page in Refinery to add the event content there, areas that have special functionality are much better suited as an extension.
 
 Rick is going to want to enter the following information about each event:
 
@@ -131,7 +131,7 @@ __TIP__: Models in Refinery extensions expect a string field that acts as the ti
 Now go to the backend of your Refinery site ([http://localhost:3000/refinery](http://localhost:3000/refinery)) and
 you'll notice a new tab called "Events". Click on "Add new event" and you'll see something like this:
 
-![](/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfODYwX2V2ZW50X3BhZ2VfZWRpdC5wbmciXV0/event_page_edit.png?sha=d45dd13cf1a97d8f)
+![Adding an event](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTMvMDYvMDkvMjNfNTdfNDRfODYwX2V2ZW50X3BhZ2VfZWRpdC5wbmciXV0/event_page_edit.png?sha=d45dd13cf1a97d8f)
 
 You'll see the entire form has been generated for you based off the field types you specified when generating the events section. The blurb has a visual editor, the date field is a date picker and the photo allows you to pick or upload a new photo from a built-in Refinery dialog.
 
@@ -141,9 +141,9 @@ Now click on "Switch to your website", and navigate to <http://localhost:3000/ev
 
 You'll notice not only has Refinery generated the backend "Events" tab but also a new menu item called "Events" and two new front-end views,`index.html.erb` and `show.html.erb`, located in `vendor/extensions/events/app/views/refinery/events/` for you to customise.
 
-![](/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfNDE1X2V2ZW50c19lbmdpbmVfc21hbGwucG5nIl1d/events-engine-small.png?sha=d3af41646dd136ba)
+![Events frontend with undesired ordering](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfNDE1X2V2ZW50c19lbmdpbmVfc21hbGwucG5nIl1d/events-engine-small.png?sha=d3af41646dd136ba)
 
-As you can see, Refinery makes it insanely easy to quickly add new extensions to manage various areas of a site.
+As you can see, Refinery makes it really easy to quickly add new extensions to manage various areas of a site.
 
 But I've noticed one problem. The "2011 Music Awards" is showing up in the middle when it makes more sense to order the events with the latest event at the top. To fix this we need to understand what's happening under the hood of a Refinery extension. Let's dive in.
 
@@ -218,7 +218,7 @@ end
 
 Now when you look at <http://localhost:3000/events> you'll notice they're now being sorted by the event date.
 
-![](/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfMzE0X2V2ZW50c19lbmdpbmVfZml4ZWRfc21hbGwucG5nIl1d/events-engine-fixed-small.png?sha=452dcc1cbd2522c3)
+![Finished events frontend](https://www.refinerycms.com/system/images/W1siZiIsIjIwMTAvMTIvMDIvMTRfMjRfNTFfMzE0X2V2ZW50c19lbmdpbmVfZml4ZWRfc21hbGwucG5nIl1d/events-engine-fixed-small.png?sha=452dcc1cbd2522c3)
 
 ## What's Next?