spree_static_content 0.60.1 → 0.70.3

data/README.md

@@ -0,0 +1,45 @@
+# 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.
+- Show a static page instead of existing dynamic pages such as the home page,
+  products pages, and taxon pages.
+  
+## HowTo
+
+See the wiki for some more documentation on how you can use this extension.
+
+- use spree_editor.
+- override dynamic pages.
+- ...
+
+## Basic Installation
+
+1. Add the following to your Gemfile
+<pre>
+  gem 'spree_static_content', :git => 'github.com/spree/spree_static_content'
+</pre>
+2. Run `bundle install`
+3. To copy and apply migrations run: `rails g spree_static_content:install`
+
+## Development
+
+1. fork the repo here: https://github.com/spree/spree_static_content
+2. inside your fork run `bundle install`
+3. make sure the tests can run on your system run : `bundle exec rake test_app && bundle exec rspec spec`
+
+You can also run `bundle exec rake test_app` and then to run the specs run `bundle exec rake`
+
+### Fix bugs or add functionality
+
+1. create a feature branch
+<pre>
+  git checkout -b my-feature-branch
+</pre>
+2. Apply your changes and add specs.
+3. Push the feature branch to your fork:
+<pre>
+  git push -u origin my-feature-branch
+</pre>
+4. Send a pull request from your feature branch in the forked repository on github.

data/app/controllers/static_content_controller.rb

@@ -12,14 +12,14 @@ class StaticContentController < Spree::BaseController
     end
 
     unless @page = Page.visible.find_by_slug(path)
-      render :file => "#{RAILS_ROOT}/public/404.html", :layout => false, :status => 404
+      render_404
     end
   end
   
   private
   
   def accurate_title
-    @page ? @page.title : nil
+    @page ? (@page.meta_title ? @page.meta_title : @page.title) : nil
   end
 end
 

data/app/models/page.rb

@@ -4,10 +4,11 @@ class Page < ActiveRecord::Base
   validates_presence_of :title
   validates_presence_of [:slug, :body], :if => :not_using_foreign_link?
   
-  scope :header_links, where(["show_in_header = ?", true])
-  scope :footer_links, where(["show_in_footer = ?", true])
-  scope :sidebar_links, where(["show_in_sidebar = ?", true])
   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
 
@@ -33,8 +34,10 @@ private
       end
     end
 
-    self.slug = slug_link
-    Rails.cache.delete('page_not_exist/' + self.slug)
+    if not_using_foreign_link?
+      self.slug = slug_link
+      Rails.cache.delete('page_not_exist/' + self.slug)
+    end
     return true
   end
   

data/app/overrides/static_content_admin_tab.rb

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

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

@@ -1,10 +1,9 @@
-<%= stylesheet_link_tag 'formtastic', 'formtastic_changes' %>
-
 <%= 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 %>

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

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

data/lib/generators/spree_static_content/install_generator.rb

@@ -1,18 +1,23 @@
 module SpreeStaticContent
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
 
-      desc "Configures your Rails application for use with spree_static_content"
-
-      def copy_migrations
-        directory "db"
+      def add_stylesheets
+        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require formtastic\n", :before => /\*\//, :verbose => true
       end
-      
-      def copy_public
-        directory "public"
+
+      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

data/lib/spree_static_content.rb

@@ -1,11 +1,17 @@
 require 'spree_core'
-require 'spree_static_content_hooks'
+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.env == "production" ? require(c) : load(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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_static_content
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 257
+  prerelease: 
   segments: 
   - 0
-  - 60
-  - 1
-  version: 0.60.1
+  - 70
+  - 3
+  version: 0.70.3
 platform: ruby
 authors: 
 - Peter Berkenbosch
@@ -15,138 +16,124 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 +04:00
-default_executable: 
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 261
         segments: 
         - 0
-        - 60
-        - 0
-        version: 0.60.0
+        - 70
+        - 1
+        version: 0.70.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: spree_editor
+  name: spree_auth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 261
         segments: 
         - 0
-        - 50
-        - 0
-        version: 0.50.0
+        - 70
+        - 1
+        version: 0.70.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: formtastic
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id003
-description: Extention to manage the static pages for your Spree shop.
-email: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: 
+email: peter@pero-ict.nl
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- CONTRIBUTORS.textile
-- README.rdoc
-- Rakefile
-- VERSION
-- Versionfile
-- app/controllers/admin/pages_controller.rb
-- app/controllers/spree/base_controller_decorator.rb
-- app/controllers/static_content_controller.rb
+- README.md
+- 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/index.html.erb
 - app/views/admin/pages/new.html.erb
+- app/views/admin/pages/index.html.erb
 - app/views/static_content/show.html.erb
-- config/locales/de-CH.yml
-- config/locales/en-AU.yml
-- config/locales/en-GB.yml
-- config/locales/en.yml
-- config/locales/es-ES.yml
-- config/locales/fr-FR.yml
-- config/locales/nl-BE.yml
-- config/locales/nl-NL.yml
-- config/locales/pl.yml
-- config/locales/pt-BR.yml
-- config/locales/ru.yml
-- config/routes.rb
-- lib/generators/spree_static_content/install_generator.rb
-- lib/generators/templates/db/migrate/20081216193152_create_pages.rb
-- lib/generators/templates/db/migrate/20090625125735_extend_pages.rb
-- lib/generators/templates/db/migrate/20090814113100_add_visible_to_pages.rb
-- lib/generators/templates/db/migrate/20090814142845_add_default_true_to_visible_for_page.rb
-- lib/generators/templates/db/migrate/20090829000527_add_index_for_page.rb
-- lib/generators/templates/db/migrate/20091219021134_add_meta_fields_to_pages.rb
-- lib/generators/templates/db/migrate/20100204105222_add_layout_to_pages.rb
-- lib/generators/templates/db/migrate/20100323085528_add_show_in_sidebar_option_to_pages.rb
-- lib/generators/templates/public/stylesheets/formtastic.css
-- lib/generators/templates/public/stylesheets/formtastic_changes.css
-- lib/spree_static_content.rb
-- lib/spree_static_content_hooks.rb
-- spec/controllers/admin/pages_controller_spec.rb
-- spec/controllers/content_controller_spec.rb
-- spec/models/page_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spree_static_content.gemspec
-has_rdoc: true
-homepage: http://github.com/spree/spree-static-content
+- 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
+homepage: http://spreecommerce.com/extensions/139-static-content
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
-requirements: []
-
+requirements: 
+- none
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Extention to manage the static pages for your Spree shop.
-test_files: 
-- spec/models/page_spec.rb
-- spec/spec_helper.rb
-- spec/controllers/content_controller_spec.rb
-- spec/controllers/admin/pages_controller_spec.rb
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-nbproject

data/CONTRIBUTORS.textile

@@ -1,7 +0,0 @@
-h2. Contributors list - Thanks guys!
-
-|Maxim Filatov|http://github.com/Bregor|
-|Marcin Raczkowski|http://github.com/swistak|
-|Roman Smirnov|http://github.com/romul|
-|Eliot Sykes|http://github.com/eliotsykes|
-|Oliver Azevedo Barnes|http://github.com/oliverbarnes|

data/README.rdoc

@@ -1,34 +0,0 @@
-= 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.
-- Show a static page instead of existing dynamic pages such as the home page,
-  products pages, and taxon pages.
-  
-To override a dynamic page, use the path of that dynamic page as the slug when
-you create your page in the Spree Administration area, including the
-leading slash.  For example:
-
-- to override the home page, use a path of '/' (without quotes).
-- to override a product page, use its path, e.g. '/products/apache-baseball-jersey' (without quotes). 
-
-The dynamic page can be made available again if you delete the static page or change its slug.
-
-Create your own copy of the app/views/content/show.html.erb template in your site
-extension to change the layout of the static pages.
-
-=== Example to use the static pages inside a menu
-  <ul>
-    <% for page in Page.header_links do %>
-      <li><%= link_to page.title, page.link %></li>
-    <% end %>
-  </ul>
-
-== Installation
-
-1. Add `gem "spree_static_content"` and `gem "spree_editor", :git => "git://github.com/romul/spree_editor.git"` to your Gemfile
-1. Run `bundle install`
-1. Run `rails g spree_static_content:install`
-1. Run `rake db:migrate`
-1. Run `rake spree_editor:install`

data/Rakefile

@@ -1,113 +0,0 @@
-# encoding: utf-8
-require 'rubygems'
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-  exit 1
-end
-#gem 'rdoc', '= 2.2'
-require 'rdoc'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
-Jeweler::Tasks.new do |s|
-  s.name = "spree_static_content"
-  s.summary = "Extention to manage the static pages for your Spree shop."
-  s.description = s.summary
-  #s.email = ""
-  s.homepage = "http://github.com/spree/spree-static-content"
-  s.authors = ["Peter Berkenbosch", "Roman Smirnov"]
-  s.add_dependency 'spree_core', '>= 0.60.0'
-  s.add_dependency 'spree_editor', '>= 0.50.0'
-  s.add_dependency 'formtastic', '~> 1.2.3'
-  #s.has_rdoc = false
-  #s.extra_rdoc_files = [ "README.rdoc"]
-  #s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
-  #s.test_files = Dir['test/**/*.{yml,rb}']
-end
-Jeweler::GemcutterTasks.new
-
-
-require 'spec/rake/spectask'
-# require 'spec/translator'
-
-extension_root = File.expand_path(File.dirname(__FILE__))
-
-task :default => :spec
-task :stats => "spec:statsetup"
-
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-namespace :spec do
-  desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--rails']
-  end
-  
-  desc "Print Specdoc for all specs"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-
-  [:models, :controllers, :views, :helpers].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub) do |t|
-      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-    end
-  end
-  
-  # Hopefully no one has written their extensions in pre-0.9 style
-  # desc "Translate specs from pre-0.9 to 0.9 style"
-  # task :translate do
-  #   translator = ::Spec::Translator.new
-  #   dir = RAILS_ROOT + '/spec'
-  #   translator.translate(dir, dir)
-  # end
-
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-    ::CodeStatistics::TEST_TYPES << "Model specs"
-    ::CodeStatistics::TEST_TYPES << "View specs"
-    ::CodeStatistics::TEST_TYPES << "Controller specs"
-    ::CodeStatistics::TEST_TYPES << "Helper specs"
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
-end
-
-desc 'Generate documentation for the static_content extension.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'StaticContentExtension'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-# For extensions that are in transition
-desc 'Test the static_content extension.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-# Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }