typus 3.0.8 → 3.0.9

data/test/lib/typus/orm/active_record/class_methods_test.rb

@@ -97,7 +97,7 @@ class ClassMethodsTest < ActiveSupport::TestCase
                   ["password_confirmation", :password],
                   ["locale", :selector]]
 
-      assert_equal expected.map { |i| i.first }, TypusUser.typus_fields_for(:form).keys
+      assert_equal expected.map { |i| i.first }, TypusUser.typus_fields_for(:new).keys
       assert_equal expected.map { |i| i.last }, TypusUser.typus_fields_for(:form).values
     end
 
@@ -127,6 +127,16 @@ class ClassMethodsTest < ActiveSupport::TestCase
       assert_equal expected, TypusUser.typus_fields_for(:undefined).keys
     end
 
+    should "return fields for new Asset" do
+      expected = %w(dragonfly_required)
+      assert_equal expected, Asset.typus_fields_for(:new).keys
+    end
+
+    should "return fields for edit Asset" do
+      expected = %w(caption dragonfly dragonfly_required original_file_name)
+      assert_equal expected, Asset.typus_fields_for(:edit).keys
+    end
+
     should "work for transversal fields" do
       expected = [["email", :string],
                   ["post", :belongs_to],
@@ -363,7 +373,9 @@ class ClassMethodsTest < ActiveSupport::TestCase
     should "return data for existing model" do
       expected = {"application"=>"CRUD Extended",
                   "fields"=>{"default"=>"caption, dragonfly, dragonfly_required",
-                             "special"=>"caption, dragonfly, dragonfly_required, original_file_name"}}
+                             "special"=>"caption, dragonfly, dragonfly_required, original_file_name",
+                             "form"=>"caption, dragonfly, dragonfly_required, original_file_name",
+                             "new"=>"dragonfly_required"}}
       assert_equal expected, Asset.read_model_config
     end
 

data/test/lib/typus/orm/active_record/search_test.rb

@@ -34,7 +34,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
     end
 
     should "generate conditions for id" do
-      Post.stubs(:typus_defaults_for).with(:search).returns(["id"])
+      Post.expects(:typus_defaults_for).with(:search).returns(["id"])
 
       expected = case ENV["DB"]
                  when "postgresql"

data/test/lib/typus_test.rb

@@ -71,7 +71,7 @@ class TypusTest < ActiveSupport::TestCase
   end
 
   should "return applications sorted" do
-    expected = ["Admin", "CRUD", "CRUD Extended", "HasManyThrough", "HasOne", "Polymorphic", "STI"]
+    expected = ["Admin", "CRUD", "CRUD Extended", "HasManyThrough", "HasOne", "MongoDB", "Polymorphic", "STI"]
     assert_equal expected, Typus.applications
   end
 
@@ -89,6 +89,7 @@ class TypusTest < ActiveSupport::TestCase
                 "Comment",
                 "Dog",
                 "Entry",
+                "Hit",
                 "ImageHolder",
                 "Invoice",
                 "Order",

data/typus.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency "bcrypt-ruby"
   s.add_dependency "fastercsv", "~> 1.5" if RUBY_VERSION < '1.9'
   s.add_dependency "render_inheritable"
   s.add_dependency "will_paginate", "~> 3.0.pre2"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 8
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -15,22 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: bcrypt-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,12 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1923831917
-        segments: 
-        - 3
-        - 0
-        - pre
-        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id003
@@ -102,6 +84,7 @@ files:
 - app/views/admin/account/forgot_password.html.erb
 - app/views/admin/account/new.html.erb
 - app/views/admin/base/user_guide.html.erb
+- app/views/admin/dashboard/_applications.html.erb
 - app/views/admin/dashboard/_sidebar.html.erb
 - app/views/admin/dashboard/show.html.erb
 - app/views/admin/dashboard/styles.html.erb
@@ -110,7 +93,6 @@ files:
 - app/views/admin/helpers/base/_flash_message.html.erb
 - app/views/admin/helpers/base/_header.html.erb
 - app/views/admin/helpers/base/_login_info.html.erb
-- app/views/admin/helpers/dashboard/_applications.html.erb
 - app/views/admin/helpers/dashboard/_resources.html.erb
 - app/views/admin/helpers/filters/_filters.html.erb
 - app/views/admin/helpers/resources/_display_link_to_previous.html.erb
@@ -261,10 +243,13 @@ files:
 - lib/typus/engine.rb
 - lib/typus/i18n.rb
 - lib/typus/orm/active_record.rb
+- lib/typus/orm/active_record/admin_user_v1.rb
+- lib/typus/orm/active_record/admin_user_v2.rb
 - lib/typus/orm/active_record/class_methods.rb
-- lib/typus/orm/active_record/instance_methods.rb
 - lib/typus/orm/active_record/search.rb
-- lib/typus/orm/active_record/user.rb
+- lib/typus/orm/active_record/user/instance_methods.rb
+- lib/typus/orm/base.rb
+- lib/typus/orm/mongo/class_methods.rb
 - lib/typus/regex.rb
 - lib/typus/resources.rb
 - lib/typus/version.rb
@@ -298,6 +283,7 @@ files:
 - test/app/helpers/admin/sidebar_helper_test.rb
 - test/app/helpers/admin/table_helper_test.rb
 - test/app/mailers/admin/mailer_test.rb
+- test/app/models/admin_user_test.rb
 - test/app/models/typus_user_roles_test.rb
 - test/app/models/typus_user_test.rb
 - test/config/routes_test.rb
@@ -334,6 +320,7 @@ files:
 - test/fixtures/rails_app/app/controllers/admin/comments_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/dogs_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/entries_controller.rb
+- test/fixtures/rails_app/app/controllers/admin/hits_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/image_holders_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/invoices_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/orders_controller.rb
@@ -346,6 +333,7 @@ files:
 - test/fixtures/rails_app/app/controllers/admin/users_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/views_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/watch_dog_controller.rb
+- test/fixtures/rails_app/app/controllers/admin_user.rb
 - test/fixtures/rails_app/app/controllers/application_controller.rb
 - test/fixtures/rails_app/app/helpers/application_helper.rb
 - test/fixtures/rails_app/app/helpers/form_helper.rb
@@ -359,6 +347,7 @@ files:
 - test/fixtures/rails_app/app/models/delayed/task.rb
 - test/fixtures/rails_app/app/models/dog.rb
 - test/fixtures/rails_app/app/models/entry.rb
+- test/fixtures/rails_app/app/models/hit.rb
 - test/fixtures/rails_app/app/models/image_holder.rb
 - test/fixtures/rails_app/app/models/invoice.rb
 - test/fixtures/rails_app/app/models/order.rb
@@ -374,6 +363,9 @@ files:
 - test/fixtures/rails_app/app/views/admin/categories/_index.html.erb
 - test/fixtures/rails_app/app/views/admin/dashboard/_sidebar.html.erb
 - test/fixtures/rails_app/app/views/admin/entries/_index.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/_edit.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/_index.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/index.html.erb
 - test/fixtures/rails_app/app/views/admin/pages/_index.html.erb
 - test/fixtures/rails_app/app/views/admin/posts/_edit.html.erb
 - test/fixtures/rails_app/app/views/admin/posts/_index.html.erb
@@ -402,6 +394,7 @@ files:
 - test/fixtures/rails_app/config/initializers/typus.rb
 - test/fixtures/rails_app/config/initializers/typus_resources.rb
 - test/fixtures/rails_app/config/locales/en.yml
+- test/fixtures/rails_app/config/mongoid.yml
 - test/fixtures/rails_app/config/routes.rb
 - test/fixtures/rails_app/config/typus/README
 - test/fixtures/rails_app/config/typus/crud_basic.yml
@@ -414,6 +407,8 @@ files:
 - test/fixtures/rails_app/config/typus/has_many_through_roles.yml
 - test/fixtures/rails_app/config/typus/has_one.yml
 - test/fixtures/rails_app/config/typus/has_one_roles.yml
+- test/fixtures/rails_app/config/typus/mongo_db.yml
+- test/fixtures/rails_app/config/typus/mongo_db_roles.yml
 - test/fixtures/rails_app/config/typus/polymorphic.yml
 - test/fixtures/rails_app/config/typus/polymorphic_roles.yml
 - test/fixtures/rails_app/config/typus/resource_roles.yml
@@ -436,12 +431,6 @@ files:
 - test/fixtures/rails_app/public/500.html
 - test/fixtures/rails_app/public/favicon.ico
 - test/fixtures/rails_app/public/images/rails.png
-- test/fixtures/rails_app/public/javascripts/application.js
-- test/fixtures/rails_app/public/javascripts/controls.js
-- test/fixtures/rails_app/public/javascripts/dragdrop.js
-- test/fixtures/rails_app/public/javascripts/effects.js
-- test/fixtures/rails_app/public/javascripts/prototype.js
-- test/fixtures/rails_app/public/javascripts/rails.js
 - test/fixtures/rails_app/public/robots.txt
 - test/fixtures/rails_app/public/stylesheets/.gitkeep
 - test/fixtures/rails_app/public/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
@@ -529,23 +518,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: typus
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold generator)
@@ -580,6 +563,7 @@ test_files:
 - test/app/helpers/admin/sidebar_helper_test.rb
 - test/app/helpers/admin/table_helper_test.rb
 - test/app/mailers/admin/mailer_test.rb
+- test/app/models/admin_user_test.rb
 - test/app/models/typus_user_roles_test.rb
 - test/app/models/typus_user_test.rb
 - test/config/routes_test.rb
@@ -616,6 +600,7 @@ test_files:
 - test/fixtures/rails_app/app/controllers/admin/comments_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/dogs_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/entries_controller.rb
+- test/fixtures/rails_app/app/controllers/admin/hits_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/image_holders_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/invoices_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/orders_controller.rb
@@ -628,6 +613,7 @@ test_files:
 - test/fixtures/rails_app/app/controllers/admin/users_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/views_controller.rb
 - test/fixtures/rails_app/app/controllers/admin/watch_dog_controller.rb
+- test/fixtures/rails_app/app/controllers/admin_user.rb
 - test/fixtures/rails_app/app/controllers/application_controller.rb
 - test/fixtures/rails_app/app/helpers/application_helper.rb
 - test/fixtures/rails_app/app/helpers/form_helper.rb
@@ -641,6 +627,7 @@ test_files:
 - test/fixtures/rails_app/app/models/delayed/task.rb
 - test/fixtures/rails_app/app/models/dog.rb
 - test/fixtures/rails_app/app/models/entry.rb
+- test/fixtures/rails_app/app/models/hit.rb
 - test/fixtures/rails_app/app/models/image_holder.rb
 - test/fixtures/rails_app/app/models/invoice.rb
 - test/fixtures/rails_app/app/models/order.rb
@@ -656,6 +643,9 @@ test_files:
 - test/fixtures/rails_app/app/views/admin/categories/_index.html.erb
 - test/fixtures/rails_app/app/views/admin/dashboard/_sidebar.html.erb
 - test/fixtures/rails_app/app/views/admin/entries/_index.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/_edit.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/_index.html.erb
+- test/fixtures/rails_app/app/views/admin/hits/index.html.erb
 - test/fixtures/rails_app/app/views/admin/pages/_index.html.erb
 - test/fixtures/rails_app/app/views/admin/posts/_edit.html.erb
 - test/fixtures/rails_app/app/views/admin/posts/_index.html.erb
@@ -684,6 +674,7 @@ test_files:
 - test/fixtures/rails_app/config/initializers/typus.rb
 - test/fixtures/rails_app/config/initializers/typus_resources.rb
 - test/fixtures/rails_app/config/locales/en.yml
+- test/fixtures/rails_app/config/mongoid.yml
 - test/fixtures/rails_app/config/routes.rb
 - test/fixtures/rails_app/config/typus/README
 - test/fixtures/rails_app/config/typus/crud_basic.yml
@@ -696,6 +687,8 @@ test_files:
 - test/fixtures/rails_app/config/typus/has_many_through_roles.yml
 - test/fixtures/rails_app/config/typus/has_one.yml
 - test/fixtures/rails_app/config/typus/has_one_roles.yml
+- test/fixtures/rails_app/config/typus/mongo_db.yml
+- test/fixtures/rails_app/config/typus/mongo_db_roles.yml
 - test/fixtures/rails_app/config/typus/polymorphic.yml
 - test/fixtures/rails_app/config/typus/polymorphic_roles.yml
 - test/fixtures/rails_app/config/typus/resource_roles.yml
@@ -718,12 +711,6 @@ test_files:
 - test/fixtures/rails_app/public/500.html
 - test/fixtures/rails_app/public/favicon.ico
 - test/fixtures/rails_app/public/images/rails.png
-- test/fixtures/rails_app/public/javascripts/application.js
-- test/fixtures/rails_app/public/javascripts/controls.js
-- test/fixtures/rails_app/public/javascripts/dragdrop.js
-- test/fixtures/rails_app/public/javascripts/effects.js
-- test/fixtures/rails_app/public/javascripts/prototype.js
-- test/fixtures/rails_app/public/javascripts/rails.js
 - test/fixtures/rails_app/public/robots.txt
 - test/fixtures/rails_app/public/stylesheets/.gitkeep
 - test/fixtures/rails_app/public/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png

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

@@ -1,13 +0,0 @@
-module Typus
-  module Orm
-    module ActiveRecord
-      module InstanceMethods
-
-        def owned_by?(user)
-          send(Typus.user_fk) == user.id
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,157 +0,0 @@
-module Typus
-  module Orm
-    module ActiveRecord
-      module User
-
-        def self.included(base)
-          base.extend(ClassMethods)
-        end
-
-        module ClassMethods
-
-          def enable_as_typus_user
-
-            extend ClassMethodsMixin
-
-            attr_accessor :password
-            attr_protected :status
-
-            validates :email,
-                      :presence => true,
-                      :uniqueness => true,
-                      :format => { :with => Typus::Regex::Email }
-
-            validates :password,
-                      :confirmation => { :if => :password_required? },
-                      :presence => { :if => :password_required? }
-
-            validates_length_of :password, :within => 6..40, :if => :password_required?
-
-            validates :role, :presence => true
-
-            before_save :initialize_salt, :encrypt_password, :initialize_token
-
-            serialize :preferences
-
-            include InstanceMethods
-
-          end
-
-        end
-
-        module ClassMethodsMixin
-
-          def authenticate(email, password)
-            user = find_by_email_and_status(email, true)
-            user && user.authenticated?(password) ? user : nil
-          end
-
-          def generate(*args)
-            options = args.extract_options!
-
-            options[:password] ||= ActiveSupport::SecureRandom.hex(4)
-            options[:role] ||= Typus.master_role
-
-            new :email => options[:email],
-                :password => options[:password],
-                :password_confirmation => options[:password],
-                :role => options[:role],
-                :preferences => { :locale => ::I18n.default_locale.to_s }
-          end
-
-        end
-
-        module InstanceMethods
-
-          def name
-            full_name = [first_name, last_name].delete_if { |s| s.blank? }
-            full_name.any? ? full_name.join(" ") : email
-          end
-
-          def authenticated?(password)
-            crypted_password == encrypt(password)
-          end
-
-          def resources
-            Typus::Configuration.roles[role].compact
-          end
-
-          def applications
-            Typus.applications.delete_if { |a| application(a).empty? }
-          end
-
-          def application(name)
-            Typus.application(name).delete_if { |r| !resources.keys.include?(r) }
-          end
-
-          def can?(action, resource, options = {})
-            resource = resource.model_name if resource.is_a?(Class)
-
-            return false if !resources.include?(resource)
-            return true if resources[resource].include?("all")
-
-            action = options[:special] ? action : action.acl_action_mapper
-
-            resources[resource].extract_settings.include?(action)
-          end
-
-          def cannot?(*args)
-            !can?(*args)
-          end
-
-          def is_root?
-            role == Typus.master_role
-          end
-
-          def is_not_root?
-            !is_root?
-          end
-
-          def locale
-            (preferences && preferences[:locale]) ? preferences[:locale] : ::I18n.default_locale
-          end
-
-          def locale=(locale)
-            options = { :locale => locale }
-            self.preferences ||= {}
-            self.preferences[:locale] = locale
-          end
-
-          protected
-
-          # TODO: Update the hash generation by a harder one ...
-          def generate_hash(string)
-            Digest::SHA1.hexdigest(string)
-          end
-
-          def encrypt_password
-            return if password.blank?
-            self.crypted_password = encrypt(password)
-          end
-
-          def encrypt(string)
-            generate_hash("--#{salt}--#{string}--")
-          end
-
-          def initialize_salt
-            self.salt = generate_hash("--#{Time.zone.now.to_s(:number)}--#{email}--") if new_record?
-          end
-
-          def initialize_token
-            generate_token if new_record?
-          end
-
-          def generate_token
-            self.token = encrypt("--#{Time.zone.now.to_s(:number)}--#{password}--").first(12)
-          end
-
-          def password_required?
-            crypted_password.blank? || !password.blank?
-          end
-
-        end
-
-      end
-    end
-  end
-end