alchemy_cms 2.2.0 → 2.2.1

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
+  - ree
   - 1.9.2
   - 1.9.3
-  - ree
-  - rbx-19mode
 branches:
   only:
     - 2.2-stable
@@ -16,7 +14,3 @@ script: "bundle exec rspec spec --format=doc"
 env:
   - DB=mysql
   - DB=postgresql
-  - DB=sqlite
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode

data/README.md

@@ -1,7 +1,7 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.2-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
 ![Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)
 
 About

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -235,8 +235,7 @@ module Alchemy
     private
 
       def load_page
-        @page = Page.find_by_id(params[:id])
-        raise ActiveRecord::RecordNotFound if @page.nil?
+        @page = Page.find(params[:id])
       end
 
       def pages_from_raw_request

data/app/models/alchemy/page.rb

@@ -80,12 +80,6 @@ module Alchemy
     scope :flushables, not_locked.published.contentpages
     scope :searchables, not_restricted.published.contentpages
 
-    # Using the urlname value as id parameter in URLs.
-    # Falls back to id, if no urlname is set yet.
-    def to_param
-      urlname || id.to_s
-    end
-
     # Finds selected elements from page.
     #
     # Options are:

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -93,20 +93,5 @@ module Alchemy
 
     end
 
-    describe '#edit' do
-
-      before(:each) do
-        @language = Language.get_default
-        @page = FactoryGirl.create(:public_page, :language => @language)
-        session[:language_id] = @language.id
-      end
-
-      it "should find a page from id" do
-        get :edit, {:id => @page.id}
-        response.status.should == 200
-      end
-
-    end
-
   end
 end

data/spec/models/page_spec.rb

@@ -527,17 +527,5 @@ module Alchemy
 
     end
 
-    describe '#to_param' do
-
-      before(:each) do
-        @page = FactoryGirl.create(:public_page)
-      end
-
-      it "should use the urlname as id parameter in urls" do
-        @page.to_param.should == @page.urlname
-      end
-
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1039,7 +1039,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1665960692087372061
+      hash: 3374243950541601124
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: