refinerycms-core 2.0.5 → 2.0.6

data/lib/generators/refinery/engine/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.where(:name => 'refinerycms-<%= namespacing.underscore %>').blank?

data/lib/generators/refinery/engine/templates/spec/requests/refinery/namespace/admin/{plural_name_spec.rb → plural_name_spec.rb.erb}

@@ -8,7 +8,7 @@ describe Refinery do
         login_refinery_user
 <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
         describe "<%= plural_name %> list" do
-          before(:each) do
+          before do
             FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne")
             FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleTwo")
           end
@@ -21,7 +21,7 @@ describe Refinery do
         end
 
         describe "create" do
-          before(:each) do
+          before do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
 
             click_link "Add New <%= singular_name.titleize %>"
@@ -47,7 +47,7 @@ describe Refinery do
           end
 
           context "duplicate" do
-            before(:each) { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitle") }
+            before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitle") }
 
             it "should fail" do
               visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
@@ -63,7 +63,7 @@ describe Refinery do
           end
 <% if localized? %>
           context "with translations" do
-            before(:each) do
+            before do
               Refinery::I18n.stub(:frontend_locales).and_return([:en, :cs])
             end
 
@@ -164,7 +164,7 @@ describe Refinery do
         end
 
         describe "edit" do
-          before(:each) { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "A <%= title.name %>") }
+          before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "A <%= title.name %>") }
 
           it "should succeed" do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
@@ -182,7 +182,7 @@ describe Refinery do
         end
 
         describe "destroy" do
-          before(:each) { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne") }
+          before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne") }
 
           it "should succeed" do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path

data/lib/generators/refinery/engine/templates/spec/spec_helper.rb

@@ -7,8 +7,6 @@ def setup_environment
   elsif File.dirname(__FILE__) =~ %r{vendor/extensions}
     # Require the path to the refinerycms application this is vendored inside.
     require File.expand_path('../../../../../config/environment', __FILE__)
-  else
-    raise "Could not find a config/environment.rb file to require. Please specify this in #{File.expand_path(__FILE__)}"
   end
 
   require 'rspec/rails'

data/lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/{plural_name_controller.rb → plural_name_controller.rb.erb}

@@ -6,7 +6,8 @@ module Refinery
         crudify :'refinery/<%= namespacing.underscore %>/<%= singular_name %>', <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
                 :title_attribute => "<%= title.name %>", <% end %>
                 :order => "created_at DESC"
-      <% if @includes_spam %>
+<% if @includes_spam -%>
+
         before_filter :get_spam_count, :only => [:index, :spam]
 
         def index
@@ -35,7 +36,7 @@ module Refinery
         def get_spam_count
           @spam_count = <%= class_name %>.count(:conditions => {:spam => true})
         end
-      <% else %>
+<% else %>
         def index
           unless searching?
             find_all_<%= plural_name %>
@@ -46,8 +47,7 @@ module Refinery
           @grouped_<%= plural_name %> = group_by_date(@<%= plural_name %>)
         end
 
-      <% end %>
-
+<% end -%>
       end
     end
   end

data/lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/settings_controller.rb.erb

@@ -0,0 +1,45 @@
+module Refinery
+  module <%= class_name.pluralize %>
+    module Admin
+      class SettingsController < Refinery::AdminController
+
+        before_filter :check_setting, :only => [:edit, :update]
+        after_filter :save_subject_for_confirmation, :save_message_for_confirmation, :only => :update
+
+        def edit
+          @setting = Refinery::Setting.find(params[:id])
+        end
+
+        def update
+          @setting = Refinery::Setting.find(params[:id])
+
+          if @setting.update_attributes(params[:setting])
+            flash[:notice] = t('refinery.crudify.updated', :what => @setting.name.gsub("<%= singular_name %>_", "").titleize)
+
+            unless request.xhr? or from_dialog?
+              redirect_back_or_default(refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path)
+            else
+              render :text => "<script type='text/javascript'>parent.window.location = '#{refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path}';</script>"
+            end
+          end
+        end
+
+      protected
+        def check_setting
+          setting = params[:id].gsub("<%= singular_name %>_", "")
+
+          Refinery::<%= namespacing %>::Setting.send(setting) if Refinery::<%= namespacing %>::Setting.respond_to?(setting)
+        end
+
+        def save_subject_for_confirmation
+          Refinery::<%= namespacing %>::Setting.confirmation_subject = params[:subject] if params.keys.include?('subject')
+        end
+
+        def save_message_for_confirmation
+          Refinery::<%= namespacing %>::Setting.confirmation_message = params[:message] if params.keys.include?('message')
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,24 +3,29 @@ module Refinery
     class <%= class_name %> < Refinery::Core::BaseModel
 <% if table_name == namespacing.underscore.pluralize -%>
       self.table_name = 'refinery_<%= plural_name %>'
-<% end %>
-      attr_accessible <%= attributes.map { |attr| ":#{attr.name}" }.join(', ') %>, :position
+<% end -%>
+
+      attr_accessible <%= names_for_attr_accessible.map { |a| ":#{a}" }.join(', ') %>, :position
+<% if string_attributes.any? -%>
 
-<% if (text_or_string_fields = attributes.map{ |a| a.name if a.type.to_s =~ /string|text/ }.compact.uniq).any? -%>
-      acts_as_indexed :fields => [:<%= text_or_string_fields.join(", :") %>]
+      acts_as_indexed :fields => [<%= string_attributes.map { |a| ":#{a.name}" }.join(", ") %>]
 <% end -%>
-<% if (text_fields = attributes.map {|a| a.name if a.type.to_s == 'text'}.compact.uniq).any? && text_fields.detect{|a| a.to_s == 'message'}.nil? -%>
+<% 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 %>
-<% elsif text_fields.empty? %>
+<% elsif text_fields.empty? -%>
+
       # def message was created automatically because you didn't specify a text field
       # when you ran the refinery:form generator. <3 <3 Refinery CMS.
       def message
         "Override def message in vendor/extensions/<%= namespacing.underscore %>/app/models/refinery/<%= namespacing.underscore %>/<%= singular_name %>.rb"
       end
-<% end %>
-<% unless (string_fields = attributes.map{ |a| a.name if a.type.to_s == 'string' }.compact.uniq).empty? || string_fields.detect{|f| f.to_s == 'name'} %>
+<% end -%>
+<% unless (string_fields = attributes.map { |a| a.name if a.type == :string }.compact.uniq).empty? || string_fields.detect { |f| f.to_s == 'name' } -%>
+
       alias_attribute :name, :<%= string_fields.first %>
-<% end %>
+<% end -%>
+
       # Add some validation here if you want to validate the user's input
 <% if string_fields.any? -%>
       # We have validated the first string field for you.
@@ -32,15 +37,15 @@ module Refinery
         "Override def name in vendor/extensions/<%= namespacing.underscore %>/app/models/refinery/<%= namespacing.underscore %>/<%= singular_name %>.rb"
       end
 <% end -%>
-<% attributes.select{|a| a.type.to_s == 'image'}.uniq.each do |a| -%>
+<% image_attributes.each do |a| -%>
 
-      belongs_to :<%= a.name.gsub("_id", "") -%>, :class_name => '::Refinery::Image'
+      belongs_to :<%= a.name -%>, :class_name => 'Refinery::Image'
 <% end -%>
-<% attributes.select{|a| a.type.to_s == 'resource'}.uniq.each do |a| -%>
+<% resource_attributes.each do |a| -%>
 
-      belongs_to :<%= a.name.gsub("_id", "") %>, :class_name => '::Refinery::Resource'
+      belongs_to :<%= a.name %>, :class_name => 'Refinery::Resource'
 <% end -%>
-<% attributes.select{|a| a.type.to_s =~ /radio|select/}.uniq.each do |a| -%>
+<% attributes.select{ |a| /radio|select/ === a.type.to_s }.uniq.each do |a| %>
       <%= a.name.pluralize.upcase %> = []
 <% end -%>
     end

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

@@ -1,7 +1,7 @@
 <li class='clearfix record <%%= cycle("on", "on-hover") %>'>
   <span class='title'>
     <%%= link_to <%= singular_name %>.name, refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>) %> <%%= t('.said') %>
-    <span class="preview"><%%= truncate(strip_tags(<%= singular_name %>.message), :length => 60) -%></span>
+    <span class="preview"><%%= truncate(strip_tags(sanitize(<%= singular_name %>.message)), :length => 60) -%></span>
   </span>
   <span class='actions'>
     <%%= link_to refinery_icon_tag('delete.png'), refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>),

data/lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/settings/_confirmation_email_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for([refinery, :admin, @setting], :url => (@url_override || @url)) do |f| %>
+<%%= form_for @setting, :url => refinery.<%= namespacing.underscore %>_admin_setting_path do |f| %>
 
   <p>
     <%%= t('.explanation') %>

data/lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/settings/_notification_recipients_form.html.erb

@@ -1,4 +1,4 @@
-<%%= form_for([refinery, :admin, @setting], :url => (@url_override || @url)) do |f| %>
+<%%= form_for @setting, :url => refinery.<%= namespacing.underscore %>_admin_setting_path do |f| %>
 
   <div class='field'>
     <span class='label_with_help'>

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

@@ -6,8 +6,8 @@
       <%%= render '/refinery/admin/error_messages',
                  :object => @<%= singular_name %>,
                  :include_object_name => true  %>
-<% string_fields = attributes.map{ |a| a.name if a.type.to_s =~ /string|text/ }.compact.uniq -%>
-      <% attributes.each do |attribute| %>
+<% string_fields = string_attributes.map(&:name) -%>
+<% attributes.each do |attribute| %>
       <div class='field <%= attribute.name %>_field <%= attribute.type %>_field'>
         <%%= f.<%= 'required_' if string_fields.any? && attribute.name == string_fields.first %>label :<%= attribute.name %> %>
 <% case attribute.type
@@ -16,7 +16,7 @@
 <% when :text -%>
         <%%= f.text_area :<%= attribute.name %>, :rows => 8 %>
 <% when :radio -%>
-        <%% <%= class_name %>::<%= attribute.name.pluralize.upcase %>.each do |value, name| %>
+        <%% Refinery::<%= namespacing %>::<%= class_name %>::<%= attribute.name.pluralize.upcase %>.each do |value, name| %>
           <%%= f.radio_button :<%= attribute.name %>, (name || value), :value => value %>
           <%%= f.label :"<%= attribute.name %>_#{(name || value)}", value.humanize %>
         <%% end %>
@@ -33,7 +33,7 @@
         <%%= f.time_select :<%= attribute.name %> %>
 <% end -%>
       </div>
-      <% end %>
+<% end %>
       <div class='actions'>
         <%%= f.submit t('.send') %>
       </div>

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

@@ -0,0 +1,78 @@
+cs:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+        description: Poskytuje kontaktní formulář a zaznamenáva <%= plural_name.humanize.downcase %>
+    <%= namespacing.underscore %>:
+      <%= plural_name %>:
+        new:
+          send: Odeslat zprávu
+          privacy_policy: Chráníme vaše soukromí
+      admin:
+        <%= plural_name %>:
+          delete: Trvale odstranit <%= singular_name.humanize.downcase %>
+          <%= singular_name %>:
+            read_<%= singular_name %>: Přečíst <%= singular_name.humanize.downcase %>
+            said: řekl
+            mark_as_spam: Označit jako spam
+            mark_as_ham: Označit jako přečtené
+          submenu:
+            inbox: Inbox
+            spam: Spam
+            update_notified: Upravit seznam notifikovaných
+            edit_confirmation_email: Upravit potvrzovací e-mail
+          index:
+            no_<%= plural_name %>: Zatím jste neobdrželi žádné <%= plural_name.humanize.downcase %>.
+          spam:
+            no_spam: Hurá! Nemáte žádný spam.
+          show:
+            details: Podrobnosti
+            age: Věk
+            actions: Akce
+            back_to_all_<%= plural_name %>: Zpět na všechny <%= plural_name.humanize.downcase %>
+            spam: Spam
+            spam_yes: 'ano'
+            <%= singular_name %>: <%= class_name.underscore.titleize %>
+            to: Komu
+            from: Od
+            click_to_email: Klikněte pro odeslání této adresy e-mailem
+            phone: Telefon
+            date: Datum
+            message: Zpráva
+        settings:
+          notification_recipients_form:
+            settings_value_name: Zaslat upozornění pro
+            explanation: Pokaždé, když Vás někdo kontaktuje přes vaše webové stránky, Refinery odešle e-mail s upozorněním na nový <%= singular_name.humanize.downcase %>.
+            hint: Když je odeslán nový <%= singular_name.humanize.downcase %>, Refinery pošle upozornení na Váš e-mail.
+            example: "Zadejte e-mailové adresy jako: jack@work.com, jill@office.com"
+          confirmation_email_form:
+            to: Komu
+            from: Od
+            subject: Předmet
+            click_to_edit_subject: Klikněte zde pro editaci předmetu
+            explanation: Když Vás někdo kontaktuje přes vaše webové stránky, Refinery odešle e-mail s potvrzením o přijetí odesílateli <%= singular_name.humanize.downcase %>.
+            below_edit_email_sent: Níže můžete upravit e-mail, který je odeslán.
+            the_customer_making_<%= singular_name %>: Klient delá <%= singular_name.humanize.downcase %>
+            message: Zpráva
+            note: "Poznámka: umístěte text %name%, pro určení pozice jména klienta v e-maile"
+      mailer:
+        notification:
+          greeting: Hi there
+          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: Od
+          email: E-mail
+          phone: Telefon
+          message: Zpráva
+          closing_line: S pozdravem
+          ps_html: P.S. Všechny vaše <%= plural_name.humanize.downcase %> jsou uloženy pod záložkou "<%= plural_name.titleize %>" v Refinery, pokud by jste je chtěli zobrazit pozdeji.
+  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/locales/sk.yml

@@ -0,0 +1,78 @@
+sk:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+        description: Poskytuje kontaktný formulár a zaznamenáva <%= plural_name.humanize.downcase %>
+    <%= namespacing.underscore %>:
+      <%= plural_name %>:
+        new:
+          send: Odoslať správu
+          privacy_policy: Chránime vaše súkromie
+      admin:
+        <%= plural_name %>:
+          delete: Trvalo odstrániť <%= singular_name.humanize.downcase %>
+          <%= singular_name %>:
+            read_<%= singular_name %>: Prečítať <%= singular_name.humanize.downcase %>
+            said: povedal
+            mark_as_spam: Označiť ako spam
+            mark_as_ham: Označiť ako prečítané
+          submenu:
+            inbox: Inbox
+            spam: Spam
+            update_notified: Upraviť zoznam notifikovaných
+            edit_confirmation_email: Upraviť potvrdzovací e-mail
+          index:
+            no_<%= plural_name %>: Zatiaľ ste neobdržali žiadne <%= plural_name.humanize.downcase %>.
+          spam:
+            no_spam: Hurá! Nemáte žiaden spam.
+          show:
+            details: Podrobnosti
+            age: Vek
+            actions: Akcie
+            back_to_all_<%= plural_name %>: Späť na všetky <%= plural_name.humanize.downcase %>
+            spam: Spam
+            spam_yes: 'áno'
+            <%= singular_name %>: <%= class_name.underscore.titleize %>
+            to: Komu
+            from: Od
+            click_to_email: Kliknite pre odoslanie tejto adresy e-mailom
+            phone: Telefón
+            date: Dátum
+            message: Správa
+        settings:
+          notification_recipients_form:
+            settings_value_name: Poslať upozornenie pre
+            explanation: Zakaždým, keď Vás niekto kontaktuje cez vaše webové stránky, Refinery odošle e-mail s upozornením na nový <%= singular_name.humanize.downcase %>.
+            hint: Keď je odoslaný nový <%= singular_name.humanize.downcase %>, Refinery odošle upozornenie na Váš e-mail.
+            example: "Zadajte e-mailovú adresu(y) ako: jack@work.com, jill@office.com"
+          confirmation_email_form:
+            to: Komu
+            from: Od
+            subject: Predmet
+            click_to_edit_subject: Kliknite tu ak chcete upraviť predmet
+            explanation: Zakaždým, keď Vás niekto kontaktuje cez vaše webové stránky, Refinery odošle e-mail s potvrdením o prijatí odosielateľovi <%= singular_name.humanize.downcase %>.
+            below_edit_email_sent: Nižšie môžete upraviť e-mail, ktorý je odosielaný.
+            the_customer_making_<%= singular_name %>: Klient robiť <%= singular_name.humanize.downcase %>
+            message: Správa
+            note: "Poznámka: umiestniťe text %name%, pre určenie pozície mena klienta v e-maile"
+      mailer:
+        notification:
+          greeting: Ahoj
+          you_recieved_new_<%= singular_name %>: Práve ste obdržali nový <%= singular_name.humanize.downcase %> na vašej webové stránke.
+          <%= singular_name %>_starts: --- <%= singular_name.humanize.downcase %> začiatok ---
+          <%= singular_name %>_ends: --- <%= singular_name.humanize.downcase %> koniec ---
+          from: Od
+          email: E-mail
+          phone: Telefón
+          message: Správa
+          closing_line: S pozdravom
+          ps_html: P.S. Všetky vaše <%= plural_name.humanize.downcase %> sú uložené v "<%= plural_name.titleize %>" sekcii v Refinery, ak by ste ich chceli zobraziť neskôr.
+  activerecord:
+    models:
+      <%= singular_name %>: <%= class_name.underscore.titleize %>
+    attributes:
+      <%= singular_name %>:
+<% attributes.each do |a| -%>
+        <%= a.name %>: <%= a.name.humanize %>
+<% end -%>