thesis 0.1.0 → 0.1.1

data/app/assets/stylesheets/thesis/thesis.css.scss

@@ -0,0 +1,65 @@
+#thesis-editor {
+  display: block;
+  position:absolute;
+  right: 10px;
+  top: 10px;
+  width:54px;
+  z-index: 1040;
+  
+  & #thesis-edit-page {
+    background-color:rgba(0, 0, 0, 0.6);
+    color:#ECECEC;
+    display:block;
+    font-size: 20px;
+    padding:10px;
+    line-height: 20px;
+    border-radius: 8px;
+    box-shadow: 0 0 10px #444;
+    -webkit-transition: 0.5s;
+    text-decoration: none;
+    width: 34px;
+    
+    &:hover {
+      box-shadow: 0 0 20px #000;
+      -webkit-transition: 0.5s;
+    }
+    & i {
+      display: none;
+    }
+    & i:first-child {
+      display: block;
+    }
+  }
+  
+}
+
+body.thesis-editing {
+  & .thesis-content {
+    z-index: 1039;
+    box-shadow: 0 0 1px 1px rgba(150, 168, 236, 0.8);
+  }
+  & #thesis-editor {
+    & #thesis-edit-page  {
+      & i {
+        display: block;
+      }
+      & i:first-child {
+        display: none;
+      }
+    }
+  }
+}
+
+.fader {
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  background-color: rgb(29, 49, 58);
+  opacity: 0.1;
+  cursor: crosshair;
+  z-index: 1038;
+  display: block;
+  pointer-events: none;
+}

data/app/assets/stylesheets/thesis.css

@@ -0,0 +1,4 @@
+/*
+ *= require_self
+ *= require_tree .
+*/

data/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  thesis_routes
+end

data/lib/thesis/controllers/controller_helpers.rb

@@ -1,11 +1,13 @@
 module Thesis
   module ControllerHelpers
     def current_page
-      @current_page ||= Page.where(slug: request.fullpath).first
+      slug = request.fullpath.sub(/(\/)+$/,'')
+      @current_page ||= Page.where(slug: slug).first
+      @current_page
     end
 
     def root_pages
-      @root_pages ||= Page.where(parent_id: nil).order("sort_order ASC").all
+      @root_pages ||= Page.where(parent_id: nil).order("sort_order ASC")
     end
     
     def thesis_editor

data/lib/thesis/controllers/thesis_controller.rb

@@ -4,7 +4,7 @@ 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
       else
@@ -17,6 +17,11 @@ module Thesis
       return head :forbidden unless page_is_editable?(page)
 
       update_page_attributes page
+      if params[:parent_slug].present?
+        parent_slug = params[:parent_slug].to_s.sub(/(\/)+$/,'')
+        parent = Page.where(slug: parent_slug).first
+        page.parent = parent
+      end
 
       resp = {}
 
@@ -30,7 +35,8 @@ module Thesis
     end
     
     def delete_page      
-      page = Page.where(slug: params[:slug].to_s).first
+      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

data/lib/thesis/models/page.rb

@@ -37,11 +37,11 @@ module Thesis
     
     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 = "<p>Edit This HTML Area</p>" if content_type == :html
-        pc.content = "Edit This Text Area" if content_type == :text
+        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 = "http://placehold.it/#{width}x#{height}" if content_type == :image
+        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/routing/route_constraint.rb

@@ -1,7 +1,8 @@
 module Thesis
   class RouteConstraint
     def self.matches?(request)
-      Page.where(slug: request.path.to_s).select("id").first.present?
+      slug = request.path.to_s.sub(/(\/)+$/,'')
+      Page.where(slug: slug).select("id").first.present?
     end
   end
 end

data/lib/thesis/routing/routes.rb

@@ -0,0 +1,12 @@
+module ActionDispatch::Routing
+ class Mapper
+   def thesis_routes
+      put "thesis/update_page_content" => "thesis/thesis#update_page_content"
+      post "thesis/create_page" => "thesis/thesis#create_page"
+      delete "thesis/delete_page" => "thesis/thesis#delete_page"
+
+      get "*slug" => 'thesis/thesis#show', constraints: ::Thesis::RouteConstraint
+    end
+  end
+end  
+    

data/lib/thesis/version.rb

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

data/lib/thesis.rb

@@ -1,12 +1,11 @@
 require "thesis/version"
 require "thesis/exceptions"
 require "thesis/controllers/controller_helpers"
+require "thesis/routing/routes"
 require "thesis/routing/route_constraint"
-require "thesis/engine"
-
-# Models
 require "thesis/models/page"
 require "thesis/models/page_content"
+require "thesis/engine"
 
 module Thesis
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thesis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -50,9 +50,40 @@ files:
 - lib/thesis/models/page_content.rb
 - lib/thesis/railtie.rb
 - lib/thesis/routing/route_constraint.rb
+- lib/thesis/routing/routes.rb
 - lib/thesis/version.rb
 - lib/thesis.rb
+- app/assets/javascripts/thesis/hallo.js
+- app/assets/javascripts/thesis/rangy-core.js
+- app/assets/javascripts/thesis/thesis.js.coffee
+- app/assets/javascripts/thesis.js
+- app/assets/stylesheets/thesis/font/fontawesome-webfont.eot
+- app/assets/stylesheets/thesis/font/fontawesome-webfont.svg
+- app/assets/stylesheets/thesis/font/fontawesome-webfont.ttf
+- app/assets/stylesheets/thesis/font/fontawesome-webfont.woff
+- app/assets/stylesheets/thesis/font/FontAwesome.otf
+- app/assets/stylesheets/thesis/font-awesome/font-awesome.scss
+- app/assets/stylesheets/thesis/jquery-ui/images/animated-overlay.gif
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_flat_30_cccccc_40x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_flat_50_5c5c5c_40x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_glass_20_555555_1x400.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_glass_40_0078a3_1x400.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_glass_40_ffc73d_1x400.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_gloss-wave_25_333333_500x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_inset-soft_25_000000_1x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-bg_inset-soft_30_f58400_1x100.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-icons_222222_256x240.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-icons_4b8e0b_256x240.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-icons_a83300_256x240.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-icons_cccccc_256x240.png
+- app/assets/stylesheets/thesis/jquery-ui/images/ui-icons_ffffff_256x240.png
+- app/assets/stylesheets/thesis/jquery-ui/jquery-ui-1.10.2.custom.css
+- app/assets/stylesheets/thesis/thesis.css.scss
+- app/assets/stylesheets/thesis.css
+- config/routes.rb
 - README.md
+- LICENSE.txt
 - spec/factories/page_contents.rb
 - spec/factories/pages.rb
 - spec/lib/thesis/controllers/thesis_controller_spec.rb