trusty-cms 1.2.29 → 2.0.0.pre.beta

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDljNjFiYjdjZTNiNWViMmUxZjYwZjE0NGViNGViZDg4ZTNmMjMzNQ==
+    YzgwMzQzZGZlMDFhZjljN2M3NDE5OGZlNTBkM2FhMDVhM2I2M2YwNw==
   data.tar.gz: !binary |-
-    MTdkODliMmQxM2MwZjg1ZGFmMDY5OTU2Y2UwYTBjNmU1MDRhZDJhZQ==
+    NDdjMWFhZmVlYjQ2MDZmYjZhZmM0N2Y1YTk4N2FiZTIwMTI2NGNjZA==
 SHA512:
   metadata.gz: !binary |-
-    YTEwNmZiZTY5ZTQ3YzAwZGNmNTdiZjBmNTM4ZTM5OTM2YmQ1NThjYzhiYjk5
-    ZjJmY2UxNjE2MTViYjVkNDBhZmE0ZTc3NTBkYzRlMTNhZjFhNmZlZjA4MzAw
-    ZGFjMThjZjAyZDlhMjZkMmFjYzc3YWVlNWE3MjE4MzliNDRhYmQ=
+    ZThjNmRhOGI1YjkzYWZlNGJiODVlYjU3YjdiNGVkZjMyNDlmNGUzY2JhZmVk
+    YmFhNWQ3ZmQwNzAzZjI1ZDI3Nzk0ODRlNWRjNDEyOGQ4MjQyZmQ5NDMyM2Yy
+    MTNjNGY4OWE3ZGY0ZTg5MjBkYzU4OWZmYjliYjFjZjJkODJjOTQ=
   data.tar.gz: !binary |-
-    MjNiOWQzZDM4ODRkMTM4MGI2YjExZGIwZDM0ZTE2NTk4ZDE3ZmU4MjAxMzdi
-    NTJmNTEyODc2YWFjYWU3NmI5ZDk4Y2EzMmRkODcwNTZjNjUzNzYxYmExMTFj
-    MjE3NzZhYmE5ZDc3NzkzZGFiNzMxNWUyMzE0MDBlOTg3NWU1ZDI=
+    YjMwNmY5ZjZlZjNlZTk1NDE3NDkxZWMzMjEyOTM5MmY0ZjM0MTE0NTYwMjRm
+    MzcxNzM4MjQ3NjljMzgzYTY3YWZmZDVjYTBkMmE2YWQwMjJhNzRhOWQ3YWZh
+    YTYxZjkyMzM2NDZhMzRkNTljODI3YmZkNjI4ZDg5MTZmMmQ1NGI=

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -7,6 +7,8 @@ source 'https://rubygems.org'
 # requires radiant and therefore pulls in every
 # dependency mentioned in radiant.gemspec.
 
+gem 'trustygems', '~> 0.0.1'
+
 gemspec
 
 # When trusty is installed as a gem you can run all of

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    trusty-cms (1.1.28)
+    trusty-cms (2.0.0.pre.beta)
       RedCloth (~> 4.2)
-      acts_as_tree (~> 0.1.1)
+      acts_as_tree (~> 2.1)
       bundler (~> 1.7)
       ckeditor (~> 4.1)
       compass-rails (~> 2.0)
       delocalize (~> 0.2)
       execjs (~> 2.2)
       haml (~> 4.0)
-      haml-rails (>= 0.4, < 0.5)
+      haml-rails (~> 0.5)
       highline (~> 1.6)
       jquery-rails (~> 3.1)
       mysql (~> 2.9)
+      protected_attributes (~> 1.0.9)
       rack (~> 1.4)
       rack-cache (~> 1.2)
       radius (~> 0.7)
-      rails (~> 3.2)
+      rails (~> 4.2)
       rdoc (~> 3.9)
       stringex (~> 1.3)
       therubyracer (~> 0.12)
-      tzinfo (~> 0.3)
+      tzinfo (~> 1.2)
       uglifier (~> 2.6)
       will_paginate (~> 3.0)
 
@@ -30,51 +31,60 @@ GEM
   specs:
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
-      mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    acts_as_tree (0.1.1)
-    addressable (2.3.7)
-    arel (3.0.3)
-    builder (3.0.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
+      globalid (>= 0.3.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
+      builder (~> 3.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
+      arel (~> 6.0)
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    acts_as_tree (2.2.0)
+      activerecord (>= 3.0.0)
+    addressable (2.3.8)
+    arel (6.0.2)
+    builder (3.2.2)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.3)
-    ckeditor (4.1.1)
+    chunky_png (1.3.4)
+    ckeditor (4.1.2)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.5)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
     compass (1.0.3)
@@ -93,7 +103,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
-    daemons (1.1.9)
+    daemons (1.2.3)
     database_cleaner (1.3.0)
     delocalize (0.4.0)
       rails (>= 3.0)
@@ -101,38 +111,47 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.7)
     eventmachine (1.0.7-java)
-    execjs (2.3.0)
-    ffi (1.9.6)
-    ffi (1.9.6-java)
+    execjs (2.5.2)
+    ffi (1.9.10)
+    ffi (1.9.10-java)
+    globalid (0.3.5)
+      activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    haml-rails (0.4)
-      actionpack (>= 3.1, < 4.1)
-      activesupport (>= 3.1, < 4.1)
-      haml (>= 3.1, < 4.1)
-      railties (>= 3.1, < 4.1)
-    highline (1.6.21)
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    highline (1.7.2)
     hike (1.2.3)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     i18n (0.7.0)
-    journey (1.0.4)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.3)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
-    json (1.8.2-java)
+    json (1.8.3)
+    json (1.8.3-java)
     launchy (2.4.3)
       addressable (~> 2.3)
     launchy (2.4.3-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
-    libv8 (3.16.14.7)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    libv8 (3.16.14.11)
+    loofah (2.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    multi_json (1.10.1)
+    minitest (5.7.0)
+    multi_json (1.11.2)
     mysql (2.9.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -143,7 +162,8 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
+    protected_attributes (1.0.9)
+      activemodel (>= 4.0.1, < 5.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -153,36 +173,43 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    rack (1.4.5)
+    rack (1.6.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.4)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
-      bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.3)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.6)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    ref (1.0.5)
+    ref (2.0.0)
     rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-expectations (3.0.4)
@@ -199,21 +226,30 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    sass (3.4.11)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
+    ruby_parser (3.7.0)
+      sexp_processor (~> 4.1)
+    sass (3.4.16)
+    sass-rails (5.0.1)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sexp_processor (4.6.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    sprockets (2.2.3)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.3.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
     stringex (1.5.1)
-    therubyracer (0.12.1)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
     thin (1.6.3)
@@ -221,19 +257,21 @@ GEM
       eventmachine (~> 1.0)
       rack (~> 1.0)
     thor (0.19.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.43)
-    uglifier (2.7.0)
+    trustygems (0.0.6)
+      rake
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.5.1)
+    websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.5.1-java)
+    websocket-driver (0.6.2-java)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -253,3 +291,4 @@ DEPENDENCIES
   rspec-rails (~> 3.0.0)
   thin (~> 1.6.2)
   trusty-cms!
+  trustygems (~> 0.0.1)

data/Rakefile

@@ -4,4 +4,5 @@
 
 require File.expand_path('../config/application', __FILE__)
 STDOUT.sync = true
-TrustyCms::Application.load_tasks
+TrustyCms::Application.load_tasks
+require 'trustygems'

data/app/controllers/admin/configuration_controller.rb

@@ -26,7 +26,7 @@ class Admin::ConfigurationController < ApplicationController
       begin
         TrustyCms.config.transaction do
           params[:trusty_config].each_pair do |key, value|
-            @trusty_config[key] = TrustyCms::Config.find_or_create_by_key(key)
+            @trusty_config[key] = TrustyCms::Config.find_or_initialize_by(key: key)
             @trusty_config[key].value = value      # validation sets errors on @trusty_config['key'] that the helper methods will pick up
           end
           redirect_to :action => :show

data/app/helpers/admin/configuration_helper.rb

@@ -69,7 +69,7 @@ module Admin::ConfigurationHelper
 
   def setting_for(key)
     @trusty_config ||= {}    # normally initialized in Admin::ConfigurationController
-    @trusty_config[key] ||= TrustyCms.config.find_or_create_by_key(key)
+    @trusty_config[key] ||= TrustyCms.config.find_or_initialize_by(key: key)
   end
 
   def definition_for(key)

data/app/models/layout.rb

@@ -2,7 +2,7 @@ class Layout < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   # Default Order
-  default_scope :order => "name"
+  default_scope {order("name")}
 
   # Associations
   has_many :pages

data/app/models/page.rb

@@ -10,9 +10,9 @@ class Page < ActiveRecord::Base
 
   # Associations
   acts_as_tree :order => 'virtual DESC, title ASC'
-  has_many :parts, :class_name => 'PagePart', :order => 'id', :dependent => :destroy
+  has_many :parts, {:class_name => 'PagePart', :dependent => :destroy}, -> {order(:id)}
   accepts_nested_attributes_for :parts, :allow_destroy => true
-  has_many :fields, :class_name => 'PageField', :order => 'id', :dependent => :destroy
+  has_many :fields, {:class_name => 'PageField', :dependent => :destroy}, -> {order(:id)}
   accepts_nested_attributes_for :fields, :allow_destroy => true
   belongs_to :layout
   belongs_to :created_by, :class_name => 'User'
@@ -25,7 +25,7 @@ class Page < ActiveRecord::Base
   validates_length_of :slug, :maximum => 100
   validates_length_of :breadcrumb, :maximum => 160
 
-  validates_format_of :slug, :with => %r{^([-_.A-Za-z0-9]*|/)$}
+  validates_format_of :slug, :with => %r{\A([-_.A-Za-z0-9]*|/)\z}
   validates_uniqueness_of :slug, :scope => :parent_id
 
   validate :valid_class_name

data/app/models/page_part.rb

@@ -2,7 +2,7 @@ class PagePart < ActiveRecord::Base
   attr_accessible :name, :filter_id, :content
 
   # Default Order
-  default_scope :order => 'name'
+  default_scope {order("name")}
 
   # Associations
   belongs_to :page

data/app/models/trusty_cms/config.rb

@@ -88,7 +88,7 @@ module TrustyCms
 
       def []=(key, value)
         if table_exists?
-          setting = find_or_initialize_by_key(key)
+          setting = find_or_initialize_by(key: key)
           setting.value = value
         end
       end

data/app/models/user.rb

@@ -5,7 +5,7 @@ class User < ActiveRecord::Base
   attr_protected 'why_is_this_needed'
 
   # Default Order
-  default_scope :order => 'name'
+  default_scope {order("name")}
 
   # Associations
   belongs_to :created_by, :class_name => 'User'

data/app/views/admin/page_parts/_page_part.html.haml

@@ -8,8 +8,6 @@
         = "To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button."
       %span.reference_links
         = t('reference')
-        %span{:id => "filter_reference_link_#{page_part.name.to_slug}"}
-          = link_to_function t('filter'), "loadFilterReference('#{page_part.name.to_slug}');"
         %span{:id => "tag_reference_link_#{page_part.name.to_slug}"}
           = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
       = render_region :part_controls, :locals => {:page_part => page_part}

data/app/views/admin/pages/_popups.html.haml

@@ -14,7 +14,7 @@
       .buttons
         = submit_tag t('add_part'), :id => 'add_part_button', :class => "button"
         = t('or')
-        = link_to_function t('cancel'), "Popup.close();", :class=>"cancel"
+        = link_to "Cancel", '#', onclick: "Popup.close(); return false", class: "cancel"
   #add_field_popup.popup{:style=>"display: none"}
     #add_field_busy.busy{:style=>"display: none"}= image('spinner.gif', :alt => "")
     .popup_title= t('add_field')
@@ -27,5 +27,5 @@
       .buttons
         = submit_tag t('add_field'), :class=>'button', :id=>'add_page_field_button'
         = t('or')
-        = link_to_function t('cancel'), "Popup.close();", :class=>"cancel"
+        = link_to "Cancel", '#', onclick: "Popup.close(); return false", class: "cancel"
   = render_region :popups

data/config/routes.rb

@@ -1,7 +1,7 @@
 TrustyCms::Application.routes.draw do
   root to: 'site#show_page'
   TrustyCms::Application.config.enabled_extensions.each { |ext|
-    load File.join(TrustyCms::ExtensionPath.find(ext).to_s, "config", "routes.rb")
+    #load File.join(TrustyCms::ExtensionPath.find(ext).to_s, "config", "routes.rb")
   }
   namespace :admin do
     resources :pages do
@@ -27,12 +27,12 @@ TrustyCms::Application.routes.draw do
     match '/reference/:type(.:format)' => 'references#show', :as => :reference, :via => :get
   end
 
-  match 'admin' => 'admin/welcome#index', :as => :admin
-  match 'admin/welcome' => 'admin/welcome#index', :as => :welcome
-  match 'admin/login' => 'admin/welcome#login', :as => :login
-  match 'admin/logout' => 'admin/welcome#logout', :as => :logout
+  get 'admin' => 'admin/welcome#index', :as => :admin
+  get 'admin/welcome' => 'admin/welcome#index', :as => :welcome
+  match 'admin/login' => 'admin/welcome#login', :as => :login, :via => [:get, :post]
+  get 'admin/logout' => 'admin/welcome#logout', :as => :logout
   # match '/' => 'site#show_page', :url => '/' # set root to this so root_path works
-  match 'error/404' => 'site#not_found', :as => :not_found
-  match 'error/500' => 'site#error', :as => :error
-  match '*url' => 'site#show_page'
+  get 'error/404' => 'site#not_found', :as => :not_found
+  get 'error/500' => 'site#error', :as => :error
+  get '*url' => 'site#show_page'
 end

data/config/trustygems.yml

@@ -0,0 +1,3 @@
+gemspec: trusty_cms.gemspec
+# If using a private server, change this to the necessary command, i.e. gem inabox
+deploy_command: gem push

data/lib/trusty_cms.rb

@@ -2,18 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::Version
   module TrustyCms
-    module Version
-      Major = '1'
-      Minor = '2'
-      Tiny  = '29'
-      Patch = nil # set to nil for normal release
-
-      class << self
-        def to_s
-          [Major, Minor, Tiny, Patch].delete_if{|v| v.nil? }.join('.')
-        end
-        alias :to_str :to_s
-      end
-    end
+    VERSION = "2.0.0-beta"
   end
 end

data/lib/trusty_cms/extension.rb

@@ -108,8 +108,10 @@ module TrustyCms
       def activate_extension
         return if instance.active?
         instance.activate if instance.respond_to? :activate
-        TrustyCms::Application.config.paths["config/routes"].concat([instance.routing_file]) if instance.routed?
-        TrustyCms::Application.reload_routes!
+        Dir["#{Rails.root}/config/routes/**/*.rb"].each do |route_file|
+          #config.paths["config/routes"] << route_file if instance.routed?
+        end
+        #TrustyCms::Application.reload_routes!
         instance.active = true
       end
       alias :activate :activate_extension

data/lib/trusty_cms/initializer.rb

@@ -148,10 +148,10 @@ module TrustyCms
     def initialize_framework_views
       view_paths = extension_loader.paths(:view) #.push(TrustyCms::Application.config.view_path)
       if ActionController::Base.view_paths.count == 0 || !ActionView::Base.cache_template_loading
-        ActionController::Base.view_paths = ActionView::Base.process_view_paths(view_paths)
+        ActionController::Base.view_paths = ActionView::PathSet.new(Array.wrap(view_paths))
       end
       if ActionMailer::Base.view_paths.count == 0 || !ActionView::Base.cache_template_loading
-        ActionMailer::Base.view_paths = ActionView::Base.process_view_paths(view_paths)
+        ActionMailer::Base.view_paths = ActionView::PathSet.new(Array.wrap(view_paths))
       end
     end
 

data/trusty_cms.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
 Gem::Specification.new do |s|
   s.name = %q{trusty-cms}
-  s.version = TrustyCms::Version.to_s
+  s.version = TrustyCms::VERSION
   s.platform = Gem::Platform::RUBY
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
@@ -23,8 +23,9 @@ a general purpose content managment system--not merely a blogging engine.}
   s.summary = %q{A no-fluff content management system designed for small teams.}
   s.license = %q{MIT}
 
-  s.add_dependency "tzinfo",          "~> 0.3"
-  s.add_dependency "rails",           "~> 3.2"
+  s.add_dependency "tzinfo",          "~> 1.2"
+  s.add_dependency "rails",           "~> 4.2"
+  s.add_dependency "protected_attributes", '~> 1.0.9'
   s.add_dependency "jquery-rails",    "~> 3.1"
   s.add_dependency "rdoc",            "~> 3.9"
   s.add_dependency "acts_as_tree",    "~> 2.1"
@@ -32,7 +33,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency "compass-rails",   "~> 2.0"
   s.add_dependency "delocalize",      "~> 0.2"
   s.add_dependency "haml",            "~> 4.0"
-  s.add_dependency "haml-rails",      ">= 0.4", "< 0.5" # 0.5 is rails 4+ only
+  s.add_dependency "haml-rails",      "~> 0.5" # 0.5 is rails 4+ only
   s.add_dependency "highline",        "~> 1.6"
   s.add_dependency "mysql",           "~> 2.9"
   s.add_dependency "rack",            "~> 1.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 1.2.29
+  version: 2.0.0.pre.beta
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: protected_attributes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +154,14 @@ dependencies:
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
@@ -343,6 +351,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTORS.md
 - Gemfile
 - Gemfile.lock
@@ -564,6 +573,7 @@ files:
 - config/locales/en_available_tags.yml
 - config/routes.rb
 - config/routes.rb.rails2
+- config/trustygems.yml
 - db/migrate/001_create_radiant_tables.rb
 - db/migrate/002_insert_initial_data.rb
 - db/migrate/003_rename_behavior_column.rb