thesis 0.1.1 → 0.1.3

data/app/assets/stylesheets/thesis/base/bourbon/helpers/_shape-size-stripper.scss

@@ -0,0 +1,10 @@
+@function _shape-size-stripper($shape-size) {
+  $shape-size-spec: null;
+  @each $value in $shape-size {
+    @if ($value == "cover") or ($value == "contain") {
+      $value: null;
+    }
+    $shape-size-spec: "#{$shape-size-spec} #{$value}";
+  }
+  @return $shape-size-spec;
+}

data/app/assets/stylesheets/thesis/base/bourbon/helpers/_str-to-num.scss

@@ -0,0 +1,50 @@
+//************************************************************************//
+// Helper function for linear/radial-gradient-parsers.
+// Source: http://sassmeister.com/gist/9647408
+//************************************************************************//
+@function _str-to-num($string) {
+  // Matrices
+  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
+  $numbers:  0   1   2   3   4   5   6   7   8   9;
+
+  // Result
+  $result: 0;
+  $divider: 0;
+  $minus: false;
+
+  // Looping through all characters
+  @for $i from 1 through str-length($string) {
+    $character: str-slice($string, $i, $i);
+    $index: index($strings, $character);
+
+    @if $character == '-' {
+      $minus: true;
+    }
+
+    @else if $character == '.' {
+      $divider: 1;
+    }
+
+    @else {
+      @if not $index {
+        $result: if($minus, $result * -1, $result);
+        @return _convert-units($result, str-slice($string, $i));
+      }
+
+      $number: nth($numbers, $index);
+
+      @if $divider == 0 {
+        $result: $result * 10;
+      }
+
+      @else {
+        // Move the decimal dot to the left
+        $divider: $divider * 10;
+        $number: $number / $divider;
+      }
+
+      $result: $result + $number;
+    }
+  }
+  @return if($minus, $result * -1, $result);
+}

data/app/assets/stylesheets/thesis/base/bourbon/settings/_asset-pipeline.scss

@@ -0,0 +1 @@
+$asset-pipeline: false !default;

data/app/assets/stylesheets/thesis/base/bourbon/settings/_prefixer.scss

@@ -0,0 +1,6 @@
+// Variable settings for /addons/prefixer.scss
+$prefix-for-webkit:    true !default;
+$prefix-for-mozilla:   true !default;
+$prefix-for-microsoft: true !default;
+$prefix-for-opera:     true !default;
+$prefix-for-spec:      true !default; // required for keyframe mixin

data/app/assets/stylesheets/thesis/base/bourbon/settings/_px-to-em.scss

@@ -0,0 +1 @@
+$em-base: 16px !default;

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

@@ -4,11 +4,11 @@ module Thesis
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
-      
+
       source_root File.expand_path('../templates', __FILE__)
-      
+
       desc "install or upgrade Thesis"
-      
+
       def self.next_migration_number(path)
         unless @prev_migration_nr
           @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
@@ -19,20 +19,20 @@ module Thesis
       end
 
       def copy_migrations
-        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 }
+        copy_migration "thesis_create_page"
+        copy_migration "thesis_create_page_content"
       end
 
       def create_folders
-        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
+        return copy_file "page_templates/default.html.slim", "app/views/page_templates/default.html.slim" if defined? Slim
+        return 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"
       end
 
       def install_js
         filename = "app/assets/javascripts/application.js"
         existing = File.binread("#{filename}").include?("require thesis")
-        
+
         if existing && generating?
           say_status("skipped", "insert into #{filename}", :yellow)
         else
@@ -48,7 +48,7 @@ module Thesis
         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
@@ -64,11 +64,11 @@ module Thesis
       def install_page_is_editable
         filename = "app/controllers/application_controller.rb"
         existing = File.binread("#{filename}").include?("def page_is_editable?")
-        
+
         if existing && generating?
           say_status("skipped", "insert into #{filename}", :yellow)
         else
-          insert_into_file "#{filename}", after: %r{  protect_from_forgery} do
+          insert_into_file "#{filename}", after: %r{  protect_from_forgery with: :exception} do
             "\n" +
             "\n  # Thesis authentication" +
             "\n  def page_is_editable?(page)" +
@@ -103,7 +103,15 @@ module Thesis
 
       def destroying?
         :revoke == behavior
-      end  
+      end
+
+      def copy_migration(filename)
+        if generating? && self.class.migration_exists?("db/migrate", "#{filename}")
+          say_status("skipped", "Migration #{filename}.rb already exists")
+        else
+          migration_template "migrations/#{filename}.rb", "db/migrate/#{filename}.rb"
+        end
+      end
     end
   end
 end

data/lib/thesis/controllers/controller_helpers.rb

@@ -1,17 +1,23 @@
 module Thesis
   module ControllerHelpers
     def current_page
-      slug = request.fullpath.sub(/(\/)+$/,'')
-      @current_page ||= Page.where(slug: slug).first
-      @current_page
+      @current_page ||= begin
+        p = Page.where(slug: current_slug).first_or_create
+        p.editable = page_is_editable?(p)
+        p
+      end
+    end
+
+    def current_slug
+      request.fullpath.sub(/(\/)+$/,'').presence || "/"
     end
 
     def root_pages
       @root_pages ||= Page.where(parent_id: nil).order("sort_order ASC")
     end
-    
+
     def thesis_editor
-      "<div id='thesis-editor'></div>".html_safe if page_is_editable?(current_page)
+      current_page.editable ? "<div id='thesis-editor'></div>".html_safe : ""
     end
   end
 end

data/lib/thesis/controllers/thesis_controller.rb

@@ -4,15 +4,17 @@ module Thesis
 
     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}", layout: false
+      elsif template_exists?("page_templates/default")
+        render "page_templates/default"
       else
-        raise PageRequiresTemplate.new("Page requires a template but none was specified.")
+        raise PageRequiresTemplate.new("No default template found in page_templates. Create page_templates/default.html.(erb|haml|slim).")
       end
     end
-    
-    def create_page      
+
+    def create_page
       page = Page.new
       return head :forbidden unless page_is_editable?(page)
 
@@ -23,8 +25,9 @@ module Thesis
         page.parent = parent
       end
 
-      resp = {}
+      resp = { page: page }
 
+      page.update_slug
       if page.save
         resp[:page] = page
       else
@@ -33,30 +36,30 @@ module Thesis
 
       render json: resp, status: page.valid? ? :ok : :not_acceptable
     end
-    
-    def delete_page      
+
+    def delete_page
       slug = params[:slug].to_s.sub(/(\/)+$/,'')
       page = Page.where(slug: slug).first
       return head :forbidden unless page && page_is_editable?(page)
 
       head page.destroy ? :ok : :not_acceptable
     end
-    
+
     def update_page
       page = current_page
       return head :forbidden unless page_is_editable?(page)
 
       update_page_attributes page
-      
+
       head page.save ? :ok : :not_acceptable
     end
 
     def page_attributes
       [ :name, :title, :description, :parent_id ]
     end
-    
+
     def update_page_attributes(page)
-      page_attributes.each { |a| page.send("#{a}=", params[a]) if params[a] }
+      page_attributes.each { |a| page.send("#{a}=", params[a].to_s) if params[a] }
       page
     end
 
@@ -71,7 +74,7 @@ module Thesis
       else
         page_contents.each do |pc|
           if page_is_editable? pc.page
-            pc.content = params[pc.id.to_s]
+            pc.content = params[pc.id.to_s].to_s.presence || " ".html_safe
             pc.save
           else
             errors = true
@@ -85,7 +88,7 @@ module Thesis
 
       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)

data/lib/thesis/models/page.rb

@@ -1,47 +1,54 @@
 module Thesis
   class Page < ActiveRecord::Base
+    attr_accessor :editable
+
     self.table_name = "pages"
-    
+
     belongs_to :parent, class_name: "Page"
-    has_many :subpages, class_name: "Page", foreign_key: "parent_id", order: "sort_order ASC"
+    has_many :subpages, -> { order(:sort_order) }, class_name: "Page", foreign_key: "parent_id"
     has_many :page_contents, dependent: :destroy
 
-    before_validation :update_slug
+    before_create :set_name
+    before_save :update_slug # Do we even want to do this?
     after_save :update_subpage_slugs
-    
-    validates :slug, 
-      uniqueness: { message: "There's already a page like that. Change your page name." }, 
+
+    validates :slug,
+      uniqueness: { message: "There's already a page at that location." },
       presence: true,
-      length: { minimum: 1 },
-      allow_blank: false
-    
+      allow_blank: true,
+      allow_null: false
+
+    def set_name
+      self.name ||= self.slug.to_s.split("/").last.to_s.humanize if self.slug
+    end
+
     def update_slug
+      self.name ||= ""
       self.slug = "/" << self.name.parameterize
       self.slug = "#{parent.slug.to_s}#{self.slug.to_s}" if parent
     end
-    
+
     def update_subpage_slugs
       subpages.each(&:save) if slug_changed?
     end
-    
+
     def content(name, content_type = :html, opts = {})
-      pc = find_or_create_page_content(name, content_type, opts)
-      pc.render
+      find_or_create_page_content(name, content_type, opts).render(editable: self.editable)
     end
-    
+
     def path
       self.slug
     end
-    
+
   protected
-    
+
     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 = opts[:default] || "<p>Edit This HTML Area</p>" if content_type == :html
-        pc.content = opts[:default] || "Edit This Text Area" if content_type == :text
-        width = opts[:width] || 350
-        height = opts[:height] || 150
-        pc.content = opts[:default] || "http://placehold.it/#{width}x#{height}" if content_type == :image
+      page_content =  self.page_contents.where(name: name).first_or_create do |pc|
+        pc.content =  opts[:default]  || "<p>Edit This HTML Area</p>" if content_type == :html
+        pc.content =  opts[:default]  || "Edit This Text Area" if content_type == :text
+        width =       opts[:width]    || 350
+        height =      opts[:height]   || 150
+        pc.content =  opts[:default]  || "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

@@ -3,41 +3,56 @@ module Thesis
     self.table_name = "page_contents"
 
     belongs_to :page
-    
-    def render
+    validates :page_id, presence: true
+
+    def render(args={})
+      args[:editable] ? render_editable : render_content
+    end
+
+    def render_editable
+      case self.content_type.to_sym
+      when :html then  render_html_editable
+      when :text then  render_plain_text_editable
+      when :image then render_image_editable
+      else render_html_editable
+      end
+    end
+
+    def render_content
       case self.content_type.to_sym
-      when :html
-        render_html
-      when :text
-        render_plain_text
-      when :image
-        render_image
-      else
-        render_html
+      when :image then render_image_tag
+      else self.content.to_s.html_safe
       end
     end
-    
+
     protected
-    
-    def render_html
-      h = "<div class='thesis-content thesis-content-html' data-thesis-content-id='#{self.id}'>" +
-            "#{self.content}" + 
-          "</div>"
-      h.html_safe
+
+    def render_html_editable
+      (
+        "<thesis-content class='thesis-content thesis-content-html' data-thesis-content-id='#{self.id}'>" +
+          "#{self.content}" +
+        "</thesis-content>"
+      ).html_safe
+    end
+
+    def render_plain_text_editable
+      (
+        "<thesis-content class='thesis-content thesis-content-text' data-thesis-content-id='#{self.id}'>" +
+          "#{self.content}" +
+        "</thesis-content>"
+      ).html_safe
     end
-    
-    def render_plain_text
-      h = "<span class='thesis-content thesis-content-text' data-thesis-content-id='#{self.id}'>" +
-            "#{self.content}" +
-          "</span>"
-      h.html_safe
+
+    def render_image_editable
+      (
+        "<thesis-content class='thesis-content thesis-content-image' data-thesis-content-id='#{self.id}'>" +
+          render_image_tag +
+        "</thesis-content>"
+      ).html_safe
     end
-    
-    def render_image
-      h = "<div class='thesis-content thesis-content-image'>" +
-            "<img src='#{self.content}' />" +
-          "</div>"
-      h.html_safe
+
+    def render_image_tag
+      "<img src='#{self.content}' />".html_safe
     end
   end
 end

data/lib/thesis/routing/route_constraint.rb

@@ -1,8 +1,14 @@
 module Thesis
   class RouteConstraint
-    def self.matches?(request)
+    def matches?(request)
       slug = request.path.to_s.sub(/(\/)+$/,'')
-      Page.where(slug: slug).select("id").first.present?
+      return false if excluded_path?(slug)
+      Page.where(slug: slug).size > 0
+    end
+
+    def excluded_path?(path)
+      excluded_extensions = [ :jpg, :jpeg, :png, :css, :js, :ico, :pdf ]
+      excluded_extensions.any?{ |ext| path.ends_with?(".#{ext}") }
     end
   end
 end