refinerycms-copywriting 2.0.2 → 2.0.3

data/app/assets/stylesheets/{refinerycms-copywriting-tab.css.scss → refinery/copywriting/backend.css.scss}

@@ -1,3 +1,7 @@
+.scope_icon {
+  background-image: url("/assets/refinery/icons/zoom.png");
+}
+
 #copywriting-tab {
   ul {
     padding: 0 5px 10px 10px;

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

@@ -1,6 +1,6 @@
 module Refinery
   module Copywriting
-    class Phrase < ActiveRecord::Base
+    class Phrase < Refinery::Core::BaseModel
 
       belongs_to :page, :class_name => 'Refinery::Page'
       translates :value if self.respond_to?(:translates)
@@ -19,7 +19,7 @@ module Refinery
         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 = self.find_by_name_and_scope_and_page_id(options[:name], options[:scope], 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?
@@ -33,4 +33,4 @@ module Refinery
 
     end
   end
-end
+end

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

@@ -1,19 +1,14 @@
 <%= 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 "/refinery/admin/error_messages", :object => @phrase, :include_object_name => true %>
 
-  <%= render :partial => '/refinery/copywriting/admin/phrases/value_field', :locals => {:f => f} %>
+  <%= render '/refinery/copywriting/admin/phrases/value_field', :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)
-             } %>
+  <%= render "/refinery/admin/form_actions",
+             :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/refinery/copywriting/admin/phrases/_locale_filters.html.erb

@@ -1,4 +1,3 @@
-<% 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'>
 
@@ -22,4 +21,3 @@
     </li>
   <% end %>
 </ul>
-<% end %>

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

@@ -1,4 +1,4 @@
-<%= will_paginate @phrases %>
+<%= will_paginate @phrases, :params => { :controller => "refinery/copywriting/admin/phrases", :action => "index" } %>
 <ul id='phrases'>
   <%= render :partial => 'refinery/copywriting/admin/phrases/phrase', :collection => @phrases %>
 </ul>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render "form" %>

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

@@ -1,10 +1,10 @@
 <section id='records'>
-  <%= render :partial => 'records' %>
+  <%= render 'records' %>
 </section>
 <aside id='actions'>
-  <%= render :partial => 'actions' %>
+  <%= render 'actions' %>
 </aside>
 
 <% content_for :stylesheets do %>
-  <%= stylesheet_link_tag 'refinerycms-copywriting' %>
-<% end %>
+  <%= stylesheet_link_tag 'refinery/copywriting/backend' %>
+<% end %>

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

@@ -5,7 +5,7 @@
       <% copywriting_phrases.each do |phrase| %>
         <li>
           <%= f.fields_for :copywriting_phrases, phrase do |p| %>
-            <%= render :partial => 'refinery/copywriting/admin/phrases/value_field', :locals => {:f => p} %>
+            <%= render 'refinery/copywriting/admin/phrases/value_field', :f => p %>
           <% end %>
         </li>
       <% end %>
@@ -18,5 +18,5 @@
 <% end %>
 
 <% content_for :stylesheets do %>
-  <%= stylesheet_link_tag 'refinerycms-copywriting-tab' %>
+  <%= stylesheet_link_tag 'refinery/copywriting/backend' %>
 <% end %>

data/config/locales/pl.yml

@@ -0,0 +1,24 @@
+pl:
+  refinery:
+    plugins:
+      refinerycms_copywriting:
+        title: "Stopki"
+    copywriting:
+      admin:
+        phrases:
+          locale_filters:
+            change_language: "Zmień język"
+          scope_filters:
+            filter_by_scope: "Filtruj wg elementu"
+            filtered_by: "Filtruj wg '%{filter_scope}'"
+            clear_scope_filter: "WYczyść"
+          records:
+            no_items_yet: "Nie ma jeszcze żadnej frazy do edycji."
+          phrase:
+            edit: "Edytuj frazę"
+            delete: "Usuń frazę"
+    pages:
+      admin:
+        tabs:
+          copywriting:
+            no_copywriting_yet: "Brak frazy do edycji dla tej strony"

data/config/locales/ru.yml

@@ -0,0 +1,24 @@
+ru:
+  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:
+      admin:
+        tabs:
+          copywriting:
+            no_copywriting_yet: Записей для этой страницы пока еще нет

data/config/routes.rb

@@ -2,11 +2,7 @@ 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
+        resources :phrases, :except => [:show, :new, :create]
       end
     end
   end

data/db/migrate/2_create_copywriting_translation_table.rb

@@ -13,7 +13,9 @@ class CreateCopywritingTranslationTable < ActiveRecord::Migration
       :migrate_data => true
     })
 
-    rename_column Refinery::Copywriting::Phrase.translation_class.table_name, :copywriting_phrase_id, :refinery_copywriting_phrase_id
+    with_short_sqlite_compatible_index do
+      rename_column Refinery::Copywriting::Phrase.translation_class.table_name, :copywriting_phrase_id, :refinery_copywriting_phrase_id
+    end
 
     ::Refinery::Copywriting::Phrase.table_name = "refinery_#{Refinery::Copywriting::Phrase.table_name}"
     ::Refinery::Copywriting::Phrase.module_eval do
@@ -38,4 +40,15 @@ class CreateCopywritingTranslationTable < ActiveRecord::Migration
     ::Refinery::Copywriting::Phrase.translation_class.table_name = "refinery_#{Refinery::Copywriting::Phrase.translation_class.table_name}"
   end
 
+  
+  def self.with_short_sqlite_compatible_index
+    if ActiveRecord::Base.connection.adapter_name.downcase.to_sym == :sqlite
+      remove_index Refinery::Copywriting::Phrase.translation_class.table_name, [:copywriting_phrase_id]#[:index_altered_copywriting_phrase_translations_on_copywriting_phrase_id] 
+      yield
+      add_index Refinery::Copywriting::Phrase.translation_class.table_name, :refinery_copywriting_phrase_id, :name => "index_short_on_refinery_copywriting_phrase_id"
+    else
+      yield
+    end
+  end
+
 end

data/lib/refinery/copywriting/engine.rb

@@ -21,7 +21,7 @@ module Refinery
 
       initializer "register refinery_copywriting plugin", :after => :set_routes_reloader do |app|
         ::Refinery::Pages::Tab.register do |tab|
-          tab.name = 'copywriting'
+          tab.name = ::I18n.t(:'refinery.plugins.refinerycms_copywriting.title')
           tab.partial = '/refinery/pages/admin/tabs/copywriting'
         end
 
@@ -42,4 +42,4 @@ module Refinery
       end
     end
   end
-end
+end

data/spec/models/copywriting_phrase_spec.rb

@@ -22,7 +22,12 @@ describe Refinery::Copywriting::Phrase do
       Refinery::Copywriting::Phrase.where(:name => 'name').count.should == 1
     end
 
-    it "should return the string the value once its set" do
+    it "differentiates records by scope" do
+      2.times {|n| Refinery::Copywriting::Phrase.for('name', {:scope => "scope#{n}", :default => 'default'}) }
+      Refinery::Copywriting::Phrase.where(:name => 'name').pluck(:scope).should =~ ['scope0', 'scope1']
+    end
+
+    it "should return the string the value once it is set" do
       Refinery::Copywriting::Phrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
       copy = Refinery::Copywriting::Phrase.where(:name => 'name').first
       copy.value = 'updated!'
@@ -75,4 +80,4 @@ describe Refinery::Copywriting::Phrase do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-copywriting
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -28,9 +28,10 @@ files:
 - config/locales/cs.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/pl.yml
+- config/locales/ru.yml
 - config/routes.rb
-- app/assets/stylesheets/refinerycms-copywriting-tab.css.scss
-- app/assets/stylesheets/refinerycms-copywriting.css.scss
+- app/assets/stylesheets/refinery/copywriting/backend.css.scss
 - app/controllers/refinery/copywriting/admin/phrases_controller.rb
 - app/helpers/refinery/copywriting/copywriting_helper.rb
 - app/models/refinery/copywriting/phrase.rb
@@ -51,69 +52,6 @@ files:
 - db/migrate/4_add_refinery_prefix_to_tables.rb
 - db/migrate/5_add_phrase_last_access_at.rb
 - db/seeds/copywritings.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/sitemap/index.xml.builder
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/database.yml.mysql
-- spec/dummy/config/database.yml.postgresql
-- spec/dummy/config/database.yml.sqlite3
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/refinery/core.rb
-- spec/dummy/config/initializers/refinery/images.rb
-- spec/dummy/config/initializers/refinery/pages.rb
-- spec/dummy/config/initializers/refinery/resources.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/migrate/20120416115049_create_copywritings.refinery_copywriting.rb
-- spec/dummy/db/migrate/20120416115050_create_copywriting_translation_table.refinery_copywriting.rb
-- spec/dummy/db/migrate/20120416115051_add_phrase_type.refinery_copywriting.rb
-- spec/dummy/db/migrate/20120416115052_add_refinery_prefix_to_tables.refinery_copywriting.rb
-- spec/dummy/db/migrate/20120416115053_add_phrase_last_access_at.refinery_copywriting.rb
-- spec/dummy/db/migrate/20120416115054_create_refinerycms_authentication_schema.refinery_authentication.rb
-- spec/dummy/db/migrate/20120416115055_create_refinerycms_images_schema.refinery_images.rb
-- spec/dummy/db/migrate/20120416115056_create_refinerycms_resources_schema.refinery_resources.rb
-- spec/dummy/db/migrate/20120416115057_create_refinerycms_pages_schema.refinery_pages.rb
-- spec/dummy/db/migrate/20120416115058_create_seo_meta.seo_meta_engine.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/dummy_dev
-- spec/dummy/dummy_test
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
-- spec/dummy/script/rails
-- spec/dummy/tmp/index/development/refinery/page/102_111_117.ind
-- spec/dummy/tmp/index/development/refinery/page/104_111_109.ind
-- spec/dummy/tmp/index/development/refinery/page/110_111_116.ind
-- spec/dummy/tmp/index/development/refinery/page/112_97_103.ind
-- spec/dummy/tmp/index/development/refinery/page/97_98_111.ind
-- spec/dummy/tmp/index/development/refinery/page/size
-- spec/dummy/tmp/index/development/refinery/page/version
-- spec/dummy/tmp/index/test/refinery/page/112_97_103.ind
-- spec/dummy/tmp/index/test/refinery/page/116_101_115.ind
-- spec/dummy/tmp/index/test/refinery/page/size
-- spec/dummy/tmp/index/test/refinery/page/version
 - spec/helpers/copywriting_helper_spec.rb
 - spec/models/copywriting_phrase_spec.rb
 - spec/spec_helper.rb
@@ -137,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Refinery CMS engine to manage copywriting, application wide or per pages,

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

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

data/spec/dummy/README.rdoc

@@ -1,261 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting Started
-
-1. At the command prompt, create a new Rails application:
-       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
-
-2. Change directory to <tt>myapp</tt> and start the web server:
-       <tt>cd myapp; rails server</tt> (run with --help for options)
-
-3. Go to http://localhost:3000/ and you'll see:
-       "Welcome aboard: You're riding Ruby on Rails!"
-
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
-
-
-== Debugging Rails
-
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
-
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
-
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
-
-  class WeblogController < ActionController::Base
-    def destroy
-      @weblog = Weblog.find(params[:id])
-      @weblog.destroy
-      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
-    end
-  end
-
-The result will be a message in your log file along the lines of:
-
-  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
-
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.all
-      debugger
-    end
-  end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8
-          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
-       #<Post:0x14a6620
-          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
-  >> @posts.first.title = "hello from a debugger"
-  => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
-  >> f = @posts.first
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
-  made to the database.
-* Passing an environment name as an argument will load the corresponding
-  environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
-  |-- app
-  |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
-  |   |-- controllers
-  |   |-- helpers
-  |   |-- mailers
-  |   |-- models
-  |   `-- views
-  |       `-- layouts
-  |-- config
-  |   |-- environments
-  |   |-- initializers
-  |   `-- locales
-  |-- db
-  |-- doc
-  |-- lib
-  |   `-- tasks
-  |-- log
-  |-- public
-  |-- script
-  |-- test
-  |   |-- fixtures
-  |   |-- functional
-  |   |-- integration
-  |   |-- performance
-  |   `-- unit
-  |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
-  `-- vendor
-      |-- assets
-          `-- stylesheets
-      `-- plugins
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/assets
-  Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
-  Holds controllers that should be named like weblogs_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ApplicationController which itself descends from ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb. Models descend from
-  ActiveRecord::Base by default.
-
-app/views
-  Holds the template files for the view that should be named like
-  weblogs/index.html.erb for the WeblogsController#index action. All views use
-  eRuby syntax by default.
-
-app/views/layouts
-  Holds the template files for layouts to be used with views. This models the
-  common header/footer method of wrapping views. In your views, define a layout
-  using the <tt>layout :default</tt> and create a file named default.html.erb.
-  Inside default.html.erb, call <% yield %> to render the view using this
-  layout.
-
-app/helpers
-  Holds view helpers that should be named like weblogs_helper.rb. These are
-  generated for you automatically when using generators for controllers.
-  Helpers can be used to wrap functionality for your views into methods.
-
-config
-  Configuration files for the Rails environment, the routing map, the database,
-  and other dependencies.
-
-db
-  Contains the database schema in schema.rb. db/migrate contains all the
-  sequence of Migrations for your schema.
-
-doc
-  This directory is where your application documentation will be stored when
-  generated using <tt>rake doc:app</tt>
-
-lib
-  Application specific libraries. Basically, any kind of custom code that
-  doesn't belong under controllers, models, or helpers. This directory is in
-  the load path.
-
-public
-  The directory available for the web server. Also contains the dispatchers and the
-  default HTML files. This should be set as the DOCUMENT_ROOT of your web
-  server.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures. When using the rails generate
-  command, template test files will be generated for you and placed in this
-  directory.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins
-  subdirectory. If the app has frozen rails, those gems also go here, under
-  vendor/rails/. This directory is in the load path.