refinerycms 0.9.7.8 → 0.9.7.9

data/vendor/plugins/refinery/plugins.md

@@ -12,7 +12,7 @@ The Refinery generator is a standard Rails generator that functions just like th
 
 To see how to use the generator run
 
-    ruby script/generate refinery
+    ruby script/generate refinery_plugin
 
 Usage instructions should appear.
 
@@ -24,11 +24,11 @@ First decide what fields they need to manage. In our case, the client is going t
 
 So go to the root of your project and run
 
-    ruby script/generate refinery
+    ruby script/generate refinery_plugin
 
 This will output the help on how to use the generator. To generate the new section we want to manage products we run:
 
-    ruby script/generate refinery product title:string description:text facts:text
+    ruby script/generate refinery_plugin product title:string description:text image:image brochure:resource
 
 The generator will output a list of files it generated. You'll notice there is a new plugin that has been added in ``vendor/plugins/products``. This is where both the backend and front end files are held for this new products area.
 

data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb

@@ -64,7 +64,9 @@ class RefinerySetting < ActiveRecord::Base
       # if the database is not up to date yet then it won't know about certain fields.
       setting.scoping = scoping if self.column_names.include?('scoping')
       setting.restricted = restricted if self.column_names.include?('restricted')
-      setting.callback_proc_as_string = callback_proc_as_string if callback_proc_as_string.is_a?(String) && self.column_names.include?('callback_proc_as_string')
+      if callback_proc_as_string.is_a?(String) and self.column_names.include?('callback_proc_as_string')
+        setting.callback_proc_as_string = callback_proc_as_string
+      end
 
       setting.save
 
@@ -90,22 +92,29 @@ class RefinerySetting < ActiveRecord::Base
   def self.[]=(name, value)
     setting = find_or_create_by_name(name.to_s)
 
+    scoping = nil
     # 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]
-      setting.scoping = value[:scoping] if value.has_key?(:scoping) and setting.class.column_names.include?('scoping')
-      setting.callback_proc_as_string = value[:callback_proc_as_string] if value.has_key?(:callback_proc_as_string) and setting.class.column_names.include?('callback_proc_as_string')
+      if value.has_key?(:scoping) and setting.class.column_names.include?('scoping')
+        scoping, setting.scoping = value[:scoping]
+      end
+      if value.has_key?(:callback_proc_as_string) and
+         setting.class.column_names.include?('callback_proc_as_string')
+        setting.callback_proc_as_string = value[:callback_proc_as_string]
+      end
     end
 
     setting.save
-    cache_write(setting.name, setting.scoping, setting.value)
+    cache_write(setting.name, scoping, setting.value)
   end
 
-  # Below is not very nice, but seems to be required
-  # The problem is when Rails serialises a fields like booleans it doesn't retrieve it back out as a boolean
-  # it just returns a string. This code maps the two boolean values correctly so a boolean is returned
+  # Below is not very nice, but seems to be required. The problem is when Rails
+  # serialises a fields like booleans it doesn't retrieve it back out as a boolean
+  # it just returns a string. This code maps the two boolean values
+  # correctly so that a boolean is returned instead of a string.
   REPLACEMENTS = {"true" => true, "false" => false}
 
   def value
@@ -132,18 +141,25 @@ class RefinerySetting < ActiveRecord::Base
 
   def value=(new_value)
     # must convert to string if true or false supplied otherwise it becomes 0 or 1, unfortunately.
-    new_value = new_value.to_s if ["trueclass","falseclass"].include?(new_value.class.to_s.downcase)
+    if ["trueclass","falseclass"].include?(new_value.class.to_s.downcase)
+      new_value = new_value.to_s
+    end
     self[:value] = new_value
   end
 
   def callback_proc
-    eval "Proc.new{#{self.callback_proc_as_string} }" if RefinerySetting.column_names.include?('callback_proc_as_string') && self.callback_proc_as_string.present?
+    if RefinerySetting.column_names.include?('callback_proc_as_string') and
+       self.callback_proc_as_string.present?
+      eval "Proc.new{#{self.callback_proc_as_string} }"
+    end
   end
 
   private
 
   def check_restriction
-    self.restricted = false if restricted.nil?
+    if self.class.column_names.include?('restricted') and restricted.nil?
+      self.restricted = false
+    end
   end
 
 end

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb

@@ -29,8 +29,7 @@
     <%= f.label :value %>
     <%= f.text_area :value, :rows => 5, :class => 'widest' %>
   </div>
-  <input type='hidden' name='modal' value='<%= from_dialog? %>' />
-  <input type='hidden' name='dialog' value='<%= from_dialog? %>' />
+  
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => f,

data/vendor/plugins/themes/generators/refinery_theme/README

@@ -0,0 +1,17 @@
+== Refinery Theme Generator
+
+== Description
+
+Generate a new barebones Refinery theme.
+
+If you want this new theme to be the current theme used, set the "theme"
+setting in the Refinery backend to the name of this theme.
+
+== Usage
+./script/generate refinery_theme theme_name
+
+== Example
+./script/generate refinery_theme modern
+
+Results in:
+create  /themes/modern/...

data/vendor/plugins/themes/generators/refinery_theme/Rakefile

@@ -0,0 +1,11 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Generate documentation for the Refinery Theme Generator plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Refinery Theme Generator'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+end

data/vendor/plugins/themes/generators/refinery_theme/USAGE

@@ -0,0 +1,2 @@
+Usage:
+  ruby script/generate refinery_theme modern

data/vendor/plugins/themes/generators/refinery_theme/install.rb

@@ -0,0 +1,2 @@
+# install.rb
+puts IO.read(File.join(File.dirname(__FILE__), 'README'))

data/vendor/plugins/themes/generators/refinery_theme/refinery_theme_generator.rb

@@ -0,0 +1,41 @@
+class RefineryThemeGenerator < Rails::Generator::Base
+
+  def banner
+    "Usage: ruby script/generate refinery_theme theme_name"
+  end
+
+  def manifest
+    if @args[0].nil?
+      puts "You must specify a theme name."
+      puts banner
+      exit
+    end
+
+    record do |m|
+      m.directory "themes"
+      m.directory "themes/#{theme_name}"
+      m.directory "themes/#{theme_name}/javascripts"
+
+      m.directory "themes/#{theme_name}/stylesheets"
+      m.file "stylesheets/application.css", "themes/#{theme_name}/stylesheets/application.css"
+      m.file "stylesheets/formatting.css", "themes/#{theme_name}/stylesheets/formatting.css"
+      m.file "stylesheets/home.css", "themes/#{theme_name}/stylesheets/home.css"
+
+      m.directory "themes/#{theme_name}/views"
+      m.directory "themes/#{theme_name}/views/layouts"
+      m.file "views/layouts/application.html.erb", "themes/#{theme_name}/views/layouts/application.html.erb"
+
+      m.directory "themes/#{theme_name}/views/pages"
+      m.file "views/pages/show.html.erb", "themes/#{theme_name}/views/pages/show.html.erb"
+      m.file "views/pages/home.html.erb", "themes/#{theme_name}/views/pages/home.html.erb"
+
+      puts 'NOTE: If you want this new theme to be the current theme used, set the "theme"
+            setting in the Refinery backend to the name of this theme.' unless RAILS_ENV == "test"
+    end
+  end
+
+  def theme_name
+    @args[0]
+  end
+
+end

data/vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/application.css

@@ -0,0 +1,5 @@
+@import url('/stylesheets/refinery/application.css');
+/*
+    Override default refinery application CSS below.
+    Formatting applies to all frontend.
+*/

data/vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/formatting.css

@@ -0,0 +1,7 @@
+@import url('/stylesheets/refinery/formatting.css');
+/*  
+    Override default refinery formatting below. 
+    Formatting applies to backend WYSIWYG editors and all frontend. 
+    This is the best place to put your heading and text related styles
+    like colours, fonts and line-height.
+*/

data/vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/home.css

@@ -0,0 +1,5 @@
+@import url('/stylesheets/refinery/home.css');
+/* 
+    Override default refinery homepage styles here. 
+    These only apply to the homepage of your site. 
+*/

data/vendor/plugins/themes/generators/refinery_theme/templates/views/layouts/application.html.erb

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <%= render :partial => "/shared/head", :locals => {:theme => true} %>
+  <body>
+    <%= render :partial => "/shared/site_bar" %>
+    <div id='page_container'>
+      <div id='page'>
+        <%= render :partial => "/shared/ie6check" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
+        <div id='header'>
+          <%= render :partial => "/shared/header" %>
+        </div>
+        <div id='body' class='clearfix'>
+          <%= yield %>
+        </div>
+        <div id='footer'>
+          <%= render :partial => "/shared/footer" %>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

data/vendor/plugins/themes/generators/refinery_theme/templates/views/pages/home.html.erb

@@ -0,0 +1,4 @@
+<%# For the best way to modify this page with your own markup read %>
+<%# http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/readme.md %>
+
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/themes/generators/refinery_theme/templates/views/pages/show.html.erb

@@ -0,0 +1,4 @@
+<%# For the best way to modify this page with your own markup read %>
+<%# http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/readme.md %>
+
+<%= render :partial => "/shared/content_page" %>

data/vendor/plugins/themes/rails/init.rb

@@ -1,6 +1,5 @@
 # Set up middleware to serve theme files
 config.middleware.use "ThemeServer"
-
 ::Refinery::ApplicationController.module_eval do
 
   # Add or remove theme paths to/from Refinery application

data/vendor/plugins/themes/readme.md

@@ -45,7 +45,8 @@ Let's take the ``mytheme`` example theme shown above. This is how the theme is s
             |    |- index.html.erb
             |- layouts
                  |- application.html.erb
-             
+
+   
 ### Images
 
 Usually this would be just what you have in ``public/images`` except we move that to the theme instead.
@@ -64,7 +65,11 @@ This is exactly the same as how you lay your views out in ``app/views/`` just in
 
 ## How do I make my own Theme?
 
-Create a folder with the name if your theme inside ``/themes`` e.g. ``/themes/mytheme`` and follow the directory structure outlined in 'The structure of a Theme'.
+Simply use the Theme generator to make the basic structure of a new theme.
+
+    ruby script/generate refinery_theme name_of_theme
+
+Don't forgot to "activate" this new theme by setting the theme setting to the name of this new theme.
 
 ## How do I select which Theme Refinery should use?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 8
-  version: 0.9.7.8
+  - 9
+  version: 0.9.7.9
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +12:00
+date: 2010-07-30 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -91,7 +91,6 @@ files:
 - db/migrate/20100525084518_remove_take_down_for_maintenance_page.rb
 - db/migrate/20100525110237_add_small_and_large_thumbnail_sizes.rb
 - db/migrate/20100530205942_update_link_url_on_pages_from_inquiries_new_to_contact.rb
-- db/migrate/20100606173919_create_page_translations.rb
 - db/migrate/20100608062447_add_scoping_to_refinery_settings.rb
 - db/migrate/20100623220402_add_restricted_to_refinery_settings.rb
 - db/migrate/20100624024501_add_roles.rb
@@ -99,11 +98,13 @@ files:
 - db/migrate/20100701053151_remove_superuser_from_users.rb
 - db/migrate/20100702022630_add_spam_to_inquiries.rb
 - db/migrate/20100708014636_ensure_user_plugins_use_name_and_not_title.rb
+- db/migrate/20100729221735_remove_page_translations_if_present.rb
 - db/schema.rb
 - db/seeds/inquiry_settings.rb
 - db/seeds/pages.rb
 - db/seeds/refinery_settings.rb
 - db/seeds.rb
+- features/refinery/create_inquiries.feature
 - features/refinery/dashboard.feature
 - features/refinery/manage_files.feature
 - features/refinery/manage_images.feature
@@ -111,15 +112,27 @@ files:
 - features/refinery/manage_pages.feature
 - features/refinery/manage_refinery_settings.feature
 - features/refinery/manage_users.feature
+- features/refinery/plugin_generator.feature
 - features/refinery/site_bar.feature
+- features/refinery/theme_generator.feature
 - features/step_definitions/refinery/core_steps.rb
+- features/step_definitions/refinery/file_steps.rb
+- features/step_definitions/refinery/generator_steps.rb
+- features/step_definitions/refinery/image_steps.rb
+- features/step_definitions/refinery/inquiry_steps.rb
 - features/step_definitions/refinery/page_steps.rb
+- features/step_definitions/refinery/plugin_generator_steps.rb
+- features/step_definitions/refinery/theme_generator_steps.rb
 - features/step_definitions/refinery/user_steps.rb
 - features/step_definitions/web_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
 - features/support/negative_expectations_helper.rb
 - features/support/paths.rb
+- features/uploads/beach.INVALID
+- features/uploads/beach.jpeg
+- features/uploads/id-rather-be-here.jpg
+- features/uploads/refinery_is_awesome.txt
 - lib/gemspec.rb
 - lib/refinery_initializer.rb
 - lib/tasks/cucumber.rake
@@ -710,6 +723,7 @@ files:
 - vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb
 - vendor/plugins/dashboard/app/views/admin/dashboard/_recent_inquiries.html.erb
 - vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb
+- vendor/plugins/dashboard/app/views/admin/dashboard/index.rss.builder
 - vendor/plugins/dashboard/config/locales/da.yml
 - vendor/plugins/dashboard/config/locales/de.yml
 - vendor/plugins/dashboard/config/locales/en.yml
@@ -957,30 +971,31 @@ files:
 - vendor/plugins/refinery/config/routes.rb
 - vendor/plugins/refinery/crud.md
 - vendor/plugins/refinery/lib/crud.rb
-- vendor/plugins/refinery/lib/generators/refinery/install.rb
-- vendor/plugins/refinery/lib/generators/refinery/Rakefile
-- vendor/plugins/refinery/lib/generators/refinery/README
 - vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/en.yml
-- vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nb.yml
-- vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nl.yml
-- vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/MIGRATE
-- vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/model.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/rails/init.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/seed.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/edit.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/USAGE
+- vendor/plugins/refinery/lib/generators/refinery_plugin/install.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/Rakefile
+- vendor/plugins/refinery/lib/generators/refinery_plugin/README
+- vendor/plugins/refinery/lib/generators/refinery_plugin/refinery_plugin_generator.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/config/locales/en.yml
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/config/locales/nb.yml
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/config/locales/nl.yml
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/config/routes.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/controller.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/MIGRATE
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/migration.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/model.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/public_controller.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/rails/init.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/seed.rb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/_form.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/_singular_name.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/_sortable_list.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/edit.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/index.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/admin/new.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/index.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/templates/views/show.html.erb
+- vendor/plugins/refinery/lib/generators/refinery_plugin/USAGE
 - vendor/plugins/refinery/lib/refinery/activity.rb
 - vendor/plugins/refinery/lib/refinery/admin_base_controller.rb
 - vendor/plugins/refinery/lib/refinery/application_controller.rb
@@ -1049,6 +1064,17 @@ files:
 - vendor/plugins/resources/rails/init.rb
 - vendor/plugins/resources/readme.md
 - vendor/plugins/themes/app/helpers/themes_helper.rb
+- vendor/plugins/themes/generators/refinery_theme/install.rb
+- vendor/plugins/themes/generators/refinery_theme/Rakefile
+- vendor/plugins/themes/generators/refinery_theme/README
+- vendor/plugins/themes/generators/refinery_theme/refinery_theme_generator.rb
+- vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/application.css
+- vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/formatting.css
+- vendor/plugins/themes/generators/refinery_theme/templates/stylesheets/home.css
+- vendor/plugins/themes/generators/refinery_theme/templates/views/layouts/application.html.erb
+- vendor/plugins/themes/generators/refinery_theme/templates/views/pages/home.html.erb
+- vendor/plugins/themes/generators/refinery_theme/templates/views/pages/show.html.erb
+- vendor/plugins/themes/generators/refinery_theme/USAGE
 - vendor/plugins/themes/lib/theme.rb
 - vendor/plugins/themes/lib/theme_server.rb
 - vendor/plugins/themes/rails/init.rb

data/db/migrate/20100606173919_create_page_translations.rb

@@ -1,12 +0,0 @@
-class CreatePageTranslations < ActiveRecord::Migration
-  def self.up
-    create_table :page_translations do |t|
-      t.references :page
-      t.string :custom_title
-      t.string :meta_keywords
-    end
-  end
-
-  def self.down
-  end
-end