Merge branch 'panoramic-integration' of github.com:eclipxe/browsercms into eclipxe-panoramic-integration

Author: peakpg

Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 # Load this project as a gem.
 gemspec
-
+gem "panoramic"
 gem "mysql2"
 
 gem 'yard', :groups=>[:development, :test]
@@ -41,7 +41,7 @@ group :test do
  # Cucumber and dependencies
  gem 'capybara'
  gem 'database_cleaner'
- gem 'cucumber-rails', require: false
+ gem 'cucumber-rails', :require=> false
  gem 'cucumber'
  gem 'launchy'
  gem 'ruby-prof'

Gemfile.lock

@@ -6,6 +6,7 @@ PATH
  bootstrap-sass
  ckeditor_rails (~> 4.0.1.1)
  jquery-rails (~> 2.0)
+ panoramic
  paperclip (~> 3.0.3)
  rails (>= 3.2.5, < 3.3.0)
  sass-rails
@@ -124,6 +125,8 @@ GEM
  multi_json (1.7.6)
  mysql2 (0.3.11)
  nokogiri (1.5.9)
+ panoramic (0.0.4)
+ rails (>= 3.0.7)
  paperclip (3.0.4)
  activemodel (>= 3.0.0)
  activerecord (>= 3.0.0)
@@ -225,6 +228,7 @@ DEPENDENCIES
  minitest-rails
  mocha
  mysql2
+ panoramic
  poltergeist
  rake (~> 0.9.5)
  ruby-prof

app/controllers/cms/content_controller.rb

@@ -72,6 +72,7 @@ def render_editing_frame
 
  def render_page
  prepare_connectables_for_render
+ prepend_view_path DynamicView.resolver
  respond_with @page, determine_page_layout
  end
 

app/models/cms/dynamic_view.rb

@@ -1,12 +1,14 @@
 module Cms
  class DynamicView < ActiveRecord::Base
+ store_templates
+
 
  after_save :write_file_to_disk
  after_destroy :remove_file_from_disk
 
  include DefaultAccessible
  # Need to explicitly define these, since during new project creation, these files aren't discoverable.
- attr_accessible :name, :body, :format, :handler
+ attr_accessible :name, :body, :format, :handler, :locale, :path, :partial
 
  scope :with_file_name, lambda { |file_name|
  conditions = {:name => nil, :format => nil, :handler => nil}
@@ -29,8 +31,9 @@ def self.inherited(subclass)
  is_versioned
 
  before_validation :set_publish_on_save
+ before_validation :set_defaults, :set_path
 
- validates_presence_of :name, :format, :handler
+ validates_presence_of :name, :format, :handler, :path, :locale
  validates_uniqueness_of :name, :scope => [:format, :handler],
  :message => "Must have a unique combination of name, format and handler"
 
@@ -43,7 +46,7 @@ def self.title
  end
 
  def self.new_with_defaults(options={})
- new({:format => "html", :handler => "erb", :body => default_body}.merge(options))
+ new({:format => "html", :handler => "erb", :body => default_body, :locale => I18n.locale}.merge(options))
  end
 
  def self.find_by_file_name(file_name)
@@ -107,5 +110,15 @@ def self.resource_collection_name
  def self.engine
  "cms"
  end
+
+def set_path
+self.path = self.class.relative_path + '/' + name
+end
+
+def set_defaults
+self.locale = I18n.locale.to_s unless locale
+self.partial = partial?
+return true
+end
  end
 end

app/models/cms/page_partial.rb

@@ -28,5 +28,9 @@ def prepend_underscore
  end
  end
 
+ def partial?
+true
+end
+
  end
 end

app/models/cms/page_template.rb

@@ -36,5 +36,9 @@ def self.options
  page_templates.map { |f| [display_name(f), f] }.sort.uniq
  end
 
+def partial?
+false
+end
+
  end
 end

app/views/cms/dynamic_views/index.html.erb

@@ -24,18 +24,16 @@
  <table class="data cms-content-table table table-striped table-bordered table-hover">
 <thead> 
 <tr>
- <th class="first"></th>
  <th><div class="dividers">Name</div></th>
+ <th><div>Path</div></th>
  <th><div>Updated At</div></th>
- <th class="last"></th>
  </tr>
 </thead>
  <% @views.each do |view| %>
  <tr id="<%= dynamic_view_type.form_name %>_<%= view.id %>">
- <td class="first"></td>
  <td><div class="dividers" title="<%=h view.file_path %>"><%=h view.display_name %></div></td>
+ <td><div class="dividers" title="<%=h view.path %>"><%=h view.path %></div></td>
  <td><div><%= view.updated_at && view.updated_at.to_s(:date) %></div></td>
- <td class="last"></td>
  </tr>
  <% end %>
  </table>

browsercms.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
  s.add_dependency("underscore-rails", "~> 1.4")
  s.add_dependency("jquery-rails", "~> 2.0")
  s.add_dependency("paperclip", "~> 3.0.3")
+ s.add_dependency("panoramic")
 
  # Required only for bcms-upgrade
  s.add_dependency "term-ansicolor"

db/migrate/20130327184912_browsercms400.rb

@@ -3,5 +3,11 @@ class Browsercms400 < ActiveRecord::Migration
  def up
  rename_table :section_nodes, :cms_section_nodes if table_exists?(:section_nodes) && !table_exists?(:section_nodes)
  add_column :cms_section_nodes, :slug, :string
+ add_column :cms_dynamic_views, :path, :string
+ add_column :cms_dynamic_views, :locale, :string
+ add_column :cms_dynamic_views, :partial, :boolean
+ add_column :cms_dynamic_view_versions, :path, :string
+ add_column :cms_dynamic_view_versions, :locale, :string 
+ add_column :cms_dynamic_view_versions, :partial, :boolean
  end
 end

lib/browsercms.rb

@@ -31,3 +31,5 @@
 
 ActiveRecord::Base.send(:include, Cms::Acts::CmsUser)
 require 'cms/responders/content_responder'
+
+require "panoramic"