cmsimple 0.2.0 → 0.2.2

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .bundle
+vendor/ruby
 .idea
 .rake_tasks
 .rvmrc
@@ -7,6 +8,7 @@
 REVISION
 vendor/bundle
 .rake_tasks~
+pkg
 mkmf.log
 
 # Local config files

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/modeset/cmsimple.png?branch=master)](http://travis-ci.org/modeset/cmsimple)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/modeset/cmsimple)
+[![Gem Version](https://badge.fury.io/rb/cmsimple.png)](http://badge.fury.io/rb/cmsimple)
 
 CMSimple is an easy-to-use but extensible CMS wrapped around the Mercury editor (https://github.com/jejacks0n/mercury), written as a Rails engine.
 
@@ -103,7 +104,7 @@ To run the test suite for CMSimple, you will need to do the following:
   1. Configure a `database.yml` in the demo rails app6 (see spec/rails_app/config/database.example.yml)
   2. Run setup tasks: `rake app:db:setup` and `rake app:db:test:prepare`
 2. Run specs
-  1. `rake spec`
+  1. `rake`
   2. Wait.
 
 

data/app/assets/javascripts/cmsimple/views/redirects/list.jst.hamlc

@@ -1,4 +1,3 @@
-
 %header.panel-actions.add-redirect-form
   %button.btn.btn-primary.add Add Redirect
   %form.form-horizontal(style='display: none')

data/app/assets/javascripts/cmsimple/views/versions/_item.jst.hamlc

@@ -1,6 +1,6 @@
 %li(id="version_#{@id}" data-id=@id)
   %article
     %p.published= moment(@published_at).format('dddd, MMMM Do YYYY, h:mm:ss a')
-    %button.btn.view View
-    %button.btn.important.revert Revert to
+    %button.btn.btn-primary.view View
+    %button.btn.btn-danger.revert Revert to
 

data/app/assets/stylesheets/cmsimple.css

@@ -6,7 +6,7 @@
 
 /*
  *= require mercury
- *= require cmsimple/forms
+ *= require cmsimple/elements
  *= require cmsimple/panels
  *= require cmsimple/toolbar-images
  *

data/app/assets/stylesheets/cmsimple/panels.css

@@ -1,4 +1,3 @@
-
 /* Dialogs */
 .mercury-framed-panel {
   background-color: #f5f5f5;
@@ -8,8 +7,6 @@
 .mercury-framed-panel h1 {
   color: #f5f5f5;
   border-bottom: 1px solid #222;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
 
@@ -38,8 +35,6 @@
 .mercury-panel .panel-actions {
   background-color: #eaeaea;
   border: 1px solid #ccc;
-  -webkit-border-radius: 0.5em;
-  -moz-border-radius: 0.5em;
   border-radius: 0.5em;
   padding: 1em;
   overflow: hidden;
@@ -50,9 +45,9 @@
 
 .mercury-panel-pane .loading {
   text-align: center;
-  width: 100%;
   float: left;
-  margin-top: 50%
+  margin-top: 50%;
+  width: 100%;
 }
 
 .mercury-panel .hidden {
@@ -62,7 +57,6 @@
  * Image Panel
  *----------------------------------------------------------------------------*/
 .mercury-panel .add-image-action {
-  /* margin-top: 50px; */
   display: none;
 }
 
@@ -85,14 +79,14 @@
 
 .mercury-panel .add-image-action label {
   font-size: 11px;
+  text-align: left;
   display: block;
+  overflow: visible;
   float: none;
-  width: auto;
-  margin-right: 0;
-  text-align: left;
   line-height: normal;
-  overflow: visible;
   margin-top: 20px;
+  margin-right: 0;
+  width: auto;
 }
 .mercury-panel .add-image-action textarea {
   font-size: 1em;
@@ -100,27 +94,26 @@
 }
 
 .image-filter input.filter {
-  outline: none;
-  font-size: 1em;
-  border-radius: 30px;
-  moz-border-radius: 30px;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  width: 100%;
-  padding-left: 20px;
-  background-color: #FFF;
-  background-repeat: no-repeat;
+  background-color: white;
   background-image: url(/assets/mercury/search-icon.png);
   background-position: 4px center;
-  margin: 1em 0
+  background-repeat: no-repeat;
+  border-radius: 30px;
+  font-size: 1em;
+  outline: none;
+  margin: 1em 0;
+  padding-left: 20px;
+  width: 100%;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .mercury-panel ul.media-grid {
-  width: 400px;
-  padding: 0;
-  overflow: hidden;
   list-style: none;
+  overflow: hidden;
+  padding: 0;
+  width: 400px;
 }
 
 .mercury-panel .media-grid > li {
@@ -132,37 +125,35 @@
 }
 
 .mercury-panel .media-item {
-  position: relative;
-  display: block;
-  padding: 4px;
-  line-height: 1;
   border: 1px solid #ccc;
   cursor: default;
+  line-height: 1;
+  display: block;
+  position: relative;
+  padding: 4px;
   max-width: 182px;
 }
 
 .mercury-panel .media-item:hover {
   border-color: #268bd2;
-  -webkit-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
 .mercury-panel .media-item > .media-info {
-  position: absolute;
   background-color: rgba(255,255,255,0.9);
-  z-index: 2;
+  display: none;
+  overflow: hidden;
+  position: absolute;
   width: 182px;
   height: 182px;
-  overflow: hidden;
-  display: none;
+  z-index: 2;
 }
 .mercury-panel .media-item > .media-info .close {
   position: absolute;
   top: 0;
   right: 2px;
   text-decoration: none;
-  color: #000;
+  color: black;
 }
 
 .mercury-panel .media-item > .media-info.active {
@@ -175,8 +166,8 @@
 }
 .mercury-panel .media-item > .media-info dt {
   font-size: .75em;
-  text-transform: uppercase;
   font-weight: bold;
+  text-transform: uppercase;
   margin: 1em 0 0.25em;
   padding: 0;
 }
@@ -187,9 +178,9 @@
 
 .mercury-panel .media-item > img {
   display: block;
-  max-width: 100%;
   margin-left: auto;
   margin-right: auto;
+  max-width: 100%;
 }
 
 .mercury-panel .media-caption {
@@ -211,16 +202,16 @@
  * Sitemap Panel
  *----------------------------------------------------------------------------*/
 .mercury-panel ul.sitemap {
-  width: 400px;
   padding: 0;
+  width: 400px;
 }
 
 .mercury-panel ul.sitemap li {
+  background: url(/assets/tree-line-horizontal.png) no-repeat left 12px;
   list-style: none;
-  padding: 0;
   margin: 0;
+  padding: 0;
   padding-left: 2.5em;
-  background: url(/assets/tree-line-horizontal.png) no-repeat left 12px;
 }
 .mercury-panel ul.sitemap li:last-child {
   background-image: url(/assets/tree-line-horizontal-last.png);
@@ -232,14 +223,12 @@
 
 .mercury-panel ul.sitemap > li article {
   background-color: #666;
-  color: #fff;
-  padding: 0.25em 0.5em;
-  margin-bottom: 2px;
-  -webkit-border-radius: 0.25em;
-  -moz-border-radius: 0.25em;
   border-radius: 0.25em;
-  cursor: default;
   border: 1px solid transparent;
+  color: white;
+  cursor: default;
+  margin-bottom: 2px;
+  padding: 0.25em 0.5em;
 }
 /* Nested coloring of pages */
 .mercury-panel ul.sitemap > li ul li article {
@@ -254,8 +243,6 @@
 .mercury-panel ul.sitemap > li article:hover {
   background-color: #444;
   border-color: #268bd2;
-  -webkit-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
@@ -266,12 +253,12 @@
   margin-left: 0.5em;
 }
 .mercury-panel ul.sitemap > li article .icon {
-  height: 16px;
-  width: 16px;
   background: url('/assets/sitemap/unpublished.png') no-repeat left top;
   background-size: 16px 16px;
-  margin-top: -1px;
   margin-left: -4px;
+  margin-top: -1px;
+  width: 16px;
+  height: 16px;
 }
 .mercury-panel ul.sitemap > li article .icon.has-changes {
   background-image: url('/assets/sitemap/has-changes.png');
@@ -280,24 +267,19 @@
   background-image: url('/assets/sitemap/published.png');
 }
 .mercury-panel ul.sitemap .caret {
-  display: inline-block;
-  vertical-align: middle;
-  zoom: 1;
-  *display: inline;
-  *vertical-align: auto;
-  border-width: 4px;
+  border-color: white transparent transparent transparent;
   border-style: solid;
-  border-color: #fff transparent transparent transparent;
-  width: 0;
-  height: 0;
-  vertical-align: top;
+  border-width: 4px;
+  display: inline-block;
   float: right;
   margin: 0.5em 0;
+  width: 0;
+  height: 0;
 }
 
 .mercury-panel ul.sitemap .caret.north {
+  border-color: transparent transparent white transparent;
   margin: 0.2em 0;
-  border-color: transparent transparent #fff transparent;
 }
 
 /* Increase the gap for top level pages */
@@ -307,7 +289,6 @@
 
 .mercury-panel ul.sitemap ul {
   padding: 0;
-  *zoom: 1;
 }
 .mercury-panel ul.sitemap ul:before,
 .mercury-panel ul.sitemap ul:after {
@@ -331,21 +312,17 @@
 
 .mercury-panel ul.redirects > li article {
   background-color: #666;
-  color: #fff;
-  padding: 0 0.5em;
-  margin-bottom: 2px;
-  -webkit-border-radius: 0.25em;
-  -moz-border-radius: 0.25em;
   border-radius: 0.25em;
   border: 1px solid transparent;
+  color: white;
   cursor: default;
+  margin-bottom: 2px;
+  padding: 0 0.5em;
 }
 
 .mercury-panel ul.redirects > li article:hover {
   background-color: #444;
   border-color: #268bd2;
-  -webkit-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
   box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
@@ -358,12 +335,12 @@
 }
 
 .mercury-panel ul.redirects > li article .remove {
+  color: white;
+  font-weight: bold;
+  text-decoration: none;
   position: absolute;
   top: 0;
   right: 5px;
-  color: #fff;
-  text-decoration: none;
-  font-weight: bold;
 }
 
 /* Versions panel */
@@ -379,14 +356,12 @@
 
 .mercury-panel ul.versions > li article {
   background-color: #666;
-  color: #fff;
-  padding: 0 0.5em;
-  margin-bottom: 2px;
-  -webkit-border-radius: 0.25em;
-  -moz-border-radius: 0.25em;
   border-radius: 0.25em;
   border: 1px solid transparent;
+  color: white;
   cursor: default;
+  margin-bottom: 2px;
+  padding: 0 0.5em;
 }
 .mercury-panel ul.versions > li article .view,
 .mercury-panel ul.versions > li article .revert {

data/app/assets/stylesheets/cmsimple/toolbar-images.css

@@ -1,4 +1,3 @@
-
 /* Button example */
 .mercury-primary-toolbar .mercury-inspector-button em {
   background-image: url(/assets/mercury/toolbar/primary/inspectorpanel.png);

data/app/controllers/cmsimple/front_controller.rb

@@ -16,7 +16,7 @@ module Cmsimple
     end
 
     def current_path
-      @path ||= Path.from_request(params[:path])
+      @path ||= Path.from_request!(request)
     end
 
     def current_page

data/app/controllers/cmsimple/pages_controller.rb

@@ -69,7 +69,7 @@ module Cmsimple
 
     #helpers
     def current_path
-      @path ||= Path.from_request(params[:path])
+      @path ||= Path.from_request!(request)
     end
 
     def current_page

data/app/models/cmsimple/path.rb

@@ -12,16 +12,17 @@ module Cmsimple
     before_validation :downcase_uri
 
     def self.from_request(request)
-      path = request.is_a?(String) ? request : ( request.try(:path) || '' )
-      path = "/#{path.gsub(/\/$/,'')}".gsub(/\/+/, '/')
-      path.downcase!
-      if path == '/'
-        with_pages.merge(Cmsimple::Page.root).first!
-      else
-        with_pages.where(uri: path).first!
+      if !request.params.has_key?(:path)
+        with_pages.merge(Cmsimple::Page.root).first
+      elsif result = find_from_request(request)
+        result
       end
     end
 
+    def self.from_request!(request)
+      from_request(request) || raise(ActiveRecord::RecordNotFound.new)
+    end
+
     def self.with_pages
       includes(:page)
     end
@@ -40,6 +41,17 @@ module Cmsimple
 
     protected
 
+    def self.find_from_request(request)
+      if found_with_fullpath = with_pages.where(uri: request.fullpath).first
+        found_with_fullpath
+      else
+        path = request.params[:path]
+        path = "/#{path.gsub(/\/$/,'')}".gsub(/\/+/, '/')
+        path.downcase!
+        with_pages.where(uri: path).first
+      end
+    end
+
     def require_destination
       unless destination.uri.present?
         errors[:destination] << 'can\'t be blank'

data/features/create.feature

@@ -11,7 +11,7 @@ Feature: As a user I should be able to create pages on the site
     Then I should be redirected to the new page
     And I should see the page in the sitemap
 
-  Scenario: As a user I add a page from the sitemap panel
+  Scenario: As a user I add a new home page from the sitemap panel
     When I open the sitemap
     And I add a new home page
     Then I should be redirected to the home page

data/lib/cmsimple/version.rb

@@ -1,3 +1,3 @@
 module Cmsimple
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/generators/cmsimple/snippet/templates/options.html.erb

@@ -12,7 +12,7 @@
       <%- end -%>
     </fieldset>
     <div class="form-actions mercury-display-controls">
-      <%%= f.submit class: 'btn btn=primary' %>
+      <%%= f.submit class: 'btn btn-primary' %>
     </div>
   <%% end %>
 </div>

data/spec/models/path_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
+
 describe Cmsimple::Path do
+
   subject { Cmsimple::Path.new }
+
   it { should validate_presence_of(:uri) }
   it { should belong_to(:page) }
 
@@ -34,38 +37,108 @@ describe Cmsimple::Path do
       subject.destination.should be_a(Cmsimple::Path::Redirect)
       subject.should be_redirect
     end
-
   end
 
-  describe 'from_request' do
+  describe '#from_request' do
 
-    it 'returns the path that has a uri mathing the request path' do
-      subject.uri = '/path'
-      subject.redirect_uri = '/some-other-path'
-      subject.save
-      Cmsimple::Path.from_request(OpenStruct.new(path: '/path')).destination.uri.should == '/some-other-path'
+    let(:request) { ActionDispatch::TestRequest.new }
+
+    context "when there is no path to follow" do
+      before do
+        request.stub(:fullpath).and_return('/foo')
+        request.stub(:params).and_return(path: '/path')
+      end
+      it "does not raise an error" do
+        expect(Cmsimple::Path.from_request(request)).to_not raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it "returns nil" do
+        expect(Cmsimple::Path.from_request(request)).to eq(nil)
+      end
     end
 
-    it "returns the path with the associated page" do
-      page = Cmsimple::Page.create title: 'About'
-      Cmsimple::Path.create uri: '/about', page: page
-      Cmsimple::Path.from_request(OpenStruct.new(path: '/about')).destination.title.should == 'About'
+    context 'without a path parameter' do
+      it "should send you to Cmsimple root path" do
+        page = Cmsimple::Page.create!(is_root: true, uri: "/foo", slug: "foo", title: "Foo")
+        Cmsimple::Path.should_not_receive(:find_from_request)
+        request.stub(:fullpath).and_return('/editor')
+        request.stub(:params).and_return({})
+        expect(Cmsimple::Path.from_request(request).destination.uri).to eq("/foo")
+      end
     end
 
-    it "returns the path where the associated page is marked as root" do
-      page = Cmsimple::Page.create title: 'Home', is_root: true
-      Cmsimple::Path.create uri: '/home', page: page
-      Cmsimple::Path.from_request(OpenStruct.new(path: '/')).destination.title.should == 'Home'
+    context "when a path exists that matches the full request path" do
+      before { request.stub(:params).and_return(path:nil) }
+
+      it "finds the redirect" do
+        request.stub(:fullpath).and_return('/path')
+        subject.uri = '/path'
+        subject.redirect_uri = '/some-other-path'
+        subject.save
+        expect(Cmsimple::Path.from_request(request).destination.uri).to eq('/some-other-path')
+      end
+
+      it "finds the redirect when the path has an extension" do
+        request.stub(:fullpath).and_return('/Legacy.aspx')
+        subject.uri = '/Legacy.aspx'
+        subject.redirect_uri = '/some-other-path'
+        subject.save
+        expect(Cmsimple::Path.from_request(request).destination.uri).to eq('/some-other-path')
+      end
     end
 
-    it "normalizes the path before querying" do
-      subject.uri = '/path'
-      subject.redirect_uri = '/some-other-path'
-      subject.save
-      Cmsimple::Path.from_request(OpenStruct.new(path: '//path')).destination.uri.should == '/some-other-path'
-      Cmsimple::Path.from_request(OpenStruct.new(path: '//path/')).destination.uri.should == '/some-other-path'
-      Cmsimple::Path.from_request(OpenStruct.new(path: 'path')).destination.uri.should == '/some-other-path'
-      Cmsimple::Path.from_request(OpenStruct.new(path: '/Path')).destination.uri.should == '/some-other-path'
+    context "when a path exists that matches the globbed request path" do
+      before do
+        request.stub(:fullpath).and_return('/foo')
+      end
+
+      it 'returns the path that has a uri matching the request path' do
+        request.stub(:params).and_return(path: '/path')
+        subject.uri = '/path'
+        subject.redirect_uri = '/some-other-path'
+        subject.save
+        Cmsimple::Path.from_request(request).destination.uri.should == '/some-other-path'
+      end
+
+      it "returns the path with the associated page" do
+        page = Cmsimple::Page.create title: 'About'
+        Cmsimple::Path.create uri: '/about', page: page
+        request.stub(:params).and_return(path: '/about')
+        Cmsimple::Path.from_request(request).destination.title.should == 'About'
+      end
+
+      it "returns the path where the associated page is marked as root" do
+        page = Cmsimple::Page.create title: 'Home', is_root: true
+        Cmsimple::Path.create uri: '/home', page: page
+        request.stub(:params).and_return(path: '/home')
+        Cmsimple::Path.from_request(request).destination.title.should == 'Home'
+      end
+
+      it "normalizes the path before querying" do
+        subject.uri = '/path'
+        subject.redirect_uri = '/some-other-path'
+        subject.save
+        request.stub(:params).and_return(path: '//path')
+        Cmsimple::Path.from_request(request).destination.uri.should == '/some-other-path'
+        request.stub(:params).and_return(path: '//path/')
+        Cmsimple::Path.from_request(request).destination.uri.should == '/some-other-path'
+        request.stub(:params).and_return(path: 'path')
+        Cmsimple::Path.from_request(request).destination.uri.should == '/some-other-path'
+        request.stub(:params).and_return(path: '/Path')
+        Cmsimple::Path.from_request(request).destination.uri.should == '/some-other-path'
+      end
     end
   end
+
+  describe "#from_request!" do
+    let(:request) { ActionDispatch::TestRequest.new }
+
+    it "raises ActiveRecord::RecordNotFound when no records are found" do
+      Cmsimple::Path.should_receive(:from_request).with(request).and_return(nil)
+      request.stub(:fullpath).and_return('/foo')
+      request.stub(:params).and_return(path: '/foo')
+      expect { Cmsimple::Path.from_request!(request) }.to raise_error ActiveRecord::RecordNotFound
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ RSpec.configure do |config|
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-  # config.mock_with :rspec
+  config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   # config.fixture_path = "#{::Rails.root}/spec/fixtures"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmsimple
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -384,7 +384,7 @@ files:
 - app/assets/javascripts/cmsimple/views/versions/_item.jst.hamlc
 - app/assets/javascripts/cmsimple/views/versions/list.jst.hamlc
 - app/assets/stylesheets/cmsimple.css
-- app/assets/stylesheets/cmsimple/forms.css
+- app/assets/stylesheets/cmsimple/elements.css
 - app/assets/stylesheets/cmsimple/panels.css
 - app/assets/stylesheets/cmsimple/toolbar-images.css
 - app/assets/stylesheets/mercury_overrides.css
@@ -576,7 +576,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2539754313290137300
+      hash: 3036956300692261753
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -585,7 +585,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2539754313290137300
+      hash: 3036956300692261753
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23