refinerycms-core 2.0.10 → 2.1.0

data/lib/generators/refinery/form/form_generator.rb

@@ -12,19 +12,7 @@ module Refinery
     end
 
     def generate
-      sanity_check!
-
-      evaluate_templates!
-
-      unless options[:pretend]
-        merge_locales!
-
-        copy_or_merge_seeds!
-
-        append_extension_to_gemfile!
-      end
-
-      finalize_extension!
+      default_generate!
     end
 
     protected

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

@@ -6,10 +6,6 @@ module Refinery
 <% end -%>
 
       attr_accessible <%= names_for_attr_accessible.map { |a| ":#{a}" }.join(', ') %>, :position
-<% if string_attributes.any? -%>
-
-      acts_as_indexed :fields => [<%= string_attributes.map { |a| ":#{a.name}" }.join(", ") %>]
-<% end -%>
 <% if (text_fields = attributes.map { |a| a.name if a.type == :text }.compact.uniq).any? && text_fields.detect{ |a| a.to_s == 'message' }.nil? -%>
 
       alias_attribute :message, :<%= text_fields.first %>

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

@@ -1,11 +1,11 @@
+<%%= render 'refinery/admin/search_header', :url => refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path %>
 <%% if searching? %>
-  <h2><%%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
   <%% if @<%= plural_name %>.any? %>
     <ul>
       <%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %> %>
     </ul>
   <%% else %>
-    <p><%%= t('shared.admin.search.no_results') %></p>
+    <p><%%= t('no_results', :scope => 'refinery.admin.search') %></p>
   <%% end %>
 <%% else %>
   <%% if @grouped_<%= plural_name %>.any? -%>

data/lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/plural_name/spam.html.erb

@@ -1,17 +1,18 @@
 <%%= render 'submenu' %>
 <div id='records'>
   <%% if searching? %>
-    <h2><%%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
-    <%% if @<%%= plural_name %>.any? %>
+    <%%= link_to t('cancel_search', :scope => 'refinery.admin.search'), refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path, :class => "cancel-search" %>
+    <h2><%%= t('results_for_html', :scope => 'refinery.admin.search', :query => h(params[:search])).html_safe %></h2>
+    <%% if @<%= plural_name %>.any? %>
       <ul>
-        <%%= render :partial => '<%= singular_name %>', :collection => @<%%= plural_name %> %>
+        <%%= render :partial => '<%= singular_name %>', :collection => @<%= plural_name %> %>
       </ul>
     <%% else %>
-      <p><%%= t('shared.admin.search.no_results') %></p>
+      <p><%%= t('no_results', :scope => 'refinery.admin.search') %></p>
     <%% end %>
   <%% else %>
-    <%% if @grouped_<%%= plural_name %>.any? -%>
-      <%% @grouped_<%%= plural_name %>.each do |container| %>
+    <%% if @grouped_<%= plural_name %>.any? -%>
+      <%% @grouped_<%= plural_name %>.each do |container| %>
         <h3><%%= l((<%= singular_name %>_group = container.last).first.created_at) %></h3>
         <ul>
           <%%= render :partial => '<%= singular_name %>', :collection => <%= singular_name %>_group %>

data/lib/generators/refinery/form/templates/config/locales/nl.yml

@@ -3,76 +3,76 @@ nl:
     plugins:
       <%= plural_name %>:
         title: <%= plural_name.titleize %>
+        description: Contactformulier en beheer van <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:
         new:
-          send: Verstuur uw vraag
+          send: Bericht verzenden
           privacy_policy: Wij respecteren uw privacy
       admin:
         <%= plural_name %>:
-          delete: Verwijder deze vraag voorgoed
+          delete: Deze <%= singular_name.humanize.downcase %> definitief verwijderen
           <%= singular_name %>:
-            read_<%= singular_name %>: Lees de vraag
+            read_<%= singular_name %>: Lees de <%= singular_name.humanize.downcase %>
             said: zei
-            mark_as_spam: Markeer als spam
-            mark_as_ham: Verplaats naar de inbox
+            mark_as_spam: Als spam markeren
+            mark_as_ham: Naar de inbox verplaatsen
           submenu:
             inbox: Inbox
             spam: Spam
-            update_notified: Wijzig wie op de hoogte wordt gesteld van vragen
-            edit_confirmation_email: Bewerk bevestigings email
+            update_notified: Wijzigen wie op de hoogte wordt gesteld
+            edit_confirmation_email: Bevestigings-e-mail bewerken
           index:
-            no_<%= plural_name %>: Je hebt nog geen vragen ontvangen.
+            no_<%= plural_name %>: U heeft nog geen <%= plural_name.humanize.downcase %> ontvangen.
           spam:
-            no_spam: Jeej! Je hebt geen spam.
+            no_spam: Hoera! U heeft geen spam.
           show:
             details: Details
             age: Leeftijd
             actions: Acties
-            back_to_all_<%= plural_name %>: Terug naar alle vragen
+            back_to_all_<%= plural_name %>: Terug naar alle <%= plural_name.humanize.downcase %>
             spam: Spam
-            spam_yes: ja
+            spam_yes: 'ja'
             <%= singular_name %>: <%= class_name.underscore.titleize %>
             to: Aan
             from: Van
-            click_to_email: Klik hier om een e-mail te sturen
+            click_to_email: Klik hier om een e-mail te sturen naar dit adres
             phone: Telefoonnummer
             date: Datum
             message: Bericht
         settings:
           notification_recipients_form:
             settings_value_name: Stuur notificaties naar
-            explanation: "Iedere keer wanneer iemand het vraag formulier invult op uw website, stuurt Refinery een email waarin staat dat er een nieuwe vraag ontvangen is."
-            hint: "Vul hierboven een email adres in. Wilt u naar meerdere adressen notificaties sturen? Vul dan meerdere email adressen in gescheiden door comma's"
-            example: "Bijvoorbeeld: ik@domein.com, vrienden@msn.com, collegas@werk.com"
+            explanation: "Telkens wanneer iemand het contactformulier invult op uw website, stuurt Refinery een bevestiging naar de verzender."
+            hint: "Wilt u naar meerdere adressen notificaties sturen? Vul dan meerdere e-mailadressen in gescheiden door komma's"
+            example: "Bijvoorbeeld: jan@werk.nl, els@kantoor.nl"
           confirmation_email_form:
             to: Aan
             from: Van
             subject: Onderwerp
             click_to_edit_subject: Klik hier om het onderwerp bewerken
-            explanation: "Iedere keer wanneer iemand het vraag formulier invult op uw website, stuurt Refinery een email naar die persoon waarin staat dat de vraag ontvangen is."
-            below_edit_email_sent: Hieronder kun je de email die verzonden wordt bewerken.
-            the_customer_making_<%= singular_name %>: De persoon die de heeft vraag gesteld
+            explanation: "Telkens wanneer iemand het contactformulier invult op uw website, stuurt Refinery een bevestiging naar de verzender."
+            below_edit_email_sent: Hieronder kunt u de email die verzonden wordt bewerken.
+            the_customer_making_<%= singular_name %>: De persoon die de <%= singular_name.humanize.downcase %> heeft ingezonden
             message: Bericht
-            note: "Notitie: plaats de tekst %name% overal in je email waar je de naam van de vragende persoon wilt invoegen"
+            note: "N.B.: plaats de tekst %name% overal in de email waar u de naam van de klant persoon wilt invoegen"
       mailer:
         notification:
           greeting: Hallo
-          you_recieved_new_<%= singular_name %>: Je hebt een nieuwe vraag via de website ontvangen.
-          <%= singular_name %>_starts: --- begin van de vraag---
-          <%= singular_name %>_ends: --- einde van de vraag---
+          you_recieved_new_<%= singular_name %>: U hebt een nieuwe <%= singular_name.humanize.downcase %> ontvangen via de website.
+          <%= singular_name %>_starts: --- begin van de <%= singular_name.humanize.downcase %> ---
+          <%= singular_name %>_ends: --- einde van de <%= singular_name.humanize.downcase %> ---
           from: Van
-          email: Email
+          email: E-mail
           phone: Telefoon
           message: Bericht
-          closing_line: Vriendelijke groeten,
-          ps_html: P.S. Alle vragen woren opgeslagen in de "vragen" sectie van uw website.All your <%= plural_name.humanize.downcase %> are stored in the "<%= plural_name.titleize %>" section of Refinery.
+          closing_line: Met vriendelijke groet,
+          ps_html: P.S. Alle <%= plural_name.humanize.downcase %> worden opgeslagen in de sectie <%= plural_name.titleize %> van Refinery.
   activerecord:
     models:
       <%= singular_name %>: <%= class_name.underscore.titleize %>
     attributes:
       <%= singular_name %>:
-        name: Naam
-        email: 'Email'
-        phone: Telefoon
-        message: Bericht
+<% attributes.each do |a| -%>
+        <%= a.name %>: <%= a.name.humanize %>
+<% end -%>

data/lib/generators/refinery/form/templates/config/locales/tr.yml

@@ -0,0 +1,78 @@
+tr:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+        description: Iletisim formu ve kayitlarin temini <%= plural_name.humanize.downcase %>
+    <%= namespacing.underscore %>:
+      <%= plural_name %>:
+        new:
+          send: Mesaj Gonder
+          privacy_policy: Mahremiyetinize onem veriyoruz.
+      admin:
+        <%= plural_name %>:
+          delete: Sonsuza dek <%= singular_name.humanize.downcase %> sil
+          <%= singular_name %>:
+            read_<%= singular_name %>: Read the <%= singular_name.humanize.downcase %>
+            said: dedi
+            mark_as_spam: Spam olarak isaretle
+            mark_as_ham: Gelen kutusuna tasi
+          submenu:
+            inbox: Gelen Kutusu
+            spam: Istenmeyen E-posta
+            update_notified: Uyari alanlari guncelle
+            edit_confirmation_email: Dogrulama e-posta'sini duzenle
+          index:
+            no_<%= plural_name %>: Henuz  Herhangi bir  <%= plural_name.humanize.downcase %> almadiniz.
+          spam:
+            no_spam: Oley! Herhangi bir istenmeyen e-posta yok
+          show:
+            details: Detay
+            age: Yas
+            actions: Eylemler
+            back_to_all_<%= plural_name %>: Geri don tum <%= plural_name.humanize.downcase %>
+            spam: Istenmeyen E-posta
+            spam_yes: 'evet'
+            <%= singular_name %>: <%= class_name.underscore.titleize %>
+            to: Kime
+            from: Kimden
+            click_to_email: Bu adrese e-posta'layin
+            phone: Telefon
+            date: Tarih
+            message: Mesaj
+        settings:
+          notification_recipients_form:
+            settings_value_name: Bildirimleri gonderecegin  adres
+            explanation: Her kim olursa seninle web sitesi uzerinden iletisime gecen, Refinery yeni bir <%= singular_name.humanize.downcase %>  diye e-posta atar.
+            hint: Yeni Bir <%= singular_name.humanize.downcase %> teslim edildiginde, Refinery bir e-posta bildirisi yollayacak sana.
+            example: "Lutfen e-posta adres(ler)inizi giriniz. Ornek olarak: jack@work.com, jill@office.com gibi"
+          confirmation_email_form:
+            to: Kime
+            from: Kimden
+            subject: Baslik
+            click_to_edit_subject: Basligi degistirmek icin buraya tiklayiniz
+            explanation: Her kim olursa seninle web siten uzerinden iletisime gecen,Refinery yeni bir dogrulama postasi gonderir <%= singular_name.humanize.downcase %> yapan kisiye
+            below_edit_email_sent: Asagida gonderilen e-postayi duzenleyebilirsin.
+            the_customer_making_<%= singular_name %>: Musteri <%= singular_name.humanize.downcase %> yapiyor
+            message: Mesaj
+            note: "Not: metini hizala %name% nerede musterinizin e-posta adresi gibi gozukmesini istiyorsan"
+      mailer:
+        notification:
+          greeting: Selamlar
+          you_recieved_new_<%= singular_name %>: You just received a new <%= singular_name.humanize.downcase %> on your website.
+          <%= singular_name %>_starts: --- <%= singular_name.humanize.downcase %> starts ---
+          <%= singular_name %>_ends: --- <%= singular_name.humanize.downcase %> ends ---
+          from: Kimden
+          email: E-posta
+          phone: Telefon
+          message: Mesaj
+          closing_line: Saygilarimizla
+          ps_html: Senin butun <%= plural_name.humanize.downcase %> kayitli oldugu yer "<%= plural_name.titleize %>" burasidir eger ileride kullanmak istersen
+  activerecord:
+    models:
+      <%= singular_name %>: <%= class_name.underscore.titleize %>
+    attributes:
+      <%= singular_name %>:
+<% attributes.each do |a| -%>
+        <%= a.name %>: <%= a.name.humanize %>
+<% end -%>

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

@@ -10,7 +10,7 @@ Refinery::Core::Engine.routes.draw do
 
   # Admin routes
   namespace :<%= namespacing.underscore %>, :path => '' do
-    namespace :admin, :path => 'refinery/<%= namespacing.underscore %>' do
+    namespace :admin, :path => "#{Refinery::Core.backend_route}/<%= namespacing.underscore %>" do
       resources :<%= plural_name %>, :path => '' <% if @includes_spam %> do
         collection do
           get :spam

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

@@ -1,6 +1,6 @@
 class Create<%= class_name.pluralize %> < ActiveRecord::Migration
 
-  def self.up
+  def up
     create_table :refinery_<%= table_name %> do |t|
 <%
   attributes.each do |attribute|
@@ -22,13 +22,9 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
     end
 
     add_index :refinery_<%= table_name %>, :id
-
-    if (seed = Rails.root.join('db', 'seeds', '<%= plural_name %>.rb')).exist?
-      load(seed)
-    end
   end
 
-  def self.down
+  def down
     if defined?(::Refinery::UserPlugin)
       ::Refinery::UserPlugin.destroy_all({:name => "<%= plural_name %>"})
     end

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

@@ -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/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb

@@ -1,7 +1,7 @@
 module Refinery
   module <%= namespacing %>
     class Engine < Rails::Engine
-      include Refinery::Engine
+      extend Refinery::Engine
       isolate_namespace Refinery::<%= namespacing %>
 
       engine_name :refinery_<%= extension_plural_name %>

data/lib/generators/refinery/form/templates/refinerycms-plural_name.gemspec

@@ -11,9 +11,6 @@ Gem::Specification.new do |s|
   s.files             = Dir["{app,config,db,lib}/**/*"] + ["readme.md"]
 
   # Runtime dependencies
-  s.add_dependency             'refinerycms-core',     '~> <%= Refinery::Version %>'
-  s.add_dependency             'refinerycms-settings', '~> 2.0.0'
-
-  # Development dependencies (usually used for testing)
-  s.add_development_dependency 'refinerycms-testing',  '~> <%= Refinery::Version %>'
+  s.add_dependency    'refinerycms-core',     '~> <%= Refinery::Version %>'
+  s.add_dependency    'refinerycms-settings', '~> <%= Refinery::Version %>'
 end

data/lib/refinery.rb

@@ -0,0 +1,191 @@
+require 'rails' # from railties
+require 'active_record'
+require 'action_controller'
+require 'rbconfig'
+
+module Refinery
+  require 'refinery/errors'
+
+  autoload :Activity, 'refinery/activity'
+  autoload :ApplicationController, 'refinery/application_controller'
+  autoload :Engine, 'refinery/engine'
+  autoload :Menu, 'refinery/menu'
+  autoload :MenuItem, 'refinery/menu_item'
+  autoload :Plugin,  'refinery/plugin'
+  autoload :Plugins, 'refinery/plugins'
+  autoload :Version, 'refinery/version'
+  autoload :Crud, 'refinery/crud'
+  autoload :BasePresenter, 'refinery/base_presenter'
+
+  require 'refinery/ext/action_view/helpers/form_builder'
+  require 'refinery/ext/action_view/helpers/form_helper'
+  require 'refinery/ext/action_view/helpers/form_tag_helper'
+
+  module Admin
+    autoload :BaseController, 'refinery/admin/base_controller'
+  end
+
+  autoload :CmsGenerator, 'generators/refinery/cms/cms_generator'
+  autoload :DummyGenerator, 'generators/refinery/dummy/dummy_generator'
+  autoload :CoreGenerator, 'generators/refinery/core/core_generator'
+  autoload :EngineGenerator, 'generators/refinery/engine/engine_generator'
+
+  class << self
+    @@extensions = []
+
+    # Returns an array of modules representing currently registered Refinery Engines
+    #
+    # Example:
+    #   Refinery.extensions  =>  [Refinery::Core, Refinery::Pages]
+    def extensions
+      @@extensions
+    end
+
+    # Register an extension with Refinery
+    #
+    # Example:
+    #   Refinery.register_extension(Refinery::Core)
+    def register_extension(const)
+      return if extension_registered?(const)
+
+      validate_extension!(const)
+
+      @@extensions << const
+    end
+    alias_method :register_engine, :register_extension
+
+    # Unregister an extension from Refinery
+    #
+    # Example:
+    #   Refinery.unregister_extension(Refinery::Core)
+    def unregister_extension(const)
+      @@extensions.delete(const)
+    end
+
+    # Returns true if an extension is currently registered with Refinery
+    #
+    # Example:
+    #   Refinery.extension_registered?(Refinery::Core)
+    def extension_registered?(const)
+      @@extensions.include?(const)
+    end
+
+    # Constructs a deprecation warning message and warns with Kernel#warn
+    #
+    # Example:
+    #   Refinery.deprecate('foo') => "The use of 'foo' is deprecated"
+    #
+    # An options parameter can be specified to construct a more detailed deprecation message
+    #
+    # Options:
+    #   when - version that this deprecated feature will be removed
+    #   replacement - a replacement for what is being deprecated
+    #   caller - who called the deprecated feature
+    #
+    # Example:
+    #   Refinery.deprecate('foo', :when => 'tomorrow', :replacement => 'bar') =>
+    #       "The use of 'foo' is deprecated and will be removed at version 2.0. Please use 'bar' instead."
+    def deprecate(what, options = {})
+      # Build a warning.
+      warning = "\n-- DEPRECATION WARNING --\nThe use of '#{what}' is deprecated"
+      warning << " and will be removed at version #{options[:when]}" if options[:when]
+      warning << "."
+      warning << "\nPlease use #{options[:replacement]} instead." if options[:replacement]
+
+      # See if we can trace where this happened
+      if (invoker = detect_invoker(options[:caller])).present?
+        warning << invoker
+      end
+
+      # Give stern talking to.
+      warn warning
+    end
+
+    # Returns a Pathname to the root of the Refinery CMS project
+    def root
+      @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+    end
+
+    # Returns an array of Pathnames pointing to the root directory of each extension that
+    # has been registered with Refinery.
+    #
+    # Example:
+    #   Refinery.roots => [#<Pathname:/Users/Reset/Code/refinerycms/core>, #<Pathname:/Users/Reset/Code/refinerycms/pages>]
+    #
+    # An optional extension_name parameter can be specified to return just the Pathname for
+    # the specified extension. This can be represented in Constant, Symbol, or String form.
+    #
+    # Example:
+    #   Refinery.roots(Refinery::Core)    =>  #<Pathname:/Users/Reset/Code/refinerycms/core>
+    #   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(&:root) if extension_name.nil?
+
+      extension_name.to_s.camelize.constantize.root
+    end
+
+    def version
+      Refinery::Version.to_s
+    end
+
+    # Returns string version of url helper path. We need this to temporarily support namespaces
+    # like Refinery::Image and Refinery::Blog::Post
+    #
+    # Example:
+    #   Refinery.route_for_model(Refinery::Image) => "admin_image_path"
+    #   Refinery.route_for_model(Refinery::Image, {:plural => true}) => "admin_images_path"
+    #   Refinery.route_for_model(Refinery::Blog::Post) => "blog_admin_post_path"
+    #   Refinery.route_for_model(Refinery::Blog::Post, {:plural => true}) => "blog_admin_posts_path"
+    #   Refinery.route_for_model(Refinery::Blog::Post, {:admin => false}) => "blog_post_path"
+    def route_for_model(klass, options = {})
+      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))
+
+      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)
+        }
+
+        # Get the singular resource_name from the url parts
+        resource_name = parts.pop
+        resource_name = resource_name.pluralize if options[:plural]
+
+        [parts.join("_"), "admin", resource_name, "path"].reject(&:blank?).join "_"
+      else
+        path = options[:plural] ? active_name.route_key : active_name.singular_route_key
+
+        [path, 'path'].join '_'
+      end
+    end
+
+    def include_once(base, extension_module)
+      base.send :include, extension_module unless included_extension_module?(base, extension_module)
+    end
+
+    private
+    def detect_invoker(the_caller = caller)
+      return '' unless the_caller && the_caller.respond_to?(:detect)
+      the_caller.detect{|c| /#{Rails.root}/ === c }.inspect.to_s.split(':in').first
+    end
+
+    # plain Module#included? or Module#included_modules doesn't cut it here
+    def included_extension_module?(base, extension_module)
+      if base.kind_of?(Class)
+        direct_superclass = base.superclass
+        base.ancestors.take_while {|ancestor| ancestor != direct_superclass}.include?(extension_module)
+      else
+        base < extension_module # can't do better than that for modules
+      end
+    end
+
+    def validate_extension!(const)
+      unless const.respond_to?(:root) && const.root.is_a?(Pathname)
+        raise InvalidEngineError, "Engine must define a root accessor that returns a pathname to its root"
+      end
+    end
+  end
+end