spree_static_content 0.70.3 → 1.0.1

data/README.md

@@ -1,5 +1,7 @@
 # Spree Static Content
 
+[![Build Status](https://secure.travis-ci.org/spree/spree_static_content.png?branch=1-0-stable)](http://travis-ci.org/spree/spree_static_content)
+
 Good, clean content management of pages for Spree.  You can use this to:
 
 - Add and manage static pages such as an 'About' page.
@@ -16,9 +18,11 @@ See the wiki for some more documentation on how you can use this extension.
 
 ## Basic Installation
 
+**For Spree 0.70.x**
+
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_static_content', :git => 'github.com/spree/spree_static_content'
+  gem 'spree_static_content', :git => 'http://github.com/spree/spree_static_content', :ref => '1861f4cd08c0ffa9940f0c81e69ea29b4541dbbd'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run: `rails g spree_static_content:install`
@@ -42,4 +46,4 @@ You can also run `bundle exec rake test_app` and then to run the specs run `bund
 <pre>
   git push -u origin my-feature-branch
 </pre>
-4. Send a pull request from your feature branch in the forked repository on github.
+4. Send a pull request from your feature branch in the forked repository on github.

data/app/controllers/spree/admin/pages_controller.rb

@@ -0,0 +1,16 @@
+class Spree::Admin::PagesController < Spree::Admin::ResourceController
+  update.after :expire_cache
+
+  def new
+    @page = @object
+  end
+
+  def edit
+    @page = @object
+  end
+
+  private
+  def expire_cache
+    expire_page :controller => '/spree/static_content', :action => 'show', :path => @object.slug
+  end
+end

data/app/controllers/{static_content_controller.rb → spree/static_content_controller.rb}

@@ -1,23 +1,29 @@
-class StaticContentController < Spree::BaseController
+class Spree::StaticContentController < Spree::BaseController
   caches_action :show
+  layout :determine_layout
   
   def show
     path = case params[:path]
     when Array
       '/' + params[:path].join("/")
     when String
-      params[:path]
+      '/' + params[:path]
     when nil
       request.path
     end
 
-    unless @page = Page.visible.find_by_slug(path)
+    unless @page = Spree::Page.visible.find_by_slug(path.gsub('//','/'))
       render_404
     end
   end
-  
+
   private
   
+  def determine_layout
+    return @page.layout if @page and @page.layout.present?
+    'spree/layouts/spree_application'
+  end
+
   def accurate_title
     @page ? (@page.meta_title ? @page.meta_title : @page.title) : nil
   end

data/app/models/{page.rb → spree/page.rb}

@@ -1,20 +1,20 @@
-class Page < ActiveRecord::Base
+class Spree::Page < ActiveRecord::Base
   default_scope :order => "position ASC"
 
   validates_presence_of :title
   validates_presence_of [:slug, :body], :if => :not_using_foreign_link?
-  
+
   scope :visible, where(:visible => true)
   scope :header_links, where(:show_in_header => true).visible
   scope :footer_links, where(:show_in_footer => true).visible
   scope :sidebar_links, where(:show_in_sidebar => true).visible
-  
-  
+
+
   before_save :update_positions_and_slug
 
   def initialize(*args)
     super(*args)
-    last_page = Page.last
+    last_page = Spree::Page.last
     self.position = last_page ? last_page.position + 1 : 0
   end
 
@@ -26,11 +26,11 @@ private
 
   def update_positions_and_slug
     unless new_record?
-      return unless prev_position = Page.find(self.id).position
+      return unless prev_position = Spree::Page.find(self.id).position
       if prev_position > self.position
-        Page.update_all("position = position + 1", ["? <= position AND position < ?", self.position, prev_position])
+        Spree::Page.update_all("position = position + 1", ["? <= position AND position < ?", self.position, prev_position])
       elsif prev_position < self.position
-        Page.update_all("position = position - 1", ["? < position AND position <= ?", prev_position,  self.position])
+        Spree::Page.update_all("position = position - 1", ["? < position AND position <= ?", prev_position,  self.position])
       end
     end
 
@@ -40,7 +40,7 @@ private
     end
     return true
   end
-  
+
   def not_using_foreign_link?
     foreign_link.blank?
   end
@@ -48,7 +48,7 @@ private
   def slug_link
     ensure_slash_prefix slug
   end
-  
+
   def ensure_slash_prefix(str)
     str.index('/') == 0 ? str : '/' + str
   end

data/app/overrides/pages_in_footer.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/layouts/spree_application",
+                     :name => "pages_in_footer",
+                     :insert_bottom => "#footer-right",
+                     :partial => "spree/static_content/static_content_footer")

data/app/overrides/pages_in_header.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/layouts/spree_application",
+                     :name => "pages_in_header",
+                     :insert_bottom => "#main-nav-bar",
+                     :partial => "spree/static_content/static_content_header")

data/app/overrides/pages_in_sidebar.rb

@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/layouts/spree_application",
+                     :name => "pages_in_sidebar",
+                     :insert_bottom => "#sidebar",
+                     :partial => "spree/static_content/static_content_sidebar")

data/app/overrides/static_content_admin_tab.rb

@@ -1,4 +1,4 @@
-Deface::Override.new(:virtual_path => "layouts/admin",
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "static_content_admin_tab",
                      :insert_bottom => "[data-hook='admin_tabs']",
                      :text => "<%= tab(:pages) %>")

data/app/views/spree/admin/pages/_form.html.erb

@@ -0,0 +1,76 @@
+<div class="clearfix">
+  <div class="left">
+    <%= f.field_container :title do %>
+      <%= f.label :title, t(:title) %> <span class="required">*</span><br />
+      <%= f.text_field :title, :class => 'fullwidth title' %>
+      <%= f.error_message_on :title %>
+    <% end %>
+    
+    <%= f.field_container :slug do %>
+      <%= f.label :slug, t(:slug) %> <span class="required">*</span><br />
+      <%= f.text_field :slug, :class => 'fullwidth title' %>
+      <%= f.error_message_on :slug %>
+    <% end %>
+    
+    <%= f.field_container :body do %>
+      <%= f.label :body, t(:body) %><br />
+      <%= f.text_area :body, {:class => 'fullwidth'} %>
+      <%= f.error_message_on :body %>
+    <% end %>
+
+    <%= f.field_container :meta_title do %>
+      <%= f.label :meta_title, t(:meta_title) %><br />
+      <%= f.text_field :meta_title, :class => 'fullwidth title' %>
+      <%= f.error_message_on :meta_title %>
+    <% end %>
+    
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords, t(:meta_keywords) %><br />
+      <%= f.text_field :meta_keywords, :class => 'fullwidth title' %>
+      <%= f.error_message_on :meta_keywords %>
+    <% end %>
+    
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, t(:meta_description) %><br />
+      <%= f.text_field :meta_description, :class => 'fullwidth title' %>
+      <%= f.error_message_on :meta_description %>
+    <% end %>
+    
+  </div>
+  <div class="right">
+    <%= f.field_container :layout do %>
+      <%= f.label :layout, t(:layout) %><br />
+      <%= f.text_field :layout, :class => 'fullwidth title' %>
+    <% end %>
+
+    <%= f.field_container :foreign_link do %>
+      <%= f.label :foreign_link, t(:foreign_link) %><br />
+      <%= f.text_field :foreign_link, :class => 'fullwidth title' %>
+    <% end %>
+
+    <%= f.field_container :position do %>
+      <%= f.label :position, t(:position) %><br />
+      <%= f.number_field :position, :min => 0 %>
+    <% end %>
+    
+    <ul id="static_page_options">
+      <li>
+        <%= f.check_box :show_in_sidebar %>
+        <%= f.label :show_in_sidebar %>
+      </li>
+      <li>
+        <%= f.check_box :show_in_header %>
+        <%= f.label :show_in_header %>
+      </li>
+      <li>
+        <%= f.check_box :show_in_footer %>
+        <%= f.label :show_in_footer %>
+      </li>
+      <li>
+        <%= f.check_box :visible %>        
+        <%= f.label :visible %>
+      </li>
+    </ul>
+    
+  </div>
+</div>

data/app/views/spree/admin/pages/edit.html.erb

@@ -0,0 +1,7 @@
+<h1><%= t("static_content.editing_page") %></h1>
+<%= render "spree/shared/error_messages", :target => @page %>
+
+<%= form_for [:admin, @page] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+<% end %>

data/app/views/{admin → spree/admin}/pages/index.html.erb

@@ -11,9 +11,9 @@
 
 <table class="index">
 	<tr>
-		<th><%= Page.human_attribute_name(:title) %></th>
+		<th><%= Spree::Page.human_attribute_name(:title) %></th>
 		<th><%= t("static_content.link") %></th>
-		<th><%= Page.human_attribute_name(:visible) %></th>
+		<th><%= Spree::Page.human_attribute_name(:visible) %></th>
 		<th><%= t("action") %></th>
   </tr>
 	<tbody>

data/app/views/spree/admin/pages/new.html.erb

@@ -0,0 +1,7 @@
+<h1><%= t("static_content.editing_page") %></h1>
+<%= render "spree/shared/error_messages", :target => @page %>
+
+<%= form_for [:admin, @page] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+<% end %>

data/app/views/spree/static_content/_static_content_footer.html.erb

@@ -0,0 +1,3 @@
+<nav id="footer-pages">
+  <ul><%= render :partial => "spree/static_content/static_content_list", :collection => Spree::Page.visible.footer_links, :as => :page %></ul>
+</nav>

data/app/views/spree/static_content/_static_content_header.html.erb

@@ -0,0 +1 @@
+<%= render :partial => "spree/static_content/static_content_list", :collection => Spree::Page.visible.header_links, :as => :page %>

data/app/views/spree/static_content/_static_content_list.html.erb

@@ -0,0 +1 @@
+<li class=<%=(request.fullpath[1..-1] == page.slug) ? 'current' : 'not'%>><%= link_to page.title, page.slug %></li>

data/app/views/spree/static_content/_static_content_sidebar.html.erb

@@ -0,0 +1,3 @@
+<nav id="sidebar-pages-menu">
+  <ul><%= render :partial => "spree/static_content/static_content_list", :collection => Spree::Page.visible.sidebar_links, :as => :page %></ul>
+</nav>

data/app/views/spree/static_content/show.html.erb

@@ -0,0 +1,22 @@
+<% content_for :head do -%>
+  <%- if @page.meta_title.present? -%>
+    <meta name="title" content="<%=@page.meta_title%>">
+  <%- else -%>
+    <meta name="title" content="<%=@page.title%>">
+  <%- end -%>
+  <meta name="keywords" content="<%=@page.meta_keywords%>">
+  <meta name="keywords" content="<%=@page.meta_description%>">
+<% end -%>
+
+<% content_for :sidebar do %>
+  <% if "products" == @current_controller && @taxon %>
+    <%= render :partial => "spree/shared/filters" %>
+  <% else %>
+    <%= render :partial => "spree/shared/taxonomies" %>
+  <% end %>
+<% end %>
+
+<h1><%= @page.title %></h1>
+<div id="page_content">
+  <%= raw @page.body %>
+</div>

data/lib/generators/spree_static_content/install_generator.rb

@@ -1,24 +1,45 @@
-module SpreeStaticContent
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
+if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
+  module SpreeStaticContent
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
 
-      def add_stylesheets
-        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require formtastic\n", :before => /\*\//, :verbose => true
-      end
+        def add_stylesheets
+          inject_into_file "app/assets/stylesheets/admin/all.css", " *= require formtastic\n", :before => /\*\//, :verbose => true
+        end
 
-      def add_migrations
-        run 'rake railties:install:migrations FROM=spree_static_content'
-      end
+        def add_migrations
+          run 'rake railties:install:migrations FROM=spree_static_content'
+        end
 
-      def run_migrations
-         res = ask "Would you like to run the migrations now? [Y/n]"
-         if res == "" || res.downcase == "y"
-           run 'rake db:migrate'
-         else
-           puts "Skiping rake db:migrate, don't forget to run it!"
-         end
+        def run_migrations
+           res = ask "Would you like to run the migrations now? [Y/n]"
+           if res == "" || res.downcase == "y"
+             run 'rake db:migrate'
+           else
+             puts "Skiping rake db:migrate, don't forget to run it!"
+           end
+        end
       end
     end
   end
-end
+else
+  module SpreeStaticContent
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        def add_migrations
+          run 'rake railties:install:migrations FROM=spree_static_content'
+        end
+
+        def run_migrations
+           res = ask "Would you like to run the migrations now? [Y/n]"
+           if res == "" || res.downcase == "y"
+             run 'rake db:migrate'
+           else
+             puts "Skiping rake db:migrate, don't forget to run it!"
+           end
+        end
 
+      end
+    end
+  end
+end

data/lib/spree_static_content.rb

@@ -1,21 +1,2 @@
-require 'spree_core'
-require 'formtastic'
-
-module SpreeStaticContent
-  class Engine < Rails::Engine
-    engine_name 'spree_static_content'
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-    end
-    config.to_prepare &method(:activate).to_proc
-    config.autoload_paths += %W(#{config.root}/lib)
-  end
-end
-
+require 'spree/core'
+require 'spree_static_content/engine'

data/lib/spree_static_content/engine.rb

@@ -0,0 +1,16 @@
+module SpreeStaticContent
+  class Engine < Rails::Engine
+    engine_name 'spree_static_content'
+    
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/**/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
+    config.to_prepare &method(:activate).to_proc
+    config.autoload_paths += %W(#{config.root}/lib)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_static_content
 version: !ruby/object:Gem::Version 
-  hash: 257
+  hash: 21
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 70
-  - 3
-  version: 0.70.3
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Peter Berkenbosch
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 261
+        hash: 23
         segments: 
-        - 0
-        - 70
         - 1
-        version: 0.70.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,20 +40,36 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 261
+        hash: 23
         segments: 
-        - 0
-        - 70
         - 1
-        version: 0.70.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: capybara
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +78,41 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ffaker
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,7 +122,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
 description: 
 email: peter@pero-ict.nl
 executables: []
@@ -88,18 +133,25 @@ extra_rdoc_files: []
 
 files: 
 - README.md
+- lib/spree_static_content/engine.rb
 - lib/spree_static_content.rb
 - lib/generators/spree_static_content/install_generator.rb
-- app/models/page.rb
-- app/views/admin/pages/_form.html.erb
-- app/views/admin/pages/edit.html.erb
-- app/views/admin/pages/new.html.erb
-- app/views/admin/pages/index.html.erb
-- app/views/static_content/show.html.erb
+- app/models/spree/page.rb
+- app/views/spree/admin/pages/_form.html.erb
+- app/views/spree/admin/pages/edit.html.erb
+- app/views/spree/admin/pages/new.html.erb
+- app/views/spree/admin/pages/index.html.erb
+- app/views/spree/static_content/_static_content_sidebar.html.erb
+- app/views/spree/static_content/_static_content_footer.html.erb
+- app/views/spree/static_content/show.html.erb
+- app/views/spree/static_content/_static_content_list.html.erb
+- app/views/spree/static_content/_static_content_header.html.erb
+- app/overrides/pages_in_footer.rb
 - app/overrides/static_content_admin_tab.rb
-- app/controllers/spree/base_controller_decorator.rb
-- app/controllers/static_content_controller.rb
-- app/controllers/admin/pages_controller.rb
+- app/overrides/pages_in_sidebar.rb
+- app/overrides/pages_in_header.rb
+- app/controllers/spree/static_content_controller.rb
+- app/controllers/spree/admin/pages_controller.rb
 homepage: http://spreecommerce.com/extensions/139-static-content
 licenses: []
 

data/app/controllers/admin/pages_controller.rb

@@ -1,16 +0,0 @@
-class Admin::PagesController < Admin::ResourceController
-  update.after :expire_cache
-  
-  def new
-    @page = @object
-  end
-  
-  def edit
-    @page = @object
-  end
-    
-  private
-  def expire_cache
-    expire_page :controller => '/static_content', :action => 'show', :path => @object.slug
-  end
-end

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,33 +0,0 @@
-Spree::BaseController.class_eval do
-  # ProductsHelper needed for seo_url method used when generating
-  # taxonomies partial in content/show.html.erb.
-  helper :products
-  # Use before_filter instead of prepend_before_filter to ensure that
-  # ApplicationController filters that the view may require are run.
-  before_filter :render_page_if_exists
-
-  # Checks if page is not beeing overriden by static one that starts with /
-  #
-  # Using request.path allows us to override dynamic pages including
-  # the home page, product and taxon pages.
-  def render_page_if_exists
-    # If we don't know if page exists we assume it's and we query DB.
-    # But we realy don't want to query DB on each page we're sure doesn't exist!
-    return if Rails.cache.fetch('page_not_exist/'+request.path)
-
-    if @page = Page.visible.find_by_slug(request.path)
-
-      #load @content object to load correct meta_keywords & meta_description
-      @content = @page
-      
-      if @page.layout && !@page.layout.empty?
-        render :template => 'static_content/show', :layout => @page.layout
-      else
-        render :template => 'static_content/show'
-      end
-    else
-      Rails.cache.write('page_not_exist/'+request.path, true)
-      return(nil)
-    end
-  end
-end

data/app/views/admin/pages/_form.html.erb

@@ -1,15 +0,0 @@
-<%= f.inputs do %>
-  <%= f.input :title %>
-  <%= f.input :slug %>
-  <%= f.input :body %>
-  <%= f.input :foreign_link %>
-  <%= f.input :meta_title %>
-  <%= f.input :meta_keywords %>
-  <%= f.input :meta_description %>
-  <%= f.input :show_in_sidebar %>
-  <%= f.input :show_in_header %>
-  <%= f.input :show_in_footer %>
-  <%= f.input :position %>
-  <%= f.input :layout %>
-  <%= f.input :visible %>
-<% end %>

data/app/views/admin/pages/edit.html.erb

@@ -1,10 +0,0 @@
-<h1><%= t("static_content.editing_page") %></h1>
-<%= render "shared/error_messages", :target => @page %>
-
-<%= semantic_form_for([:admin, @page]) do |f| -%>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p class="form-buttons">
-    <%= button t("actions.update"), nil, 'submit' %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_pages_path %>
-  </p>
-<% end %>

data/app/views/admin/pages/new.html.erb

@@ -1,10 +0,0 @@
-<h1><%= t("static_content.new_page") %></h1>
-<%= render "shared/error_messages", :target => @page %>
-
-<%= semantic_form_for([:admin, @page]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p class="form-buttons">
-    <%= button t("actions.create"), nil, 'submit' %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_pages_path %>
-  </p>
-<% end %>

data/app/views/static_content/show.html.erb

@@ -1,14 +0,0 @@
-<% content_for :head do -%>
-  <meta name="title" content="<%=@page.title%>">
-<% end -%>
-<% content_for :sidebar do %>
-  <% if "products" == @current_controller && @taxon %>
-    <%= render :partial => "shared/filters" %>
-  <% else %>
-    <%= render :partial => "shared/taxonomies" %>
-  <% end %>
-<% end %>
-<h1><%= @page.title %></h1>
-<div id="page_content">
-  <%= raw @page.body %>
-</div>