radiant 0.8.0 → 0.8.1

data/spec/lib/radiant/extension_spec.rb

@@ -41,6 +41,34 @@ describe Radiant::Extension do
     Radiant::Extension.route_definitions.first.should == my_block
   end
 
+  it "should expose configuration object" do
+    SuperExtension.extension_config do |config|
+      config.should eql(Rails.configuration)
+    end
+  end
+
+  describe ".extension_enabled?" do
+    it "should be false if extension does not exist" do
+      BasicExtension.extension_enabled?(:bogus).should be_false
+    end
+
+    it "should be false if extension is inactive" do
+      OverridingExtension.active = false
+      BasicExtension.extension_enabled?(:overriding).should be_false
+    end
+
+    it "should be false if extension is not migrated" do
+      UpgradingExtension.migrator.new(:up, UpgradingExtension.migrations_path).pending_migrations.should_not be_empty # sanity check
+      BasicExtension.extension_enabled?(:upgrading).should be_false
+    end
+
+    it "should be true if extension is defined and migrated" do
+      ActiveRecord::Migration.suppress_messages do
+        UpgradingExtension.migrator.migrate
+      end
+      BasicExtension.extension_enabled?(:upgrading).should be_true
+    end
+  end
 end
 
 describe Radiant::Extension, "when inactive" do

data/spec/lib/radiant/initializer_spec.rb

@@ -47,6 +47,29 @@ describe Radiant::Configuration do
   it "should have access to the AdminUI" do
     @configuration.admin.should == Radiant::AdminUI.instance
   end
+
+  it "should initialize extension dependencies" do
+    @configuration.extension_dependencies.should eql([])
+  end
+
+  it "should add extension dependencies" do
+    @configuration.extension('basic')
+    @configuration.extension_dependencies.should eql(['basic'])
+  end
+
+  it "should validate dependencies" do
+    @configuration.extensions = [BasicExtension]
+    @configuration.extension('basic')
+    @configuration.check_extension_dependencies.should be_true
+  end
+
+  it "should report missing dependencies" do
+    @configuration.extensions = [BasicExtension]
+    @configuration.extension('does_not_exist')
+    lambda {
+      @configuration.check_extension_dependencies
+    }.should raise_error(SystemExit)
+  end
 end
 
 describe Radiant::Initializer do
@@ -94,4 +117,15 @@ describe Radiant::Initializer do
   it "should have access to the AdminUI" do
     @initializer.admin.should == Radiant::AdminUI.instance
   end
+
+  it "should load metal from RADIANT_ROOT and exensions" do
+    Rails::Rack::Metal.metal_paths.should == ["#{RADIANT_ROOT}/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/metal"]
+  end
+
+  it "should check dependent extensions" do
+    @initializer.configuration.frameworks = [] # ActionMailer not loaded at this point
+    @initializer.configuration.should_receive(:check_extension_dependencies)
+    @initializer.after_initialize
+  end
+
 end

data/spec/lib/task_support_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe TaskSupport do
+  describe "self.config_export" do
+    before do
+      @yaml_file = "#{Rails.root}/tmp/config/radiant_config.yml"
+      FileUtils.rm_rf(File.dirname(@yaml_file))
+      Radiant::Config['test_data'] = 'test string'
+      File.exist?(@yaml_file).should be_false
+    end
+    it "should create a YAML file in config/radiant_config.yml" do
+      TaskSupport.config_export(@yaml_file)
+      File.exist?(@yaml_file).should be_true
+    end
+    it "should create YAML equal to Radiant::Config.to_hash" do
+      TaskSupport.config_export(@yaml_file)
+      YAML.load_file(@yaml_file).should == Radiant::Config.to_hash.to_yaml
+    end
+  end
+  describe "self.config_import" do
+    before do
+      @yaml_file = "#{RADIANT_ROOT}/spec/fixtures/radiant_config.yml"
+    end
+    it "should delete all Radiant::Config when the clear parameter is set to true" do
+      Radiant::Config['testing_clear'] = 'true'
+      TaskSupport.config_import(@yaml_file, true)
+      Radiant::Config['testing_clear'].should be_nil
+    end
+    it "should load from the given YAML path" do
+      @yaml = "--- \ndefaults.page.parts: body, extended\n"
+      @hash = {}
+      YAML.stub!(:load_file).and_return(@yaml)
+      YAML.should_receive(:load).with(@yaml).and_return(@hash)
+      TaskSupport.config_import(@yaml_file)
+    end
+    it "should update Radiant::Config with the settings from the given YAML" do
+      Radiant::Config.delete_all
+      TaskSupport.config_import(@yaml_file)
+      Radiant::Config.to_hash.should == YAML.load(YAML.load_file(@yaml_file))
+    end
+  end
+end

data/spec/models/page_spec.rb

@@ -184,7 +184,7 @@ describe Page do
     @page.status_id = Status[:published].id
     @page.save
     @page.published_at.should_not be_nil
-    @page.published_at.day.should == Time.now.day
+    @page.published_at.utc.day.should == Time.now.utc.day
   end
 
   it 'should not update published_at when already published' do
@@ -514,7 +514,7 @@ describe Page, "class which is applied to a page but not defined" do
   dataset :pages
 
   before :each do
-    eval(%Q{class ClassNotDefinedPage < Page; def self.missing?; false end end}, TOPLEVEL_BINDING)
+    Object.send(:const_set, :ClassNotDefinedPage, Class.new(Page){ def self.missing?; false end })
     create_page "Class Not Defined", :class_name => "ClassNotDefinedPage"
     Object.send(:remove_const, :ClassNotDefinedPage)
     Page.load_subclasses
@@ -531,6 +531,10 @@ describe Page, "class which is applied to a page but not defined" do
   it "should adjust the display name to indicate that the page type is not installed" do
     ClassNotDefinedPage.display_name.should match(/not installed/)
   end
+  
+  after :each do
+    Object.send(:remove_const, :ClassNotDefinedPage)
+  end
 end
 
 describe Page, "class find_by_url" do

data/spec/models/radiant/config_spec.rb

@@ -2,10 +2,14 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe Radiant::Config do
   before :each do
+    Radiant::Config.initialize_cache
     @config = Radiant::Config
     set('test', 'cool')
     set('foo', 'bar')
   end
+  after :each do 
+    Radiant::Cache.clear
+  end
 
   describe "before the table exists, as in case of before bootstrap" do
     before :each do
@@ -22,6 +26,43 @@ describe Radiant::Config do
       @config['test'] = 'cool'
     end
   end
+  
+  it "should create a cache of all records in a hash with Radiant::Config.initialize_cache" do
+    Rails.cache.read('Radiant::Config').should == Radiant::Config.to_hash
+  end
+  
+  it "should recreate the cache after a record is saved" do
+    Radiant::Config.create!(:key => 'cache', :value => 'true')
+    Rails.cache.read('Radiant::Config').should == Radiant::Config.to_hash
+  end
+  
+  it "should update the mtime on the cache file after a record is saved" do
+    FileUtils.should_receive(:mkpath).with("#{Rails.root}/tmp").at_least(:once)
+    FileUtils.should_receive(:touch).with(Rails.cache.read('Radiant.cache_file'))
+    Radiant::Config['mtime'] = 'now'
+  end
+  
+  it "should record the cache file mtime when the cache is initialized" do
+    Radiant::Config.initialize_cache
+    Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Rails.cache.fetch('Radiant.cache_file'))
+  end
+  
+  it "should create a cache file when initializing the cache" do
+    Radiant::Cache.clear
+    cache_file = File.join(Rails.root,'tmp','radiant_config_cache.txt')
+    FileUtils.rm_rf(cache_file) if File.exist?(cache_file)
+    Radiant::Config.initialize_cache
+    File.file?(cache_file).should be_true
+  end
+  
+  it "should find the value in the cache with []" do
+    Radiant::Config['test'].should === Rails.cache.read('Radiant::Config')['test']
+  end
+  
+  it "should set the value in the database with []=" do
+    Radiant::Config['new-db-key'] = 'db-value'
+    Radiant::Config.find_by_key('new-db-key').value.should == 'db-value'
+  end
 
   it "should return the value of a key with the bracket accessor" do
     @config['test'].should == 'cool'
@@ -68,6 +109,6 @@ describe Radiant::Config do
   def set(key, value)
     setting = Radiant::Config.find_by_key(key)
     setting.destroy if setting
-    Radiant::Config.new(:key => key, :value => value).save
+    Radiant::Config.create!(:key => key, :value => value)
   end
 end

data/spec/models/standard_tags_spec.rb

@@ -479,8 +479,8 @@ describe "Standard Tags" do
       end
     end
 
-    it "should use the configured local timezone" do
-      Radiant::Config["local.timezone"] = "Tokyo"
+    it "should use the currently set timezone" do
+      Time.zone = "Tokyo"
       format = "%H:%m"
       expected = page.published_at.in_time_zone(ActiveSupport::TimeZone['Tokyo']).strftime(format)
       page.should render(%Q(<r:date format="#{format}" />) ).as(expected)

data/test/fixtures/extensions/01_basic/app/metal/basic_metal.rb

@@ -0,0 +1,9 @@
+class BasicMetal
+  def self.call(env)
+    if env["PATH_INFO"] =~ /^\/basic-metal/
+      [200, {"Content-Type" => 'text/html'}, ['Extension with Metal!']]
+    else
+      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+    end
+  end
+end

data/test/fixtures/extensions/02_overriding/app/metal/basic_metal.rb

@@ -0,0 +1,9 @@
+class BasicMetal
+  def self.call(env)
+    if env["PATH_INFO"] =~ /^\/basic-metal/
+      [200, {"Content-Type" => 'text/html'}, ['Overriding Extension with Metal!']]
+    else
+      [404, {"Content-Type" => "text/html"}, ["Not Found"]]
+    end
+  end
+end

data/vendor/extensions/textile_filter/textile.html

@@ -1,4 +1,4 @@
-<p>Many people prefer <a href="http://textism.com/tools/textile/" target="_blank">Textile</a>
+<p>Many people prefer <a href="http://en.wikipedia.org/wiki/Textile_(markup_language)" target="_blank">Textile</a>
   over standard HTML because it is less verbose. Textile is very similar
   to plain text, but there are a few additional enhancements to make it
   suitable for hypertext documents.</p>
@@ -111,5 +111,5 @@ Textile is nice, and so are you!</pre>
 
 <p>Advanced users may want to play around with the official
   <a href="http://textism.com/tools/textile/" target="_blank">Textile Dingus</a> or review 
-  <a href="http://hobix.com/textile/" target="_blank">Why the Lucky Stiff&#8217;s Textile
+  the <a href="http://redcloth.org/textile/" target="_blank">RedCloth Textile
   Reference</a>.</p>

data/vendor/plugins/dataset/CHANGELOG

@@ -1,12 +1,13 @@
 *1.3.0 [Rails 2.3.2] (??)
 
 * Supporting Rails 2.3.2 [mhawkins, underlog]
+* Added tasks to load path so folks can require 'dataset.rake' [aiwilliams]
+* Updated gemspec to include dependencies [aiwilliams]
 
 *1.2.0 [Cucumber] (April 8, 2009)
 
 * Support for cucumber [jgarber, seancribbs]
 
-
 *1.1.0 [STI, belongs_to] (February 14, 2009)
 
 * STI is better supported for inserting, naming and finding records [aiwilliams]

data/vendor/plugins/dataset/Rakefile

@@ -19,6 +19,9 @@ begin
     s.summary = 'A simple API for creating and finding sets of data in your database, built on ActiveRecord.'
     s.email = 'adam@thewilliams.ws'
     s.files = FileList["[A-Z]*", "{lib,tasks}/**/*", "plugit/descriptor.rb"].exclude("tmp")
+    s.require_paths = ["lib", "tasks"]
+    s.add_dependency('activesupport', '>= 2.3.0')
+    s.add_dependency('activerecord', '>= 2.3.0')
     s.homepage = "http://github.com/aiwilliams/dataset"
     s.description = s.summary
     s.authors = ['Adam Williams']

data/vendor/plugins/dataset/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 3
-:patch: 0
+:patch: 1
 :major: 1
+:minor: 3

data/vendor/plugins/dataset/dataset.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dataset}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Williams"]
-  s.date = %q{2009-04-14}
+  s.date = %q{2009-06-12}
   s.description = %q{A simple API for creating and finding sets of data in your database, built on ActiveRecord.}
   s.email = %q{adam@thewilliams.ws}
   s.files = ["CHANGELOG", "LICENSE", "Rakefile", "README", "TODO", "VERSION.yml", "lib/dataset", "lib/dataset/base.rb", "lib/dataset/collection.rb", "lib/dataset/database", "lib/dataset/database/base.rb", "lib/dataset/database/mysql.rb", "lib/dataset/database/postgresql.rb", "lib/dataset/database/sqlite3.rb", "lib/dataset/extensions", "lib/dataset/extensions/cucumber.rb", "lib/dataset/extensions/rspec.rb", "lib/dataset/extensions/test_unit.rb", "lib/dataset/instance_methods.rb", "lib/dataset/load.rb", "lib/dataset/record", "lib/dataset/record/fixture.rb", "lib/dataset/record/meta.rb", "lib/dataset/record/model.rb", "lib/dataset/resolver.rb", "lib/dataset/session.rb", "lib/dataset/session_binding.rb", "lib/dataset/version.rb", "lib/dataset.rb", "tasks/dataset.rake", "plugit/descriptor.rb"]
   s.homepage = %q{http://github.com/aiwilliams/dataset}
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "tasks"]
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{A simple API for creating and finding sets of data in your database, built on ActiveRecord.}
 
@@ -20,8 +20,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.3.0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.3.0"])
   end
 end

data/vendor/plugins/dataset/lib/dataset.rb

@@ -1,3 +1,6 @@
+require 'activesupport'
+require 'activerecord'
+
 require 'dataset/version'
 require 'dataset/instance_methods'
 require 'dataset/base'

data/vendor/radius/lib/radius.rb

@@ -210,6 +210,11 @@ module Radius
     def render(tag, attributes = {}, &block)
       @context.render_tag(tag, attributes, &block)
     end
+    
+    # Shortcut for accessing tag.attr[key]
+    def [](key)
+      attr[key]
+    end
   end
   
   #

data/vendor/radius/test/radius_test.rb

@@ -197,6 +197,12 @@ class RadiusParserTest < Test::Unit::TestCase
     define_tag('hello') { |tag| tag.render('test', tag.attr) }
     assert_parse_output 'Hello John!', '<r:hello name="John" />'
   end
+  
+  def test_accessing_tag_attributes_through_tag_indexer
+    define_tag('test') { |tag| "Hello #{tag['name']}!" }
+    assert_parse_output 'Hello John!', '<r:test name="John" />'
+  end
+  
   def test_parse_tag__binding_render_tag_with_block
     define_tag('test') { |tag| "Hello #{tag.expand}!" }
     define_tag('hello') { |tag| tag.render('test') { tag.expand } }

data/vendor/rails/actionmailer/CHANGELOG

@@ -1,3 +1,11 @@
+*2.3.4 (September 4, 2009)*
+
+* Minor bug fixes.
+
+*2.3.3 (July 12, 2009)*
+
+* No changes, just a version bump.
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]

data/vendor/rails/actionmailer/Rakefile

@@ -4,7 +4,6 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -55,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.4' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -76,12 +75,14 @@ end
 
 desc "Publish the API documentation"
 task :pgem => [:package] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/am", "doc").upload
 end
 

data/vendor/rails/actionmailer/lib/action_mailer/base.rb

@@ -543,6 +543,7 @@ module ActionMailer #:nodoc:
         @headers ||= {}
         @body ||= {}
         @mime_version = @@default_mime_version.dup if @@default_mime_version
+        @sent_on ||= Time.now
       end
 
       def render_message(method_name, body)
@@ -674,7 +675,7 @@ module ActionMailer #:nodoc:
       def perform_delivery_smtp(mail)
         destinations = mail.destinations
         mail.ready_to_send
-        sender = (mail['return-path'] && mail['return-path'].spec) || mail.from
+        sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
 
         smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
         smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)

data/vendor/rails/actionmailer/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 2
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/rails/actionmailer/test/abstract_unit.rb

@@ -1,9 +1,6 @@
 require 'rubygems'
 require 'test/unit'
 
-gem 'mocha', '>= 0.9.5'
-require 'mocha'
-
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
 $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"