tiny_cms 0.2.6 → 0.2.8

data/.gitignore

@@ -2,4 +2,6 @@
 test/rails_app/db/*.sqlite3
 *.gemspec
 *.gem
-test/rails_app/log/
+test/rails_app/log/
+*.swp
+*.swo

data/Rakefile

@@ -9,7 +9,10 @@ begin
     gem.description = %Q{Minimal CMS Rails Engine or more likelly a "static" pages manager.\nPages can be created, deleted, edited and arranged into sections using a file tree like interface courtesy of jQuery tree (http://jstree.com).\n\nIt attempts to be as minimal, flexible and unobtrusive as posible leaving a lot of functionality like templating languages\nand authentication/authorization for page creation, deletion and editing for the Rails app developer to implement. (It now works after premature release)}
     gem.email = "macarui@gmail.com"
     gem.homepage = "http://github.com/maca/tiny_cms"
+    gem.post_install_message = %{ \n***********************************\nIf you are updating from previous versions please add new dynamic_route
+ and dynamic_route_uuid string fields to your node model.\n***********************************\n\n }
     gem.authors = ["Macario"]
+    gem.add_dependency "uuid", ">= 2.3.1"
     gem.add_development_dependency "shoulda", ">= 2.11.1"
     gem.add_development_dependency "rails", ">= 2.3.5"
     gem.add_development_dependency "factory_girl", ">= 1.3.1"

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/app/views/tiny_cms/_form.html.erb

@@ -5,6 +5,11 @@
     Path: <%= resource.path %>
   </p>
   
+  <p>
+    <%= f.label :dynamic_route %>
+    <%= f.text_field :dynamic_route %>
+  </p>
+
   <p>
     <%= f.label :title %>
     <%= f.text_field :title %>
@@ -23,4 +28,4 @@
   <p>
     <%= f.submit %>
   </p>
-<% end %>
+<% end %>

data/generators/tiny_cms/templates/migration.rb

@@ -6,6 +6,7 @@ class TinyCmsCreate<%= table_name.camelize %> < ActiveRecord::Migration
       t.integer  :position
       t.string   :title
       t.string   :content
+      t.string   :route_to
       
       t.timestamps
     end
@@ -14,4 +15,4 @@ class TinyCmsCreate<%= table_name.camelize %> < ActiveRecord::Migration
   def self.down
     drop_table :<%= table_name %>
   end
-end
+end

data/lib/tiny_cms.rb

@@ -1,5 +1,7 @@
+require 'uuid'
+
 require 'tiny_cms/node'
 require 'tiny_cms/pages_controller'
 
 module TinyCMS
-end
+end

data/lib/tiny_cms/node.rb

@@ -53,8 +53,17 @@ module TinyCMS
         self.children_without_position = array
       end
       model.alias_method_chain :children=, :position
+
+      if model.columns.find { |c| c.name == 'dynamic_route' }
+        # dynamic routing
+        model.before_save   :update_dynamic_route!
+        model.after_destroy :remove_dynamic_route!
+        model.find(:all, "dynamic_route IS NOT nil").each(&:update_dynamic_route!)
+      end
     end
-   
+
+    @@uuid = UUID.new
+
     def parameterize_permalink
       text = permalink.blank? ? title : permalink
       self.permalink = text.parameterize if text
@@ -79,5 +88,22 @@ module TinyCMS
     def to_json opts = {}
       self.to_hash.to_json
     end
+
+    # Dynamic routing
+    def add_dynamic_route!
+      controller, action = dynamic_route.split('#')
+      self.dynamic_route_uuid = @@uuid.generate
+      new_route = ActionController::Routing::Routes.builder.build(permalink, {:controller => controller, :action => action, :dynamic_route_uuid => dynamic_route_uuid})
+      ActionController::Routing::Routes.routes.unshift new_route
+    end
+
+    def remove_dynamic_route!
+      ActionController::Routing::Routes.routes.reject! { |r| r.instance_variable_get(:@requirements)[:dynamic_route_uuid] == dynamic_route_uuid } unless dynamic_route_uuid.blank?
+    end
+
+    def update_dynamic_route!
+      remove_dynamic_route!
+      add_dynamic_route! unless dynamic_route.blank?
+    end
   end
-end
+end

data/lib/tiny_cms/pages_controller.rb

@@ -5,10 +5,10 @@ module TinyCMS
     
     def index
       respond_to do |format|
-        format.html {
+        format.html do
           @class = klass
           render 'tiny_cms/index' 
-        }
+        end
         format.json { render :json => klass.include_tree(5).roots }
       end
     end

data/lib/tiny_cms/tiny_cms.en.yml

@@ -9,4 +9,3 @@ en:
     alerts:
       confirm: Are you sure?
       duplicate_path: This action would cause two nodes to have the same path (they have the same permalink).
-      

data/test/helper.rb

@@ -11,6 +11,17 @@ require 'shoulda'
 require 'factory_girl'
 require 'support/page_migration'
 
+class Test::Unit::TestCase
+  # Hack to be able to do route testing
+  def clean_backtrace(&block)
+    yield
+  rescue ActiveSupport::TestCase::Assertion => error
+    framework_path = Regexp.new(File.expand_path("#{File.dirname(__FILE__)}/assertions"))
+    error.backtrace.reject! { |line| File.expand_path(line) =~ framework_path }
+    raise
+  end
+end
+
 Factory.define :page do |p|
   p.sequence(:title) { |i| "Node #{i}"}
   p.sequence(:permalink) { |i| "node_#{i}"}

data/test/rails_app/app/controllers/dummy_controller.rb

@@ -0,0 +1,5 @@
+class DummyController < ApplicationController
+  def index
+  end
+
+end

data/test/rails_app/app/helpers/dummy_helper.rb

@@ -0,0 +1,2 @@
+module DummyHelper
+end

data/test/rails_app/app/views/dummy/index.html.erb

@@ -0,0 +1,2 @@
+<h1>Dummy#index</h1>
+<p>Find me in app/views/dummy/index.html.erb</p>

data/test/rails_app/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -38,4 +38,4 @@ Rails::Initializer.run do |config|
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
-end
+end

data/test/rails_app/config/locales/tiny_cms.en.yml

@@ -9,4 +9,3 @@ en:
     alerts:
       confirm: Are you sure?
       duplicate_path: This action would cause two nodes to have the same path (they have the same permalink).
-      

data/test/support/page_migration.rb

@@ -11,7 +11,8 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  :position
     t.string   :title
     t.string   :content
-
+    t.string   :dynamic_route
+    t.string   :dynamic_route_uuid
     t.timestamps
   end
-end
+end

data/test/test_node.rb

@@ -1,6 +1,8 @@
 require 'helper'
 
 class PageTest < Test::Unit::TestCase
+  include ActionController::Assertions::RoutingAssertions
+
   should_belong_to :parent
   should_have_many :children
 
@@ -262,4 +264,33 @@ class PageTest < Test::Unit::TestCase
       end
     end
   end
+
+  context 'Dynamic routing' do
+    setup do
+      @page = Factory :page, :dynamic_route => "dummy#index"
+    end
+
+    should 'generate route' do
+      assert_routing @page.path, :controller => 'dummy', :action => 'index', :dynamic_route_uuid => @page.dynamic_route_uuid
+    end
+
+    should 'remove route on destroy' do
+      @page.destroy
+      assert_equal 0, ActionController::Routing::Routes.routes.select{ |route| route.segments.inject(""){|str,s| str << s.to_s} == "#{@page.path}/" }.size
+    end
+
+    context 'changing route' do
+      setup do
+        @page.update_attributes :dynamic_route => "dummy#other"
+      end
+
+      should 'generate route' do
+        assert_routing @page.path, :controller => 'dummy', :action => 'other', :dynamic_route_uuid => @page.dynamic_route_uuid
+      end
+
+      should 'should remove previous route' do
+        assert_equal 1, ActionController::Routing::Routes.routes.select{ |route| route.segments.inject(""){|str,s| str << s.to_s} == "#{@page.path}/" }.size
+      end
+    end
+  end
 end

data/test/test_pages_controller.rb

@@ -8,6 +8,10 @@ class PagesControllerTest < ActionController::TestCase
   should_route :get,  '/pages/1/edit',           :controller => :pages, :action => :edit,   :id   => '1'
   should_route :get,  '/pages/1',                :controller => :pages, :action => :show,   :id   => '1'
   should_route :get,  '/root/children/children', :controller => :pages, :action => :show,   :path => %w(root children children)
+  
+  setup do
+    Page.destroy_all
+  end
 
   context 'get index' do
     context "as html" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_cms
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Macario
@@ -14,51 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2010-10-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: uuid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 3
+        - 1
+        version: 2.3.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 33
         segments: 
         - 2
         - 11
         - 1
         version: 2.11.1
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
         - 5
         version: 2.3.5
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 3
         - 1
         version: 1.3.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: |-
   Minimal CMS Rails Engine or more likelly a "static" pages manager.
   Pages can be created, deleted, edited and arranged into sections using a file tree like interface courtesy of jQuery tree (http://jstree.com).
@@ -144,9 +167,12 @@ files:
 - test/rails_app/README
 - test/rails_app/Rakefile
 - test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/dummy_controller.rb
 - test/rails_app/app/controllers/pages_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/helpers/dummy_helper.rb
 - test/rails_app/app/models/page.rb
+- test/rails_app/app/views/dummy/index.html.erb
 - test/rails_app/app/views/layouts/application.html.erb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/database.yml
@@ -162,8 +188,6 @@ files:
 - test/rails_app/config/locales/en.yml
 - test/rails_app/config/locales/tiny_cms.en.yml
 - test/rails_app/config/routes.rb
-- test/rails_app/db/migrate/20100426222349_create_pages.rb
-- test/rails_app/db/schema.rb
 - test/rails_app/db/seeds.rb
 - test/rails_app/doc/README_FOR_APP
 - test/rails_app/public/404.html
@@ -183,68 +207,67 @@ files:
 - test/rails_app/script/plugin
 - test/rails_app/script/runner
 - test/rails_app/script/server
-- test/rails_app/test/fixtures/pages.yml
-- test/rails_app/test/performance/browsing_test.rb
-- test/rails_app/test/test_helper.rb
-- test/rails_app/test/unit/page_test.rb
 - test/rails_app/tmp/restart.txt
 - test/support/page_migration.rb
-- test/support/test.sqlite3s
 - test/test_node.rb
 - test/test_pages_controller.rb
 has_rdoc: true
 homepage: http://github.com/maca/tiny_cms
 licenses: []
 
-post_install_message: 
+post_install_message: " \n\
+  ***********************************\n\
+  If you are updating from previous versions please add new dynamic_route\n and dynamic_route_uuid string fields to your node model.\n\
+  ***********************************\n\n "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Minimal CMS Rails Engine or more likelly a "static" pages manager
 test_files: 
 - test/helper.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/pages_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/models/page.rb
-- test/rails_app/config/boot.rb
+- test/rails_app/db/seeds.rb
 - test/rails_app/config/environment.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/routes.rb
+- test/rails_app/config/initializers/backtrace_silencers.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/new_rails_defaults.rb
+- test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
 - test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/backtrace_silencers.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/mime_types.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/db/migrate/20100426222349_create_pages.rb
-- test/rails_app/db/schema.rb
-- test/rails_app/db/seeds.rb
-- test/rails_app/test/performance/browsing_test.rb
-- test/rails_app/test/test_helper.rb
-- test/rails_app/test/unit/page_test.rb
-- test/support/page_migration.rb
+- test/rails_app/app/models/page.rb
+- test/rails_app/app/helpers/dummy_helper.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/controllers/dummy_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/pages_controller.rb
 - test/test_node.rb
 - test/test_pages_controller.rb
+- test/support/page_migration.rb

data/test/rails_app/db/migrate/20100426222349_create_pages.rb

@@ -1,19 +0,0 @@
-class CreatePages < ActiveRecord::Migration
-  def self.up
-    create_table :pages do |t|
-      t.integer  :parent_id
-      t.string   :permalink
-      t.string   :path
-      t.integer  :position
-      t.string   :title
-      t.string   :content
-      t.boolean  :is_page
-
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :pages
-  end
-end

data/test/rails_app/db/schema.rb

@@ -1,26 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20100426222349) do
-
-  create_table "pages", :force => true do |t|
-    t.integer  "parent_id"
-    t.string   "permalink"
-    t.string   "path"
-    t.integer  "position"
-    t.string   "title"
-    t.string   "content"
-    t.boolean  "is_page"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-end

data/test/rails_app/test/fixtures/pages.yml

@@ -1,17 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  parent_id: 1
-  permalink: MyString
-  path: MyString
-  position: 1
-  title: MyString
-  content: MyString
-
-two:
-  parent_id: 1
-  permalink: MyString
-  path: MyString
-  position: 1
-  title: MyString
-  content: MyString

data/test/rails_app/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/test/rails_app/test/test_helper.rb

@@ -1,38 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-
-class ActiveSupport::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually 
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end

data/test/rails_app/test/unit/page_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class PageTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end