brightcontent-pages 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce00f1da51773d10d82d547a0cac73e00965af5
-  data.tar.gz: e3819eb119baf8a62004b701c1c96ece8d7994d0
+  metadata.gz: 112947762fa3d05aa45691987766348bd2256438
+  data.tar.gz: 0c19ad6cf07c0dd1314e486edded47cf12b4981c
 SHA512:
-  metadata.gz: ebb8e5d9427bd83d768da06cc5a628360dbc5390b1bbea2309d026ac17ed847c39214425ce5ad609aa14fc2739486c81ff4483452bd0f9558d53aff66ba24445
-  data.tar.gz: 70784aa91cd3d3f763ea95664f082b4353abaa49c555caa710c60d312656e1ebdf0eb2023570f49c2e6a218c8b8140c8f27c0acbd1b26a26fd4b107396c66979
+  metadata.gz: 3ba829349ef0b518b96e53e1d84cc74fa6ba9892819794677873743f8417e8abb42333791206de2d0db60b382c73e76a05349370a781060665491ef94f224ffc
+  data.tar.gz: d6730a095af90e99dae1763f3f4b50871dedd55141a5a76dae02dee4c6a10b15dca19ef1ce0d5766091b43b8964668eb30a557d9aa26b7b3a3bf16b1d25fe98a

data/app/assets/javascripts/brightcontent/pages.js

@@ -1,3 +1,3 @@
-//= require jquery.ui.sortable
+//= require jquery-ui/sortable
 //= require jquery.ui.nestedSortable
 //= require sortable_tree/initializer

data/app/models/brightcontent/page.rb

@@ -1,5 +1,6 @@
 module Brightcontent
   class Page < ActiveRecord::Base
     include Brightcontent::PageCore
+    attr_accessible *column_names if defined? ProtectedAttributes
   end
 end

data/app/models/brightcontent/page_core.rb

@@ -13,6 +13,9 @@ module Brightcontent
       after_save :update_slug, :expire_path_cache
       after_move :update_slug, :expire_path_cache
 
+      scope :visible, -> { where(arel_table[:hidden].eq false) }
+      scope :hidden, -> { where(arel_table[:hidden].eq true) }
+
       default_scope { order(:lft) }
     end
 
@@ -38,6 +41,10 @@ module Brightcontent
       "/" + slug
     end
 
+    def to_s
+      name
+    end
+
     private
 
     def update_slug

data/brightcontent-pages.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.add_dependency "brightcontent-core", version
   s.add_dependency "brightcontent-attachments", version
   s.add_dependency "awesome_nested_set", ">= 3.0.0.rc.3"
-  s.add_dependency "jquery-ui-rails", ">= 2.3.0"
+  s.add_dependency "jquery-ui-rails", "~> 5.0.0"
   s.add_dependency "the_sortable_tree", "~> 2.3.0"
 
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rspec", "~> 2.14.1"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "launchy"

data/lib/brightcontent/pages/methods.rb

@@ -2,6 +2,10 @@ module Brightcontent
   module Pages
     module Methods
       def current_page
+        @current_page ||= Page.find_by_path(request.path)
+      end
+
+      def current_page!
         @current_page ||= Page.find_by_path!(request.path)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-pages
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brightcontent-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: brightcontent-attachments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: the_sortable_tree
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +237,6 @@ files:
 - spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb
 - spec/dummy/db/migrate/20121228111704_create_attachments.brightcontent_attachments_engine.rb
 - spec/dummy/db/migrate/20140227110824_add_position_to_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
@@ -297,7 +310,6 @@ test_files:
 - spec/dummy/db/migrate/20121206121725_create_brightcontent_admin_users.rb
 - spec/dummy/db/migrate/20121228111704_create_attachments.brightcontent_attachments_engine.rb
 - spec/dummy/db/migrate/20140227110824_add_position_to_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

data/spec/dummy/db/schema.rb

@@ -1,53 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended that you check this file into your version control system.
-
-ActiveRecord::Schema.define(version: 20140227110824) do
-
-  create_table "brightcontent_admin_users", force: true do |t|
-    t.string   "email"
-    t.string   "password_digest"
-    t.datetime "created_at",      null: false
-    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
-    t.integer  "position"
-  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"
-    t.string   "slug"
-    t.integer  "depth"
-    t.integer  "lft"
-    t.integer  "rgt"
-    t.integer  "parent_id"
-    t.datetime "created_at",                 null: false
-    t.datetime "updated_at",                 null: false
-    t.boolean  "hidden",     default: false, null: false
-  end
-
-  add_index "brightcontent_pages", ["slug"], name: "index_brightcontent_pages_on_slug"
-
-end