typus 3.1.0.rc2 → 3.1.0.rc3

data/Gemfile

@@ -1,20 +1,19 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0.rc1'
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'sqlite3'
-gem 'jquery-rails'
-
 # Specify your gem's dependencies in typus.gemspec
 gemspec
 
+gem 'sqlite3'
+
 # And this stuff needed for the demo application.
 gem 'acts_as_list'
 gem 'acts_as_tree'
-gem 'dragonfly', '~> 0.9'
 gem 'factory_girl'
-gem 'paperclip'
-gem 'rack-cache', :require => 'rack/cache'
+
+# Asset Management
+gem "dragonfly", "~> 0.9"
+gem "rack-cache", :require => "rack/cache"
+gem "paperclip"
 
 group :test do
   gem 'shoulda-context'

data/lib/typus.rb

@@ -102,10 +102,10 @@ module Typus
   #
 
   mattr_accessor :image_preview_size
-  @@image_preview_size = 'x450'
+  @@image_preview_size = 'x650>'
 
   mattr_accessor :image_thumb_size
-  @@image_thumb_size = '150x150#'
+  @@image_thumb_size = 'x100'
 
   ##
   # Defines the default relationship table.

data/lib/typus/orm/active_record/admin_user_v1.rb

@@ -79,7 +79,7 @@ module Typus
           end
 
           def set_token
-            self.token = "#{ActiveSupport::SecureRandom.hex(3)}-#{ActiveSupport::SecureRandom.hex(3)}"
+            self.token = "#{SecureRandom.hex(3)}-#{SecureRandom.hex(3)}"
           end
 
           def password_required?

data/lib/typus/orm/active_record/admin_user_v2.rb

@@ -62,7 +62,7 @@ module Typus
           end
 
           def set_token
-            self.token = "#{ActiveSupport::SecureRandom.hex(6)}-#{ActiveSupport::SecureRandom.hex(6)}"
+            self.token = "#{SecureRandom.hex(6)}-#{SecureRandom.hex(6)}"
           end
 
           def password_must_be_strong

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc2"
+  VERSION = "3.1.0.rc3"
 end

data/test/app/models/typus_user_roles_test.rb

@@ -13,7 +13,8 @@ class TypusUserRolesTest < ActiveSupport::TestCase
     end
 
     should "verify models access" do
-      expected = ["Article::Entry",
+      expected = ["AdminUser",
+                  "Article::Entry",
                   "Asset",
                   "Bird",
                   "Case",

data/test/app/models/typus_user_test.rb

@@ -108,7 +108,7 @@ class TypusUserTest < ActiveSupport::TestCase
 
   test "admin gets a list of application resources for Admin application" do
     typus_user = Factory.build(:typus_user)
-    assert_equal %w(TypusUser), typus_user.application("Admin")
+    assert_equal %w(AdminUser TypusUser), typus_user.application("Admin")
   end
 
   test "editor get a list of all applications" do

data/test/lib/typus/i18n_test.rb

@@ -7,7 +7,7 @@ class I18nTest < ActiveSupport::TestCase
   end
 
   test "default_locale" do
-    assert Typus::I18n.default_locale(:en)
+    assert_equal :en, Typus::I18n.default_locale
   end
 
 end

data/test/lib/typus_test.rb

@@ -47,11 +47,11 @@ class TypusTest < ActiveSupport::TestCase
     context "dragonfly" do
 
       should "verify default_config for image_preview_size" do
-        assert Typus.image_preview_size.eql?('x450')
+        assert_equal "x650>", Typus.image_preview_size
       end
 
       should "verify default_config for image_thumb_size" do
-        assert Typus.image_thumb_size.eql?('150x150#')
+        assert_equal "x100", Typus.image_thumb_size
       end
 
     end
@@ -81,7 +81,8 @@ class TypusTest < ActiveSupport::TestCase
   end
 
   should "return models and should be sorted" do
-    expected = ["Animal",
+    expected = ["AdminUser",
+                "Animal",
                 "Article::Entry",
                 "Asset",
                 "Bird",

data/typus.gemspec

@@ -18,6 +18,12 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.1.0.rc2"
+  s.add_development_dependency "dragonfly", "~> 0.9"
+  s.add_development_dependency "jquery-rails"
+  s.add_development_dependency "paperclip"
+  s.add_development_dependency "rack-cache"
+
+  s.add_dependency "jquery-rails"
   s.add_dependency "kaminari"
+  s.add_dependency "rails", "~> 3.1.0.rc2"
 end

metadata

@@ -2,7 +2,7 @@
 name: typus
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.rc2
+  version: 3.1.0.rc3
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -10,21 +10,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 Z
+date: 2011-06-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: dragonfly
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc2
-  type: :runtime
+        version: "0.9"
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: kaminari
+  name: jquery-rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -32,8 +32,63 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: paperclip
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rack-cache
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jquery-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: kaminari
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.rc2
+  type: :runtime
+  version_requirements: *id007
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured content.
 email: 
 - core@typuscms.com