refinerycms 0.9.8.5 → 0.9.8.6

data/vendor/refinerycms/core/public/stylesheets/refinery/refinery.css

@@ -17,7 +17,7 @@ body {
   font-size: 10px;
   font-family: Verdana;
   line-height: 1.5em;
-  background: black url('/images/refinery/page_bg.png') repeat;
+  background: #303030 url('/images/refinery/page_bg.png') repeat;
 }
 acronym {
   cursor: help;
@@ -43,6 +43,7 @@ label[for] {
 }
 #dialog_container #content .field, .dialog_container .field {
   width: auto;
+  margin:5px 0;
 }
 input.widest, textarea.widest {
   width: 99%;
@@ -231,7 +232,7 @@ body.login #site_bar_content a#site_bar_refinery_cms_logo {
   font-size: 20px;
   line-height:22px
 }
-body.login #page_container div.remember_me label {
+body.login #page_container div.remember_me label, label.inline {
   display: inline;
 }
 body.login #page_container div.actions {
@@ -267,13 +268,13 @@ body.login label, body.login a {
 body.login #flash_container, body.login .errorExplanation {
   margin-bottom: 12px;
 }
-div.field.plugin_access ul#plugins li {
+div.field.checkbox_access ul.checkboxes li {
   margin-top: 3px;
 }
-div.field.plugin_access {
+div.field.checkbox_access {
   margin-top: 20px;
 }
-div.field.plugin_access .label_with_help a {
+div.field.checkbox_access .label_with_help a {
   font-weight: normal;
 }
 /* Works in Firefox, Safari, Chrome, IE8+ */
@@ -488,6 +489,9 @@ header p {
   padding: 4px 0 0 40px;
   background: url('/images/refinery/branch.gif') no-repeat 15px 0px;
 }
+#records.tree li.record ul {
+  margin-left: 0;
+}
 #records.tree .on-hover, #pagination ul.tree a:hover, #pagination .tree .on {
   background: url('/images/refinery/branch.gif') no-repeat 15px 0px;
 }
@@ -731,18 +735,18 @@ label.stripped {
 .brown_border {
   border: 1px solid #99998B;
 }
-#inquiry {
+#inquiry, .inquiry {
   border-collapse: collapse;
   width: 100%;
 }
-#inquiry td {
+#inquiry td, .inquiry td {
   border-bottom: 1px solid #CCCCCC;
   padding: 7px;
 }
-#inquiry tr:last-child td {
+#inquiry tr:last-child td, .inquiry tr:last-child td {
   border-bottom: 0px;
 }
-#inquiry td label.stripped {
+#inquiry td label.stripped, .inquiry td label.stripped {
   font-weight: bold;
 }
 body.dialog {
@@ -786,6 +790,9 @@ body.dialog form {
   height: 300px;
   padding: 12px;
 }
+.dialog #existing_image_area_content {
+  margin-top: 28px;
+}
 .dialog #existing_image_area_content ul {
   margin: 0px;
   padding: 0px;
@@ -866,6 +873,7 @@ body.dialog form {
 }
 #dialog_main #pages_list {
   width: 100%;
+  padding-bottom: 40px;
 }
 #dialog_main #pages_list ul {
   margin: 0px 12px 0px 12px;
@@ -1106,6 +1114,11 @@ a#toggle_advanced_options:hover {
 #content .form-actions .form-actions-right, .wym_dialog .form-actions .form-actions-right, .ui-dialog .form-actions .form-actions-right {
   right: 10px;
 }
+#content .form-actions .save-loader {
+  position: absolute;
+  right: -24px;
+  top: 4px;
+}
 .wym_dialog .form-actions, .ui-dialog .form-actions {
   border: 0px none;
   border-top: 1px solid #E8E8E8;
@@ -1126,6 +1139,12 @@ a#toggle_advanced_options:hover {
 #dialog_container.dialog.iframed #content .form-actions {
   position: fixed;
 }
+body.dialog #content .search_form {
+  float: right;
+  width: auto !important;
+  min-width: 300px;
+  margin-bottom: 0px;
+}
 #existing_image_area {
   padding-top:6px;
 }
@@ -1178,11 +1197,19 @@ ul#image_grid li p {
 ul#image_grid li span.actions {
   width: 100%;
 }
-ul#plugins {
+#content form.edit_image {
+  width: 70%;
+  float: left;
+}
+#content #existing_image {
+  float: right;
+  width: 25%;
+}
+ul.checkboxes {
   margin: 0px;
   padding: 0px;
 }
-ul#plugins li {
+ul.checkboxes li {
   list-style: none;
 }
 .label_inline_with_link label {
@@ -1198,7 +1225,7 @@ ul#plugins li {
 .label_inline_with_link a img {
   vertical-align: middle;
 }
-#remove_picked_image {
+.remove_picked_image {
   margin-top:8px;
   display:inline-block;
   width:auto;
@@ -1378,6 +1405,12 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 
 #other_locales li:first-child {
   margin-top: 0px;
+}  
+
+/* dubiously in here */
+.current_image_link {
+  display: inline-block;
+  width: auto;
 }
 
 /* cornering */
@@ -1430,3 +1463,38 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
 }
+
+/* Internet Explorer to follow: */
+/* IE 7 */
+.ie7 #content .form-actions .form-actions-left a.button {
+  height: 19px;
+  line-height: 19px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+.ie7 .search_form input.button {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+.ie7 body.login .field input.larger, .ie7 body.login .field input.larger:focus {
+  background-image: none !important;
+  padding: 0px;
+  line-height: 30px;
+}
+.ie7 .pagination a, .ie7 #content .pagination a, .ie7 .pagination .current, .ie7 .disabled, .ie7 .pagination em {
+  padding-bottom: 6px;
+}
+.ie7 .pt-BR #search {
+  width: 177px;
+}
+.ie7 .en #search {
+  width: 200px;
+}
+
+/* IE 8 */
+.ie8 body.login .field input.larger, .ie8 body.login .field input.larger:focus {
+  line-height: 30px;
+}
+.ie8 .pagination a, .ie8 #content .pagination a, .ie8 .pagination .current, .ie8 .disabled, .ie8 .pagination em {
+  padding-bottom: 6px;
+}

data/vendor/refinerycms/dashboard/features/dashboard.feature

@@ -1,4 +1,4 @@
-@dashboard
+@refinerycms @dashboard
 Feature: Dashboard
   In order to see recent changes to my website
   As an administrator
@@ -35,10 +35,12 @@ Feature: Dashboard
     When I follow "See home page"
     Then I should be on the home page
 
+  @i18n
   Scenario: Translation options available
     When I go to the Dashboard
     Then I should see "English Change Language"
 
+  @i18n
   Scenario: Change Language to Slovenian and back to English
     When I go to the dashboard
     And I follow "English Change Language"

data/vendor/refinerycms/images/features/support/factories.rb

@@ -0,0 +1,5 @@
+require 'factory_girl'
+
+Factory.define :image do |i|
+  i.image File.new(File.expand_path('../../uploads/beach.jpeg', __FILE__))
+end

data/vendor/refinerycms/images/lib/images.rb

@@ -5,32 +5,9 @@ require 'refinery'
 module Refinery
   module Images
     class Engine < Rails::Engine
-      initializer 'fix-tempfile-not-closing-with-dragonfly-images' 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 'images-with-dragonfly' do |app|
         app_images = Dragonfly[:images]
-        app_images.configure_with(:rmagick)
+        app_images.configure_with(:imagemagick)
         app_images.configure_with(:rails) do |c|
           c.datastore.root_path = Rails.root.join('public', 'system', 'images').to_s
           c.url_path_prefix = '/system/images'
@@ -42,23 +19,18 @@ module Refinery
         app_images.configure_with(:heroku, ENV['S3_BUCKET']) if Refinery.s3_backend
 
         app_images.define_macro(ActiveRecord::Base, :image_accessor)
-        app_images.analyser.register(Dragonfly::Analysis::RMagickAnalyser)
+        app_images.analyser.register(Dragonfly::Analysis::ImageMagickAnalyser)
         app_images.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/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
         # and adds the filename onto the end (say the image was 'refinery_is_awesome.jpg')
         # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
-        app_images.instance_eval %{
-          def url_for(job, *args)
-            image_url = nil
-            if (fetcher = job.steps.detect{|s| s.class.step_name == :fetch}).present?
-              image_url = ['', fetcher.uid.to_s.split('/').last].join('/')
-            end
-            "\#{super}\#{image_url}"
-          end
+        # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
+        app_images.url_suffix = proc{|job|
+          "/#{job.uid_basename}#{job.encoded_extname || job.uid_extname}"
         }
 
         ### Extend active record ###
@@ -66,7 +38,7 @@ module Refinery
         app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images, '/system/images'
 
         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/images/spec/models/image_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Image do
+
+  def reset_image(options = {})
+    @valid_attributes = {
+      :id => 1,
+      :image => File.new(File.expand_path('../../uploads/beach.jpeg', __FILE__))
+    }.merge(options)
+
+    @image.destroy if @image
+    @image = Image.create!(@valid_attributes)
+  end
+
+  def image_can_be_destroyed
+    @image.destroy.should == true
+  end
+
+  before(:each) do
+    reset_image
+  end
+
+  context "with valid attributes" do
+    it "should create successfully" do
+      @image.errors.empty?
+    end
+  end
+
+  context "image url" do
+    it "should respond to .thumbnail" do
+      @image.respond_to?(:thumbnail).should == true
+    end
+
+    it "should contain its filename at the end" do
+      @image.thumbnail(nil).url.should =~ %r{#{@image.image_uid.split('/').last}$}
+    end
+
+    it "should be different when supplying geometry" do
+      @image.thumbnail(nil).url.should_not == @image.thumbnail('200x200').url
+    end
+
+    it "should have different urls for each geometry string" do
+      @image.thumbnail('200x200').url.should_not == @image.thumbnail('200x201').url
+    end
+
+  end
+
+
+end
+

data/vendor/refinerycms/pages/features/manage_pages.feature

@@ -1,4 +1,4 @@
-@pages @pages-manage
+@refinerycms @pages @pages-manage
 Feature: Manage Pages
   In order to control the content on my website
   As an administrator

data/vendor/refinerycms/pages/features/step_definitions/page_steps.rb

@@ -1,11 +1,15 @@
-Given /^I (only )?have a page titled "([^"]*)" with a custom url "([^"]*)"?$/ do |only, title, link_url|
+Given /^I (only )?have a page titled "?([^\"]*)"? with a custom url "?([^\"]*)"?$/ do |only, title, link_url|
   Page.delete_all if only
 
   Page.create(:title => title,
               :link_url => link_url)
 end
 
-Given /^I (only )?have pages titled "?([^"]*)"?$/ do |only, titles|
+Given /^the page titled "?([^\"]*)"? has a menu match "?([^\"]*)"?$/ do |title, menu_match|
+  Page.find_by_title(title).update_attribute(:menu_match, menu_match)
+end
+
+Given /^I (only )?have pages titled "?([^\"]*)"?$/ do |only, titles|
   Page.delete_all if only
   titles.split(', ').each do |title|
     Page.create(:title => title)
@@ -16,7 +20,7 @@ Given /^I have no pages$/ do
   Page.delete_all
 end
 
-Given /^I (only )?have a page titled "([^"]*)"$/ do |only, title|
+Given /^I (only )?have a page titled "?([^\"]*)"?$/ do |only, title|
   Page.delete_all if only
   PagePart.delete_all if only
   page = Page.create(:title => title)
@@ -24,6 +28,18 @@ Given /^I (only )?have a page titled "([^"]*)"$/ do |only, title|
   page
 end
 
+Given /^the page titled "?([^\"]*)"? is a child of "?([^\"]*)"?$/ do |title, parent_title|
+  Page.find_by_title(title).update_attribute(:parent, Page.find_by_title(parent_title))
+end
+
+Given /^the page titled "?([^\"]*)"? is not shown in the menu$/ do |title|
+  Page.find_by_title(title).update_attribute(:show_in_menu, false)
+end
+
+Given /^the page titled "?([^\"]*)"? is draft$/ do |title|
+  Page.find_by_title(title).update_attribute(:draft, true)
+end
+
 Then /^I should have ([0-9]+) pages?$/ do |count|
   Page.count.should == count.to_i
 end

data/vendor/refinerycms/pages/features/support/paths.rb

@@ -10,7 +10,15 @@ module NavigationHelpers
         when /the new page form/
           new_admin_page_path
         else
-          nil
+          begin
+            if page_name =~ /the page titled "?([^\"]*)"?/ and (page = Page.find_by_title($1)).present?
+              self.url_for(page.url)
+            else
+              nil
+            end
+          rescue
+            nil
+          end
         end
       end
     end

data/vendor/refinerycms/pages/features/visit_pages.feature

@@ -0,0 +1,45 @@
+@refinerycms @pages @pages-visit @visit-pages
+Feature: Visit Pages
+  In order to view the content on this website
+  As a visitor
+  I want to view pages
+
+  Background:
+    Given A Refinery user exists
+    And I have a page titled "Home" with a custom url "/"
+    And I have a page titled "About"
+    And I have a page titled "ä ö ü spéciål chåråctÉrs"
+    And I have a page titled "Hidden"
+    And the page titled "Hidden" is a child of Home
+    And the page titled "Hidden" is not shown in the menu
+
+  Scenario: Home Page
+    When I go to the home page
+    Then I should see "Home"
+    And I should see "About"
+    And I should see "Home" within ".selected"
+
+  Scenario: Content Page
+    When I go to the page titled "About"
+    Then I should see "Home"
+    And I should see "About"
+    And I should see "About" within ".selected > a"
+
+  Scenario: Special Characters Title
+    When I go to the page titled "ä ö ü spéciål chåråctÉrs"
+    Then I should see "Home"
+    And I should see "About"
+    And I should see "ä ö ü spéciål chåråctÉrs"
+
+  Scenario: Special Characters Title as submenu page
+    Given the page titled "ä ö ü spéciål chåråctÉrs" is a child of About
+    When I go to the page titled "ä ö ü spéciål chåråctÉrs"
+    Then I should see "Home"
+    And I should see "About"
+    And I should see "ä ö ü spéciål chåråctÉrs"
+
+  Scenario: Hidden Page
+    When I go to the page titled "Hidden"
+    Then I should see "Home"
+    And I should see "About"
+    And I should see "Home" within ".selected > a"