radiant-snippets-extension 1.0.0 → 1.0.1

data/lib/radiant-snippets-extension.rb

@@ -1,5 +1,5 @@
 module RadiantSnippetsExtension
-  VERSION     = "1.0.0"
+  VERSION     = "1.0.1"
   SUMMARY     = "Snippets for Radiant CMS"
   DESCRIPTION = "Makes Radiant better by adding snippets!"
   URL         = "http://github.com/radiant"

data/spec/ci/before_script

@@ -7,7 +7,7 @@ then
 fi
 cp -r ~/builds/*/radiant-snippets-extension vendor/extensions/snippets
 gem install bundler --pre
-echo 'gem "radiant-snippets-extension", :path => "vendor/extensions/snippets"' >> Gemfile
+echo gemspec >> Gemfile
 bundle install
 
 case $DB in

data/spec/controllers/admin/snippets_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require 'snippets_spec_helper'
 
 describe Admin::SnippetsController do
   dataset :users, :snippets

data/spec/datasets/snippets_dataset.rb

@@ -1,9 +1,15 @@
+class SnippetMarkdownFilter < TextFilter
+  def filter(text)
+    text + ' for Snippets!'
+  end
+end
+
 class SnippetsDataset < Dataset::Base
   
   def load
     create_snippet "first", :content => "test"
     create_snippet "another", :content => "another test"
-    create_snippet "markdown", :filter_id => "Markdown", :content => "**markdown**"
+    create_snippet "markdown", :filter_id => "Snippet Markdown", :content => "**markdown**"
     create_snippet "radius", :content => "<r:title />"
     create_snippet "global_page_cascade", :content => "<r:children:each><r:page:title /> </r:children:each>"
     create_snippet "recursive", :content => "<r:children:each><r:snippet name='recursive' /></r:children:each><r:title />"

data/spec/lib/radiant/admin_ui_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require 'snippets_spec_helper'
 
 describe Radiant::AdminUI do
   let(:admin) do

data/spec/models/page_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'snippets_spec_helper'
 
 describe "Page rendering snippets" do
   dataset :pages, :snippets
@@ -12,7 +12,7 @@ describe "Page rendering snippets" do
   end
 
   it 'should render a snippet with a filter' do
-    page.render_snippet(snippets(:markdown)).should match(%r{<p><strong>markdown</strong></p>})
+    page.render_snippet(snippets(:markdown)).should include(%{**markdown** for Snippets!})
   end
 
   it 'should render a snippet with a tag' do
@@ -33,11 +33,12 @@ describe "Page rendering snippets" do
     end
 
     it "should filter the snippet with its assigned filter" do
-      page.should render('<r:page><r:snippet name="markdown" /></r:page>').matching(%r{<p><strong>markdown</strong></p>})
+      page.should render('<r:page><r:snippet name="markdown" /></r:page>').matching(Regexp.new(Regexp.quote('**markdown** for Snippets!')))
     end
 
     it "should maintain the global page inside the snippet" do
-      pages(:parent).should render('<r:snippet name="global_page_cascade" />').as("#{page.title} " * page.children.count)
+      parent_page = pages(:parent)
+      parent_page.should render('<r:snippet name="global_page_cascade" />').as("#{parent_page.title} " * parent_page.children.count)
     end
 
     it "should maintain the global page when the snippet renders recursively" do

data/spec/models/snippet_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'snippets_spec_helper'
 
 describe Snippet do
   dataset :snippets
@@ -14,14 +14,14 @@ describe Snippet do
   end
 
   it "should take the filter from the default filter" do
-    Radiant::Config['defaults.snippet.filter'] = "Textile"
+    Radiant::Config.should_receive(:[]).with("defaults.snippet.filter").and_return('Textile')
     snippet = Snippet.new :name => 'new-snippet'
     snippet.filter_id.should == "Textile"
   end
 
   it "shouldn't override existing snippets filters with the default filter" do
     snippet = Snippet.find(:first, :conditions => {:filter_id => nil})
-    Radiant::Config['defaults.snippet.filter'] = "Textile"
+    Radiant::Config.stub!(:[]).with("defaults.snippet.filter").and_return('Textile')
     snippet.reload
     snippet.filter_id.should_not == "Textile"
   end
@@ -54,6 +54,6 @@ describe Snippet do
   
   it 'should allow the filter to be specified' do
     @snippet = snippets(:markdown)
-    @snippet.filter.should be_kind_of(MarkdownFilter)
+    @snippet.filter.should be_kind_of(SnippetMarkdownFilter)
   end
 end

data/spec/models/user_action_observer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'snippets_spec_helper'
 
 describe UserActionObserver do
   dataset :users, :pages_with_layouts, :snippets
@@ -9,11 +9,8 @@ describe UserActionObserver do
   end
   
   it 'should observe create' do
-    [
-      Snippet.create!(snippet_params)
-    ].each do |model|
-      model.created_by.should == @user
-    end
+    snippet = Snippet.create!(snippet_params)
+    snippet.created_by.should == @user
   end
   
   it 'should observe update' do

metadata

@@ -1,104 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-snippets-extension
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
-  - Jim Gay
+authors:
+- Jim Gay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-05 00:00:00 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies: []
-
 description: Makes Radiant better by adding snippets!
-email: 
-  - radiant@radiantcms.org
+email:
+- radiant@radiantcms.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - cucumber.yml
-  - radiant-snippets-extension.gemspec
-  - Rakefile
-  - README.md
-  - snippets_extension.rb
-  - app/controllers/admin/snippets_controller.rb
-  - app/helpers/admin/snippets_helper.rb
-  - app/models/snippet.rb
-  - app/views/admin/snippets/_form.html.haml
-  - app/views/admin/snippets/edit.html.haml
-  - app/views/admin/snippets/index.html.haml
-  - app/views/admin/snippets/new.html.haml
-  - app/views/admin/snippets/remove.html.haml
-  - config/routes.rb
-  - config/initializers/radiant_config.rb
-  - config/locales/en.yml
-  - features/admin/configuration.feature
-  - features/admin/pagination.feature
-  - features/admin/snippets_management.feature
-  - features/step_definitions/admin/snippet_steps.rb
-  - features/support/env.rb
-  - features/support/paths.rb
-  - lib/radiant-snippets-extension.rb
-  - lib/snippet_tags.rb
-  - lib/tasks/snippets_extension_tasks.rake
-  - spec/spec.opts
-  - spec/spec_helper.rb
-  - spec/ci/before_script
-  - spec/ci/script
-  - spec/controllers/admin/snippets_controller_spec.rb
-  - spec/datasets/snippets_dataset.rb
-  - spec/lib/radiant/admin_ui_spec.rb
-  - spec/models/page_spec.rb
-  - spec/models/snippet_spec.rb
-  - spec/models/user_action_observer_spec.rb
+files:
+- app/controllers/admin/snippets_controller.rb
+- app/helpers/admin/snippets_helper.rb
+- app/models/snippet.rb
+- app/views/admin/snippets/_form.html.haml
+- app/views/admin/snippets/edit.html.haml
+- app/views/admin/snippets/index.html.haml
+- app/views/admin/snippets/new.html.haml
+- app/views/admin/snippets/remove.html.haml
+- config/initializers/radiant_config.rb
+- config/locales/en.yml
+- config/routes.rb
+- cucumber.yml
+- features/admin/configuration.feature
+- features/admin/pagination.feature
+- features/admin/snippets_management.feature
+- features/step_definitions/admin/snippet_steps.rb
+- features/support/env.rb
+- features/support/paths.rb
+- lib/radiant-snippets-extension.rb
+- lib/snippet_tags.rb
+- lib/tasks/snippets_extension_tasks.rake
+- radiant-snippets-extension.gemspec
+- Rakefile
+- README.md
+- snippets_extension.rb
+- spec/ci/before_script
+- spec/ci/script
+- spec/controllers/admin/snippets_controller_spec.rb
+- spec/datasets/snippets_dataset.rb
+- spec/lib/radiant/admin_ui_spec.rb
+- spec/models/page_spec.rb
+- spec/models/snippet_spec.rb
+- spec/models/user_action_observer_spec.rb
+- spec/snippets_spec_helper.rb
+- spec/spec.opts
 homepage: http://github.com/radiant
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Snippets for Radiant CMS
-test_files: 
-  - spec/spec.opts
-  - spec/spec_helper.rb
-  - spec/ci/before_script
-  - spec/ci/script
-  - spec/controllers/admin/snippets_controller_spec.rb
-  - spec/datasets/snippets_dataset.rb
-  - spec/lib/radiant/admin_ui_spec.rb
-  - spec/models/page_spec.rb
-  - spec/models/snippet_spec.rb
-  - spec/models/user_action_observer_spec.rb
-  - features/admin/configuration.feature
-  - features/admin/pagination.feature
-  - features/admin/snippets_management.feature
-  - features/step_definitions/admin/snippet_steps.rb
-  - features/support/env.rb
-  - features/support/paths.rb
+test_files:
+- spec/ci/before_script
+- spec/ci/script
+- spec/controllers/admin/snippets_controller_spec.rb
+- spec/datasets/snippets_dataset.rb
+- spec/lib/radiant/admin_ui_spec.rb
+- spec/models/page_spec.rb
+- spec/models/snippet_spec.rb
+- spec/models/user_action_observer_spec.rb
+- spec/snippets_spec_helper.rb
+- spec/spec.opts
+- features/admin/configuration.feature
+- features/admin/pagination.feature
+- features/admin/snippets_management.feature
+- features/step_definitions/admin/snippet_steps.rb
+- features/support/env.rb
+- features/support/paths.rb