refinerycms-core 2.0.0 → 2.0.1

data/app/assets/javascripts/refinery/admin.js.erb

@@ -419,9 +419,9 @@ var link_dialog = {
           });
         }
       }
-    });
 
-    $('.form-actions-dialog #cancel_button').trigger('click');
+      $('.form-actions-dialog #cancel_button').trigger('click');
+    });
   },
 
   init_close: function(){

data/app/views/refinery/_javascripts.html.erb

@@ -7,4 +7,5 @@
     <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
   <![endif]-->
 <% end %>
+<%= javascript_include_tag 'application' %>
 <%= yield :javascripts -%>

data/lib/generators/refinery/engine/templates/config/routes.rb

@@ -1,4 +1,4 @@
-Refinery::Core::Engine.routes.draw do
+Refinery::Core::Engine.routes.append do
 <% unless skip_frontend? %>
   # Frontend routes
   namespace :<%= namespacing.underscore %> do

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

@@ -6,13 +6,10 @@ module Refinery
 
       engine_name :refinery_<%= extension_plural_name %>
 
-      initializer "register refinerycms_<%= plural_name %> plugin" do |app|
+      initializer "register refinerycms_<%= plural_name %> plugin" do
         Refinery::Plugin.register do |plugin|
           plugin.name = "<%= plural_name %>"
-          plugin.url = {
-            :controller => 'refinery/<%= namespacing.underscore %>/admin/<%= plural_name %>',
-            :action => 'index'
-          }
+          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' %>,

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

@@ -22,15 +22,15 @@ module Refinery
         if @<%= singular_name %>.save
           begin
             Mailer.notification(@<%= singular_name %>, request).deliver
-          rescue
-            logger.warn "There was an error delivering an <%= singular_name %> notification.\n#{$!}\n"
+          rescue => e
+            logger.warn "There was an error delivering the <%= singular_name %> notification.\n#{e.message}\n"
           end<% if @includes_spam %> if @<%= singular_name %>.ham?<% end %>
 
           if <%= class_name %>.column_names.map(&:to_s).include?('email')
             begin
               Mailer.confirmation(@<%= singular_name %>, request).deliver
-            rescue
-              logger.warn "There was an error delivering an foo confirmation:\n#{$!}\n"
+            rescue => e
+              logger.warn "There was an error delivering the <%= singular_name %> confirmation:\n#{e.message}\n"
             end<% if @includes_spam %> if @<%= singular_name %>.ham?<% end %>
           else
             logger.warn "Please add an 'email' field to <%= class_name %> if you wish to send confirmation emails when forms are submitted."

data/lib/generators/refinery/form/templates/config/routes.rb

@@ -1,4 +1,4 @@
-Refinery::Core::Engine.routes.draw do
+Refinery::Core::Engine.routes.append do
   # Frontend routes
   namespace :<%= namespacing.underscore %> do
     resources :<%= plural_name %><%= ", :path => ''" if namespacing.underscore == plural_name %>, :only => [:new, :create] do

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

@@ -6,13 +6,10 @@ module Refinery
 
       engine_name :refinery_<%= extension_plural_name %>
 
-      initializer "register refinerycms_<%= plural_name %> plugin" do |app|
+      initializer "register refinerycms_<%= plural_name %> plugin" do
         Refinery::Plugin.register do |plugin|
           plugin.name = "<%= plural_name %>"
-          plugin.url = {
-            :controller => 'refinery/<%= namespacing.underscore %>/admin/<%= plural_name %>',
-            :action => 'index'
-          }
+          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' %>,

data/lib/refinery/core/engine.rb

@@ -138,6 +138,16 @@ module Refinery
       config.after_initialize do
         Refinery.register_extension(Refinery::Core)
       end
+
+      # We need to reload the routes here due to how Refinery sets them up
+      # The different facets of Refinery (dashboard, pages, etc.) append/prepend routes to Core
+      # *after* Core has been loaded.
+      #
+      # So we wait until after initialization is complete to do one final reload
+      # This then makes the appended/prepended routes available to the application.
+      config.after_initialize do
+        Rails.application.routes_reloader.reload!
+      end
     end
   end
 end

data/lib/refinery/plugin.rb

@@ -66,7 +66,14 @@ module Refinery
       else
         { :controller => "refinery/admin/#{name}" }
       end
-      @url.is_a?(Hash) ? {:only_path => true}.merge(@url) : @url
+
+      if @url.is_a?(Hash)
+        {:only_path => true}.merge(@url)
+      elsif @url.respond_to?(:call)
+        @url.call
+      else
+        @url
+      end
     end
 
   # Make this protected, so that only Plugin.register can use it.

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 2
     @minor = 0
-    @tiny  = 0
+    @tiny  = 1
     @build = nil
 
     class << self

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2011 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2012 [Resolve Digital](http://www.resolvedigital.com)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Philip Arndt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false