brightcontent-pages 2.0.6 → 2.0.7

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 
 gem 'brightcontent-core', path: '../core'
+gem 'brightcontent-attachments', path: '../attachments'
 
 gemspec

data/Gemfile.lock

@@ -1,14 +1,23 @@
 PATH
   remote: .
   specs:
-    brightcontent-pages (2.0.6)
+    brightcontent-pages (2.0.7)
       awesome_nested_set
-      brightcontent-core (= 2.0.6)
+      brightcontent-attachments (= 2.0.7)
+      brightcontent-core (= 2.0.7)
+
+PATH
+  remote: ../attachments
+  specs:
+    brightcontent-attachments (2.0.7)
+      brightcontent-core (= 2.0.7)
+      jquery-fileupload-rails
+      paperclip
 
 PATH
   remote: ../core
   specs:
-    brightcontent-core (2.0.6)
+    brightcontent-core (2.0.7)
       bcrypt-ruby
       bootstrap-wysihtml5-rails
       has_scope
@@ -53,7 +62,7 @@ GEM
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.0.1)
-    bootstrap-wysihtml5-rails (0.3.1.13)
+    bootstrap-wysihtml5-rails (0.3.1.14)
       railties (>= 3.0)
     builder (3.0.4)
     capybara (2.0.1)
@@ -65,6 +74,7 @@ GEM
       xpath (~> 1.0.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    cocaine (0.4.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     factory_girl (4.1.0)
@@ -80,6 +90,9 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.4)
+    jquery-fileupload-rails (0.4.0)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -96,6 +109,12 @@ GEM
     mime-types (1.19)
     multi_json (1.5.0)
     nokogiri (1.5.6)
+    paperclip (3.4.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.4.0)
+      mime-types
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -165,6 +184,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  brightcontent-attachments!
   brightcontent-core!
   brightcontent-pages!
   capybara

data/app/controllers/brightcontent/pages_controller.rb

@@ -2,14 +2,13 @@ require_dependency "brightcontent/application_controller"
 
 module Brightcontent
   class PagesController < BaseController
-    private
 
     def list_fields
-      default_fields - %w{body depth lft rgt parent_id slug}
+      %w{name}
     end
 
     def form_fields
-      default_fields - %w{slug depth lft rgt}
+      %w{name parent_id body attachments}
     end
 
   end

data/app/models/brightcontent/page.rb

@@ -1,13 +1,16 @@
 module Brightcontent
   class Page < ActiveRecord::Base
-    acts_as_nested_set
     attr_accessible :body, :name, :parent_id
 
-    validates_presence_of :name
+    acts_as_nested_set
+    include Brightcontent::Attachable
 
+    validates_presence_of :name
     after_save :update_slug
 
-    default_scope order('lft')
+    def self.default_scope
+      order :lft
+    end
 
     def homepage?
       lft == 1

data/brightcontent-pages.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "brightcontent-core", version
+  s.add_dependency "brightcontent-attachments", version
   s.add_dependency "awesome_nested_set"
 
   s.add_development_dependency "sqlite3"

data/lib/brightcontent/pages.rb

@@ -1,4 +1,5 @@
 require "brightcontent-core"
+require "brightcontent-attachments"
 require "awesome_nested_set"
 
 require "brightcontent/pages/engine"

data/spec/dummy/db/migrate/20121228111704_create_attachments.brightcontent_attachments_engine.rb

@@ -0,0 +1,20 @@
+# This migration comes from brightcontent_attachments_engine (originally 20121222172513)
+class CreateAttachments < ActiveRecord::Migration
+  def self.up
+    create_table :brightcontent_attachments do |t|
+      t.integer  :attachable_id
+      t.string   :attachable_type
+      t.string   :asset_file_name
+      t.string   :asset_content_type
+      t.integer  :asset_file_size
+      t.datetime :asset_updated_at
+      t.timestamps
+    end
+    add_index :brightcontent_attachments, :attachable_id
+    add_index :brightcontent_attachments, :attachable_type
+  end
+
+  def self.down
+    drop_table :brightcontent_attachments
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121207132810) do
+ActiveRecord::Schema.define(:version => 20121228111704) do
 
   create_table "brightcontent_admin_users", :force => true do |t|
     t.string   "email"
@@ -20,6 +20,20 @@ ActiveRecord::Schema.define(:version => 20121207132810) do
     t.datetime "updated_at",      :null => false
   end
 
+  create_table "brightcontent_attachments", :force => true do |t|
+    t.integer  "attachable_id"
+    t.string   "attachable_type"
+    t.string   "asset_file_name"
+    t.string   "asset_content_type"
+    t.integer  "asset_file_size"
+    t.datetime "asset_updated_at"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "brightcontent_attachments", ["attachable_id"], :name => "index_brightcontent_attachments_on_attachable_id"
+  add_index "brightcontent_attachments", ["attachable_type"], :name => "index_brightcontent_attachments_on_attachable_type"
+
   create_table "brightcontent_pages", :force => true do |t|
     t.string   "name"
     t.text     "body"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brightcontent-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
+- !ruby/object:Gem::Dependency
+  name: brightcontent-attachments
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -181,12 +197,14 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb
+- spec/dummy/db/migrate/20121228111704_create_attachments.brightcontent_attachments_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/brightcontent/attachments/assets/000/000/001/original/cosellers-browser.jpg
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/menu_spec.rb
@@ -208,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858221036745283576
+      hash: -4435009024661515266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2858221036745283576
+      hash: -4435009024661515266
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -258,12 +276,14 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb
+- spec/dummy/db/migrate/20121228111704_create_attachments.brightcontent_attachments_engine.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/brightcontent/attachments/assets/000/000/001/original/cosellers-browser.jpg
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/menu_spec.rb