thesis 0.0.4 → 0.1.0

data/README.md

@@ -1,6 +1,6 @@
-# Thesis
+# Thesis ![Build Status](https://travis-ci.org/clearsightstudio/thesis.png)
 
-### Thesis is a CMS gem that integrates as seamlessly as possible into your current Rails website.
+### Thesis is a Rails CMS gem that integrates as seamlessly as possible into your current Rails website.
 
 Most Rails content management systems make you conform to their system from the start, 
 making it difficult to just "drop in" the gem and make it work with your CMS. Thesis
@@ -10,9 +10,12 @@ of the way.
 ### Requirements
 
 * Rails 3.2.x (or higher)
+* ActiveRecord on MySQL, PostgresQL, or SQLite3
 * Ruby 1.9.3 (or higher)
+* jQuery
+* jQuery UI
 
-Thesis might work with earlier versions but that's not our focus.
+Thesis *might* work with other versions but no guarantees.
 
 ## Getting Started
 
@@ -116,13 +119,11 @@ Referencing a content area in a page template will create one if it doesn't exis
 
 ### Routing
         
-Thesis will also add a route handler to your `routes.rb` file. This will 
-automatically handle routes for pages you create with Thesis.
-
-    thesis_routes
+Thesis will automatically handle routes for pages you create with Thesis. Your
+routes will take precedence over Thesis-created pages, so if you create a page
+with Thesis called "About" and you already have a route for 
+`get "about" => "something#else"` Thesis won't show the page.
     
-**To improve performance, put it near the bottom of your `routes.rb` file.**
-
 ## Using the CMS
 
 ### Adding a Page
@@ -143,11 +144,12 @@ TODO
 
 ## What Thesis Isn't
 
-You can't have it all or it becomes the same as the other bloated content management systems
-out there. This is a list of what it's not and what it's not ever likely to be.
+You can't have it all. Thesis isn't the same as other -bloated- full-functioned 
+content management systems out there. This is a list of what it's not now and 
+not likely to be in the future.
 
-We reserve the right to change our mind, however, especially with well planned and written
-pull requests to help prod us in the right direction. :-)
+*We reserve the right to change our mind, however, especially with well planned and written
+pull requests to help prod us in the right direction. :-)*
 
 1. A WordPress Replacement
 2. A full featured CMS
@@ -162,6 +164,13 @@ pull requests to help prod us in the right direction. :-)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Write tests for your new feature
-5. Run `bundle exec rspec` in the root directory to ensure that all tests pass.
+5. Run `rake spec` in the root directory to ensure that all tests pass.
 6. Push to the branch (`git push origin my-new-feature`)
 7. Create new Pull Request
+
+### Key Contributors
+
+* Jamon Holmgren [@jamonholmgren](https://twitter.com/jamonholmgren)
+* Daniel Berkompas [@dberkom](https://twitter.com/dberkom)
+* The ClearSight Studio team
+

data/lib/generators/thesis/install/install_generator.rb

@@ -19,18 +19,14 @@ module Thesis
       end
 
       def copy_migrations
-        migration_template "migrations/create_page.rb", "db/migrate/create_page.rb"
-        migration_template "migrations/create_page_content.rb", "db/migrate/create_page_content.rb"
+        migration_template "migrations/thesis_create_page.rb", "db/migrate/thesis_create_page.rb"
+        migration_template "migrations/thesis_create_page_content.rb", "db/migrate/thesis_create_page_content.rb", { skip: true }
       end
 
       def create_folders
-        copy_file "page_templates/default.html.slim", "app/views/page_templates/default.html.slim" if Slim
-        copy_file "page_templates/default.html.haml", "app/views/page_templates/default.html.haml" if Haml
-        copy_file "page_templates/default.html.erb", "app/views/page_templates/default.html.erb" unless Haml || Slim
-      end
-
-      def set_up_routes
-        route "thesis_routes # This needs to be the last route!"
+        copy_file "page_templates/default.html.slim", "app/views/page_templates/default.html.slim" if defined? Slim
+        copy_file "page_templates/default.html.haml", "app/views/page_templates/default.html.haml" if defined? Haml
+        copy_file "page_templates/default.html.erb", "app/views/page_templates/default.html.erb" unless defined? Haml || defined? Slim
       end
 
       def install_js
@@ -48,15 +44,20 @@ module Thesis
       end
 
       def install_css
-        filename = "app/assets/stylesheets/application.css.scss"
-        existing = File.binread("#{filename}").include?("require thesis")
-        
-        if existing && generating?
-          say_status("skipped", "insert into #{filename}", :yellow)
-        else
-          insert_into_file "#{filename}", after: %r{ *= require_self} do
-            "\n *= require thesis"
+        filename = "app/assets/stylesheets/application.css"
+        filename = filename << ".scss" unless File.exists? filename
+        if File.exists? filename
+          existing = File.binread("#{filename}").include?("require thesis")
+          
+          if existing && generating?
+            say_status("skipped", "insert into #{filename}", :yellow)
+          else
+            insert_into_file "#{filename}", after: %r{ *= require_self} do
+              "\n *= require thesis"
+            end
           end
+        else
+          say_status("skipped", "Couldn't insert into #{filename} -- doesn't exist")
         end
       end
 

data/lib/generators/thesis/install/templates/migrations/{create_page.rb → thesis_create_page.rb}

@@ -1,5 +1,8 @@
-class CreatePage < ActiveRecord::Migration
+class ThesisCreatePage < ActiveRecord::Migration
   def self.up
+    # Please note: if you change this (in the thesis gem) please
+    # update the /spec/spec_helper.rb to match.
+    
     create_table :pages do |t|
       t.integer :parent_id
       t.string  :name

data/lib/generators/thesis/install/templates/migrations/{create_page_content.rb → thesis_create_page_content.rb}

@@ -1,5 +1,8 @@
-class CreatePageContent < ActiveRecord::Migration
+class ThesisCreatePageContent < ActiveRecord::Migration
   def self.up
+    # Please note: if you change this (in the thesis gem) please
+    # update the /spec/spec_helper.rb to match.
+    
     create_table :page_contents do |t|
       t.integer :page_id,           null: false
       t.string  :name,              null: false

data/lib/thesis/controllers/controller_helpers.rb

@@ -1,18 +1,5 @@
 module Thesis
   module ControllerHelpers
-    module ClassMethods
-      def class_method_here
-        # Sample
-      end
-    end
-    
-    def self.included(base)
-      raise ActiveRecordRequired.new("Currently, Thesis only works with ActiveRecord.") unless defined? ActiveRecord
-
-      # base.extend ClassMethods
-      # base.helper_method :class_method_here
-    end
-
     def current_page
       @current_page ||= Page.where(slug: request.fullpath).first
     end
@@ -20,20 +7,9 @@ module Thesis
     def root_pages
       @root_pages ||= Page.where(parent_id: nil).order("sort_order ASC").all
     end
-
-    def page_is_editable?(page)
-      raise RequiredMethodNotImplemented.new("Add a `page_is_editable?(page)` method to your controller that returns true or false.")
-    end
-
+    
     def thesis_editor
       "<div id='thesis-editor'></div>".html_safe if page_is_editable?(current_page)
     end
   end
 end
-
-if defined? ActionController::Base
-  ActionController::Base.class_eval do
-    include Thesis::ControllerHelpers
-    helper_method :current_page, :root_pages, :page_is_editable?, :thesis_editor
-  end
-end

data/lib/thesis/controllers/thesis_controller.rb

@@ -1,24 +1,39 @@
 module Thesis
-  class ThesisController < ActionController::Base
-    include ControllerHelpers
-    
+  class ThesisController < ::ApplicationController
+    include Thesis::ControllerHelpers
+
     def show
       raise ActionController::RoutingError.new('Not Found') unless current_page
 
       if current_page.template && template_exists?("page_templates/#{current_page.template}")
-        render "page_templates/#{current_page.template}"
+        render "page_templates/#{current_page.template}", layout: false
       else
         raise PageRequiresTemplate.new("Page requires a template but none was specified.")
       end
     end
     
-    def new_page      
+    def create_page      
       page = Page.new
       return head :forbidden unless page_is_editable?(page)
 
       update_page_attributes page
 
-      head page.save ? :ok : :not_acceptable
+      resp = {}
+
+      if page.save
+        resp[:page] = page
+      else
+        resp[:message] = page.errors.messages.first
+      end
+
+      render json: resp, status: page.valid? ? :ok : :not_acceptable
+    end
+    
+    def delete_page      
+      page = Page.where(slug: params[:slug].to_s).first
+      return head :forbidden unless page && page_is_editable?(page)
+
+      head page.destroy ? :ok : :not_acceptable
     end
     
     def update_page
@@ -38,16 +53,37 @@ module Thesis
       page_attributes.each { |a| page.send("#{a}=", params[a]) if params[a] }
       page
     end
-    
-  protected
-    
-    def page_is_editable?(page)
-      appcon = ApplicationController.new
-      if appcon.respond_to?("page_is_editable?")
-        appcon.page_is_editable?(page)
+
+    def update_page_content
+      errors = false
+      error_message = "Unknown error."
+
+      page_contents = PageContent.where(id: params.keys).includes(:page).all
+      if page_contents.length.zero?
+        error_message = "That page doesn't exist anymore."
+        errors = true
       else
-        raise RequiredMethodNotImplemented.new("Add a `page_is_editable?(page)` method to your controller that returns true or false.")
+        page_contents.each do |pc|
+          if page_is_editable? pc.page
+            pc.content = params[pc.id.to_s]
+            pc.save
+          else
+            errors = true
+            error_message = "You don't have permission to update this page."
+          end
+        end
       end
+
+      resp = {}
+      resp[:message] = error_message if errors
+
+      render json: resp, status: errors ? :not_acceptable : :ok
+    end
+    
+    # The ApplicationController should implement this.
+    def page_is_editable?(page)
+      raise RequiredMethodNotImplemented.new("Add a `page_is_editable?(page)` method to your controller that returns true or false.") unless defined?(super)
+      super
     end
   end
 end

data/lib/thesis/engine.rb

@@ -1,5 +1,14 @@
 module Thesis
   class Engine < ::Rails::Engine
-    isolate_namespace Thesis
+    # isolate_namespace Thesis # We're accessing the application controller, so we can't do this.
+    initializer 'thesis.action_controller' do |app|
+      require "thesis/controllers/controller_helpers"
+      require "thesis/controllers/thesis_controller"
+      
+      ActiveSupport.on_load(:action_controller) do
+        include ::Thesis::ControllerHelpers
+        helper_method :current_page, :root_pages, :page_is_editable?, :thesis_editor
+      end
+    end
   end
 end

data/lib/thesis/models/page.rb

@@ -4,12 +4,16 @@ module Thesis
     
     belongs_to :parent, class_name: "Page"
     has_many :subpages, class_name: "Page", foreign_key: "parent_id", order: "sort_order ASC"
-    has_many :page_contents
+    has_many :page_contents, dependent: :destroy
 
     before_validation :update_slug
     after_save :update_subpage_slugs
     
-    validates :slug, uniqueness: { message: "There's already a page like that. Change your page name." }, presence: true
+    validates :slug, 
+      uniqueness: { message: "There's already a page like that. Change your page name." }, 
+      presence: true,
+      length: { minimum: 1 },
+      allow_blank: false
     
     def update_slug
       self.slug = "/" << self.name.parameterize
@@ -20,8 +24,8 @@ module Thesis
       subpages.each(&:save) if slug_changed?
     end
     
-    def content(name, content_type = :html)
-      pc = find_or_create_page_content(name, content_type)
+    def content(name, content_type = :html, opts = {})
+      pc = find_or_create_page_content(name, content_type, opts)
       pc.render
     end
     
@@ -31,9 +35,13 @@ module Thesis
     
   protected
     
-    def find_or_create_page_content(name, content_type)
+    def find_or_create_page_content(name, content_type, opts = {})
       page_content = self.page_contents.where(name: name).first_or_create do |pc|
-        pc.content = "Edit This Area"
+        pc.content = "<p>Edit This HTML Area</p>" if content_type == :html
+        pc.content = "Edit This Text Area" if content_type == :text
+        width = opts[:width] || 350
+        height = opts[:height] || 150
+        pc.content = "http://placehold.it/#{width}x#{height}" if content_type == :image
       end
       page_content.content_type = content_type
       page_content.save if page_content.changed?

data/lib/thesis/models/page_content.rb

@@ -9,7 +9,9 @@ module Thesis
       when :html
         render_html
       when :text
-        render_text
+        render_plain_text
+      when :image
+        render_image
       else
         render_html
       end
@@ -19,22 +21,22 @@ module Thesis
     
     def render_html
       h = "<div class='thesis-content thesis-content-html' data-thesis-content-id='#{self.id}'>" +
-      "#{self.content}" + 
-      "</div>"
+            "#{self.content}" + 
+          "</div>"
       h.html_safe
     end
     
-    def render_text
+    def render_plain_text
       h = "<span class='thesis-content thesis-content-text' data-thesis-content-id='#{self.id}'>" +
-      "#{self.content}" +
-      "</span>"
+            "#{self.content}" +
+          "</span>"
       h.html_safe
     end
     
     def render_image
       h = "<div class='thesis-content thesis-content-image'>" +
-      "<img src='#{self.content}' />" +
-      "</div>"
+            "<img src='#{self.content}' />" +
+          "</div>"
       h.html_safe
     end
   end

data/lib/thesis/version.rb

@@ -1,3 +1,3 @@
 module Thesis
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/thesis.rb

@@ -1,10 +1,8 @@
-require "thesis/engine"
 require "thesis/version"
 require "thesis/exceptions"
-require "thesis/controllers/controller_helpers" # Included into ActionController::Base
-require "thesis/controllers/thesis_controller"
+require "thesis/controllers/controller_helpers"
 require "thesis/routing/route_constraint"
-require "thesis/routing/routes"
+require "thesis/engine"
 
 # Models
 require "thesis/models/page"

data/spec/lib/thesis/controllers/thesis_controller_spec.rb

@@ -1,68 +1,96 @@
 require "spec_helper"
 
 describe Thesis::ThesisController do
-	let(:page) { create :page, template: "default" }
-	
-	before do
-		described_class.any_instance.stub(:render).and_return(page.title)
-		described_class.any_instance.stub(:template_exists?).and_return(true)
-		described_class.any_instance.stub(:page_is_editable?).and_return(true)
-	end
+  let(:page) { create :page, template: "default" }
+  let(:page_content) { create :page_content, name: "Main", page: page }
+  
+  before do
+    described_class.any_instance.stub(:render).and_return(page.title)
+    described_class.any_instance.stub(:template_exists?).and_return(true)
+    described_class.any_instance.stub(:page_is_editable?).and_return(true)
+  end
 
-	describe "#show" do
-		it "displays a page when it can be found" do
-			make_request :show, path: page.slug
-			@response.should_not be_nil
-		end
+  describe "#show" do
+    it "displays a page when it can be found" do
+      make_request :show, path: page.slug
+      @response.should_not be_nil
+    end
 
-		it "raises RoutingError when the page slug can't be found" do
-			expect { make_request :show, path: "/nonexistent" }.to raise_error ActionController::RoutingError
-		end
+    it "raises RoutingError when the page slug can't be found" do
+      expect { make_request :show, path: "/nonexistent" }.to raise_error ActionController::RoutingError
+    end
 
-		it "raises PageRequiresTemplate when template can't be found" do
-			described_class.any_instance.stub(:template_exists?).and_return(false)
-			expect { make_request :show, path: page.slug }.to raise_error Thesis::PageRequiresTemplate
-		end
-	end
+    it "raises PageRequiresTemplate when template can't be found" do
+      described_class.any_instance.stub(:template_exists?).and_return(false)
+      expect { make_request :show, path: page.slug }.to raise_error Thesis::PageRequiresTemplate
+    end
+  end
 
-	describe "#new_page" do
-		context "when the page can be edited" do
-			it "creates a page" do
-				make_request :new_page, name: "New Page"
-				page = Thesis::Page.last
-				expect(page.name).to eq "New Page"
-			end
-		end
+  describe "#create_page" do
+    context "when the page can be edited" do
+      it "creates a page" do
+        make_request :create_page, name: "New Page"
+        page = Thesis::Page.last
+        expect(page.name).to eq "New Page"
+      end
+    end
 
-		context "when the page can't be edited" do
-			before { described_class.any_instance.stub(:page_is_editable?).and_return(false) }
+    context "when the page can't be edited" do
+      before { described_class.any_instance.stub(:page_is_editable?).and_return(false) }
 
-			it "returns a status of 403 'Forbidden'" do
-				make_request :new_page, name: "New Page"
-				expect(@response.status).to eq 403	
-			end
-		end
-	end
+      it "returns a status of 403 'Forbidden'" do
+        make_request :create_page, name: "New Page"
+        expect(@response.status).to eq 403  
+      end
+    end
+  end
 
-	describe "#update_page" do
-		context "when the page can be edited" do
-			it "updates the attributes of the page" do
-				make_request :update_page, path: page.slug, name: "New Name"
-				page.reload
-				expect(page.name).to eq "New Name"
-				expect(page.slug).to eq "/new-name"
-			end
-		end
-	end
+  describe "#update_page" do
+    context "when the page can be edited" do
+      it "updates the attributes of the page" do
+        make_request :update_page, path: page.slug, name: "New Name"
+        page.reload
+        expect(page.name).to eq "New Name"
+        expect(page.slug).to eq "/new-name"
+      end
+    end
+  end
+
+  describe "#update_page_content" do
+    context "when the page can be edited" do 
+      it "updates the content on the page" do
+        page_content.content = "I'm the content"
+        page_content.save
+
+        make_request :update_page_content, { method: :put, page_content.id => "New content" }
+
+        expect(page_content.reload.content).to eq "New content"
+      end
+    end
+    
+    context "when the page can't be edited" do 
+      before { described_class.any_instance.stub(:page_is_editable?).and_return(false) }
+
+      it "doesn't update the page_content" do
+        page_content.content = "I'm the content"
+        page_content.save
+
+        make_request :update_page_content, { method: :post, page_content.id => "New content" }
+
+        expect(page_content.reload.content).to eq "I'm the content"
+      end
+    end
+  end
 end
 
 # Mock a request to the controller without
 # Using Rails routing. Makes the response available
 # in the @response instance variable.
 def make_request(action, params = {})
-	path = params[:path] || "/"
-	env = Rack::MockRequest.env_for(path, :params => params.except(:path), method: :post)
-	status, headers, body = described_class.action(action).call(env)
-	@response = ActionDispatch::TestResponse.new(status, headers, body)
-	@controller = body.request.env['action_controller.instance']
+  path = params[:path] || "/"
+  method = params[:method] || "post"
+  env = Rack::MockRequest.env_for(path, :params => params.except(:path).except(:method), method: method)
+  status, headers, body = described_class.action(action).call(env)
+  @response = ActionDispatch::TestResponse.new(status, headers, body)
+  @controller = body.request.env['action_controller.instance']
 end

data/spec/lib/thesis/models/page_content_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Thesis::PageContent do
-  let(:page) 				 { create(:page) }
+  let(:page)         { create(:page) }
   let(:page_content) { create(:page_content, attributes.merge(page_id: page.id)) }
 
   describe "#render" do
@@ -14,20 +14,19 @@ describe Thesis::PageContent do
       it { should match page_content.content }
     end
 
-		context "when the content type is 'text'" do
-			let(:attributes) {{ content_type: "text" }}
+    context "when the content type is 'text'" do
+      let(:attributes) {{ content_type: "text" }}
 
-			it { should match /thesis-content-text/ }
-			it { should match page_content.content }
-  	end
+      it { should match /thesis-content-text/ }
+      it { should match page_content.content }
+    end
 
-		context "when the content type is 'image'" do
-			let(:attributes) {{ content_type: "image" }}
-		
-			pending "currently renders as 'html'. Consider using #render_image in #render."
-			# it { should match /thesis-content-image/ }
-			# it { should match /img/ }
-			# it { should match page_content.content }
-		end
-	end
+    context "when the content type is 'image'" do
+      let(:attributes) {{ content_type: "image" }}
+    
+      it { should match /thesis-content-image/ }
+      it { should match /img/ }
+      it { should match page_content.content }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,24 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'rails/all'
 require 'factory_girl'
 require 'rspec/autorun'
 require 'database_cleaner'
+require 'rails/all'
+
+# Add a fake ApplicationController for testing.
+class ApplicationController < ActionController::Base
+  def page_is_editable?(page)
+    true
+  end
+end
+
+# Require thesis
+require "thesis"
 
-# Require all the Thesis files
-Dir[File.join('.', '/lib/thesis/**/*.rb')].each {|file| require file }
+# Manually run the Rails initializer. Thanks to @JoshReedSchramm for the code.
+initializer = Thesis::Engine.initializers.select { |i| i.name == "thesis.action_controller" }.first
+initializer.run
+# Dir[File.join('.', '/lib/thesis/**/*.rb')].each {|file| require file }
 
 # Load Factories
 FactoryGirl.find_definitions