refinerycms-copywriting 1.0.5 → 1.0.6

data/app/helpers/copywriting_helper.rb

@@ -1,11 +1,11 @@
 module CopywritingHelper
+  
   def copywriting(name, options = {}, &block)
-    scope   = options[:scope] || 'default'
-    page_id = options[:page_id] || options[:page].try(:id) || nil
-    default = block_given? ? capture(&block) : options[:default]
+    options[:default] = block_given? ? capture(&block) : options[:default]
 
-    result = ::CopywritingPhrase.for(name, scope, default, page_id)
-    result = result.html_safe if options[:html_safe]
-    result
+    result = ::CopywritingPhrase.for(name, options)
+
+    options[:html_safe] ? result.html_safe : result
   end
+
 end

data/app/models/copywriting_phrase.rb

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

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

@@ -5,11 +5,8 @@
           :object => @copywriting_phrase,
           :include_object_name => true
         } %>
-  
-  <div class='field'>
-    <%= f.label :value, f.object.name.capitalize -%>
-    <%= f.text_area :value, :value => f.object.default_or_value, :rows => 12, :class => 'widest' -%>
-  </div>
+
+  <%= render :partial => '/admin/shared/copywriting_phrases/value_field', :locals => {:f => f} %>
 
   <%= render :partial => "/shared/admin/form_actions",
               :locals => {

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

@@ -4,11 +4,8 @@
     <ul>
       <% copywriting_phrases.each do |phrase| %>
         <li>
-          <% f.fields_for :copywriting_phrases, phrase do |p|%>
-          <div class='field'>
-            <%= p.label :value, p.object.name.capitalize -%>
-            <%= p.text_field :value, :class => 'widest' -%>
-          </div>
+          <% f.fields_for :copywriting_phrases, phrase do |p| %>
+            <%= render :partial => '/admin/shared/copywriting_phrases/value_field', :locals => {:f => p} %>
           <% end %>
         </li>
       <% end %>

data/app/views/admin/shared/copywriting_phrases/_value_field.html.erb

@@ -0,0 +1,11 @@
+<div class='field'>
+  <%= f.label :value, f.object.name.capitalize -%>
+  <% case f.object.phrase_type %>
+  <% when "text" %>
+    <%= f.text_area :value, :rows => 12, :class => 'widest' -%>
+  <% when "wysiwyg" %>
+    <%= f.text_area :value, :rows => 5, :class => 'widest wymeditor' -%>
+  <% else %>
+    <%= f.text_field :value, :class => 'widest larger' -%>
+  <% end %>
+</div>

data/db/migrate/3_add_phrase_type.rb

@@ -0,0 +1,11 @@
+class AddPhraseType < ActiveRecord::Migration
+
+  def self.up
+    add_column :copywriting_phrases, :phrase_type, :string
+  end
+
+  def self.down
+    remove_column :copywriting_phrases, :phrase_type
+  end
+
+end

data/spec/helpers/copywriting_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe CopywritingHelper do
+
+  context "usage" do
+    
+    it "it should create using defaults" do
+      copywriting("test").should == nil
+    end
+    
+    it "it should allow you to set options" do
+      copywriting("test", {:scope => 'scope', :default => 'default', :phrase_type => 'wysiwyg'}).should == 'default'
+      copywriting("test two", {:default => "test just default"}).should == "test just default"
+    end
+
+    it "it should allow you to set the value using a block" do
+      block_text = "this is a block"
+      
+      result = copywriting("test block") { block_text }
+      
+      pharse = CopywritingPhrase.where(:name => "test block").first
+      pharse.should_not be_nil
+      pharse.default.should == block_text
+      
+      copywriting("test block").should == block_text
+    end
+    
+  end
+  
+end

data/spec/models/copywriting_phrase_spec.rb

@@ -14,21 +14,63 @@ describe CopywritingPhrase do
   context "for" do
 
     it "should return the default string if value is not set" do
-      CopywritingPhrase.for('name', 'scope', 'default', nil).should == 'default'
+      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
     end
 
     it "should not duplicate copywriting phrases" do
-      2.times { CopywritingPhrase.for('name', 'scope', 'default', nil) }
+      2.times { CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}) }
       CopywritingPhrase.where(:name => 'name').count.should == 1
     end
 
     it "should return the string the value once its set" do
-      CopywritingPhrase.for('name', 'scope', 'default', nil).should == 'default'
+      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'default'
       copy = CopywritingPhrase.where(:name => 'name').first
       copy.value = 'updated!'
       copy.save
 
-      CopywritingPhrase.for('name', 'scope', 'default', nil).should == 'updated!'
+      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default'}).should == 'updated!'
+    end
+    
+    it "should save options" do
+      CopywritingPhrase.for('name', {:scope => 'scope', :default => 'default', :phrase_type => 'wysiwyg'})
+
+      phrase = CopywritingPhrase.where(:name => 'name').first
+
+      phrase.name.should == "name"
+      phrase.phrase_type.should == "wysiwyg"
+      phrase.scope.should == "scope"
+      phrase.default.should == "default"
+      phrase.value.should == nil
+    end
+    
+    it "should have defaults options" do
+      name = "test_defaults"
+      CopywritingPhrase.for(name)
+      phrase = CopywritingPhrase.where(:name => name).first
+
+      phrase.name.should == name
+      phrase.phrase_type.should == "text"
+      phrase.scope.should == "default"
+      phrase.default.should == nil
+      phrase.value.should == nil
+    end
+    
+    it "should allow you to scope to a page" do
+      page = Page.create(:title => "test page")
+
+      name = "test_page"
+      CopywritingPhrase.for(name, :page => page)
+      phrase = CopywritingPhrase.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
+      
+      phrase.page_id.should == 22
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-copywriting
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Charles Barbier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 Z
+date: 2011-07-01 00:00:00 Z
 dependencies: []
 
 description: Extract all your strings and leave no human word behind, with i18n
@@ -45,9 +45,12 @@ files:
 - 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
 - db/migrate/1_create_copywritings.rb
 - db/migrate/2_create_copywriting_translation_table.rb
+- db/migrate/3_add_phrase_type.rb
 - db/seeds/copywritings.rb
+- spec/helpers/copywriting_helper_spec.rb
 - spec/models/copywriting_phrase_spec.rb
 - features/manage_copywriting.feature
 - features/step_definitions/copywriting_steps.rb