refinerycms 0.9.8.5 → 0.9.8.6

data/vendor/refinerycms/pages/spec/models/page_spec.rb

@@ -1,13 +1,143 @@
 require 'spec_helper'
 
 describe Page do
-  before(:each) do
+
+  def reset_page(options = {})
     @valid_attributes = {
-      :title => "RSpec is great for testing too"
+      :id => 1,
+      :title => "RSpec is great for testing too",
+      :deletable => true
     }
+
+    @page.destroy! if @page
+    @page = Page.create!(@valid_attributes)
+    @page.update_attributes(options)
+  end
+
+  def page_cannot_be_destroyed
+    @page.destroy.should == false
+  end
+
+  def create_child
+    @child = @page.children.create(:title => 'The child page')
+  end
+
+  def create_page_parts
+    @page.parts.create(:title => 'body', :content => "I'm the first page part for this page.")
+    @page.parts.create(:title => 'side body', :content => "Closely followed by the second page part.")
+  end
+
+  def turn_off_marketable_urls
+    RefinerySetting.set(:use_marketable_urls, {:value => false, :scoping => 'pages'})
+  end
+
+
+  before(:each) do
+    reset_page
+  end
+
+  context "cannot be deleted under certain rules" do
+    it "if link_url is present" do
+      reset_page({:link_url => '/plugin-name'})
+      page_cannot_be_destroyed
+    end
+
+
+    it "if refinery team deems it so" do
+      reset_page({:deletable => false})
+      page_cannot_be_destroyed
+    end
+
+    it "if menu_match is present" do
+      reset_page({:menu_match => '^/RSpec is great for testing too.*$'})
+      page_cannot_be_destroyed
+    end
+
+    it "unless you really want it to! >:]" do
+      reset_page
+      @page.destroy!
+    end
+  end
+
+  context "page urls" do
+    it "should return a full path" do
+      @page.path.should == 'RSpec is great for testing too'
+    end
+
+    it "and all of its parent page titles, reversed" do
+      create_child
+      @child.path.should == 'RSpec is great for testing too - The child page'
+    end
+
+    it "or normally ;-)" do
+      create_child
+      @child.path(false).should == 'The child page - RSpec is great for testing too'
+    end
+
+    it "should return its url" do
+      @page.link_url = '/contact'
+      @page.url.should == '/contact'
+
+      reset_page
+      @page.url[:path].should == ["rspec-is-great-for-testing-too"]
+      @page.url[:id].should be_nil
+
+      turn_off_marketable_urls
+      @page.url[:id].should == "rspec-is-great-for-testing-too"
+      @page.url[:path].should be_nil
+    end
+  end
+
+  context "home page" do
+    it "should respond as the home page" do
+      @page.link_url = '/'
+      @page.home?.should == true
+    end
+
+    it "should not respond as the home page" do
+      @page.home?.should == false
+    end
+  end
+
+  context "content sections (page parts)" do
+    it "should return the content when using []" do
+      create_page_parts
+
+      @page[:body].should == "<p>I'm the first page part for this page.</p>"
+      @page["BoDY"].should == "<p>I'm the first page part for this page.</p>"
+    end
+
+    it "should return all page part content" do
+      create_page_parts
+
+      @page.all_page_part_content.should == "<p>I'm the first page part for this page.</p> <p>Closely followed by the second page part.</p>"
+    end
+
+    it "should reposition correctly" do
+      create_page_parts
+      @page.parts.first.position = 6
+      @page.parts.last.position = 4
+
+      @page.parts.first.position.should == 6
+      @page.parts.last.position.should == 4
+
+      @page.reposition_parts!
+
+      @page.parts.first.position.should == 0
+      @page.parts.last.position.should == 1
+    end
   end
 
-  it "should create a new instance given valid attributes" do
-    Page.create!(@valid_attributes)
+  context "draft pages" do
+    it "should not be a live page when set to draft" do
+      @page.draft = true
+      @page.live?.should == false
+
+      @page.draft = false
+      @page.live?.should == true
+    end
   end
+
+
 end
+

data/vendor/refinerycms/refinery.rb

@@ -28,7 +28,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 5
+    @build = 6
 
     class << self
       attr_reader :major, :minor, :tiny, :build

data/vendor/refinerycms/resources/features/manage_files.feature

@@ -1,4 +1,4 @@
-@files @files-manage
+@refinerycms @files @files-manage @resources @resources-manage @manage
 Feature: Manage Files
   In order to control the content on my website
   As an administrator
@@ -8,6 +8,7 @@ Feature: Manage Files
     Given I am a logged in refinery user
     And I have no files
 
+  @files-valid @valid
   Scenario: Create Valid File
     When I go to the list of files
     And I follow "Upload New File"
@@ -16,6 +17,7 @@ Feature: Manage Files
     Then the file "refinery_is_awesome.txt" should have uploaded successfully
     And I should have 1 file
 
+  @files-edit @edit
   Scenario: Edit Existing File
     When I upload the file at "refinery_is_awesome.txt"
     And I go to the list of files
@@ -25,12 +27,14 @@ Feature: Manage Files
     Then the file "beach.jpeg" should have uploaded successfully
     And I should have 1 file
 
+  @files-show @show
   Scenario: Download Existing File
     When I upload the file at "refinery_is_awesome.txt"
     And I go to the list of files
     And I follow "Download this file"
     Then I should see "http://www.refineryhq.com/"
 
+  @files-delete @delete
   Scenario: Files Delete
     When I upload the file at "refinery_is_awesome.txt"
     And I go to the list of files

data/vendor/refinerycms/resources/features/step_definitions/file_steps.rb

@@ -3,7 +3,7 @@ Given /^I have no files$/ do
 end
 
 When /^I attach the file at "([^"]*)"$/ do |file_path|
-  attach_file('resource[file]', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
+  attach_file('resource_file', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
 end
 
 Then /^the file "([^"]*)" should have uploaded successfully$/ do |file_name|
@@ -16,6 +16,6 @@ end
 
 When /^I upload the file at "([^"]*)"$/ do |file_path|
   visit new_admin_resource_path
-  attach_file('resource[file]', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
+  attach_file('resource_file', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
   click_button 'Save'
 end

data/vendor/refinerycms/resources/lib/resources.rb

@@ -5,32 +5,8 @@ require 'refinery'
 module Refinery
   module Resources
     class Engine < Rails::Engine
-      initializer 'fix-tempfile-not-closing-with-dragonfly-resources' do |app|
-        # see http://github.com/markevans/dragonfly/issues#issue/18/comment/415807
-        require 'tempfile'
-        class Tempfile
-
-          def unlink
-            # keep this order for thread safeness
-            begin
-              if File.exist?(@tmpname)
-                closed? or close
-                File.unlink(@tmpname)
-              end
-              @@cleanlist.delete(@tmpname)
-              @data = @tmpname = nil
-              ObjectSpace.undefine_finalizer(self)
-            rescue Errno::EACCES
-              # may not be able to unlink on Windows; just ignore
-            end
-          end
-
-        end
-      end
-
       initializer 'resources-with-dragonfly' do |app|
         app_resources = Dragonfly[:resources]
-        app_resources.configure_with(:rmagick)
         app_resources.configure_with(:rails) do |c|
           c.datastore.root_path = Rails.root.join('public', 'system', 'resources').to_s
           c.url_path_prefix = '/system/resources'
@@ -44,20 +20,15 @@ module Refinery
         app_resources.define_macro(ActiveRecord::Base, :resource_accessor)
         app_resources.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
 
-        # This little eval makes it so that dragonfly urls work in traditional
+        # This url_suffix makes it so that dragonfly urls work in traditional
         # situations where the filename and extension are required, e.g. lightbox.
         # What this does is takes the url that is about to be produced e.g.
-        # /system/resources/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
-        # and adds the filename onto the end (say the file was 'refinery_is_awesome.jpg')
-        # /system/resources/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
-        app_resources.instance_eval %{
-          def url_for(job, *args)
-            resource_url = nil
-            if (fetcher = job.steps.detect{|s| s.class.step_name == :fetch}).present?
-              resource_url = ['', fetcher.uid.to_s.split('/').last].join('/')
-            end
-            "\#{super}\#{resource_url}"
-          end
+        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
+        # and adds the filename onto the end (say the file was 'refinery_is_awesome.pdf')
+        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.pdf
+        # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
+        app_resources.url_suffix = proc{|job|
+          "/#{job.uid_basename}#{job.encoded_extname || job.uid_extname}"
         }
 
         ### Extend active record ###
@@ -65,7 +36,7 @@ module Refinery
         app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :resources, '/system/resources'
 
         app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
-          :verbose     => true,
+          :verbose     => Rails.env.development?,
           :metastore   => "file:#{Rails.root.join('tmp', 'dragonfly', 'cache', 'meta')}",
           :entitystore => "file:#{Rails.root.join('tmp', 'dragonfly', 'cache', 'body')}"
         }

data/vendor/refinerycms/resources/spec/models/resource_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Resource do
+
+  def reset_resource(options = {})
+    @valid_attributes = {
+      :id => 1,
+      :file => File.new(File.expand_path('../../uploads/refinery_is_awesome.txt', __FILE__))
+    }.merge(options)
+
+    @resource.destroy if @resource
+    @resource = Resource.create!(@valid_attributes)
+  end
+
+  def resource_can_be_destroyed
+    @resource.destroy.should == true
+  end
+
+  before(:each) do
+    reset_resource
+  end
+
+  context "with valid attributes" do
+    it "should create successfully" do
+      @resource.errors.empty?
+    end
+  end
+
+  context "resource url" do
+    it "should respond to .url" do
+      @resource.respond_to?(:url).should == true
+    end
+
+    it "should not support thumbnailing like images do" do
+      @resource.respond_to?(:thumbnail).should == false
+    end
+
+    it "should contain its filename at the end" do
+      @resource.url.should =~ %r{#{@resource.file_uid.split('/').last}$}
+    end
+  end
+
+
+end
+

data/vendor/refinerycms/resources/spec/uploads/refinery_is_awesome.txt

@@ -0,0 +1 @@
+http://www.refineryhq.com/

data/vendor/refinerycms/settings/app/models/refinery_setting.rb

@@ -1,5 +1,10 @@
 class RefinerySetting < ActiveRecord::Base
 
+  FORM_VALUE_TYPES = [
+    ['Multi-line', 'text_area'],
+    ['Checkbox', 'check_box']
+  ]
+
   validates :name, :presence => true
 
   serialize :value # stores into YAML format
@@ -35,6 +40,7 @@ class RefinerySetting < ActiveRecord::Base
       result = ensure_cache_exists!
 
       if name.present?
+        scoping = scoping.to_s if scoping.is_a?(Symbol)
         result = result.detect do |rs|
           rs[:name] == name.to_s.downcase.to_sym and rs[:scoping] == scoping
         end
@@ -70,19 +76,19 @@ class RefinerySetting < ActiveRecord::Base
     end
 
     def cache_key
-      "#{Refinery.base_cache_key}_refinery_settings_cache"
+      [Refinery.base_cache_key, 'refinery_settings_cache'].join('_')
     end
 
     # find_or_set offers a convenient way to
     def find_or_set(name, the_value, options={})
-      options = {:scoping => nil, :restricted => false, :callback_proc_as_string => nil}.merge(options)
-      # Try to get the value from cache first.
-      scoping = options[:scoping]
-      restricted = options[:restricted]
-      callback_proc_as_string = options[:callback_proc_as_string]
+      # Merge default options with supplied options.
+      options = {
+        :scoping => nil, :restricted => false,
+        :callback_proc_as_string => nil, :form_value_type => 'text_area'
+      }.merge(options)
 
       # try to find the setting first
-      value = cache_read(name, scoping)
+      value = get(name, :scoping => options[:scoping])
 
       # if the setting's value is nil, store a new one using the existing functionality.
       value = set(name, options.merge({:value => the_value})) if value.nil?
@@ -94,24 +100,27 @@ class RefinerySetting < ActiveRecord::Base
     alias :get_or_set :find_or_set
 
     # Retrieve the current value for the setting whose name is supplied.
-    def get(name)
-      cache_read(name)
+    def get(name, options = {})
+      options = {:scoping => nil}.update(options)
+      cache_read(name, options[:scoping])
     end
 
     alias :[] :get
 
     def set(name, value)
-      scoping = (value.is_a?(Hash) and value.has_key?(:scoping)) ? value[:scoping] : nil
+      scoping = (value[:scoping] if value.is_a?(Hash) and value.has_key?(:scoping))
       setting = find_or_initialize_by_name_and_scoping(:name => name.to_s, :scoping => scoping)
 
       # you could also pass in {:value => 'something', :scoping => 'somewhere'}
       unless value.is_a?(Hash) and value.has_key?(:value)
         setting.value = value
       else
-        setting.value = value[:value]
+        # set the value last, so that the other attributes can transform it if required.
+        setting.form_value_type = value[:form_value_type] || 'text_area' if setting.respond_to?(:form_value_type)
         setting.scoping = value[:scoping] if value.has_key?(:scoping)
         setting.callback_proc_as_string = value[:callback_proc_as_string] if value.has_key?(:callback_proc_as_string)
         setting.destroyable = value[:destroyable] if value.has_key?(:destroyable)
+        setting.value = value[:value]
       end
 
       # Save because we're in a setter method.
@@ -154,8 +163,13 @@ class RefinerySetting < ActiveRecord::Base
   end
 
   def value=(new_value)
+    # must convert "1" to true and "0" to false when supplied using 'check_box', unfortunately.
+    if ["1", "0"].include?(new_value) and self.form_value_type == 'check_box'
+      new_value = new_value == "1" ? true : false
+    end
+
     # must convert to string if true or false supplied otherwise it becomes 0 or 1, unfortunately.
-    if %w(trueclass falseclass).include?(new_value.class.to_s.downcase)
+    if [true, false].include?(new_value)
       new_value = new_value.to_s
     end
 

data/vendor/refinerycms/settings/features/manage_refinery_settings.feature

@@ -1,4 +1,4 @@
-@settings @settings-manage @refinery-settings
+@refinerycms @settings @settings-manage @refinery-settings
 Feature: Manage Refinery Settings
   In order to control the configuration of my website
   As an administrator

data/vendor/refinerycms/settings/spec/models/refinery_setting_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe RefinerySetting do
+
+  before(:each) do
+    RefinerySetting.set(:creating_from_scratch, nil)
+    RefinerySetting.set(:rspec_testing_creating_from_scratch, nil)
+  end
+
+  context "set" do
+    it "should create a setting that didn't exist" do
+      RefinerySetting.get(:creating_from_scratch, :scoping => 'rspec_testing').should == nil
+      RefinerySetting.set(:creating_from_scratch, {:value => "Look, a value", :scoping => 'rspec_testing'}).should == "Look, a value"
+    end
+
+    it "should override an existing setting" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
+      @set.should == "a value"
+
+      @new_set = RefinerySetting.set(:creating_from_scratch, {:value => "newer replaced value", :scoping => 'rspec_testing'})
+      @new_set.should == "newer replaced value"
+    end
+
+    it "should default to form_value_type text_area" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "a value", :scoping => 'rspec_testing'})
+      RefinerySetting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'}).form_value_type.should == "text_area"
+    end
+
+    it "should fix true as a value to 'true' (string)" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => true, :scoping => 'rspec_testing'})
+      RefinerySetting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should == 'true'
+      @set.should == true
+    end
+
+    it "should fix false as a value to 'false' (string)" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => false, :scoping => 'rspec_testing'})
+      RefinerySetting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should == 'false'
+      @set.should == false
+    end
+
+    it "should fix '1' as a value with a check_box form_value_type to true" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "1", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
+      RefinerySetting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should == 'true'
+      @set.should == true
+    end
+
+    it "should fix '0' as a value with a check_box form_value_type to false" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "0", :scoping => 'rspec_testing', :form_value_type => 'check_box'})
+      RefinerySetting.find_by_name(:creating_from_scratch.to_s, :conditions => {:scoping => 'rspec_testing'})[:value].should == 'false'
+      @set.should == false
+    end
+  end
+
+  context "get" do
+    it "should retrieve a seting that was created" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
+      @set.should == 'some value'
+
+      @get = RefinerySetting.get(:creating_from_scratch, :scoping => 'rspec_testing')
+      @get.should == 'some value'
+    end
+
+    it "should also work with setting scoping using string and getting via symbol" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "some value", :scoping => 'rspec_testing'})
+      @set.should == 'some value'
+
+      @get = RefinerySetting.get(:creating_from_scratch, :scoping => :rspec_testing)
+      @get.should == 'some value'
+    end
+
+    it "should also work with setting scoping using symbol and getting via string" do
+      @set = RefinerySetting.set(:creating_from_scratch, {:value => "some value", :scoping => :rspec_testing})
+      @set.should == 'some value'
+
+      @get = RefinerySetting.get(:creating_from_scratch, :scoping => 'rspec_testing')
+      @get.should == 'some value'
+    end
+  end
+
+  context "find_or_set" do
+    it "should create a non existant setting" do
+      @created = RefinerySetting.find_or_set(:creating_from_scratch, 'I am a setting being created', :scoping => 'rspec_testing')
+
+      @created.should == "I am a setting being created"
+    end
+
+    it "should not override an existing setting" do
+      @created = RefinerySetting.set(:creating_from_scratch, {:value => 'I am a setting being created', :scoping => 'rspec_testing'})
+      @created.should == "I am a setting being created"
+
+      @find_or_set_created = RefinerySetting.find_or_set(:creating_from_scratch, 'Trying to change an existing value', :scoping => 'rspec_testing')
+
+      @created.should == "I am a setting being created"
+    end
+
+    it "should work without scoping" do
+      RefinerySetting.find_or_set(:rspec_testing_creating_from_scratch, 'Yes it worked').should == 'Yes it worked'
+    end
+  end
+
+end