mack-data_mapper 0.7.0.1 → 0.7.1

data/lib/mack-data_mapper/dm_patches/validations.rb

@@ -1,15 +1,15 @@
-module DataMapper # :nodoc:
-  module Validate # :nodoc:
-    class GenericValidator # :nodoc:
-
-      def ==(other)
-        self.field_name == other.field_name &&
-        self.if_clause == other.if_clause &&
-        self.class == other.class &&
-        self.unless_clause == other.unless_clause &&
-        self.instance_variable_get(:@options) == other.instance_variable_get(:@options)
-      end
-
-    end # class GenericValidator
-  end # module Validate
-end # module DataMapper
+# module DataMapper # :nodoc:
+#   module Validate # :nodoc:
+#     class GenericValidator # :nodoc:
+# 
+#       def ==(other)
+#         self.field_name == other.field_name &&
+#         self.if_clause == other.if_clause &&
+#         self.class == other.class &&
+#         self.unless_clause == other.unless_clause &&
+#         self.instance_variable_get(:@options) == other.instance_variable_get(:@options)
+#       end
+# 
+#     end # class GenericValidator
+#   end # module Validate
+# end # module DataMapper

data/lib/mack-data_mapper/helpers/orm_helpers.rb

@@ -36,7 +36,7 @@ module Mack
         app_errors.flatten!
         unless app_errors.empty?
           if view_partial.nil?
-            if File.exist?(File.join(Mack.root, "app", "views", "application", "_error_messages.html.erb"))
+            if File.exist?(Mack::Paths.views("application", "_error_messages.html.erb"))
               render(:partial, "application/error_messages", :locals => {:errors => app_errors})
             else
               render(:inline, DEFAULT_PARTIAL, :locals => {:errors => app_errors})

data/lib/mack-data_mapper/sessions/data_mapper_session_store.rb

@@ -0,0 +1,62 @@
+module Mack
+  module SessionStore # :nodoc:
+    # Stores session information in the database.
+    # To set the expiry time for this session store use the following app_config setting:
+    #   data_mapper_session_store::expiry_time: <%= 4.hours %>
+    class DataMapper < Mack::SessionStore::Base
+
+      class << self
+    
+        # Gets the session from the db, using the specified id.
+        # If the session has 'expired' then it's deleted from the db.
+        def get(id, *args)
+          create_storage_if_non_existent
+          sess = Mack::DataMapper::Session.first(:id => id)
+          return nil if sess.nil? 
+          expire_date = DateTime.now.minus_seconds(app_config.data_mapper_session_store.expiry_time)
+          if sess.updated_at.to_s < expire_date.to_s
+            sess.destroy
+            return nil
+          end
+          return sess.data
+        end
+        
+        # Creates or updates the session in the db.
+        def set(id, request, *args)
+          create_storage_if_non_existent
+          sess = Mack::DataMapper::Session.get(id)
+          if sess.nil?
+            sess = Mack::DataMapper::Session.new(:id => id, :data => request.session)
+            raise sess.errors.full_messages.inspect unless sess.valid?
+            sess.save
+          else
+            sess.data = request.session
+            sess.save
+          end
+        end
+        
+        # Deletes the session from the db, if it exists.
+        def expire(id, *args)
+          create_storage_if_non_existent
+          sess = Mack::DataMapper::Session.get(id)
+          sess.destroy unless sess.nil?
+        end
+        
+        # Deletes all the sessions from the db.
+        def expire_all(*args)
+          create_storage_if_non_existent
+          Mack::DataMapper::Session.all.destroy!
+        end
+        
+        private
+        def create_storage_if_non_existent
+          unless Mack::DataMapper::Session.storage_exists?
+            Mack::DataMapper::Session.auto_migrate!
+          end
+        end
+      
+      end
+      
+    end # DataMapper
+  end # SessionStore
+end # Mack

data/lib/mack-data_mapper/sessions/session.rb

@@ -0,0 +1,14 @@
+module Mack
+  module DataMapper # :nodoc:
+    
+    # Used to store the Mack::Session object in the db.
+    class Session
+      include ::DataMapper::Resource
+      
+      property :id, String, :key => true
+      property :data, Yaml, :nullable => false, :lazy => false
+      property :updated_at, DateTime
+    end # Session
+    
+  end # DataMapper
+end # Mack

data/lib/mack-data_mapper/test_extensions.rb

@@ -12,15 +12,6 @@ if Mack.env == "test"
   
     module Mack
       module Testing
-        module Helpers
-          alias_method :mack_rake_task, :rake_task
-        
-          def rake_task(name, env = {}) # :nodoc:
-            DataMapper::MigrationRunner.reset!
-            mack_rake_task(name, env, [File.join(File.dirname(__FILE__), "tasks", "db_create_drop_tasks.rake"),
-                                       File.join(File.dirname(__FILE__), "tasks", "db_migration_tasks.rake")])
-          end
-        end # Helpers
       
         class DmTestTransactionWrapper # :nodoc:
           include DataMapper::Resource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.1
+  version: 0.7.1
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-09-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-observer
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-types
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: mack-orm
@@ -100,17 +100,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.3
+        version: 0.7.1
     version: 
 description: "mack-data_mapper was developed by: markbates"
 email: mark@mackframework.com
@@ -140,6 +130,8 @@ files:
 - lib/mack-data_mapper/resource.rb
 - lib/mack-data_mapper/runner.rb
 - lib/mack-data_mapper/scaffold_generator/templates/app/controllers/controller.rb.template
+- lib/mack-data_mapper/sessions/data_mapper_session_store.rb
+- lib/mack-data_mapper/sessions/session.rb
 - lib/mack-data_mapper/test_extensions.rb
 - lib/mack-data_mapper.rb
 - lib/mack-data_mapper_tasks.rb
@@ -148,8 +140,9 @@ files:
 - doc/classes/Mack/Database/Generators.html
 - doc/classes/Mack/Database/Migrations.html
 - doc/classes/Mack/Database.html
+- doc/classes/Mack/DataMapper/Session.html
+- doc/classes/Mack/SessionStore/DataMapper.html
 - doc/classes/Mack/Testing/DataMapperHelpers.html
-- doc/classes/Mack/Testing/Helpers.html
 - doc/classes/Mack/ViewHelpers/DataMapperHelpers.html
 - doc/classes/Mack.html
 - doc/classes/MigrationGenerator.html
@@ -168,6 +161,8 @@ files:
 - doc/files/lib/mack-data_mapper/model_generator/model_generator_rb.html
 - doc/files/lib/mack-data_mapper/resource_rb.html
 - doc/files/lib/mack-data_mapper/runner_rb.html
+- doc/files/lib/mack-data_mapper/sessions/data_mapper_session_store_rb.html
+- doc/files/lib/mack-data_mapper/sessions/session_rb.html
 - doc/files/lib/mack-data_mapper/test_extensions_rb.html
 - doc/files/lib/mack-data_mapper_rb.html
 - doc/files/lib/mack-data_mapper_tasks_rb.html