refinerycms-copywriting 1.0.6 → 1.0.7

data/app/helpers/copywriting_helper.rb

@@ -1,11 +1,14 @@
 module CopywritingHelper
   
   def copywriting(name, options = {}, &block)
+	options = @copywriting_options.merge(options) if @copywriting_options
     options[:default] = block_given? ? capture(&block) : options[:default]
-
-    result = ::CopywritingPhrase.for(name, options)
-
-    options[:html_safe] ? result.html_safe : result
+    ::CopywritingPhrase.for(name, options)
   end
 
+  def copywriting_options(options, &block)
+    @copywriting_options = options
+    yield
+    @copywriting_options = nil
+  end
 end

data/app/models/copywriting_phrase.rb

@@ -14,7 +14,6 @@ class CopywritingPhrase < ActiveRecord::Base
       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

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

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

data/spec/helpers/copywriting_helper_spec.rb

@@ -24,7 +24,32 @@ describe CopywritingHelper do
       
       copywriting("test block").should == block_text
     end
-    
+
+    it "it should allow you to set default options with copywriting_options block" do
+      copywriting_options({:scope => 'default_scope'}) do
+        copywriting("test with default scope")
+      end
+
+      CopywritingPhrase.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
+      copywriting_options({:scope => 'default_scope'}) do
+        copywriting("test without default scope", {:scope => 'without_default_scope'})
+      end
+
+      CopywritingPhrase.where(:name => "test without default scope").scope.should == 'without_default_scope'
+    end
+
+    it "it should clear the default options after copywriting_options block" do
+      copywriting_options({:scope => 'default_scope'}) do
+        copywriting("test with default scope")
+      end
+      copywriting("test outside default scope")
+
+      CopywritingPhrase.where(:name => "test outside default scope").scope.should_not == 'default_scope'
+    end
+
   end
   
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-copywriting
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Charles Barbier
+- David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: []
 
 description: Extract all your strings and leave no human word behind, with i18n