refinerycms-core 2.0.5 → 2.0.6

data/lib/refinery/version.rb

@@ -2,14 +2,14 @@ module Refinery
   class Version
     @major = 2
     @minor = 0
-    @tiny  = 5
+    @tiny  = 6
     @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/spec/helpers/refinery/custom_assets_helper_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module Refinery
   describe CustomAssetsHelper do
     describe "custom_javascripts" do
-      before(:each) do
+      before do
         Refinery::Core.clear_javascripts!
       end
 
@@ -24,7 +24,7 @@ module Refinery
     end
 
     describe "custom_stylesheets" do
-      before(:each) do
+      before do
         Refinery::Core.clear_stylesheets!
       end
 

data/spec/helpers/refinery/pagination_helper_spec.rb

@@ -5,7 +5,7 @@ module Refinery
 
     describe "#pagination_css_class" do
       context "when request.xhr? and params[:from_page] is set" do
-        before(:each) do
+        before do
           controller.request.stub(:xhr?).and_return(true)
         end
 

data/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator %w[--skip-db --skip-migrations]
     end

data/spec/lib/generators/refinery/core/core_generator_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator
     end

data/spec/lib/generators/refinery/engine/engine_generator_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource }
     end
@@ -83,9 +83,6 @@ module Refinery
 
     context "when generating extension inside existing extensions dir" do
       before do
-        Refinery::EngineGenerator.any_instance.stub(:merge_locales!).and_return(true)
-        Refinery::EngineGenerator.any_instance.stub(:existing_extension?).and_return(true)
-        
         run_generator %w{ rspec_item_test title:string --extension rspec_product_tests --skip }
       end
 
@@ -95,5 +92,13 @@ module Refinery
         end
       end
     end
+
+    describe "attr_accessible" do
+      it "adds attributes to the list" do
+        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/app/models/refinery/rspec_product_tests/rspec_product_test.rb") do |file|
+          file.grep(%r{attr_accessible :title, :description, :image_id, :brochure_id, :position}).count.should eq(1)
+        end
+      end
+    end
   end
 end

data/spec/lib/generators/refinery/engine/engine_generator_with_i18n_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --i18n title description }
     end

data/spec/lib/generators/refinery/engine/engine_generator_without_frontend_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --skip-frontend }
     end

data/spec/lib/generators/refinery/form/form_generator_spec.rb

@@ -7,7 +7,7 @@ module Refinery
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
-    before(:each) do
+    before do
       prepare_destination
       run_generator %w{ rspec_form_test title:string description:text choice:radio another:dropdown enable:checkbox }
     end

data/spec/lib/refinery/application_controller_spec.rb

@@ -3,6 +3,14 @@ require "spec_helper"
 module Refinery
   describe ApplicationController do
     describe "DummyController", :type => :controller do
+      before do
+        Rails.application.routes.draw { get "anonymous/index" }
+      end
+
+      after do
+        Rails.application.reload_routes!
+      end
+
       controller do
         include ::Refinery::ApplicationController
 

data/spec/lib/refinery/core_spec.rb

@@ -11,7 +11,7 @@ describe Refinery do
   end
 
   describe "#register_extension" do
-    before(:each) { subject.extensions.clear }
+    before { subject.extensions.clear }
 
     it "should add the extension's module to the array of registered extensions" do
       subject.register_extension(Refinery::Core)
@@ -30,7 +30,7 @@ describe Refinery do
 
   describe "#extension_registered?" do
     context "with Refinery::Core::Engine registered" do
-      before(:each) { subject.register_extension(Refinery::Core) }
+      before { subject.register_extension(Refinery::Core) }
 
       it "should return true if the extension is registered" do
         subject.extension_registered?(Refinery::Core).should == true
@@ -38,7 +38,7 @@ describe Refinery do
     end
 
     context "with no extensions registered" do
-      before(:each) { subject.extensions.clear }
+      before { subject.extensions.clear }
 
       it "should return false if the extension is not registered" do
         subject.extension_registered?(Refinery::Core).should == false
@@ -47,7 +47,7 @@ describe Refinery do
   end
 
   describe "#unregister_extension" do
-    before(:each) do
+    before do
       subject.extensions.clear
       subject.register_extension(Refinery::Images)
     end
@@ -97,7 +97,7 @@ describe Refinery do
   end
 
   describe "#deprecate" do
-    before(:each) do
+    before do
       @errors = StringIO.new
       @old_err = $stderr
       $stderr = @errors
@@ -152,6 +152,15 @@ describe Refinery do
       end
     end
 
+    context 'with Refinery::GroupClass' do
+      module Refinery::GroupClass
+      end
+
+      it "returns admin_group_class_path" do
+        Refinery.route_for_model(Refinery::GroupClass).should == "admin_group_class_path"
+      end
+    end
+
     context 'with Refinery::DummyName' do
       module Refinery::DummyName
       end

data/spec/lib/refinery/crud_spec.rb

@@ -0,0 +1,106 @@
+require "spec_helper"
+
+ActiveRecord::Schema.define do
+  create_table :refinery_crud_dummies, :force => true do |t|
+    t.integer :parent_id
+    t.integer :lft
+    t.integer :rgt
+    t.integer :depth
+  end
+end
+
+module Refinery
+  class CrudDummy < ActiveRecord::Base
+    attr_accessible :parent_id
+    acts_as_nested_set
+  end
+
+  class CrudDummyController < ::ApplicationController
+    crudify :'refinery/crud_dummy'
+  end
+end
+
+module Refinery
+  describe CrudDummyController, :type => :controller do
+
+    describe "#update_positions" do
+      let!(:crud_dummy_one) { Refinery::CrudDummy.create! }
+      let!(:crud_dummy_two) { Refinery::CrudDummy.create! }
+      let!(:crud_dummy_three) { Refinery::CrudDummy.create! }
+
+      before do
+        controller.should_receive(:refinery_user_required?).and_return(false)
+      end
+
+      it "orders dummies" do
+        post :update_positions, {
+          "ul" => {
+            "0" => {
+              "0" => {"id" => "crud_dummy_#{crud_dummy_three.id}"},
+              "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
+              "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+            }
+          }
+        }
+
+        dummy = crud_dummy_three.reload
+        dummy.lft.should eq(1)
+        dummy.rgt.should eq(2)
+
+        dummy = crud_dummy_two.reload
+        dummy.lft.should eq(3)
+        dummy.rgt.should eq(4)
+
+        dummy = crud_dummy_one.reload
+        dummy.lft.should eq(5)
+        dummy.rgt.should eq(6)
+      end
+
+      it "orders nested dummies" do
+        nested_crud_dummy_one = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
+        nested_crud_dummy_two = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
+
+        post :update_positions, {
+          "ul" => {
+            "0" => {
+              "0" => {
+                "id" => "crud_dummy_#{crud_dummy_three.id}",
+                "children" => {
+                  "0" => {
+                    "0" => {"id" => "crud_dummy_#{nested_crud_dummy_one.id}"},
+                    "1" => {"id" => "crud_dummy_#{nested_crud_dummy_two.id}"}
+                  }
+                }
+              },
+              "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
+              "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+            }
+          }
+        }
+
+        dummy = crud_dummy_three.reload
+        dummy.lft.should eq(1)
+        dummy.rgt.should eq(6)
+
+        dummy = nested_crud_dummy_one.reload
+        dummy.lft.should eq(2)
+        dummy.rgt.should eq(3)
+        dummy.parent_id.should eq(crud_dummy_three.id)
+
+        dummy = nested_crud_dummy_two.reload
+        dummy.lft.should eq(4)
+        dummy.rgt.should eq(5)
+        dummy.parent_id.should eq(crud_dummy_three.id)
+
+        dummy = crud_dummy_two.reload
+        dummy.lft.should eq(7)
+        dummy.rgt.should eq(8)
+
+        dummy = crud_dummy_one.reload
+        dummy.lft.should eq(9)
+        dummy.rgt.should eq(10)
+      end
+    end
+
+  end
+end

data/spec/lib/refinery/plugin_spec.rb

@@ -122,7 +122,7 @@ module Refinery
         end
       end
 
-      before(:each) { plugin.reset_url! }
+      before { plugin.reset_url! }
 
       context 'when @url is already defined' do
         it 'returns hash' do

data/spec/lib/refinery/plugins_spec.rb

@@ -34,7 +34,7 @@ module Refinery
 
   describe Plugins do
 
-    before(:each) do
+    before do
       # First, deactivate all.
       subject.class.set_active([])
     end

data/spec/requests/refinery/admin/custom_assets_spec.rb

@@ -5,7 +5,7 @@ module Refinery
     login_refinery_user
 
     context "javascripts" do
-      before(:each) do
+      before do
         ::Refinery::Core.clear_javascripts!
       end
 
@@ -17,7 +17,7 @@ module Refinery
     end
 
     context "stylesheets" do
-      before(:each) do
+      before do
         ::Refinery::Core.clear_stylesheets!
       end
 

data/spec/requests/refinery/admin/dialogs_spec.rb

@@ -19,9 +19,10 @@ module Refinery
     end
 
     context "a" do
-      it "have empty iframe src" do
+      it "404s" do
+        Admin::DialogsController.any_instance.should_receive(:error_404).once
+
         visit refinery.admin_dialog_path('a')
-        page.should have_selector("iframe[src='']")
       end
     end
   end

data/spec/requests/refinery/search_spec.rb

@@ -17,7 +17,7 @@ module Refinery
       end
 
       describe "resource extension" do
-        before(:each) { FactoryGirl.create(:resource) }
+        before { FactoryGirl.create(:resource) }
 
         it "returns found resource" do
           visit refinery.admin_resources_path
@@ -28,7 +28,7 @@ module Refinery
       end
 
       describe "page extension" do
-        before(:each) { FactoryGirl.create(:page, :title => "Ugis Ozols") }
+        before { FactoryGirl.create(:page, :title => "Ugis Ozols") }
 
         it "returns found page" do
           visit refinery.admin_pages_path

data/spec/support/database_cleaner.rb

@@ -2,14 +2,20 @@ require 'database_cleaner'
 
 RSpec.configure do |config|
   config.before(:suite) do
-    DatabaseCleaner.strategy = (ENV['JS'] == 'false' ? :transaction : :truncation)
+    DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.start
   end
 
   config.after(:each) do
     DatabaseCleaner.clean
   end
+
+  config.around(:each, :js) do |example|
+    DatabaseCleaner.strategy = :truncation
+    example.call
+    DatabaseCleaner.strategy = :transaction
+  end
 end

data/spec/support/refinery.rb

@@ -4,10 +4,9 @@ RSpec.configure do |config|
   config.extend Refinery::Testing::ControllerMacros::Authentication, :type => :controller
   config.include Refinery::Testing::ControllerMacros::Methods, :type => :controller
   config.extend Refinery::Testing::RequestMacros::Authentication, :type => :request
-  config.include Refinery::Testing::UrlHelper
 
   # set some config values so that image and resource factories don't fail to create
-  config.before(:each) do
+  config.before do
     Refinery::Images.max_image_size = 5242880
     Refinery::Resources.max_file_size = 52428800
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_indexed
@@ -527,8 +527,8 @@ files:
 - lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb
 - lib/generators/refinery/dummy/dummy_generator.rb
 - lib/generators/refinery/dummy/templates/rails/Rakefile
-- lib/generators/refinery/dummy/templates/rails/application.rb
-- lib/generators/refinery/dummy/templates/rails/boot.rb
+- lib/generators/refinery/dummy/templates/rails/application.rb.erb
+- lib/generators/refinery/dummy/templates/rails/boot.rb.erb
 - lib/generators/refinery/dummy/templates/rails/database.yml
 - lib/generators/refinery/dummy/templates/rails/routes.rb
 - lib/generators/refinery/engine/USAGE
@@ -537,9 +537,9 @@ files:
 - lib/generators/refinery/engine/templates/Gemfile
 - lib/generators/refinery/engine/templates/Guardfile
 - lib/generators/refinery/engine/templates/Rakefile
-- lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb
-- lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/plural_name_controller.rb
-- lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb
+- lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb
+- lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/plural_name_controller.rb.erb
+- lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb.erb
 - lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_actions.html.erb
 - lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_form.html.erb
 - lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_locale_picker.html.erb
@@ -557,33 +557,34 @@ files:
 - lib/generators/refinery/engine/templates/config/locales/fr.yml
 - lib/generators/refinery/engine/templates/config/locales/nb.yml
 - lib/generators/refinery/engine/templates/config/locales/nl.yml
-- lib/generators/refinery/engine/templates/config/routes.rb
-- lib/generators/refinery/engine/templates/db/migrate/1_create_namespace_plural_name.rb
-- lib/generators/refinery/engine/templates/db/seeds.rb
-- lib/generators/refinery/engine/templates/lib/generators/refinery/extension_plural_name_generator.rb
-- lib/generators/refinery/engine/templates/lib/refinery/plural_name.rb
-- lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb
-- lib/generators/refinery/engine/templates/lib/refinerycms-extension_plural_name.rb
+- lib/generators/refinery/engine/templates/config/locales/sk.yml
+- lib/generators/refinery/engine/templates/config/routes.rb.erb
+- lib/generators/refinery/engine/templates/db/migrate/1_create_namespace_plural_name.rb.erb
+- lib/generators/refinery/engine/templates/db/seeds.rb.erb
+- lib/generators/refinery/engine/templates/lib/generators/refinery/extension_plural_name_generator.rb.erb
+- lib/generators/refinery/engine/templates/lib/refinery/plural_name.rb.erb
+- lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb
+- lib/generators/refinery/engine/templates/lib/refinerycms-extension_plural_name.rb.erb
 - lib/generators/refinery/engine/templates/lib/tasks/refinery/extension_plural_name.rake
 - lib/generators/refinery/engine/templates/readme.md
 - lib/generators/refinery/engine/templates/refinerycms-extension_plural_name.gemspec
 - lib/generators/refinery/engine/templates/script/rails
-- lib/generators/refinery/engine/templates/spec/models/refinery/namespace/singular_name_spec.rb
-- lib/generators/refinery/engine/templates/spec/requests/refinery/namespace/admin/plural_name_spec.rb
+- lib/generators/refinery/engine/templates/spec/models/refinery/namespace/singular_name_spec.rb.erb
+- lib/generators/refinery/engine/templates/spec/requests/refinery/namespace/admin/plural_name_spec.rb.erb
 - lib/generators/refinery/engine/templates/spec/spec_helper.rb
-- lib/generators/refinery/engine/templates/spec/support/factories/refinery/plural_name.rb
+- lib/generators/refinery/engine/templates/spec/support/factories/refinery/plural_name.rb.erb
 - lib/generators/refinery/engine/templates/tasks/rspec.rake
 - lib/generators/refinery/engine/templates/tasks/testing.rake
 - lib/generators/refinery/form/USAGE
 - lib/generators/refinery/form/form_generator.rb
 - lib/generators/refinery/form/templates/.gitignore
 - lib/generators/refinery/form/templates/.gitkeep
-- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb
-- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/settings_controller.rb
-- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/plural_name_controller.rb
-- lib/generators/refinery/form/templates/app/mailers/refinery/namespace/mailer.rb
-- lib/generators/refinery/form/templates/app/models/refinery/namespace/setting.rb
-- lib/generators/refinery/form/templates/app/models/refinery/namespace/singular_name.rb
+- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb
+- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/admin/settings_controller.rb.erb
+- lib/generators/refinery/form/templates/app/controllers/refinery/namespace/plural_name_controller.rb.erb
+- lib/generators/refinery/form/templates/app/mailers/refinery/namespace/mailer.rb.erb
+- lib/generators/refinery/form/templates/app/models/refinery/namespace/setting.rb.erb
+- lib/generators/refinery/form/templates/app/models/refinery/namespace/singular_name.rb.erb
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/plural_name/_records.html.erb
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/admin/plural_name/_submenu.html.erb
@@ -597,6 +598,7 @@ files:
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/mailer/notification.html.erb
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/plural_name/new.html.erb
 - lib/generators/refinery/form/templates/app/views/refinery/namespace/plural_name/thank_you.html.erb
+- lib/generators/refinery/form/templates/config/locales/cs.yml
 - lib/generators/refinery/form/templates/config/locales/da.yml
 - lib/generators/refinery/form/templates/config/locales/de.yml
 - lib/generators/refinery/form/templates/config/locales/en.yml
@@ -608,15 +610,16 @@ files:
 - lib/generators/refinery/form/templates/config/locales/nl.yml
 - lib/generators/refinery/form/templates/config/locales/pt-BR.yml
 - lib/generators/refinery/form/templates/config/locales/ru.yml
+- lib/generators/refinery/form/templates/config/locales/sk.yml
 - lib/generators/refinery/form/templates/config/locales/sl.yml
 - lib/generators/refinery/form/templates/config/locales/zh-CN.yml
-- lib/generators/refinery/form/templates/config/routes.rb
-- lib/generators/refinery/form/templates/db/migrate/1_create_plural_name.rb
-- lib/generators/refinery/form/templates/db/seeds.rb
-- lib/generators/refinery/form/templates/lib/generators/refinery/plural_name_generator.rb
-- lib/generators/refinery/form/templates/lib/refinery/plural_name.rb
-- lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb
-- lib/generators/refinery/form/templates/lib/refinerycms-plural_name.rb
+- lib/generators/refinery/form/templates/config/routes.rb.erb
+- lib/generators/refinery/form/templates/db/migrate/1_create_plural_name.rb.erb
+- lib/generators/refinery/form/templates/db/seeds.rb.erb
+- lib/generators/refinery/form/templates/lib/generators/refinery/plural_name_generator.rb.erb
+- lib/generators/refinery/form/templates/lib/refinery/plural_name.rb.erb
+- lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb
+- lib/generators/refinery/form/templates/lib/refinerycms-plural_name.rb.erb
 - lib/generators/refinery/form/templates/refinerycms-plural_name.gemspec
 - lib/generators/refinery/form/templates/script/rails
 - lib/refinery/activity.rb
@@ -670,6 +673,7 @@ files:
 - spec/lib/refinery/application_controller_spec.rb
 - spec/lib/refinery/core/configuration_spec.rb
 - spec/lib/refinery/core_spec.rb
+- spec/lib/refinery/crud_spec.rb
 - spec/lib/refinery/menu_spec.rb
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb
@@ -698,7 +702,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 753990109908748551
+      hash: -2135277000701086304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -707,7 +711,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 753990109908748551
+      hash: -2135277000701086304
 requirements: []
 rubyforge_project: refinerycms
 rubygems_version: 1.8.22
@@ -733,6 +737,7 @@ test_files:
 - spec/lib/refinery/application_controller_spec.rb
 - spec/lib/refinery/core/configuration_spec.rb
 - spec/lib/refinery/core_spec.rb
+- spec/lib/refinery/crud_spec.rb
 - spec/lib/refinery/menu_spec.rb
 - spec/lib/refinery/plugin_spec.rb
 - spec/lib/refinery/plugins_spec.rb