refinerycms-copywriting 1.0.9 → 2.0.0

data/app/assets/stylesheets/refinerycms-copywriting-tab.css.scss

@@ -0,0 +1,12 @@
+#copywriting-tab {
+  ul {
+    padding: 0 5px 10px 10px;
+  }
+
+  p {
+    text-align: center;
+    font-weight: bold;
+    font-size: 2em;
+    padding: 10px 10px 10px 10px;
+  }
+}

data/app/assets/stylesheets/refinerycms-copywriting.css.scss

@@ -0,0 +1,3 @@
+.scope_icon {
+  background-image: url("/assets/refinery/icons/zoom.png");
+}

data/app/controllers/refinery/copywriting/admin/phrases_controller.rb

@@ -0,0 +1,51 @@
+module Refinery
+  module Copywriting
+    module Admin
+      class PhrasesController < ::Refinery::AdminController
+        before_filter :find_all_locales, :find_locale, :find_scope, :find_all_scopes
+
+        crudify :'refinery/copywriting/phrase', :searchable => false,
+                :title_attribute => 'name', :xhr_paging => true, :sortable => false,
+                :redirect_to_url => 'refinery.copywriting_admin_phrases_path'
+
+      protected
+
+        def find_all_phrases
+          @phrases = Phrase.where(:page_id => nil)
+
+          if find_scope
+            @phrases = @phrases.where(:scope => find_scope)
+          end
+        end
+
+        def find_locale
+          @current_locale ||= (params[:switch_locale].try(:to_sym) || Thread.current[:globalize_locale] || default_locale).to_sym
+        end
+
+        def find_all_locales
+          @locales ||= ::Refinery::I18n.frontend_locales
+        end
+
+        def find_scope
+          @scope ||= params[:filter_scope]
+        end
+
+        def find_all_scopes
+          @scopes ||= Phrase.select(:scope).where(:page_id => nil).map(&:scope).uniq
+        end
+
+        def default_locale
+          ::Refinery::I18n.default_frontend_locale
+        end
+
+        def globalize!
+          super
+          if params[:switch_locale]
+            Thread.current[:globalize_locale] = (params[:switch_locale] || default_locale).try(:to_sym)
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/helpers/copywriting_helper.rb

@@ -4,7 +4,7 @@ module CopywritingHelper
     options = @copywriting_options.merge(options) if @copywriting_options
     options[:default] = block_given? ? capture(&block) : options[:default]
 
-    result = ::CopywritingPhrase.for(name, options)
+    result = ::Refinery::Copywriting::Phrase.for(name, options)
   end
 
   def copywriting_options(options, &block)

data/app/models/refinery/copywriting/phrase.rb

@@ -0,0 +1,36 @@
+module Refinery
+  module Copywriting
+    class Phrase < ActiveRecord::Base
+
+      belongs_to :page, :class_name => 'Refinery::Page'
+      translates :value if self.respond_to?(:translates)
+      validates :name, :presence => true
+
+      attr_accessible :locale, :name, :default, :value, :scope, :page, :page_id, :phrase_type
+
+      if self.respond_to?(:translation_class)
+        self.translation_class.send :attr_accessible, :locale
+      end
+
+      default_scope order([:scope, :name])
+
+      def self.for(name, options = {})
+        options = {:phrase_type => 'text', :scope => 'default'}.merge(options.reject {|k,v| v.blank? })
+        options[:name] = name.to_s
+        options[:page_id] ||= options[:page].try(:id)
+
+        phrase = self.find_by_name_and_page_id(options[:name], options[:page_id]) || self.create(options)
+        phrase.update_attributes(options.except(:value, :page, :page_id, :locale))
+        phrase.last_access_at = Date.today
+        phrase.save if phrase.changed?
+
+        phrase.default_or_value
+      end
+
+      def default_or_value
+        value.present? ? value : default
+      end
+
+    end
+  end
+end

data/app/views/refinery/copywriting/admin/phrases/_form.html.erb

@@ -0,0 +1,19 @@
+<%= form_for [refinery, :copywriting, :admin, @phrase] do |f| -%>
+  <%= hidden_field_tag :switch_locale, @current_locale %>
+
+  <%= render :partial => "/refinery/admin/error_messages", :locals => {
+                :object => @phrase,
+                :include_object_name => true
+              } %>
+
+  <%= render :partial => '/refinery/copywriting/admin/phrases/value_field', :locals => {:f => f} %>
+
+  <%= render :partial => "/refinery/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => false,
+               :hide_cancel => true,
+               :delete_title => t('delete', :scope => 'refinery.copywriting.admin.phrases.phrase'),
+               :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @phrase.name)
+             } %>
+<% end -%>

data/app/views/{admin/copywriting_phrases → refinery/copywriting/admin/phrases}/_locale_filters.html.erb

@@ -1,4 +1,4 @@
-<% if defined?(::Refinery::I18n) and ::Refinery::I18n.enabled? %>
+<% if ::Refinery.i18n_enabled? and !(::Refinery::I18n.frontend_locales == [::Refinery::I18n.default_frontend_locale]) %>
 <% locales = ::Refinery::I18n.locales.reject {|locale, title| !@locales.include?( locale ) } %>
 <ul class='collapsible_menu closed'>
 
@@ -6,21 +6,20 @@
     <% current_locale = @current_locale %>
     <% current_locale_title = locales[current_locale] %>
       <li>
-        <%= link_to "#", :style => "background-image: url('/images/refinery/icons/flags/#{current_locale}.png');" do %>
-          <%= current_locale_title.respond_to?(:force_encoding) ? 
+          <%= link_to "#", :style => "background-image: url('#{asset_path "refinery/icons/flags/#{current_locale}.png"}');" do %>
+          <%= current_locale_title.respond_to?(:force_encoding) ?
               current_locale_title.force_encoding('utf-8') : current_locale_title %>
           <span><%= t('.change_language') %></span>
-          <span style='display:none;'><%= t('cancel', :scope => 'shared.admin.form_actions') %></span>
+          <span style='display:none;'><%= t('cancel', :scope => 'refinery.admin.form_actions') %></span>
         <% end %>
       </li>
   <% end %>
 
   <% locales.sort_by{|key, value| value}.each do |locale, locale_title| %>
     <li>
-      <%= link_to locale_title, params.dup.tap { |p| p[:switch_locale] = locale },
-                  :style => "background-image: url('/images/refinery/icons/flags/#{locale}.png');" %>
+      <%= link_to locale_title, refinery.copywriting_admin_phrases_path(:switch_locale => locale),
+                  :style => "background-image: url('#{asset_path "refinery/icons/flags/#{locale}.png"}');" %>
     </li>
   <% end %>
 </ul>
-
 <% end %>

data/app/views/refinery/copywriting/admin/phrases/_phrase.html.erb

@@ -0,0 +1,20 @@
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(phrase) -%>">
+  <span class='title'>
+    <% if @scope.nil? and phrase.scope %>
+      <%= link_to phrase.scope.capitalize, refinery.copywriting_admin_phrases_path(:filter_scope => phrase.scope) %>
+    <% end %>
+    <b><%= phrase.name %></b>
+    <span class="preview">- <%= truncate(phrase.default_or_value, :length => 40) %></span>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_copywriting_admin_phrase_path(phrase, :dialog => true, :switch_locale => @current_locale, :height => 620),
+         :title => t('.edit') %>
+
+    <%= link_to refinery_icon_tag("delete.png"), refinery.copywriting_admin_phrase_path(phrase),
+         :title => t('.delete'),
+         :class => "cancel confirm-delete",
+         :confirm => t('message', :scope => 'refinery.admin.delete', :title => phrase.name.capitalize),
+         :method => :delete %>
+
+  </span>
+</li>

data/app/views/refinery/copywriting/admin/phrases/_phrases.html.erb

@@ -0,0 +1,4 @@
+<%= will_paginate @phrases %>
+<ul id='phrases'>
+  <%= render :partial => 'refinery/copywriting/admin/phrases/phrase', :collection => @phrases %>
+</ul>

data/app/views/refinery/copywriting/admin/phrases/_records.html.erb

@@ -0,0 +1,15 @@
+<div class='pagination_container'>
+  <% if @phrases.any? %>
+    <%= render 'phrases' %>
+  <% else %>
+    <p>
+      <% unless searching? %>
+        <strong>
+          <%= t('.no_items_yet') %>
+        </strong>
+      <% else %>
+        <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% end %>
+    </p>
+  <% end %>
+</div>

data/app/views/{admin/copywriting_phrases → refinery/copywriting/admin/phrases}/_scope_filters.html.erb

@@ -1,16 +1,18 @@
+<% if @scopes.any? %>
 <ul class='collapsible_menu closed'>
   <li>
     <% title = @scope ? t('.filtered_by', :filter_scope => @scope.capitalize) : t('.filter_by_scope') %>
-    <%= link_to title, '#', :style => 'background-image: url(\'/images/refinery/icons/zoom.png\');' %>
+    <%= link_to title, '#', :class => 'scope_icon' %>
   </li>
   <% if @scope %>
   <li>
-    <%= link_to t('.clear_scope_filter'), params.dup.tap { |p| p[:filter_scope] = nil } %>
+    <%= link_to t('.clear_scope_filter'), refinery.copywriting_admin_phrases_path %>
   </li>
   <% end %>
   <% (@scopes - [@scope]).each do |s| %>
     <li class='<%= s == @scope ? 'selected' : 'closed' %>'>
-      <%= link_to s.capitalize, params.dup.tap { |p| p[:filter_scope] = s } %>
+      <%= link_to s.capitalize, refinery.copywriting_admin_phrases_path(:filter_scope => s) %>
     </li>
   <% end %>
-</ul>
+</ul>
+<% end %>

data/app/views/{admin/copywriting_phrases → refinery/copywriting/admin/phrases}/index.html.erb

@@ -5,3 +5,6 @@
   <%= render :partial => 'actions' %>
 </aside>
 
+<% content_for :stylesheets do %>
+  <%= stylesheet_link_tag 'refinerycms-copywriting' %>
+<% end %>

data/app/views/{admin/pages → refinery/pages/admin}/tabs/_copywriting.html.erb

@@ -1,22 +1,22 @@
 <% copywriting_phrases = @page.copywriting_phrases %>
 <% if copywriting_phrases and copywriting_phrases.any? %>
-  <div class='wym_skin_refinery page_part' id='copywritting-tab'>
+  <div class='wym_skin_refinery page_part' id='copywriting-tab'>
     <ul>
       <% copywriting_phrases.each do |phrase| %>
         <li>
-          <% f.fields_for :copywriting_phrases, phrase do |p| %>
-            <%= render :partial => '/admin/shared/copywriting_phrases/value_field', :locals => {:f => p} %>
+          <%= f.fields_for :copywriting_phrases, phrase do |p| %>
+            <%= render :partial => 'refinery/copywriting/admin/phrases/value_field', :locals => {:f => p} %>
           <% end %>
         </li>
       <% end %>
     </ul>
   </div>
 <% else %>
-  <div class='wym_skin_refinery page_part' id='copywritting-tab'>
+  <div class='wym_skin_refinery page_part' id='copywriting-tab'>
     <p><%= t('.no_copywriting_yet') %></p>
   </div>
 <% end %>
 
 <% content_for :stylesheets do %>
-  <%= stylesheet_link_tag 'refinerycms-copywritting-tab' %>
+  <%= stylesheet_link_tag 'refinerycms-copywriting-tab' %>
 <% end %>

data/config/locales/bg.yml

@@ -1,20 +1,22 @@
 bg:
-  plugins:
-    refinerycms_copywriting:
-      title: Копирайтинг
-  admin:
-    copywriting_phrases:
-      locale_filters:
-        change_language: Смяна на език
-      scope_filters:
-        filter_by_scope: Филтриране по обхват
-        filtered_by: "Филтрирано по '%{filter_scope}'"
-        clear_scope_filter: Изчистване
-      records:
-        no_items_yet: Все още няма фрази.
-      phrase:
-        edit: Редактиране на тази фраза
-        delete: Изтриване на тази фраза
+  refinery:
+    plugins:
+      refinerycms_copywriting:
+        title: Копирайтинг
+    copywriting:
+      admin:
+        phrases:
+          locale_filters:
+            change_language: Смяна на език
+          scope_filters:
+            filter_by_scope: Филтриране по обхват
+            filtered_by: "Филтрирано по '%{filter_scope}'"
+            clear_scope_filter: Изчистване
+          records:
+            no_items_yet: Все още няма фрази.
+          phrase:
+            edit: Редактиране на тази фраза
+            delete: Изтриване на тази фраза
     pages:
       tabs:
         copywriting:

data/config/locales/cs.yml

@@ -0,0 +1,23 @@
+cs:
+  refinery:
+    plugins:
+      refinerycms_copywriting:
+        title: Copywriting
+    copywriting:
+      admin:
+        phrases:
+          locale_filters:
+            change_language: Změnit jazyk
+          scope_filters:
+            filter_by_scope: Třídit podle umístění
+            filtered_by: "Třízeno podle '%{filter_scope}'"
+            clear_scope_filter: Zrušit
+          records:
+            no_items_yet: Žádné fráze
+          phrase:
+            edit: Upravit tuto frázi
+            delete: Odstranit tuto frázi
+    pages:
+      tabs:
+        copywriting:
+          no_copywriting_yet: Žádné fráze pro tuto stránku

data/config/locales/en.yml

@@ -1,21 +1,24 @@
 en:
-  plugins:
-    refinerycms_copywriting:
-      title: Copywriting
-  admin:
-    copywriting_phrases:
-      locale_filters:
-        change_language: Change language
-      scope_filters:
-        filter_by_scope: Filter by scope
-        filtered_by: "Filtered by '%{filter_scope}'"
-        clear_scope_filter: Clear
-      records:
-        no_items_yet: There are no Phrase yet.
-      phrase:
-        edit: Edit this phrase
-        delete: Remove this phrase
+  refinery:
+    plugins:
+      refinerycms_copywriting:
+        title: Copywriting
+    copywriting:
+      admin:
+        phrases:
+          locale_filters:
+            change_language: Change language
+          scope_filters:
+            filter_by_scope: Filter by scope
+            filtered_by: "Filtered by '%{filter_scope}'"
+            clear_scope_filter: Clear
+          records:
+            no_items_yet: There are no copywriting phrases yet.
+          phrase:
+            edit: Edit this phrase
+            delete: Remove this phrase
     pages:
-      tabs:
-        copywriting:
-          no_copywriting_yet: No copywriting for this page
+      admin:
+        tabs:
+          copywriting:
+            no_copywriting_yet: No copywriting for this page

data/config/locales/es.yml

@@ -0,0 +1,23 @@
+es:
+  refinery:
+    plugins:
+      refinerycms_copywriting:
+        title: Redacción
+    copywriting:
+      admin:
+        phrases:
+          locale_filters:
+            change_language: Cambiar Lenguaje
+          scope_filters:
+            filter_by_scope: Filtrar por alcanze
+            filtered_by: "Filtrar por '%{filter_scope}'"
+            clear_scope_filter: Clear
+          records:
+            no_items_yet: Todavía no hay frases.
+          phrase:
+            edit: Editar esta frase.
+            delete: Borrar esta frase.
+    pages:
+      tabs:
+        copywriting:
+          no_copywriting_yet: No hay redacción para esta frase.

data/config/routes.rb

@@ -1,8 +1,12 @@
-Refinery::Application.routes.draw do
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :copywriting_phrases, :path => 'copywriting', :except => [:show, :new, :create] do
-      collection do
-        post :update_positions
+Refinery::Core::Engine.routes.draw do
+  namespace :copywriting, :path => '' do
+    namespace :admin, :path => 'refinery' do
+      scope :path => 'copywriting' do
+        resources :phrases, :except => [:show, :new, :create] do
+          collection do
+            post :update_positions
+          end
+        end
       end
     end
   end

data/db/migrate/1_create_copywritings.rb

@@ -12,12 +12,10 @@ class CreateCopywritings < ActiveRecord::Migration
     end
 
     add_index :copywriting_phrases, [:name, :scope]
-
-    load(Rails.root.join('db', 'seeds', 'copywritings.rb'))
   end
 
   def self.down
-    UserPlugin.destroy_all({:name => "refinerycms_copywriting"})
+    Refinery::UserPlugin.destroy_all({:name => "refinerycms_copywriting"})
 
     drop_table :copywriting_phrases
   end

data/db/migrate/2_create_copywriting_translation_table.rb

@@ -1,15 +1,41 @@
 class CreateCopywritingTranslationTable < ActiveRecord::Migration
 
   def self.up
-    ::CopywritingPhrase.create_translation_table!({
-        :value => :text
-      }, {
-        :migrate_data => true
-      })
+    ::Refinery::Copywriting::Phrase.table_name = Refinery::Copywriting::Phrase.table_name.sub('refinery_', '')
+    ::Refinery::Copywriting::Phrase.module_eval do
+      has_many :translations, :foreign_key => 'copywriting_phrase_id'
+    end
+    ::Refinery::Copywriting::Phrase.translation_class.table_name = Refinery::Copywriting::Phrase.translation_class.table_name.sub('refinery_', '')
+
+    ::Refinery::Copywriting::Phrase.create_translation_table!({
+      :value => :text
+    }, {
+      :migrate_data => true
+    })
+
+    rename_column Refinery::Copywriting::Phrase.translation_class.table_name, :copywriting_phrase_id, :refinery_copywriting_phrase_id
+
+    ::Refinery::Copywriting::Phrase.table_name = "refinery_#{Refinery::Copywriting::Phrase.table_name}"
+    ::Refinery::Copywriting::Phrase.module_eval do
+      has_many :translations, :foreign_key => 'refinery_copywriting_phrase_id'
+    end
+    ::Refinery::Copywriting::Phrase.translation_class.table_name = "refinery_#{Refinery::Copywriting::Phrase.translation_class.table_name}"
   end
 
   def self.down
-    ::CopywritingPhrase.drop_translation_table! :migrate_data => true
+    ::Refinery::Copywriting::Phrase.table_name = Refinery::Copywriting::Phrase.table_name.sub('refinery_', '')
+    ::Refinery::Copywriting::Phrase.module_eval do
+      has_many :translations, :foreign_key => 'refinery_copywriting_phrase_id'
+    end
+    ::Refinery::Copywriting::Phrase.translation_class.table_name = Refinery::Copywriting::Phrase.translation_class.table_name.sub('refinery_', '')
+
+    ::Refinery::Copywriting::Phrase.drop_translation_table! :migrate_data => true
+
+    ::Refinery::Copywriting::Phrase.table_name = "refinery_#{Refinery::Copywriting::Phrase.table_name}"
+    ::Refinery::Copywriting::Phrase.module_eval do
+      has_many :translations, :foreign_key => 'copywriting_phrase_id'
+    end
+    ::Refinery::Copywriting::Phrase.translation_class.table_name = "refinery_#{Refinery::Copywriting::Phrase.translation_class.table_name}"
   end
 
 end

data/db/migrate/4_add_refinery_prefix_to_tables.rb

@@ -0,0 +1,13 @@
+class AddRefineryPrefixToTables < ActiveRecord::Migration
+
+  def self.up
+    rename_table :copywriting_phrases, :refinery_copywriting_phrases
+    rename_table :copywriting_phrase_translations, :refinery_copywriting_phrase_translations
+  end
+
+  def self.down
+    rename_table :refinery_copywriting_phrases, :copywriting_phrases
+    rename_table :refinery_copywriting_phrase_translations, :copywriting_phrase_translations
+  end
+
+end

data/db/migrate/5_add_phrase_last_access_at.rb

@@ -0,0 +1,11 @@
+class AddPhraseLastAccessAt < ActiveRecord::Migration
+
+  def self.up
+    add_column Refinery::Copywriting::Phrase.table_name, :last_access_at, :date
+  end
+
+  def self.down
+    remove_column Refinery::Copywriting::Phrase.table_name, :last_access_at
+  end
+
+end

data/db/seeds/copywritings.rb

@@ -1,6 +1,6 @@
-User.all.each do |user|
+Refinery::User.all.each do |user|
   if user.plugins.where(:name => 'refinerycms_copywriting').blank?
     user.plugins.create(:name => 'refinerycms_copywriting',
                         :position => (user.plugins.maximum(:position) || -1) +1)
   end
-end
+end if defined?(Refinery::User)

data/features/step_definitions/copywriting_steps.rb

@@ -1,14 +1,14 @@
 Given /^I have no copywritings$/ do
-  CopywritingPhrase.delete_all
+  Refinery::Copywriting::Phrase.delete_all
 end
 
 Given /^I (only )?have copywritings titled "?([^\"]*)"?$/ do |only, titles|
-  CopywritingPhrase.delete_all if only
+  Refinery::Copywriting::Phrase.delete_all if only
   titles.split(', ').each do |title|
-    CopywritingPhrase.create(:name => title)
+    Refinery::Copywriting::Phrase.create(:name => title)
   end
 end
 
 Then /^I should have ([0-9]+) copywritings?$/ do |count|
-  CopywritingPhrase.count.should == count.to_i
+  Refinery::Copywriting::Phrase.count.should == count.to_i
 end

data/lib/generators/refinery/copywriting/copywriting_generator.rb

@@ -0,0 +1,19 @@
+module Refinery
+  class CopywritingGenerator < Rails::Generators::Base
+
+    def rake_db
+      rake("refinery_copywriting:install:migrations")
+    end
+
+    def append_load_seed_data
+      append_file 'db/seeds.rb', :verbose => true do
+        <<-EOH
+
+# Added by RefineryCMS Copywriting engine
+Refinery::Copywriting::Engine.load_seed
+        EOH
+      end
+    end
+
+  end
+end

data/lib/refinery/copywriting.rb

@@ -0,0 +1,19 @@
+require 'refinerycms-core'
+
+module Refinery
+  autoload :CopywritingGenerator, 'generators/refinery/copywriting/copywriting_generator'
+
+  module Copywriting
+    require 'refinery/copywriting/engine'
+
+    class << self
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def table_name_prefix
+        'refinery_copywriting_'
+      end
+    end
+  end
+end

data/lib/refinery/copywriting/engine.rb

@@ -0,0 +1,46 @@
+module Refinery
+  module Copywriting
+    class Engine < Rails::Engine
+      include Refinery::Engine
+
+      isolate_namespace Refinery::Copywriting
+      engine_name :refinery_copywriting
+
+      config.autoload_paths += %W( #{config.root}/lib )
+
+      config.to_prepare do
+        ::Refinery::Page.module_eval do
+          has_many :copywriting_phrases, :dependent => :destroy, :class_name => 'Refinery::Copywriting::Phrase'
+          accepts_nested_attributes_for :copywriting_phrases, :allow_destroy => false
+          attr_accessible :copywriting_phrases_attributes
+        end if defined?(::Refinery::Page)
+      end
+
+      after_inclusion do
+        ::ApplicationController.helper(CopywritingHelper)
+      end
+
+      initializer "register refinery_copywriting plugin", :after => :set_routes_reloader do |app|
+        ::Refinery::Pages::Tab.register do |tab|
+          tab.name = 'copywriting'
+          tab.partial = '/refinery/pages/admin/tabs/copywriting'
+        end
+
+        Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
+          plugin.name = 'refinerycms_copywriting'
+          plugin.url = {:controller => '/refinery/copywriting/admin/phrases'}
+          plugin.menu_match = /copywriting/
+          plugin.activity = {
+            :class_name => 'Refinery::Copywriting::Phrase',
+            :title => :name
+          }
+        end
+      end
+
+      config.after_initialize do
+        Refinery.register_engine(Refinery::Copywriting)
+      end
+    end
+  end
+end

data/lib/refinerycms-copywriting.rb

@@ -1,39 +1 @@
-require 'refinerycms-base'
-
-module Refinery
-  module Copywriting
-    class Engine < Rails::Engine
-      initializer "static assets" do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-
-      config.to_prepare do
-        Page.module_eval do
-          has_many :copywriting_phrases, :dependent => :destroy
-          accepts_nested_attributes_for :copywriting_phrases, :allow_destroy => false
-          attr_accessible :copywriting_phrases_attributes
-        end
-      end
-
-      config.to_prepare do
-        ::ApplicationController.helper(CopywritingHelper)
-      end
-
-      config.after_initialize do
-        ::Refinery::Pages::Tab.register do |tab|
-          tab.name = 'copywriting'
-          tab.partial = '/admin/pages/tabs/copywriting'
-        end
-        Refinery::Plugin.register do |plugin|
-          plugin.name = 'refinerycms_copywriting'
-          plugin.url = {:controller => '/admin/copywriting_phrases', :action => 'index'}
-          plugin.menu_match = /copywriting/
-          plugin.activity = {
-            :class => CopywritingPhrase,
-            :title => 'Key'
-          }
-        end
-      end
-    end
-  end
-end
+require 'refinery/copywriting'

data/spec/helpers/copywriting_helper_spec.rb

@@ -18,7 +18,7 @@ describe CopywritingHelper do
       
       result = copywriting("test block") { block_text }
       
-      pharse = CopywritingPhrase.where(:name => "test block").first
+      pharse = Refinery::Copywriting::Phrase.where(:name => "test block").first
       pharse.should_not be_nil
       pharse.default.should == block_text
       
@@ -30,7 +30,7 @@ describe CopywritingHelper do
         copywriting("test with default scope")
       end
 
-      CopywritingPhrase.where(:name => "test with default scope").scope.should == 'default_scope'
+      Refinery::Copywriting::Phrase.where(:name => "test with default scope").scope.should == 'default_scope'
     end
 
     it "it should allow you to overwrite the default options set with copywriting_options block" do
@@ -38,7 +38,7 @@ describe CopywritingHelper do
         copywriting("test without default scope", {:scope => 'without_default_scope'})
       end
 
-      CopywritingPhrase.where(:name => "test without default scope").scope.should == 'without_default_scope'
+      Refinery::Copywriting::Phrase.where(:name => "test without default scope").scope.should == 'without_default_scope'
     end
 
     it "it should clear the default options after copywriting_options block" do
@@ -47,7 +47,7 @@ describe CopywritingHelper do
       end
       copywriting("test outside default scope")
 
-      CopywritingPhrase.where(:name => "test outside default scope").scope.should_not == 'default_scope'
+      Refinery::Copywriting::Phrase.where(:name => "test outside default scope").scope.should_not == 'default_scope'
     end
 
   end

data/spec/models/copywriting_phrase_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe CopywritingPhrase do
+describe Refinery::Copywriting::Phrase do
 
   context "validations" do
     
     it "rejects empty name" do
-      copy = CopywritingPhrase.new
+      copy = Refinery::Copywriting::Phrase.new
       copy.save.should be_false
     end
     
@@ -14,27 +14,27 @@ describe CopywritingPhrase do
   context "for" do
 
     it "should return the default string if value is not set" do
-      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
+      Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
     end
 
     it "should not duplicate copywriting phrases" do
-      2.times { CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}) }
-      CopywritingPhrase.where(:name => 'name').count.should == 1
+      2.times { Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default'}) }
+      Refinery::Copywriting::Phrase.where(:name => 'name').count.should == 1
     end
 
     it "should return the string the value once its set" do
-      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
-      copy = CopywritingPhrase.where(:name => 'name').first
+      Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
+      copy = Refinery::Copywriting::Phrase.where(:name => 'name').first
       copy.value = 'updated!'
       copy.save
 
-      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'updated!'
+      Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'updated!'
     end
     
     it "should save options" do
-      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default', :phrase_type => 'wysiwyg'})
+      Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default', :phrase_type => 'wysiwyg'})
 
-      phrase = CopywritingPhrase.where(:name => 'name').first
+      phrase = Refinery::Copywriting::Phrase.where(:name => 'name').first
 
       phrase.name.should == "name"
       phrase.phrase_type.should == "wysiwyg"
@@ -45,8 +45,8 @@ describe CopywritingPhrase do
     
     it "should have defaults options" do
       name = "test_defaults"
-      CopywritingPhrase.for(name)
-      phrase = CopywritingPhrase.where(:name => name).first
+      Refinery::Copywriting::Phrase.for(name)
+      phrase = Refinery::Copywriting::Phrase.where(:name => name).first
 
       phrase.name.should == name
       phrase.phrase_type.should == "text"
@@ -59,16 +59,16 @@ describe CopywritingPhrase do
       page = Page.create(:title => "test page")
 
       name = "test_page"
-      CopywritingPhrase.for(name, :page => page)
-      phrase = CopywritingPhrase.where(:name => name).first
+      Refinery::Copywriting::Phrase.for(name, :page => page)
+      phrase = Refinery::Copywriting::Phrase.where(:name => name).first
       
       phrase.page_id.should == page.id
     end
 
     it "should allow you to scope to a page_id" do
       name = "test_page_id"
-      CopywritingPhrase.for(name, :page_id => 22)
-      phrase = CopywritingPhrase.where(:name => name).first
+      Refinery::Copywriting::Phrase.for(name, :page_id => 22)
+      phrase = Refinery::Copywriting::Phrase.where(:name => name).first
       
       phrase.page_id.should == 22
     end

metadata

@@ -1,56 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-copywriting
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 9
-  version: 1.0.9
 platform: ruby
-authors: 
+authors:
 - Charles Barbier
 - David Jones
+- Philip Arndt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-20 00:00:00 Z
+date: 2011-07-20 00:00:00.000000000 Z
 dependencies: []
-
 description: Extract all your strings and leave no human word behind, with i18n
 email: unixcharles@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/generators/refinerycms_copywriting_generator.rb
+files:
+- lib/generators/refinery/copywriting/copywriting_generator.rb
+- lib/refinery/copywriting/engine.rb
+- lib/refinery/copywriting.rb
 - lib/refinerycms-copywriting.rb
 - lib/tasks/copywritings.rake
 - config/locales/bg.yml
+- config/locales/cs.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/routes.rb
-- app/controllers/admin/copywriting_phrases_controller.rb
+- app/assets/stylesheets/refinerycms-copywriting-tab.css.scss
+- app/assets/stylesheets/refinerycms-copywriting.css.scss
+- app/controllers/refinery/copywriting/admin/phrases_controller.rb
 - app/helpers/copywriting_helper.rb
-- app/models/copywriting_phrase.rb
-- app/views/admin/copywriting_phrases/_actions.html.erb
-- app/views/admin/copywriting_phrases/_copywriting_phrases.html.erb
-- app/views/admin/copywriting_phrases/_form.html.erb
-- app/views/admin/copywriting_phrases/_locale_filters.html.erb
-- app/views/admin/copywriting_phrases/_phrase.html.erb
-- app/views/admin/copywriting_phrases/_records.html.erb
-- app/views/admin/copywriting_phrases/_scope_filters.html.erb
-- app/views/admin/copywriting_phrases/edit.html.erb
-- app/views/admin/copywriting_phrases/index.html.erb
-- app/views/admin/pages/tabs/_copywriting.html.erb
-- app/views/admin/shared/copywriting_phrases/_value_field.html.erb
+- app/models/refinery/copywriting/phrase.rb
+- app/views/refinery/copywriting/admin/phrases/_actions.html.erb
+- app/views/refinery/copywriting/admin/phrases/_form.html.erb
+- app/views/refinery/copywriting/admin/phrases/_locale_filters.html.erb
+- app/views/refinery/copywriting/admin/phrases/_phrase.html.erb
+- app/views/refinery/copywriting/admin/phrases/_phrases.html.erb
+- app/views/refinery/copywriting/admin/phrases/_records.html.erb
+- app/views/refinery/copywriting/admin/phrases/_scope_filters.html.erb
+- app/views/refinery/copywriting/admin/phrases/_value_field.html.erb
+- app/views/refinery/copywriting/admin/phrases/edit.html.erb
+- app/views/refinery/copywriting/admin/phrases/index.html.erb
+- app/views/refinery/pages/admin/tabs/_copywriting.html.erb
 - db/migrate/1_create_copywritings.rb
 - db/migrate/2_create_copywriting_translation_table.rb
 - db/migrate/3_add_phrase_type.rb
+- db/migrate/4_add_refinery_prefix_to_tables.rb
+- db/migrate/5_add_phrase_last_access_at.rb
 - db/seeds/copywritings.rb
 - spec/helpers/copywriting_helper_spec.rb
 - spec/models/copywriting_phrase_spec.rb
@@ -59,36 +58,27 @@ files:
 - features/support/paths.rb
 homepage: http://github.com/unixcharles/refinerycms-copywriting
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Refinery CMS engine to manage copywriting, application wide or per pages, with i18n.
+summary: Refinery CMS engine to manage copywriting, application wide or per pages,
+  with i18n.
 test_files: []
-

data/app/controllers/admin/copywriting_phrases_controller.rb

@@ -1,46 +0,0 @@
-module Admin
-  class CopywritingPhrasesController < Admin::BaseController
-    before_filter :find_all_locales, :find_locale, :find_scope, :find_all_scopes
-
-    crudify :copywriting_phrase, :searchable => false,
-            :title_attribute => 'name', :xhr_paging => true, :sortable => false
-
-    protected
-
-    def find_all_copywriting_phrases
-      @copywriting_phrases = CopywritingPhrase.where(:page_id => nil).order([:scope, :name])
-
-      if find_scope
-        @copywriting_phrases = @copywriting_phrases.where(:scope => find_scope)
-      end
-    end
-
-    def find_locale
-      @current_locale ||= (params[:switch_locale].try(:to_sym) || Thread.current[:globalize_locale] || default_locale).to_sym
-    end
-
-    def find_all_locales
-      @locales ||= ::Refinery::I18n.frontend_locales
-    end
-
-    def find_scope
-      @scope ||= params[:filter_scope]
-    end
-
-    def find_all_scopes
-      @scopes ||= CopywritingPhrase.select(:scope).where(:page_id => nil).map(&:scope).uniq
-    end
-
-    def default_locale
-      ::Refinery::I18n.default_frontend_locale
-    end
-
-    def globalize!
-      super
-      if params[:switch_locale]
-        Thread.current[:globalize_locale] = (params[:switch_locale] || default_locale).try(:to_sym)
-      end
-    end
-
-  end
-end

data/app/models/copywriting_phrase.rb

@@ -1,30 +0,0 @@
-class CopywritingPhrase < ActiveRecord::Base
-
-  belongs_to :page
-  translates :value if self.respond_to?(:translates)
-  validates :name, :presence => true
-
-  attr_accessible :locale, :name, :default, :value, :scope, :page_id, :phrase_type
-
-  def self.for(name, options = {})
-    options = {:phrase_type => 'text', :scope => 'default'}.merge(options)
-    name = name.to_s
-    page_id = (options[:page].try(:id) || options[:page_id] || nil)
-
-    if (phrase = self.where(:name => name, :page_id => page_id).first).nil?
-      phrase = self.create(:name => name,
-                           :scope => options[:scope],
-                           :value => options[:value],
-                           :default => options[:default],
-                           :page_id => page_id,
-                           :phrase_type => options[:phrase_type])
-    end
-
-    phrase.default_or_value
-  end
-
-  def default_or_value
-    value.blank? ? default : value 
-  end
-
-end

data/app/views/admin/copywriting_phrases/_copywriting_phrases.html.erb

@@ -1,4 +0,0 @@
-<%= will_paginate @copywriting_phrases %>
-<ul id='phrases'>
-  <%= render :partial => 'admin/copywriting_phrases/phrase', :collection => @copywriting_phrases %>
-</ul>

data/app/views/admin/copywriting_phrases/_form.html.erb

@@ -1,18 +0,0 @@
-<%= form_for [:admin, @copywriting_phrase] do |f| -%>
-  <%= hidden_field_tag :switch_locale, @current_locale %>
-
-  <%= render :partial => "/shared/admin/error_messages", :locals => {
-          :object => @copywriting_phrase,
-          :include_object_name => true
-        } %>
-
-  <%= render :partial => '/admin/shared/copywriting_phrases/value_field', :locals => {:f => f} %>
-
-  <%= render :partial => "/shared/admin/form_actions",
-              :locals => {
-                :f => f,
-                :continue_editing => false,
-                :delete_title => t('delete', :scope => 'admin.copywriting.phrase'),
-                :delete_confirmation => t('message', :scope => 'shared.admin.delete', :title => @copywriting_phrase.name)
-              } %>
-<% end -%>

data/app/views/admin/copywriting_phrases/_phrase.html.erb

@@ -1,20 +0,0 @@
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(phrase) -%>">
-  <span class='title'>
-    <% if @scope.nil? and phrase.scope %>
-      <%= link_to phrase.scope.capitalize, params.dup.tap { |p| p[:filter_scope] = phrase.scope } %>
-    <% end %>
-    <b><%= phrase.name %></b>
-    <span class="preview">- <%= truncate(phrase.default_or_value, :length => 40) %></span>
-  </span>
-  <span class='actions'>
-    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_copywriting_phrase_path(phrase, :dialog => true, :switch_locale => @current_locale),
-         :title => t('.edit') %>
-
-    <%= link_to refinery_icon_tag("delete.png"), admin_copywriting_phrase_path(phrase),
-         :title => t('.delete'),
-         :class => "cancel confirm-delete",
-         :confirm => t('message', :scope => 'shared.admin.delete', :title => phrase.name.capitalize),
-         :method => :delete %>
-
-  </span>
-</li>

data/app/views/admin/copywriting_phrases/_records.html.erb

@@ -1,15 +0,0 @@
-<% if @copywriting_phrases.any? %>
-  <div class='pagination_container'>
-    <%= render :partial => 'copywriting_phrases', :copywriting_phrases => @copywriting_phrases %>
-  </div>
-<% else %>
-  <p>
-    <% unless searching? %>
-      <strong>
-        <%= t('.no_items_yet') %>
-      </strong>
-    <% else %>
-      <%= t('no_results', :scope => 'shared.admin.search') %>
-    <% end %>
-  </p>
-<% end %>

data/lib/generators/refinerycms_copywriting_generator.rb

@@ -1,6 +0,0 @@
-class RefinerycmsCopywritingGenerator < Refinery::Generators::EngineInstaller
-
-  source_root File.expand_path('../../../', __FILE__)
-  engine_name "refinerycms_copywriting"
-
-end