skylinecms 3.2.0 → 3.3.0

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path(File.join(ENV['RAILS_ROOT'], 'config/environment.rb'))
 require 'rails/test_help'
 # include ActionController::TestProcess
 require 'factories'
+require 'shoulda'
 
 SILENT_SEED = true
 Rails.backtrace_cleaner.remove_silencers!

data/test/unit/article_test.rb

@@ -80,7 +80,7 @@ class Skyline::ArticleTest < ActiveSupport::TestCase
       @orig[:default_variant] = @article.default_variant
       @orig[:default_variant_data] = @article.default_variant_data
       
-      @clone = @article.clone
+      @clone = @article.dup
     end
     
     should "be a new record" do

data/test/unit/locales_test.rb

@@ -5,7 +5,17 @@ class Skyline::LocalesTest < ActiveSupport::TestCase
     setup do
       @original_load_path = I18n.load_path.dup
       @origignal_locale = I18n.locale
-      I18n.load_path = I18n.load_path.select{|p| (p =~ /vendor\/plugins\/skyline/)}
+      
+      skyline_locales = Dir[Skyline.root + "config/locales/*.{yml,rb}"]
+      idx = I18n.load_path.index(I18n.load_path.grep(/#{Rails.root}\/config\/locales.+/).first)
+      if idx
+        I18n.load_path.insert(idx,*skyline_locales)
+      else
+        skyline_locales.each do |locale|
+          I18n.load_path << locale
+        end
+      end
+      
       I18n.backend = I18n::Backend::Simple.new
       
       @standard_locale = :"nl-NL"
@@ -15,11 +25,11 @@ class Skyline::LocalesTest < ActiveSupport::TestCase
 
     should "should all have all entries" do
       I18n.locale = @standard_locale
-      standard = I18n.translate("")
+      standard = I18n.backend.send(:translations)
       
       @other_locales.each do |l|
         I18n.locale = l
-        other = I18n.translate("")
+        other = I18n.backend.send(:translations)
         
         missing_keys = differences(standard, other)
         if missing_keys.any?

data/test/unit/test_content_object_test.rb

@@ -25,7 +25,7 @@ class TestContentObjectTest < ActiveSupport::TestCase
       
       ref = Skyline::ObjectRef.find_by_id(test_content_object.image_id)
       
-      assert_valid ref
+      assert ref.valid?
     end
     
     should "remove object_ref on destroy" do

data/test/unit/test_section_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'test_helper'
 require 'mocks/test_section.rb'
 
@@ -5,7 +6,7 @@ class TestSectionTest < ActiveSupport::TestCase
   context "test section" do
     setup do
       @small_image_html = "<img src='henk.jpg' skyline-ref-id='' skyline-referable-id='10'  skyline-referable-type='Skyline::MediaFile' width='200' height='200'/>"
-      @small_image_no_refs = "<img src=\"broken.jpg\" height=\"200\" width=\"200\" />"
+      @small_image_no_refs = "<img src=\"broken.jpg\" width=\"200\" height=\"200\" />"
       
       @small_link_html = "<a href=\"henk.html\" skyline-ref-id=\"\" skyline-referable-id=\"10\"  skyline-referable-type=\"Skyline::MediaFile\" class=\"myLink\">my link</a>"
       @small_link_no_refs = "<a href=\"broken\" class=\"myLink\" >my link</a>"
@@ -217,7 +218,7 @@ class TestSectionTest < ActiveSupport::TestCase
         assert @section[:body_a].match(/\[REF/)
         @section = Skyline::TestSection.find(@section.id)
           
-        @clone = @section.clone
+        @clone = @section.dup
         assert @clone.save
         @clone_refs = Skyline::InlineRef.hash_refs_for_object(@clone,:body_a)
         assert_equal 1, @clone_refs.keys.size

data/test/unit/user_preference_test.rb

@@ -110,12 +110,12 @@ class UserPreferenceTest < ActiveSupport::TestCase
     end
     
     should "delete a key" do
-      Skyline::UserPreference.remove("a")
+      Skyline::UserPreference.remove_key("a")
       assert !Skyline::UserPreference.has_key?("a")
     end
     
     should "delete a key and its children" do
-      Skyline::UserPreference.remove("b")
+      Skyline::UserPreference.remove_key("b")
       assert !Skyline::UserPreference.has_key?("b.a")
       assert !Skyline::UserPreference.has_key?("b")
     end

data/vendor/digitpaint/nested_attributes_positioning.rb

@@ -36,7 +36,7 @@ module NestedAttributesPositioning
     base.extend(ClassMethods)
     base.send :cattr_accessor, :accepts_nested_attributes_for_associations
     base.send :accepts_nested_attributes_for_associations=, []
-    base.send :alias_method_chain, :attributes=, :positioning
+    base.send :alias_method_chain, :assign_attributes, :positioning
   end
       
   module ClassMethods
@@ -47,10 +47,10 @@ module NestedAttributesPositioning
     end
   end
   
-  def attributes_with_positioning=(attributes)
-    a = attributes.dup
+  def assign_attributes_with_positioning(new_attributes, options = {})
+    a = new_attributes.dup
     self.accepts_nested_attributes_for_associations.map{|association| handle_positioning_for_association(association, a)}
-    self.attributes_without_positioning = a
+    self.assign_attributes_without_positioning(a)
   end
   
   def handle_positioning_for_association(association, attributes)
@@ -63,7 +63,7 @@ module NestedAttributesPositioning
         sorted_attributes << attributes_hash[index]
       end
     
-      self.attributes_without_positioning = {"#{association}_attributes" => sorted_attributes}
+      self.assign_attributes_without_positioning({"#{association}_attributes" => sorted_attributes})
       self.send(association).sort!{|a,b| a.position <=> b.position}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylinecms
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2012-03-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70129381172720 !ruby/object:Gem::Requirement
+  requirement: &70242325538200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129381172720
+  version_requirements: *70242325538200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70129381172180 !ruby/object:Gem::Requirement
+  requirement: &70242325537540 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70129381172180
+  version_requirements: *70242325537540
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &70129381171680 !ruby/object:Gem::Requirement
+  requirement: &70242325536920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,21 +43,21 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70129381171680
+  version_requirements: *70242325536920
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70129381171220 !ruby/object:Gem::Requirement
+  requirement: &70242325536340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70129381171220
+  version_requirements: *70242325536340
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70129381170760 !ruby/object:Gem::Requirement
+  requirement: &70242325535880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70129381170760
+  version_requirements: *70242325535880
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70129381170280 !ruby/object:Gem::Requirement
+  requirement: &70242325535300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,21 +76,21 @@ dependencies:
         version: 2.13.1
   type: :runtime
   prerelease: false
-  version_requirements: *70129381170280
+  version_requirements: *70242325535300
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70129381169800 !ruby/object:Gem::Requirement
+  requirement: &70242325534720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70129381169800
+  version_requirements: *70242325534720
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70129381169320 !ruby/object:Gem::Requirement
+  requirement: &70242325534140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70129381169320
+  version_requirements: *70242325534140
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70129381168840 !ruby/object:Gem::Requirement
+  requirement: &70242325533560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,32 +109,32 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129381168840
+  version_requirements: *70242325533560
 - !ruby/object:Gem::Dependency
   name: seed-fu
-  requirement: &70129381152740 !ruby/object:Gem::Requirement
+  requirement: &70242325532980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129381152740
+  version_requirements: *70242325532980
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70129381152160 !ruby/object:Gem::Requirement
+  requirement: &70242325529560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70129381152160
+  version_requirements: *70242325529560
 - !ruby/object:Gem::Dependency
   name: personify
-  requirement: &70129381151580 !ruby/object:Gem::Requirement
+  requirement: &70242325528980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,29 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129381151580
+  version_requirements: *70242325528980
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &70242325528600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242325528600
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70242325528100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242325528100
 description: Skyline is an extremely flexible and expandable open source content management
   system. Its feature rich interface allows for fast and intuitive management of websites.
 email: info@digitpaint.nl
@@ -316,29 +338,29 @@ files:
 - app/views/skyline/browser/tabs/media_library/media_files/index.js.erb
 - app/views/skyline/browser/tabs/media_library/media_files/show.js.erb
 - app/views/skyline/browser/tabs/pages/_index.html.erb
-- app/views/skyline/content/_add.rhtml
-- app/views/skyline/content/_filter.rhtml
+- app/views/skyline/content/_add.html.erb
+- app/views/skyline/content/_filter.html.erb
 - app/views/skyline/content/_group.html.erb
 - app/views/skyline/content/_import.html.erb
 - app/views/skyline/content/_index.html.erb
 - app/views/skyline/content/_meta.html.erb
 - app/views/skyline/content/_submit.html.erb
-- app/views/skyline/content/create.rhtml
-- app/views/skyline/content/edit.rhtml
+- app/views/skyline/content/create.html.erb
+- app/views/skyline/content/edit.html.erb
 - app/views/skyline/content/editors/editable_list/new.js.erb
 - app/views/skyline/content/editors/joinable_list/_add.html.erb
 - app/views/skyline/content/editors/joinable_list/_list.html.erb
 - app/views/skyline/content/editors/joinable_list/cancel.js.erb
 - app/views/skyline/content/editors/joinable_list/index.js.erb
 - app/views/skyline/content/editors/joinable_list/new.js.erb
-- app/views/skyline/content/error.rhtml
+- app/views/skyline/content/error.html.erb
 - app/views/skyline/content/field.js.erb
 - app/views/skyline/content/import.js.erb
 - app/views/skyline/content/index.html.erb
-- app/views/skyline/content/list.rhtml
+- app/views/skyline/content/list.html.erb
 - app/views/skyline/content/order.js.erb
 - app/views/skyline/content/presenters/_table.html.erb
-- app/views/skyline/content/show.rhtml
+- app/views/skyline/content/show.html.erb
 - app/views/skyline/content_items/_content_item.html.erb
 - app/views/skyline/content_items/new.js.erb
 - app/views/skyline/content_sections/_tags.html.erb
@@ -478,6 +500,7 @@ files:
 - db/migrate/20111101092405_rename_indexes.rb
 - doc/INSTALL.md
 - doc/MIGRATION.md
+- doc/concepts.md
 - lib/skyline.rb
 - lib/skyline/authentication/user.rb
 - lib/skyline/belongs_to_referable.rb
@@ -599,6 +622,7 @@ files:
 - public/skyline/images/spinner.gif
 - public/skyline/javascripts/README
 - public/skyline/javascripts/src/application.js
+- public/skyline/javascripts/src/application_preinit.js
 - public/skyline/javascripts/src/browser.js
 - public/skyline/javascripts/src/draggable_files.js
 - public/skyline/javascripts/src/library_uploader.js
@@ -630,6 +654,7 @@ files:
 - public/skyline/javascripts/src/skyline.editor/src/script_loader.js
 - public/skyline/javascripts/src/skyline.editor/src/skyline.editor.js
 - public/skyline/javascripts/src/skyline.editor/src/theme.js
+- public/skyline/javascripts/src/skyline.editor/src/tinymce_preinit.js
 - public/skyline/javascripts/src/skyline.editor/src/ui/separator.js
 - public/skyline/javascripts/src/skyline.editor/src/ui/toolbar.js
 - public/skyline/javascripts/src/skyline.editor/test/dialog.html
@@ -1053,3 +1078,4 @@ test_files:
 - test/unit/user_preference_test.rb
 - test/unit/user_test.rb
 - test/user_access_helper.rb
+has_rdoc: