refinerycms-core 2.0.5 → 2.0.6

data/lib/generators/refinery/form/templates/config/{routes.rb → routes.rb.erb}

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

data/lib/generators/refinery/form/templates/db/migrate/{1_create_plural_name.rb → 1_create_plural_name.rb.erb}

@@ -5,12 +5,13 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
 <%
   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)$/
+    case attribute.type
+    when :image, :resource
       attribute.type = 'integer'
-      attribute.name = "#{attribute.name}_id".gsub("_id_id", "_id")
-    elsif attribute.type.to_s =~ /^(radio|select)$/
+      attribute.name = "#{attribute.name}_id"
+    when :radio, :select
       attribute.type = 'string'
-    elsif attribute.type.to_s =~ /^(checkbox)$/
+    when :checkbox
       attribute.type = 'boolean'
     end
 -%>

data/lib/generators/refinery/form/templates/db/{seeds.rb → seeds.rb.erb}

@@ -1,6 +1,6 @@
 (Refinery.i18n_enabled? ? Refinery::I18n.frontend_locales : [:en]).each do |lang|
   I18n.locale = lang
-  
+
   if defined?(Refinery::User)
     Refinery::User.all.each do |user|
       if user.plugins.find_by_name('<%= plural_name %>').nil?

data/lib/refinery/cli.rb

@@ -4,123 +4,60 @@ module Refinery
   class CLI < Thor
     include Thor::Actions
 
+    OVERRIDES = {
+      :view => {
+        :glob => '*.{erb,builder}',
+        :dir => 'views',
+        :desc => 'view template',
+      },
+      :controller => {
+        :glob => '*.rb',
+        :dir => 'controllers',
+        :desc => 'controller',
+      },
+      :model => {
+        :glob => '*.rb',
+        :dir => 'models',
+        :desc => 'model',
+      },
+      :presenter => {
+        :glob => '*.rb',
+        :dir => 'presenters',
+        :desc => 'presenter',
+      },
+      :javascript => {
+        :glob => '*.js{,.*}',
+        :dir => 'assets/javascripts',
+        :desc => 'javascript',
+      },
+      :stylesheet => {
+        :glob => '*.css.scss',
+        :dir => 'assets/stylesheets',
+        :desc => 'stylesheet',
+      },
+    }
+
     desc "override", "copies files from any Refinery extension that you are using into your application"
     def override(env)
-      if (view = env["view"]).present?
-        pattern = "{refinery#{File::SEPARATOR},}#{view.split("/").join(File::SEPARATOR)}*.{erb,builder}"
-        looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "views", pattern).to_s}
-
-        # copy in the matches
-        if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-          matches.each do |match|
-            dir = match.split("/app/views/").last.split('/')
-            file = dir.pop # get rid of the file.
-            dir = dir.join(File::SEPARATOR) # join directory back together
-
-            destination_dir = Rails.root.join("app", "views", dir)
-            FileUtils.mkdir_p(destination_dir)
-            FileUtils.cp match, (destination = File.join(destination_dir, file))
-
-            puts "Copied view template file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
-          end
-        else
-          puts "Couldn't match any view template files in any extensions like #{view}"
-        end
-      elsif (controller = env["controller"]).present?
-        pattern = "{refinery#{File::SEPARATOR},}#{controller.split("/").join(File::SEPARATOR)}*.rb"
-        looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "controllers", pattern).to_s}
-
-        # copy in the matches
-        if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-          matches.each do |match|
-            dir = match.split("/app/controllers/").last.split('/')
-            file = dir.pop # get rid of the file.
-            dir = dir.join(File::SEPARATOR) # join directory back together
-
-            destination_dir = Rails.root.join("app", "controllers", dir)
-            FileUtils.mkdir_p(destination_dir)
-            FileUtils.cp match, (destination = File.join(destination_dir, file))
-
-            puts "Copied controller file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
-          end
-        else
-          puts "Couldn't match any controller files in any extensions like #{controller}"
-        end
-      elsif (model = env["model"]).present?
-        pattern = "{refinery#{File::SEPARATOR},}#{model.split("/").join(File::SEPARATOR)}*.rb"
-        looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "models", pattern).to_s}
-
-        # copy in the matches
-        if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-          matches.each do |match|
-            dir = match.split("/app/models/").last.split('/')
-            file = dir.pop # get rid of the file.
-            dir = dir.join(File::SEPARATOR) # join directory back together
-
-            destination_dir = Rails.root.join("app", "models", dir)
-            FileUtils.mkdir_p(destination_dir)
-            FileUtils.cp match, (destination = File.join(destination_dir, file))
-
-            puts "Copied model file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
-          end
-        else
-          puts "Couldn't match any model files in any extensions like #{model}"
-        end
-      elsif (javascripts = env["javascript"]).present?
-        pattern = "#{javascripts.split("/").join(File::SEPARATOR)}*.js{,.*}"
-        looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "assets", "javascripts", pattern).to_s}
-
-        # copy in the matches
-        if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-          matches.each do |match|
-            dir = match.split("/app/assets/javascripts/").last.split('/')
-            file = dir.pop # get rid of the file.
-            dir = dir.join(File::SEPARATOR) # join directory back together
-
-            destination_dir = Rails.root.join("app", "assets", "javascripts", dir)
-            FileUtils.mkdir_p(destination_dir)
-            FileUtils.cp match, (destination = File.join(destination_dir, file))
-
-            puts "Copied javascript file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
-          end
-        else
-          puts "Couldn't match any javascript files in any extensions like #{javascripts}"
+      OVERRIDES.keys.each do |kind|
+        if (which = env[kind.to_s]).present?
+          return _override(kind, which)
         end
-      elsif (stylesheets = env["stylesheet"]).present?
-        pattern = "#{stylesheets.split("/").join(File::SEPARATOR)}*.css.scss"
-        looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", "assets", "stylesheets", pattern).to_s}
-
-        # copy in the matches
-        if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
-          matches.each do |match|
-            dir = match.split("/app/assets/stylesheets/").last.split('/')
-            file = dir.pop # get rid of the file.
-            dir = dir.join(File::SEPARATOR) # join directory back together
-
-            destination_dir = Rails.root.join("app", "assets", "stylesheets", dir)
-            FileUtils.mkdir_p(destination_dir)
-            FileUtils.cp match, (destination = File.join(destination_dir, file))
+      end
 
-            puts "Copied stylesheet file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
-          end
-        else
-          puts "Couldn't match any stylesheet files in any extensions like #{stylesheets}"
-        end
-      else
-        puts "You didn't specify anything to override. Here are some examples:"
-        {
-          :view => ['pages/home', 'refinery/pages/home', '**/*menu', '_menu_branch'],
-          :javascript => %w(admin refinery/site_bar),
-          :stylesheet => %w(home refinery/site_bar),
-          :controller => %w(pages),
-          :model => %w(page refinery/page)
-        }.each do |type, examples|
-          examples.each do |example|
-            puts "rake refinery:override #{type}=#{example}"
-          end
+      puts "You didn't specify anything valid to override. Here are some examples:"
+      {
+        :view => ['pages/home', 'refinery/pages/home', '**/*menu', '_menu_branch'],
+        :javascript => %w(admin refinery/site_bar),
+        :stylesheet => %w(home refinery/site_bar),
+        :controller => %w(pages),
+        :model => %w(page refinery/page),
+        :presenter => %w(refinery/page_presenter)
+      }.each do |type, examples|
+        examples.each do |example|
+          puts "rake refinery:override #{type}=#{example}"
         end
       end
-
     end
 
     desc "uncrudify", "shows you the code that your controller using crudify is running for a given action"
@@ -158,5 +95,30 @@ module Refinery
         puts crud_method
       end
     end
+
+    private
+
+    def _override(kind, which)
+      override_kind = OVERRIDES[kind]
+      pattern = "{refinery#{File::SEPARATOR},}#{which.split("/").join(File::SEPARATOR)}#{override_kind[:glob]}"
+      looking_for = ::Refinery::Plugins.registered.pathnames.map{|p| p.join("app", override_kind[:dir], pattern).to_s}
+
+      # copy in the matches
+      if (matches = looking_for.map{|d| Dir[d]}.flatten.compact.uniq).any?
+        matches.each do |match|
+          dir = match.split("/app/#{override_kind[:dir]}/").last.split('/')
+          file = dir.pop # get rid of the file.
+          dir = dir.join(File::SEPARATOR) # join directory back together
+
+          destination_dir = Rails.root.join('app', override_kind[:dir], dir)
+          FileUtils.mkdir_p(destination_dir)
+          FileUtils.cp match, (destination = File.join(destination_dir, file))
+
+          puts "Copied #{override_kind[:desc]} file to #{destination.gsub("#{Rails.root.to_s}#{File::SEPARATOR}", '')}"
+        end
+      else
+        puts "Couldn't match any #{override_kind[:desc]} files in any extensions like #{which}"
+      end
+    end
   end
 end

data/lib/refinery/core.rb

@@ -128,7 +128,7 @@ module Refinery
     #   Refinery.roots(:'refinery/core')  =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
     #   Refinery.roots("refinery/core")   =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
     def roots(extension_name = nil)
-      return @roots ||= self.extensions.map { |extension| extension.root } if extension_name.nil?
+      return @roots ||= self.extensions.map(&:root) if extension_name.nil?
 
       extension_name.to_s.camelize.constantize.root
     end
@@ -157,13 +157,17 @@ module Refinery
       options = {:plural => false, :admin => true}.merge options
 
       klass = klass.constantize if klass.respond_to?(:constantize)
-      active_name = ActiveModel::Name.new(klass, (Refinery if klass.parents.include?(Refinery)))
+      active_name = ActiveModel::Name.new klass, (Refinery if klass.parents.include?(Refinery))
 
       if options[:admin]
         # Most of the time this gets rid of 'refinery'
-        parts = active_name.underscore.split('/').reject{|name| active_name.singular_route_key.exclude?(name)}
+        parts = active_name.underscore.split('/').reject{|name|
+          active_name.singular_route_key.exclude?(name)
+        }
+
+        # Get the singular resource_name from the url parts
         resource_name = parts.pop
-        resource_name = options[:plural] ? resource_name.pluralize : resource_name.singularize
+        resource_name = resource_name.pluralize if options[:plural]
 
         [parts.join("_"), "admin", resource_name, "path"].reject(&:blank?).join "_"
       else

data/lib/refinery/crud.rb

@@ -266,8 +266,11 @@ module Refinery
             def update_positions
               previous = nil
               params[:ul].each do |_, list|
-                list.each do |index, hash|
-                  moved_item_id = hash['id'].split(/#{singular_name}\\_?/)
+                # After we drop Ruby 1.8.x support the following line can be changed back to
+                # list.each do |index, hash|
+                # because there won't be an ordering issue (see https://github.com/resolve/refinerycms/issues/1585)
+                list.sort.map { |item| item[1] }.each_with_index do |hash, index|
+                  moved_item_id = hash['id'].split(/#{singular_name}\_?/).reject(&:empty?).first
                   @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
 
                   if @current_#{singular_name}.respond_to?(:move_to_root)
@@ -277,7 +280,7 @@ module Refinery
                       @current_#{singular_name}.move_to_root
                     end
                   else
-                    @current_#{singular_name}.update_attribute(:position, index)
+                    @current_#{singular_name}.update_attributes :position => index
                   end
 
                   if hash['children'].present?
@@ -293,8 +296,9 @@ module Refinery
             end
 
             def update_child_positions(_node, #{singular_name})
-              _node['children']['0'].each do |_, child|
-                child_id = child['id'].split(/#{singular_name}\_?/)
+              list = _node['children']['0']
+              list.sort.map { |item| item[1] }.each_with_index do |child, index|
+                child_id = child['id'].split(/#{singular_name}\_?/).reject(&:empty?).first
                 child_#{singular_name} = #{class_name}.where(:id => child_id).first
                 child_#{singular_name}.move_to_child_of(#{singular_name})
 

data/lib/refinery/extension_generation.rb

@@ -10,271 +10,307 @@ module Refinery
         class_option :i18n, :type => :array, :default => [], :required => false, :banner => "field field", :desc => 'Indicates generated fields'
 
         remove_class_option :skip_namespace
+      end
+    end
 
-        def namespacing
-          @namespacing ||= if options[:namespace].present?
-            # Use exactly what the user requested, not a pluralised version.
-            options[:namespace].to_s.camelize
-          else
-            class_name.pluralize
-          end
-        end
+    def namespacing
+      @namespacing ||= if options[:namespace].present?
+        # Use exactly what the user requested, not a pluralised version.
+        options[:namespace].to_s.camelize
+      else
+        class_name.pluralize
+      end
+    end
 
-        def extension_name
-          @extension_name ||= if options[:extension].present?
-            # Use exactly what the user requested, not a made up version.
-            options[:extension].to_s
-          else
-            singular_name
-          end
-        end
+    def extension_name
+      @extension_name ||= options[:extension].presence || singular_name
+    end
 
-        def extension_class_name
-          @extension_class_name ||= extension_name.camelize
-        end
+    def extension_class_name
+      @extension_class_name ||= extension_name.camelize
+    end
 
-        def extension_plural_class_name
-          @extension_plural_class_name ||= if options[:extension].present?
-            # Use exactly what the user requested, not a plural version.
-            extension_class_name
-          else
-            extension_class_name.pluralize
-          end
-        end
+    def extension_plural_class_name
+      @extension_plural_class_name ||= if options[:extension].present?
+        # Use exactly what the user requested, not a plural version.
+        extension_class_name
+      else
+        extension_class_name.pluralize
+      end
+    end
 
-        def extension_plural_name
-          @extension_plural_name ||= if options[:extension].present?
-            # Use exactly what the user requested, not a plural version.
-            extension_name
-          else
-            extension_name.pluralize
-          end
-        end
+    def extension_plural_name
+      @extension_plural_name ||= if options[:extension].present?
+        # Use exactly what the user requested, not a plural version.
+        extension_name
+      else
+        extension_name.pluralize
+      end
+    end
 
-        def localized?
-          localized_attributes.any?
-        end
+    def localized?
+      localized_attributes.any?
+    end
 
-        def localized_attributes
-          @localized_attributes ||= attributes.select{|a| options[:i18n].include?(a.name)}
-        end
+    def localized_attributes
+      @localized_attributes ||= attributes.select{|a| options[:i18n].include?(a.name)}
+    end
 
-        def attributes_for_translation_table
-          localized_attributes.inject([]) {|memo, attr| memo << ":#{attr.name} => :#{attr.type}"}.join(', ')
-        end
+    def attributes_for_translation_table
+      localized_attributes.inject([]) {|memo, attr| memo << ":#{attr.name} => :#{attr.type}"}.join(', ')
+    end
 
-      protected
+    def string_attributes
+      @string_attributes ||= attributes.select {|a| /string|text/ === a.type.to_s}.uniq
+    end
 
-        def append_extension_to_gemfile!
-          unless Rails.env.test? || (self.behavior != :revoke && extension_in_gemfile?)
-            path = extension_pathname.parent.relative_path_from(gemfile.parent)
-            append_file gemfile, "\ngem '#{gem_name}', :path => '#{path}'"
-          end
-        end
+    def image_attributes
+      @image_attributes ||= attributes.select { |a| a.type == :image }.uniq
+    end
 
-        def clash_keywords
-          @clash_keywords ||= begin
-            clash_keywords = []
-            unless (clash_file = source_pathname.parent.join('clash_keywords.yml')).file?
-              clash_file = source_pathname.parent.parent.join('clash_keywords.yml')
-            end
-            clash_keywords = YAML.load_file(clash_file) if clash_file.file?
-            clash_keywords
-          end
-        end
+    def resource_attributes
+      @resource_attributes ||= attributes.select { |a| a.type == :resource }.uniq
+    end
 
-        def destination_pathname
-          @destination_pathname ||= Pathname.new(self.destination_root.to_s)
+    def names_for_attr_accessible
+      @attributes_for_attr_accessible ||= attributes.map do |a|
+        case a.type
+        when :image, :resource
+          "#{a.name}_id" unless a.name[-3..-1] == "_id"
+        else
+          a.name
         end
+      end
+    end
+
+  protected
 
-        def extension_pathname
-          destination_pathname.join('vendor', 'extensions', extension_plural_name)
+    def append_extension_to_gemfile!
+      unless Rails.env.test? || (self.behavior != :revoke && extension_in_gemfile?)
+        path = extension_pathname.parent.relative_path_from(gemfile.parent)
+        append_file gemfile, "\ngem '#{gem_name}', :path => '#{path}'"
+      end
+    end
+
+    def clash_keywords
+      @clash_keywords ||= begin
+        clash_keywords = []
+        unless (clash_file = source_pathname.parent.join('clash_keywords.yml')).file?
+          clash_file = source_pathname.parent.parent.join('clash_keywords.yml')
         end
+        clash_keywords = YAML.load_file(clash_file) if clash_file.file?
+        clash_keywords
+      end
+    end
 
-        def extension_path_for(path, extension)
-          path = extension_pathname.join(path.to_s.gsub(%r{#{source_pathname}/?}, '')).to_s
-
-          path.gsub!('extension_plural_name', extension_plural_name)
-          path.gsub!('plural_name', plural_name)
-          path.gsub!('singular_name', singular_name)
-          path.gsub!('namespace', namespacing.underscore)
-
-          if options[:namespace].present? || options[:extension].present?
-            # Increment the migration file leading number
-            # Only relevant for nested or namespaced extensions, where a previous migration exists
-            if path =~ %r{/migrate/\d+\w*.rb\z}
-              if last_migration = Dir["#{destination_pathname.join(path.split(File::SEPARATOR)[0..-2].join(File::SEPARATOR), '*.rb')}"].sort.last
-                path.gsub!(%r{\d+_}) { |m| "#{last_migration.match(%r{migrate/(\d+)_})[1].to_i + 1}_" }
-              end
-            end
+    def destination_pathname
+      @destination_pathname ||= Pathname.new(self.destination_root.to_s)
+    end
 
-            # Detect whether this is a special file that needs to get merged not overwritten.
-            # This is important only when nesting extensions.
-            if extension.present? && File.exist?(path)
-              path = if path =~ %r{/locales/.*\.yml$} or path =~ %r{/routes.rb$} or path =~ %r{/#{gem_name}.rb$}
-                # put new translations into a tmp directory
-                path.split(File::SEPARATOR).insert(-2, "tmp").join(File::SEPARATOR)
-              elsif path =~ %r{/readme.md$} or path =~ %r{/#{plural_name}.rb$}
-                nil
-              else
-                path
-              end
-            elsif extension.present? and path =~ /lib\/#{plural_name}.rb$/
-              path = nil
-            end
-          end
+    def extension_pathname
+      destination_pathname.join('vendor', 'extensions', extension_plural_name)
+    end
 
-          path
-        end
+    def extension_path_for(path, extension, apply_tmp = true)
+      path = extension_pathname.join(path.to_s.gsub(%r{#{source_pathname}/?}, '')).to_s
 
-        def erase_destination!
-          if Pathname.glob(extension_pathname.join('**', '*')).all?(&:directory?)
-            say_status :remove, relative_to_original_destination_root(extension_pathname.to_s), true
-            FileUtils.rm_rf extension_pathname unless options[:pretend]
+      path.gsub!('extension_plural_name', extension_plural_name)
+      path.gsub!('plural_name', plural_name)
+      path.gsub!('singular_name', singular_name)
+      path.gsub!('namespace', namespacing.underscore)
+
+      if options[:namespace].present? || options[:extension].present?
+        # Increment the migration file leading number
+        # Only relevant for nested or namespaced extensions, where a previous migration exists
+        if %r{/migrate/\d+\w*.rb\z} === path
+          if last_migration = Dir["#{destination_pathname.join(path.split(File::SEPARATOR)[0..-2].join(File::SEPARATOR), '*.rb')}"].sort.last
+            path.gsub!(%r{\d+_}) { |m| "#{last_migration.match(%r{migrate/(\d+)_})[1].to_i + 1}_" }
           end
         end
 
-        def evaluate_templates!
-          Pathname.glob(source_pathname.join('**', '**')).reject{|f|
-            reject_template?(f)
-          }.sort.each do |path|
-            if (template_path = extension_path_for(path, extension_name)).present?
-              next if path.to_s =~ /seeds.rb/
-              template path, template_path
+        # Detect whether this is a special file that needs to get merged not overwritten.
+        # This is important only when nesting extensions.
+        if extension.present? && File.exist?(path)
+          if %r{/locales/.*\.yml$} === path ||
+             %r{/routes.rb$} === path ||
+             %r{/#{gem_name}.rb$} === path
+            # put new translations into a tmp directory
+            if apply_tmp
+              path = path.split(File::SEPARATOR).insert(-2, "tmp").
+                          join(File::SEPARATOR)
             end
+          elsif %r{/readme.md$} === path || %r{/#{plural_name}.rb$} === path
+            path = nil
           end
+        elsif extension.present? and path =~ /lib\/#{plural_name}.rb$/
+          path = nil
         end
+      end
 
-        def existing_extension?
-          options[:extension].present? && extension_pathname.directory? && extension_in_gemfile?
-        end
+      path.present? ? Pathname.new(path) : path
+    end
 
-        def exit_with_message!(message)
-          puts ""
-          puts message
-          puts ""
-          exit(1)
-        end
+    def erase_destination!
+      if Pathname.glob(extension_pathname.join('**', '*')).all?(&:directory?)
+        say_status :remove, relative_to_original_destination_root(extension_pathname.to_s), true
+        FileUtils.rm_rf extension_pathname unless options[:pretend]
+      end
+    end
 
-        def extension_in_gemfile?
-          gemfile.read.scan(%r{#{gem_name}}).any?
-        end
+    def evaluate_templates!
+      Pathname.glob(source_pathname.join('**', '**')).reject{|f|
+        reject_template?(f)
+      }.sort.each do |path|
+        if (template_path = extension_path_for(path, extension_name)).present?
+          next if path.to_s =~ /seeds.rb.erb/
 
-        def finalize_extension!
-          if self.behavior != :revoke and !self.options['pretend']
-            puts_instructions!
-          else
-            erase_destination!
+          unless path.to_s =~ /views/
+            template_path = template_path.to_s.sub(".erb", "")
           end
-        end
 
-        def gem_name
-          "refinerycms-#{extension_plural_name}"
-        end
-
-        def gemfile
-          @gemfile ||= begin
-            Bundler.default_gemfile || destination_pathname.join('Gemfile')
-          end
+          template path, template_path
         end
+      end
+    end
 
-        def merge_locales!
-          if existing_extension?
-            # go through all of the temporary files and merge what we need into the current files.
-            tmp_directories = []
-            Dir.glob(source_pathname.join("{config/locales/*.yml,config/routes.rb,lib/refinerycms-extension_plural_name.rb}"), File::FNM_DOTMATCH).sort.each do |path|
-              # get the path to the current tmp file.
-              new_file_path = destination_pathname.join(extension_path_for(path, extension_name))
-              tmp_directories << Pathname.new(new_file_path.to_s.split(File::SEPARATOR)[0..-2].join(File::SEPARATOR)) # save for later
-              # get the path to the existing file and perform a deep hash merge.
-              current_path = Pathname.new(new_file_path.to_s.split(File::SEPARATOR).reject{|f| f == 'tmp'}.join(File::SEPARATOR))
-              new_contents = nil
-              if new_file_path.to_s =~ %r{.yml$}
-                # merge translation files together.
-                new_contents = YAML::load(new_file_path.read).deep_merge(YAML::load(current_path.read)).to_yaml.gsub(%r{^---\n}, '')
-              elsif new_file_path.to_s =~ %r{/routes.rb$}
-                # append any routes from the new file to the current one.
-                routes_file = [(file_parts = current_path.read.to_s.split("\n")).first]
-                routes_file += file_parts[1..-2]
-                routes_file += new_file_path.read.to_s.split("\n")[1..-2]
-                routes_file << file_parts.last
-                new_contents = routes_file.join("\n")
-              elsif new_file_path.to_s =~ %r{/#{gem_name}.rb$}
-                new_contents = current_path.read + new_file_path.read
-              end
-              # write to current file the merged results.
-              current_path.open('w+') { |file| file.puts new_contents } if new_contents
-            end
+    def existing_extension?
+      options[:extension].present? && extension_pathname.directory?
+    end
 
-            tmp_directories.uniq.each{|dir| remove_dir(dir) if dir && dir.exist?}
-          end
-        end
+    def exit_with_message!(message)
+      puts ""
+      puts message
+      puts ""
+      exit 1
+    end
 
-        def copy_or_merge_seeds!
-          source_seed_file      = source_pathname.join("db/seeds.rb")
-          destination_seed_file = destination_pathname.join(extension_path_for(source_seed_file, extension_name))
+    def finalize_extension!
+      if self.behavior != :revoke and !self.options['pretend']
+        puts_instructions!
+      else
+        erase_destination!
+      end
+    end
 
-          if existing_extension?
-            # create temp seeds file
-            temp_seed_file = destination_pathname.join(extension_path_for("tmp/seeds.rb", extension_name))
+    def gem_name
+      "refinerycms-#{extension_plural_name}"
+    end
 
-            # copy/evaluate seeds template to temp file
-            template source_seed_file, temp_seed_file, :verbose => false
+    def gemfile
+      @gemfile ||= begin
+        Bundler.default_gemfile || destination_pathname.join('Gemfile')
+      end
+    end
 
-            # append temp seeds file content to extension seeds file
-            destination_seed_file.open('a+') { |file| file.puts temp_seed_file.read.to_s }
+    def extension_in_gemfile?
+      gemfile.read.scan(%r{#{gem_name}}).any?
+    end
 
-            # remove temp file
-            FileUtils.rm_rf temp_seed_file
-          else
-            template source_seed_file, destination_seed_file
+    def merge_locales!
+      if existing_extension?
+        # go through all of the temporary files and merge what we need into the current files.
+        tmp_directories = []
+        Dir.glob(source_pathname.join("{config/locales/*.yml,config/routes.rb,lib/refinerycms-extension_plural_name.rb}"), File::FNM_DOTMATCH).sort.each do |path|
+          # get the path to the current tmp file.
+          new_file_path = extension_path_for(path, extension_name)
+          tmp_directories << Pathname.new(new_file_path.to_s.split(File::SEPARATOR)[0..-2].join(File::SEPARATOR)) # save for later
+          # get the path to the existing file and perform a deep hash merge.
+          current_path = extension_path_for(path, extension_name, false)
+          new_contents = nil
+          if File.exist?(new_file_path) && %r{.yml$} === new_file_path.to_s
+            # merge translation files together.
+            new_contents = YAML::load(new_file_path.read).deep_merge(
+              YAML::load(current_path.read)
+            ).to_yaml.gsub(%r{^---\n}, '')
+          elsif %r{/routes.rb$} === new_file_path.to_s
+            # append any routes from the new file to the current one.
+            routes_file = [(file_parts = current_path.read.to_s.split("\n")).first]
+            routes_file += file_parts[1..-2]
+            routes_file += new_file_path.read.to_s.split("\n")[1..-2]
+            routes_file << file_parts.last
+            new_contents = routes_file.join("\n")
+          elsif %r{/#{gem_name}.rb$} === new_file_path.to_s
+            new_contents = current_path.read + new_file_path.read
           end
+          # write to current file the merged results.
+          current_path.open('w+') { |file| file.puts new_contents } if new_contents
         end
 
-        def puts_instructions!
-          unless Rails.env.test?
-            puts "------------------------"
-            puts "Now run:"
-            puts "bundle install"
-            puts "rails generate refinery:#{extension_plural_name}"
-            puts "rake db:migrate"
-            puts "rake db:seed"
-            puts "------------------------"
-          end
-        end
+        tmp_directories.uniq.each{|dir| remove_dir(dir) if dir && dir.exist?}
+      end
+    end
 
-        def reject_file?(file)
-          !localized? && file.to_s.include?('locale_picker')
-        end
+    def copy_or_merge_seeds!
+      source_seed_file      = source_pathname.join("db/seeds.rb.erb")
+      destination_seed_file = destination_pathname.join(
+        extension_path_for(
+          source_seed_file.to_s.sub(".erb", ""), extension_name
+        )
+      )
+
+      if existing_extension?
+        # create temp seeds file
+        temp_seed_file = destination_pathname.join(
+          extension_path_for("tmp/seeds.rb", extension_name)
+        )
+
+        # copy/evaluate seeds template to temp file
+        template source_seed_file, temp_seed_file, :verbose => false
+
+        # append temp seeds file content to extension seeds file
+        destination_seed_file.open('a+') { |file|
+          file.puts temp_seed_file.read.to_s
+        }
+
+        # remove temp file
+        FileUtils.rm_rf temp_seed_file
+      else
+        template source_seed_file, destination_seed_file
+      end
+    end
 
-        def reject_template?(file)
-          file.directory? || reject_file?(file)
-        end
+    def puts_instructions!
+      unless Rails.env.test?
+        puts "------------------------"
+        puts "Now run:"
+        puts "bundle install"
+        puts "rails generate refinery:#{extension_plural_name}"
+        puts "rake db:migrate"
+        puts "rake db:seed"
+        puts "------------------------"
+      end
+    end
 
-        def sanity_check!
-          if clash_keywords.member?(singular_name.downcase)
-            exit_with_message!("Please choose a different name. The generated code would fail for class '#{singular_name}' as it conflicts with a reserved keyword.")
-          end
+    def reject_file?(file)
+      !localized? && file.to_s.include?('locale_picker')
+    end
 
-          if singular_name == plural_name
-            message = if singular_name.singularize == singular_name
-              "The extension name you specified will not work as the singular name is equal to the plural name."
-            else
-              "Please specify the singular name '#{singular_name.singularize}' instead of '#{plural_name}'."
-            end
-            exit_with_message!(message)
-          end
+    def reject_template?(file)
+      file.directory? || reject_file?(file)
+    end
 
-          if attributes.empty? && self.behavior != :revoke
-            exit_with_message!("You must specify a name and at least one field. For help: #{generator_command}")
-          end
-        end
+    def sanity_check!
+      if clash_keywords.member?(singular_name.downcase)
+        exit_with_message!("Please choose a different name. The generated code would fail for class '#{singular_name}' as it conflicts with a reserved keyword.")
+      end
 
-        def source_pathname
-          @source_pathname ||= Pathname.new(self.class.source_root.to_s)
+      if singular_name == plural_name
+        message = if singular_name.singularize == singular_name
+          "The extension name you specified will not work as the singular name is equal to the plural name."
+        else
+          "Please specify the singular name '#{singular_name.singularize}' instead of '#{plural_name}'."
         end
+        exit_with_message!(message)
+      end
+
+      if attributes.empty? && self.behavior != :revoke
+        exit_with_message!("You must specify a name and at least one field. For help: #{generator_command}")
       end
     end
 
+    def source_pathname
+      @source_pathname ||= Pathname.new(self.class.source_root.to_s)
+    end
+
   end
 end