typus 3.1.0.rc4 → 3.1.0.rc5

data/test/lib/typus_test.rb

@@ -122,12 +122,12 @@ class TypusTest < ActiveSupport::TestCase
     assert Typus.respond_to?("user_class_name=")
   end
 
-  test "user_fk returns default value" do
-    assert Typus.user_fk.eql?("typus_user_id")
+  test "user_foreign_key returns default value" do
+    assert Typus.user_foreign_key.eql?("typus_user_id")
   end
 
-  test "user_fk setter presence" do
-    assert Typus.respond_to?("user_fk=")
+  test "user_foreign_key setter presence" do
+    assert Typus.respond_to?("user_foreign_key=")
   end
 
 end

data/typus.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "jquery-rails"
   s.add_development_dependency "paperclip"
   s.add_development_dependency "rack-cache"
+  s.add_development_dependency "rails-trash"
 
   s.add_dependency "jquery-rails"
   s.add_dependency "kaminari"
-  s.add_dependency "rails", "~> 3.1.0.rc2"
+  s.add_dependency "rails", "~> 3.1.0.rc3"
 end

metadata

@@ -2,7 +2,7 @@
 name: typus
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.rc4
+  version: 3.1.0.rc5
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dragonfly
@@ -57,7 +57,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  name: rails-trash
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -65,10 +65,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: kaminari
+  name: jquery-rails
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,16 +79,27 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: kaminari
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc2
+        version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.rc3
+  type: :runtime
+  version_requirements: *id008
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content.
 email: 
 - core@typuscms.com
@@ -104,33 +115,33 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/images/typus/blank.gif
-- app/assets/images/typus/fancy_close.png
-- app/assets/images/typus/fancy_loading.png
-- app/assets/images/typus/fancy_nav_left.png
-- app/assets/images/typus/fancy_nav_right.png
-- app/assets/images/typus/fancy_shadow_e.png
-- app/assets/images/typus/fancy_shadow_n.png
-- app/assets/images/typus/fancy_shadow_ne.png
-- app/assets/images/typus/fancy_shadow_nw.png
-- app/assets/images/typus/fancy_shadow_s.png
-- app/assets/images/typus/fancy_shadow_se.png
-- app/assets/images/typus/fancy_shadow_sw.png
-- app/assets/images/typus/fancy_shadow_w.png
-- app/assets/images/typus/fancy_title_left.png
-- app/assets/images/typus/fancy_title_main.png
-- app/assets/images/typus/fancy_title_over.png
-- app/assets/images/typus/fancy_title_right.png
-- app/assets/images/typus/fancybox-x.png
-- app/assets/images/typus/fancybox-y.png
-- app/assets/images/typus/fancybox.png
+- app/assets/images/blank.gif
+- app/assets/images/fancy_close.png
+- app/assets/images/fancy_loading.png
+- app/assets/images/fancy_nav_left.png
+- app/assets/images/fancy_nav_right.png
+- app/assets/images/fancy_shadow_e.png
+- app/assets/images/fancy_shadow_n.png
+- app/assets/images/fancy_shadow_ne.png
+- app/assets/images/fancy_shadow_nw.png
+- app/assets/images/fancy_shadow_s.png
+- app/assets/images/fancy_shadow_se.png
+- app/assets/images/fancy_shadow_sw.png
+- app/assets/images/fancy_shadow_w.png
+- app/assets/images/fancy_title_left.png
+- app/assets/images/fancy_title_main.png
+- app/assets/images/fancy_title_over.png
+- app/assets/images/fancy_title_right.png
+- app/assets/images/fancybox-x.png
+- app/assets/images/fancybox-y.png
+- app/assets/images/fancybox.png
+- app/assets/javascripts/typus.js
 - app/assets/javascripts/typus/application.js
-- app/assets/javascripts/typus/custom.js
 - app/assets/javascripts/typus/jquery.application.js
 - app/assets/javascripts/typus/jquery.rails.autocomplete.js
 - app/assets/javascripts/typus/jquery.searchField.js
+- app/assets/stylesheets/typus.css
 - app/assets/stylesheets/typus/application.css
-- app/assets/stylesheets/typus/custom.css
 - app/assets/stylesheets/typus/pagination.css
 - app/assets/stylesheets/typus/reset.css
 - app/assets/stylesheets/typus/screen.css

data/app/assets/javascripts/typus/custom.js

@@ -1,2 +0,0 @@
-// Place your application-specific JavaScript functions and classes for
-// the admin panel here.

data/app/assets/stylesheets/typus/custom.css

@@ -1,11 +0,0 @@
-/* Place your application-specific stylesheets for the admin panel here */
-
-/*
-.logo {
-  height: 50px;
-  width: 150px;
-  background: transparent url(/images/logo.gif) no-repeat;
-  text-indent: -10000px;
-}
-
-*/