muck-contents 3.0.0 → 3.0.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tatemae
+Copyright (c) 2009-2010 Tatemae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -5,7 +5,7 @@ it easy to add this content to your website.
 
 === Gems
 Add the following to your Gemfile:
-  gem 'muck-contents', :require => 'muck_contents'
+  gem 'muck-contents'
 
 ==== Note about TinyMCE
 Watch out for updates to the TinyMCE gem. The author has chosen to overwrite all files in the tiny mce asset directories when the server

data/Rakefile

@@ -1,9 +1,13 @@
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
 
-desc 'Default: run unit tests.'
+desc 'Default: run specs.'
 task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--color", "-c", "-f progress", "-r test/rails_test/spec/spec_helper.rb"]
+  t.pattern = 'test/rails_test/spec/**/*_spec.rb'  
+end
 
 
 begin
@@ -33,7 +37,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "muck_contents #{version}"
+  rdoc.title = "muck-contents #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
@@ -50,7 +54,7 @@ begin
     gemspec.name = "muck-contents"
     gemspec.summary = "Add content to your muck based project"
     gemspec.email = "justin@tatemae.com"
-    gemspec.homepage = "http://github.com/tatemae/muck_contents"
+    gemspec.homepage = "http://github.com/tatemae/muck-contents"
     gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-contents'
     gemspec.add_dependency "muck-engine"

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/app/controllers/muck/tiny_mce_controller.rb

@@ -30,7 +30,7 @@ class Muck::TinyMceController < ApplicationController
   
   def tiny_mce_flickr
     @body_tag = 'flickr'
-    Fleakr.api_key = GlobalConfig.flickr_api_key
+    Fleakr.api_key = Secrets.flickr_api_key
     @photos = Fleakr.search(params[:search]) unless params[:search].blank?
     respond_to do |format|
       format.html { render :template => 'tiny_mce/flickr'}

data/lib/muck-contents.rb

@@ -0,0 +1,18 @@
+require 'friendly_id'
+require 'acts-as-taggable-on'
+require 'tiny_mce'
+require 'sanitize'
+require 'babelphish'
+require 'uploader'
+
+require 'muck-contents/config.rb'
+require 'muck-contents/rack/rack.rb'
+require 'muck-contents/models/content.rb'
+require 'muck-contents/models/content_permission.rb'
+require 'muck-contents/models/content_translation.rb'
+require 'muck-contents/controllers/content_handler.rb'
+require 'muck-contents/engine.rb'
+
+module MuckContents
+  GLOBAL_SCOPE = '/'
+end

data/lib/{muck_contents → muck-contents}/controllers/content_handler.rb

@@ -8,7 +8,7 @@ module MuckContents
         def handle_content_request
           get_content
           if @content.blank?
-            redirect_to new_content_path(:path => env["muck_contents.request_uri"])
+            redirect_to new_content_path(:path => env["muck-contents.request_uri"])
           else
             return if ensure_current_url
             render_show_content
@@ -49,8 +49,8 @@ module MuckContents
         # Tries to find content using parameters from the url
         def get_content
           return if @content # in case @content is setup by an overriding method
-          id = params[:id] || Content.id_from_uri(env["muck_contents.request_uri"])
-          scope = params[:scope] || Content.scope_from_uri(env["muck_contents.request_uri"]) 
+          id = params[:id] || Content.id_from_uri(env["muck-contents.request_uri"])
+          scope = params[:scope] || Content.scope_from_uri(env["muck-contents.request_uri"]) 
           @content = Content.find(id, :scope => scope) rescue nil
           if @content.blank?
             @contentable = get_parent

data/lib/{muck_contents → muck-contents}/engine.rb

@@ -1,4 +1,4 @@
-require 'muck_contents'
+require 'muck-contents'
 require 'rails'
 
 module MuckContents
@@ -10,14 +10,14 @@ module MuckContents
     
     config.app_middleware.insert_before("ActionDispatch::ShowExceptions", "MuckContents::Routing::Rack")
     
-    initializer 'muck_contents.helpers' do |app|
+    initializer 'muck-contents.helpers' do |app|
       ActiveSupport.on_load(:action_view) do
         include MuckContentsHelper
         include TinymceHelper
       end
     end
     
-    initializer 'muck_contents.i18n' do |app|
+    initializer 'muck-contents.i18n' do |app|
       ActiveSupport.on_load(:i18n) do
         I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', '..', 'config', 'locales', '*.{rb,yml}') ]
       end

data/lib/{muck_contents → muck-contents}/rack/rack.rb

@@ -15,7 +15,7 @@ module MuckContents
           # request.format.html? can actually give a false result on ie so try the file extension
           # Requests to the content system won't have a file extension so request_type should be empty
           if request_type.empty?
-            env["muck_contents.request_uri"] = env["REQUEST_URI"].gsub("http://#{env["HTTP_HOST"]}", '')
+            env["muck-contents.request_uri"] = env["REQUEST_URI"].gsub("http://#{env["HTTP_HOST"]}", '')
             env["PATH_INFO"] = env["REQUEST_URI"] = "/contents_missing"
           end
         end

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-10-18}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -92,15 +92,15 @@ Gem::Specification.new do |s|
      "db/migrate/20090703055724_add_contents.rb",
      "db/migrate/20090806230610_add_layout_to_contents.rb",
      "db/migrate/20090808175401_add_contents_comment_counter_cache.rb",
-     "lib/muck_contents.rb",
-     "lib/muck_contents/config.rb",
-     "lib/muck_contents/controllers/content_handler.rb",
-     "lib/muck_contents/engine.rb",
-     "lib/muck_contents/models/content.rb",
-     "lib/muck_contents/models/content_permission.rb",
-     "lib/muck_contents/models/content_translation.rb",
-     "lib/muck_contents/rack/rack.rb",
-     "lib/muck_contents/routes.rb",
+     "lib/muck-contents.rb",
+     "lib/muck-contents/config.rb",
+     "lib/muck-contents/controllers/content_handler.rb",
+     "lib/muck-contents/engine.rb",
+     "lib/muck-contents/models/content.rb",
+     "lib/muck-contents/models/content_permission.rb",
+     "lib/muck-contents/models/content_translation.rb",
+     "lib/muck-contents/rack/rack.rb",
+     "lib/muck-contents/routes.rb",
      "lib/tasks/muck_contents.rake",
      "muck-contents.gemspec",
      "public/images/tinymce/doc.jpg",
@@ -3597,9 +3597,10 @@ Gem::Specification.new do |s|
      "test/rails_test/spec/models/content_permission_spec.rb",
      "test/rails_test/spec/models/content_spec.rb",
      "test/rails_test/spec/models/content_translation_spec.rb",
-     "test/rails_test/spec/spec_helper.rb"
+     "test/rails_test/spec/spec_helper.rb",
+     "test/rails_test/test/fixtures/rails.png"
   ]
-  s.homepage = %q{http://github.com/tatemae/muck_contents}
+  s.homepage = %q{http://github.com/tatemae/muck-contents}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{muck-contents}

data/public/javascripts/tiny_mce/templates/country.htm

@@ -13,7 +13,7 @@
 	<div class="country">
 	
 		<h1>{Country Name}</h1>
-		<img class="alignnone" src="<%=GlobalConfig.website_home_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
+		<img class="alignnone" src="<%=MuckEngine.configuration.application_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
 	
 		<h2>Background</h2>
 		<p>{Provide background about the country.}</p>

data/test/rails_test/Gemfile

@@ -6,21 +6,16 @@ gem 'mysql'
 # gem 'authlogic'
 # TODO this is temporary until the official authlogic gem is updated for rails 3
 gem 'authlogic', :git => 'git://github.com/odorcicd/authlogic.git', :branch => 'rails3'
-gem 'will_paginate', "~> 3.0.pre2"
 
-# TODO Remove this once the validation_reflection gem is released for Rails 3 and the version has been updated in muck-engine
-gem "validation_reflection", :git => "http://github.com/redinger/validation_reflection.git", :branch => "rails-3"
 
 gem "bcrypt-ruby", :require => "bcrypt"
-
 gem 'uploader'
-gem 'overlord'
 
-gem 'muck-engine', :require => 'muck_engine', :path => "~/projects/muck-engine"
-gem 'muck-users', :require => 'muck_users', :path => "~/projects/muck-users"
-gem 'muck-activities', :require => 'muck_activities', :path => "~/projects/muck-activities"
-gem 'muck-comments', :require => 'muck_comments', :path => "~/projects/muck-comments" 
-gem 'muck-contents', :require => 'muck_contents', :path => '../../'  
+gem 'muck-engine', :path => "~/projects/muck-engine"
+gem 'muck-users', :path => "~/projects/muck-users"
+gem 'muck-activities', :path => "~/projects/muck-activities"
+gem 'muck-comments', :path => "~/projects/muck-comments" 
+gem 'muck-contents', :path => '../../'  
 gem 'muck-solr', :require => 'acts_as_solr'
   
 if RUBY_VERSION < '1.9'
@@ -28,7 +23,7 @@ if RUBY_VERSION < '1.9'
 end
 
 group :test, :development do
-  gem "rspec-rails", ">=2.0.0.beta.22"
+  gem "rspec-rails", ">=2.0.0"
   gem "cucumber-rails"
 end
 
@@ -40,7 +35,7 @@ group :test do
   gem "factory_girl"
   gem "cucumber"
   gem "rcov"
-  gem "rspec", ">=2.0.0.beta.22"
+  gem "rspec", ">=2.0.0"
   gem "database_cleaner"
   gem "spork"
   gem "launchy"

data/test/rails_test/Gemfile.lock

@@ -6,13 +6,6 @@ GIT
     authlogic (2.1.3)
       activesupport
 
-GIT
-  remote: http://github.com/redinger/validation_reflection.git
-  revision: f0d81d3732304e2baa66e6caad1bb2ba09e9f293
-  branch: rails-3
-  specs:
-    validation_reflection (1.0.0.rc.1)
-
 PATH
   remote: /Users/jbasdf/projects/muck-activities
   specs:
@@ -50,8 +43,8 @@ PATH
   specs:
     muck-engine (3.0.1)
       overlord
-      validation_reflection (>= 1.0.0.rc.1)
-      will_paginate
+      validation_reflection
+      will_paginate (~> 3.0.beta)
 
 PATH
   remote: /Users/jbasdf/projects/muck-users
@@ -108,7 +101,6 @@ GEM
       mime-types
       xml-simple
     babelphish (0.2.8)
-      json
       ya2yaml
     babosa (0.2.0)
     bcrypt-ruby (2.1.2)
@@ -224,11 +216,12 @@ GEM
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
-    uploader (3.0.1)
+    uploader (3.0.2)
       aws-s3
       mime-types
       paperclip
       rack
+    validation_reflection (1.0.0)
     will_paginate (3.0.pre2)
     xml-simple (1.0.12)
     ya2yaml (0.30)
@@ -253,7 +246,6 @@ DEPENDENCIES
   muck-solr
   muck-users!
   mysql
-  overlord
   rails (= 3.0.0)
   rcov
   rspec (>= 2.0.0.beta.22)
@@ -262,5 +254,3 @@ DEPENDENCIES
   shoulda!
   spork
   uploader
-  validation_reflection!
-  will_paginate (~> 3.0.pre2)

data/test/rails_test/app/controllers/application_controller.rb

@@ -12,12 +12,4 @@ class ApplicationController < ActionController::Base
       admin?
     end
     
-    # only require ssl if we are in production
-    def ssl_required?
-      return ENV['SSL'] == 'on' ? true : false if defined? ENV['SSL']
-      return false if local_request?
-      return false if RAILS_ENV == 'test'
-      ((self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)) && (RAILS_ENV == 'production' || RAILS_ENV == 'staging')
-    end
-    
 end

data/test/rails_test/config/application.rb

@@ -6,7 +6,7 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env.to_sym])
+::Secrets = OpenStruct.new(YAML.load_file(File.expand_path('../secrets.yml', __FILE__))[Rails.env])
 
 module RailsTest
   class Application < Rails::Application

data/test/rails_test/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-RailsTest::Application.config.session_store :cookie_store, :key => '_muck_users_session'
+RailsTest::Application.config.session_store :cookie_store, :key => '_muck_contents_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/rails_test/public/javascripts/tiny_mce/templates/country.htm

@@ -13,7 +13,7 @@
 	<div class="country">
 	
 		<h1>{Country Name}</h1>
-		<img class="alignnone" src="<%=GlobalConfig.website_home_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
+		<img class="alignnone" src="<%=MuckEngine.configuration.application_url%>/wp-content/uploads/2008/08/boy-on-tire1.jpg" border="0" title="boy-on-tire1" width="210" height="300" />
 	
 		<h2>Background</h2>
 		<p>{Provide background about the country.}</p>

data/test/rails_test/spec/controllers/contents_controller_spec.rb

@@ -42,7 +42,7 @@ describe Muck::ContentsController do
     describe "GET show using parent" do
       before do
         @env = {}
-        @env["muck_contents.request_uri"] = @content.uri
+        @env["muck-contents.request_uri"] = @content.uri
         controller.stub!(:env).and_return(@env)
         get :show
       end

data/test/rails_test/spec/controllers/contents_missing_controller_spec.rb

@@ -13,7 +13,7 @@ describe Muck::ContentsMissingController do
     describe "page exists" do
       before do
         @env = {}
-        @env["muck_contents.request_uri"] = @content.uri
+        @env["muck-contents.request_uri"] = @content.uri
         controller.stub!(:env).and_return(@env)
         get :index
       end
@@ -23,7 +23,7 @@ describe Muck::ContentsMissingController do
     describe "page doesn't exist" do
       before do
         @env = {}
-        @env["muck_contents.request_uri"] = '/test_page'
+        @env["muck-contents.request_uri"] = '/test_page'
         controller.stub!(:env).and_return(@env)
         get :index
       end

data/test/rails_test/spec/models/content_spec.rb

@@ -77,7 +77,6 @@ describe Content do
         @content_with_custom_scope = Factory(:content, :custom_scope => @custom_scope)
       end
       describe "no_contentable" do
-        # named_scope :no_contentable, :conditions => 'contentable_id IS NULL'
         before(:each) do
           @user = Factory(:user)
           @content_not = Factory(:content, :contentable => nil)

data/test/rails_test/spec/models/content_translation_spec.rb

@@ -51,7 +51,6 @@ describe ContentTranslation do
     end
     
     describe "find by locale" do
-      #named_scope :by_locale, lambda { |locale| { :conditions => ['content_translations.locale = ?', locale] } }
       before do
         ContentTranslation.destroy_all
         @content_one = Factory(:content)

data/test/rails_test/spec/spec_helper.rb

@@ -1,29 +1,5 @@
 $:.reject! { |e| e.include? 'TextMate' }
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'muck_test_helper'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-  
-end
+require 'muck_test_helper'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -06:00
+date: 2010-10-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,15 +245,15 @@ files:
 - db/migrate/20090703055724_add_contents.rb
 - db/migrate/20090806230610_add_layout_to_contents.rb
 - db/migrate/20090808175401_add_contents_comment_counter_cache.rb
-- lib/muck_contents.rb
-- lib/muck_contents/config.rb
-- lib/muck_contents/controllers/content_handler.rb
-- lib/muck_contents/engine.rb
-- lib/muck_contents/models/content.rb
-- lib/muck_contents/models/content_permission.rb
-- lib/muck_contents/models/content_translation.rb
-- lib/muck_contents/rack/rack.rb
-- lib/muck_contents/routes.rb
+- lib/muck-contents.rb
+- lib/muck-contents/config.rb
+- lib/muck-contents/controllers/content_handler.rb
+- lib/muck-contents/engine.rb
+- lib/muck-contents/models/content.rb
+- lib/muck-contents/models/content_permission.rb
+- lib/muck-contents/models/content_translation.rb
+- lib/muck-contents/rack/rack.rb
+- lib/muck-contents/routes.rb
 - lib/tasks/muck_contents.rake
 - muck-contents.gemspec
 - public/images/tinymce/doc.jpg
@@ -3751,8 +3751,9 @@ files:
 - test/rails_test/spec/models/content_spec.rb
 - test/rails_test/spec/models/content_translation_spec.rb
 - test/rails_test/spec/spec_helper.rb
+- test/rails_test/test/fixtures/rails.png
 has_rdoc: true
-homepage: http://github.com/tatemae/muck_contents
+homepage: http://github.com/tatemae/muck-contents
 licenses: []
 
 post_install_message: 

data/lib/muck_contents.rb

@@ -1,17 +0,0 @@
-require 'friendly_id'
-require 'acts-as-taggable-on'
-require 'tiny_mce'
-require 'sanitize'
-require 'babelphish'
-
-require 'muck_contents/config.rb'
-require 'muck_contents/rack/rack.rb'
-require 'muck_contents/models/content.rb'
-require 'muck_contents/models/content_permission.rb'
-require 'muck_contents/models/content_translation.rb'
-require 'muck_contents/controllers/content_handler.rb'
-require 'muck_contents/engine.rb'
-
-module MuckContents
-  GLOBAL_SCOPE = '/'
-end