refinerycms-core 2.0.10 → 2.1.0

data/lib/refinery/menu_item.rb

@@ -1,89 +1,91 @@
 module Refinery
-  class MenuItem < HashWithIndifferentAccess
+  class MenuItem
 
-    class << self
-      def attributes
-        [:title, :parent_id, :lft, :rgt, :depth, :url, :menu, :menu_match]
-      end
+    attr_accessor :menu, :title, :parent_id, :lft, :rgt, :depth, :url, :menu_match,
+                  :original_type, :original_id
 
-      def apply_attributes!
-        attributes.each do |attribute|
-          class_eval %{
-            def #{attribute}
-              @#{attribute} ||= self[:#{attribute}]
-            end
-          } unless self.respond_to?(attribute)
-          class_eval %{
-            def #{attribute}=(attr)
-              @#{attribute} = attr
-            end
-          } unless self.respond_to?(:"#{attribute}=")
-        end
+    def initialize(menu, options = {})
+      @menu = menu
+      remap!(options).each do |key, value|
+        send "#{key}=", value
       end
+      self.attributes = options
     end
 
-    def original_id
-      @original_id ||= self[:id]
-    end
-
-    def original_type
-      @original_type ||= self[:type]
+    def remap!(options)
+      options[:original_id] = options.delete(:id)
+      options[:original_type] = options.delete(:type)
+      options
     end
 
-    apply_attributes!
-
     def ancestors
-      return @ancestors if @ancestors
-      @ancestors = []
-      p = self
-      @ancestors << p until(p = p.parent).nil?
-
-      @ancestors
+      @ancestors ||= generate_ancestors
     end
 
     def children
-      @children ||= if has_children?
-        menu.select { |item| item.original_type == original_type && item.parent_id == original_id }
-      else
-        []
-      end
+      @children ||= generate_children
     end
 
     def descendants
-      @descendants ||= if has_descendants?
-        menu.select{|item| item.original_type == original_type && item.lft > lft && item.rgt < rgt}
-      else
-        []
-      end
+      @descendants ||= generate_descendants
     end
 
     def has_children?
-      @has_children ||= (rgt > lft + 1)
+      !leaf?
     end
-    # really, they're the same.
-    alias_method :has_descendants?, :has_children?
+    alias_method :has_descendants?, :has_children? # really, they're the same.
 
     def has_parent?
-      !parent_id.nil?
+      !orphan?
     end
 
-    def inspect
-      hash = {}
-
-      self.class.attributes.each do |attribute|
-        hash[attribute] = self[attribute]
-      end
+    def orphan?
+      parent_id.nil? || menu.detect{|item| compatible_with?(item) && item.original_id == parent_id}.nil?
+    end
 
-      hash.inspect
+    def leaf?
+      @leaf ||= rgt.to_i - lft.to_i == 1
     end
 
     def parent
-      @parent ||= (menu.detect{|item| item.original_type == original_type && item.original_id == parent_id} if has_parent?)
+      @parent ||= ancestors.detect { |item| item.original_id == parent_id }
     end
 
     def siblings
       @siblings ||= ((has_parent? ? parent.children : menu.roots) - [self])
     end
     alias_method :shown_siblings, :siblings
+
+    def to_refinery_menu_item
+      attributes
+    end
+
+    private
+    attr_accessor :attributes
+    # At present a MenuItem can only have children of the same type to avoid id
+    # conflicts like a Blog::Post and a Page both having an id of 42
+    def compatible_with?(item)
+      original_type == item.original_type
+    end
+
+    def generate_ancestors
+      if has_parent?
+        menu.select { |item| compatible_with?(item) && item.lft < lft && item.rgt > rgt }
+      else
+        []
+      end
+    end
+
+    def generate_children
+      descendants.select { |item| item.parent_id == original_id }
+    end
+
+    def generate_descendants
+      if has_descendants?
+        menu.select { |item| compatible_with?(item) && item.lft > lft && item.rgt < rgt }
+      else
+        []
+      end
+    end
   end
 end

data/lib/refinery/plugin.rb

@@ -1,10 +1,8 @@
 module Refinery
-  module Engines; end;
-
   class Plugin
 
     attr_accessor :name, :class_name, :controller, :directory, :url,
-                  :version, :dashboard, :always_allow_access, :menu_match,
+                  :dashboard, :always_allow_access, :menu_match,
                   :hide_from_menu, :pathname, :plugin_activity
 
     def self.register(&block)
@@ -76,6 +74,16 @@ module Refinery
       end
     end
 
+    def version
+      Refinery.deprecate "Refinery::Plugin#version", :when => '2.2',
+                         :caller => caller.detect{|c| /#{pathname}/ === c }
+    end
+
+    def version=(*args)
+      Refinery.deprecate "Refinery::Plugin#version=", :when => '2.2',
+                         :caller => caller.detect{|c| /#{pathname}/ === c }
+    end
+
   # Make this protected, so that only Plugin.register can use it.
   protected
 

data/lib/refinery/plugins.rb

@@ -1,5 +1,15 @@
+require 'forwardable'
+
 module Refinery
-  class Plugins < Array
+  class Plugins
+    include Enumerable
+    extend Forwardable
+
+    def initialize(*args)
+      @plugins = Array.new(*args)
+    end
+
+    def_delegators :@plugins, :<<, :each, :delete_if
 
     def find_by_model(model)
       model = model.constantize if model.is_a? String
@@ -61,5 +71,8 @@ module Refinery
       end
     end
 
+    private
+
+    attr_reader :plugins
   end
 end

data/lib/refinery/version.rb

@@ -1,15 +1,15 @@
 module Refinery
   class Version
     @major = 2
-    @minor = 0
-    @tiny  = 10
+    @minor = 1
+    @tiny  = 0
     @build = nil
 
     class << self
       attr_reader :major, :minor, :tiny, :build
 
       def to_s
-        [@major, @minor, @tiny, @build].compact.join '.'
+        [@major, @minor, @tiny, @build].compact.join('.')
       end
     end
   end

data/refinerycms-core.gemspec

@@ -1,8 +1,8 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../../core/lib', __FILE__)
-require 'refinery/version'
+require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
+rails_version = ['>= 3.1.11', '< 3.3'] | 0.upto(11).map{|i| "!= 3.2.#{i}"}
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
@@ -20,15 +20,16 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'acts_as_indexed',             '~> 0.7.7'
-  s.add_dependency 'friendly_id',                 '~> 4.0.9'
-  s.add_dependency 'globalize3',                  '~> 0.3.0'
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency 'refinerycms-i18n',            '~> 2.1.0'
   s.add_dependency 'awesome_nested_set',          '~> 2.1.3'
-  s.add_dependency 'rails',                       ['>= 3.1.11', '< 3.3'] | 0.upto(11).map{|i| "!= 3.2.#{i}"}
-  s.add_dependency 'truncate_html',               '~> 0.5.5'
+  s.add_dependency 'railties',                    rails_version
+  s.add_dependency 'activerecord',                rails_version
+  s.add_dependency 'actionpack',                  rails_version
+  s.add_dependency 'truncate_html',               '~> 0.9'
   s.add_dependency 'will_paginate',               '~> 3.0.2'
   s.add_dependency 'sass-rails',                  '~> 3.2.3'
-  s.add_dependency 'coffee-rails',                '~> 3.2.1'
-  s.add_dependency 'uglifier',                    '>= 1.0.3'
-  s.add_dependency 'jquery-rails',                '~> 2.0.0'
+  s.add_dependency 'jquery-rails',                '~> 2.3.0'
+  s.add_dependency 'decorators',                  '~> 1.0.0'
 end

data/spec/controllers/refinery/admin/dummy_controller_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+module Refinery
+  module Admin
+    class DummyController < Refinery::AdminController
+      def index
+        render :nothing => true
+      end
+    end
+  end
+end
+
+module Refinery
+  module Admin
+    describe DummyController do
+      context "as refinery user" do
+        refinery_login_with :refinery
+
+        context "with permission" do
+          let(:controller_permission) { true }
+          it "allows access" do
+            controller.should_not_receive :error_404
+            get :index
+          end
+        end
+
+        context "without permission" do
+          let(:controller_permission) { false }
+          it "denies access" do
+            controller.should_receive :error_404
+            get :index
+          end
+        end
+
+        describe "force_ssl!" do
+          before do
+            controller.stub(:require_refinery_users!).and_return(false)
+          end
+
+          it "is false so standard HTTP is used" do
+            Refinery::Core.stub(:force_ssl).and_return(false)
+            controller.should_not_receive(:redirect_to).with(:protocol => 'https')
+
+            get :index
+          end
+
+          it "is true so HTTPS is used" do
+            Refinery::Core.stub(:force_ssl).and_return(true)
+            controller.should_receive(:redirect_to).with(:protocol => 'https')
+
+            get :index
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/refinery/admin/refinery_core_controller_spec.rb

@@ -3,15 +3,14 @@ require 'spec_helper'
 module Refinery
   module Admin
     describe CoreController do
-      login_refinery_user
+      refinery_login_with_factory :refinery_user
 
       it "updates the plugin positions" do
-        plugins = refinery_user.plugins.reverse.collect(&:name)
+        plugins = logged_in_user.plugins.reverse.map &:name
 
         post 'update_plugin_positions', :menu => plugins
 
-        refinery_user.plugins.reload
-        refinery_user.plugins.each_with_index do |plugin, idx|
+        logged_in_user.plugins.reload.each_with_index do |plugin, idx|
           plugin.name.should eql(plugins[idx])
         end
       end

data/spec/controllers/refinery/sitemap_controller_spec.rb

@@ -2,27 +2,14 @@ require 'spec_helper'
 
 module Refinery
   describe SitemapController do
-    login_refinery_user
-
     before (:each) do
       @request.env['HTTP_ACCEPT'] = 'application/xml'
     end
 
-    it "should show a valid xml answer with i18n enabled" do
-      ::Refinery.stub(:i18n_enabled?).and_return(true)
-
+    it "shows a valid xml response" do
       get :index
 
       response.should be_success
     end
-
-    it "should show a valid xml answer with i18n disabled" do
-      ::Refinery.stub(:i18n_enabled?).and_return(false)
-
-      get :index
-
-      response.should be_success
-    end
-
   end
 end

data/spec/{requests → features}/refinery/admin/custom_assets_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   describe "custom" do
-    login_refinery_user
+    refinery_login_with :refinery_user
 
     context "javascripts" do
       before do

data/spec/{requests → features}/refinery/admin/dialogs_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   describe "dialog" do
-    login_refinery_user
+    refinery_login_with :refinery_user
 
     context "links" do
       it "have iframe src" do

data/spec/features/refinery/admin/xhr_paging_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+module Refinery
+  describe "Crudify" do
+    refinery_login_with :refinery_superuser
+
+    describe "xhr_paging", :js => true do
+      # Refinery::Admin::UsersController specifies :order => 'username ASC' in crudify
+      let(:first_user) { User.order('username ASC').first }
+      let(:last_user) { User.order('username ASC').last }
+      before do
+        FactoryGirl.create :user
+        Admin::UsersController.should_receive(:xhr_pageable?).
+                               at_least(1).times.and_return(xhr_pageable)
+        User.stub(:per_page).and_return(1)
+      end
+
+      describe 'when set to true' do
+        let(:xhr_pageable) { true }
+        it 'should perform ajax paging of index' do
+          visit refinery.admin_users_path
+
+          expect(page).to have_selector('li.record', :count => 1)
+          expect(page).to have_content(first_user.email)
+
+          within '.pagination' do
+            click_link '2'
+          end
+
+          expect(page.evaluate_script('jQuery.active')).to eq(1)
+          expect(page).to have_content(last_user.email)
+        end
+      end
+
+      describe 'set to false' do
+        let(:xhr_pageable) { false }
+        it 'should not perform ajax paging of index' do
+          visit refinery.admin_users_path
+
+          expect(page).to have_selector('li.record', :count => 1)
+          expect(page).to have_content(first_user.email)
+
+          within '.pagination' do
+            click_link '2'
+          end
+
+          expect(page.evaluate_script('jQuery.active')).to eq(0)
+          expect(page).to have_content(last_user.email)
+
+        end
+      end
+    end
+  end
+
+end

data/spec/features/refinery/application_layout_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Refinery
+  describe 'layout' do
+    refinery_login_with :refinery_user
+
+    let(:home_page) do
+      FactoryGirl.create :page, :title => 'Home', :link_url => '/'
+    end
+
+    describe 'body' do
+      it "id is the page's canonical id" do
+        visit home_page.url
+
+        page.should have_css 'body#home-page'
+      end
+    end
+  end
+end