Bcms v4 update

.gitignore

@@ -2,8 +2,7 @@
 log/*.log
 pkg/
 test/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3-journal
 test/dummy/log/*.log
 test/dummy/tmp/
 test/dummy/.sass-cache
-test/dummy/config/s3.yml
-.DS_Store

Gemfile

@@ -1,7 +1,14 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem "sqlite3"
+# Declare your gem's dependencies in bcms_s3.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
 gemspec
 
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
 
-
+# To use debugger
+# gem 'debugger'

Gemfile.lock

@@ -1,134 +1,179 @@
 PATH
   remote: .
   specs:
-    bcms_aws_s3 (1.0.2)
+    bcms_s3 (0.0.1)
       aws-sdk (~> 1.5.0)
-      browsercms (>= 3.5.0.rc1, < 3.6.0)
+
+PATH
+  remote: ../browsercms
+  specs:
+    browsercms (4.0.0.alpha)
+      actionpack-page_caching (~> 1.0)
+      ancestry (~> 2.0.0)
+      bootstrap-sass
+      ckeditor_rails (~> 4.3.0)
+      compass-rails (~> 1.1.3)
+      devise (~> 3.0)
+      jquery-rails (~> 3.1)
+      jquery-ui-rails (~> 4.1)
+      panoramic
+      paperclip (~> 3.5.1)
+      rails (~> 4.0.0)
+      sass-rails
+      simple_form (>= 3.0.0.rc, < 3.1)
+      term-ansicolor
+      underscore-rails (~> 1.4)
+      will_paginate (~> 3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
-      mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
-      builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    ancestry (1.2.5)
-      activerecord (>= 2.2.2)
-    arel (3.0.2)
-    aws-sdk (1.5.2)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-page_caching (1.0.2)
+      actionpack (>= 4.0.0, < 5)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    ancestry (2.0.0)
+      activerecord (>= 3.0.0)
+    arel (4.0.1)
+    atomic (1.1.14)
+    aws-sdk (1.5.8)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    browsercms (3.5.0.rc1)
-      ancestry (~> 1.2.4)
-      ckeditor_rails (~> 3.6.2.2)
-      jquery-rails (~> 2.0)
-      paperclip (~> 3.0.3)
-      rails (~> 3.2.0)
-      sass-rails
-      term-ansicolor
-    builder (3.0.0)
-    ckeditor_rails (3.6.2.2)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    cocaine (0.2.1)
+    bcrypt-ruby (3.1.2)
+    bootstrap-sass (3.1.0.1)
+      sass (~> 3.2)
+    builder (3.1.4)
+    chunky_png (1.2.9)
+    ckeditor_rails (4.3.1)
+      railties (>= 3.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.3)
+      climate_control (>= 0.0.3, < 1.0)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    compass-rails (1.1.3)
+      compass (>= 0.12.2)
+    devise (3.2.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     erubis (2.7.0)
-    hike (1.2.1)
-    httparty (0.8.3)
-      multi_json (~> 1.0)
-      multi_xml
-    i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    fssm (0.2.10)
+    hike (1.2.3)
+    httparty (0.12.0)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    i18n (0.6.9)
+    jquery-rails (3.1.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.1.1)
+      railties (>= 3.1.0)
+    json (1.8.1)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.5)
-    multi_xml (0.5.1)
-    nokogiri (1.5.2)
-    paperclip (3.0.3)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    orm_adapter (0.5.0)
+    panoramic (0.0.4)
+      rails (>= 3.0.7)
+    paperclip (3.5.3)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.5.3)
       mime-types
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
-      bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    sass (3.1.18)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    sass (3.2.14)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    sprockets (2.1.3)
+      sprockets-rails (~> 2.0.0)
+    simple_form (3.0.1)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
+    sprockets (2.10.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    tins (0.13.2)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-    uuidtools (2.1.2)
+    tzinfo (0.3.38)
+    underscore-rails (1.5.2)
+    uuidtools (2.1.4)
+    warden (1.2.3)
+      rack (>= 1.0)
+    will_paginate (3.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcms_aws_s3!
+  bcms_s3!
+  browsercms!
   sqlite3

Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -37,4 +31,6 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :default => :test
+task default: :test
+
+load 'lib/tasks/module_tasks.rake'

app/assets/javascripts/bcms_s3/application.js

@@ -5,11 +5,9 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

app/assets/stylesheets/bcms_s3/application.css

@@ -10,4 +10,4 @@
  *
  *= require_self
  *= require_tree .
-*/
+ */

app/views/layouts/bcms_s3/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>BcmsS3</title>
+  <%= stylesheet_link_tag    "bcms_s3/application", media: "all" %>
+  <%= javascript_include_tag "bcms_s3/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>