merb_datamapper 0.9.5 → 0.9.6

data/Manifest.txt

@@ -23,6 +23,7 @@ lib/merb_datamapper.rb
 lib/merb_datamapper/merbtasks.rb
 lib/merb_datamapper/version.rb
 spec/connection_spec.rb
+spec/session_store_spec.rb
 spec/generators/data_mapper_migration_spec.rb
 spec/generators/data_mapper_model_spec.rb
 spec/generators/data_mapper_resource_controller_spec.rb

data/Rakefile

@@ -10,7 +10,7 @@ AUTHOR = "Jason Toy"
 EMAIL  = "jtoy@rubynow.com"
 GEM_NAME = "merb_datamapper"
 GEM_VERSION = DataMapper::MerbDataMapper::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-migrations", GEM_VERSION], ["merb-core", ">=0.9.4"], ['templater', ">=0.1.5"]]
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-migrations", GEM_VERSION], ["merb-core", ">=0.9.6"], ['templater', ">=0.2.0"]]
 GEM_CLEAN = ["log", "pkg", "coverage"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 

data/lib/generators/data_mapper_migration.rb

@@ -1,4 +1,4 @@
-Merb::Generators::MigrationGenerator.template :migration_datamapper, :orm => :datamapper do
-  source(File.dirname(__FILE__), 'templates/migration.rb')
-  destination("#{destination_directory}/#{file_name}.rb")
+Merb::Generators::MigrationGenerator.template :migration_datamapper, :orm => :datamapper do |t|
+  t.source = File.join(File.dirname(__FILE__), 'templates/migration.rb')
+  t.destination = "#{destination_directory}/#{file_name}.rb"
 end

data/lib/generators/data_mapper_model.rb

@@ -9,7 +9,7 @@ class Merb::Generators::ModelGenerator
   end
 end
 
-Merb::Generators::ModelGenerator.template :model_datamapper, :orm => :datamapper do
-  source(File.dirname(__FILE__), "templates", "model.rb")
-  destination("app/models", base_path, "#{file_name}.rb")
+Merb::Generators::ModelGenerator.template :model_datamapper, :orm => :datamapper do |t|
+  t.source = File.join(File.dirname(__FILE__), "templates", "model.rb")
+  t.destination = File.join("app/models", base_path, "#{file_name}.rb")
 end

data/lib/generators/data_mapper_resource_controller.rb

@@ -11,15 +11,15 @@ class Merb::Generators::ResourceControllerGenerator
 end
 
 
-Merb::Generators::ResourceControllerGenerator.template :controller_datamapper, :orm => :datamapper do
-  source(File.dirname(__FILE__), "templates/resource_controller.rb")
-  destination("app/controllers", base_path, "#{file_name}.rb")
+Merb::Generators::ResourceControllerGenerator.template :controller_datamapper, :orm => :datamapper do |t|
+  t.source = File.join(File.dirname(__FILE__), "templates/resource_controller.rb")
+  t.destination = File.join("app/controllers", base_path, "#{file_name}.rb")
 end
 
 [:index, :show, :edit, :new].each do |view|
   Merb::Generators::ResourceControllerGenerator.template "view_#{view}_datamapper".to_sym,
-      :orm => :datamapper, :template_engine => :erb do
-    source(File.dirname(__FILE__), "templates/views/#{view}.html.erb")
-    destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
+      :orm => :datamapper, :template_engine => :erb do |t|
+    t.source = File.join(File.dirname(__FILE__), "templates/views/#{view}.html.erb")
+    t.destination = File.join("app/views", base_path, "#{file_name}/#{view}.html.erb")
   end
 end

data/lib/generators/templates/views/edit.html.erb

@@ -2,19 +2,17 @@
 
 <p>Edit this file in <tt>app/views/<%= file_name %>/edit.html.erb</tt></p>
 
-<%%= error_messages_for :<%= singular_model %> %>
-
-<%% form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
+<%%= form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
 <% for property in properties.select{|p| !p.key?} -%>
   <p>
-    <%%= text_control :<%= property.getter %>, :label => "<%= Extlib::Inflection.humanize(property.field) %>"  %>
+    <%%= text_field :<%= property %>, :label => "<%= Extlib::Inflection.humanize(property) %>"  %>
   </p>
 
 <% end -%>
   <p>
-    <%%= submit_button "Update" %>
+    <%%= submit "Update" %>
   </p>
-<%% end %>
+<%% end =%>
 
 <%%= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>) %> |
 <%%= link_to 'Back', url(:<%= plural_model %>) %>

data/lib/generators/templates/views/index.html.erb

@@ -16,7 +16,6 @@
 <% end -%>
     <td><%%= link_to 'Show', url(:<%= singular_model %>, <%= singular_model %>) %></td>
     <td><%%= link_to 'Edit', url(:edit_<%= singular_model %>,  <%= singular_model %>) %></td>
-    <td><%%= delete_button :<%= singular_model %>, <%= singular_model %> %></td>
   </tr>
 <%% end %>
 </table>

data/lib/generators/templates/views/new.html.erb

@@ -2,18 +2,16 @@
 
 <p>Edit this file in <tt>app/views/<%= file_name %>/new.html.erb</tt></p>
 
-<%%= error_messages_for :<%= singular_model %> %>
-
-<%% form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do |f| %>
+<%%= form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do %>
 <% for property in properties.select{|p| !p.key?} -%>
   <p>
-    <%%= text_control :<%= property.getter %>, :label => "<%= Extlib::Inflection.humanize(property.field) %>"  %>
+    <%%= text_field :<%= property %>, :label => "<%= Extlib::Inflection.humanize(property) %>"  %>
   </p>
 
 <% end -%>
   <p>
-    <%%= submit_button "Create" %>
+    <%%= submit "Create" %>
   </p>
-<%% end %>
+<%% end =%>
 
 <%%= link_to 'Back', url(:<%= plural_model %>) %>

data/lib/merb/orms/data_mapper/connection.rb

@@ -17,10 +17,7 @@ module Merb
         end
 
         def config
-          if !Merb::Plugins.config[:merb_datamapper].nil? && Merb::Plugins.config[:merb_datamapper].empty?
-             Merb::Plugins.config[:merb_datamapper] = get_config_for_environment
-          end
-          @config ||= Merb::Plugins.config[:merb_datamapper] ||= get_config_for_environment
+          @config ||= Merb::Plugins.config[:merb_datamapper][:connection] ||= (get_config_for_environment)
         end
 
         # Database connects as soon as the gem is loaded

data/lib/merb/session/data_mapper_session.rb

@@ -1,119 +1,68 @@
 begin
-  gem 'dm-core', '=0.9.5'
+  gem 'dm-core', '=0.9.6'
   require 'dm-core'
 rescue LoadError => e
   require 'data_mapper'
 end
 
-require 'base64'
-module Merb
-  module SessionMixin
-    def setup_session
-      before_value = cookies[_session_id_key]
-      request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key])
-      @_fingerprint = Marshal.dump(request.session.data).hash
-      @_new_cookie = cookies[_session_id_key] != before_value
-    end
-
-    def finalize_session
-      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
-      set_cookie(_session_id_key, request.session.session_id, Time.now + _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
-    end
-
-    def session_store_type
-      "datamapper"
-    end
-  end
-
-  table_name = (Merb::Plugins.config[:merb_datamapper][:session_table_name] || "sessions")
+require 'merb-core/dispatch/session'
 
-  class DataMapperSession
-    include DataMapper::Resource
-
-    storage_names[:default] = "sessions"
-    property :session_id, String, :length => 255, :lazy => false, :key => true
-    property :data,       Text, :lazy => false
-    property :updated_at, DateTime
-
-    attr_accessor :needs_new_cookie
-
-    class << self
-      # Generates a new session ID and creates a row for the new session in the database.
-      def generate
-        new_session = self.new(:data =>{})
-        new_session.session_id = Merb::SessionMixin::rand_uuid
-        new_session.save
-        new_session
-      end
-
-      # Gets the existing session based on the <tt>session_id</tt> available in cookies.
-      # If none is found, generates a new session.
-      def persist(session_id)
-        if !session_id.blank?
-          session = self.first :session_id => session_id
-        end
-        unless session
-          session = generate
-        end
-        [session, session.session_id]
+module Merb
+  class DataMapperSessionStore
+    include ::DataMapper::Resource
+
+    table_name = Merb::Plugins.config[:merb_datamapper][:session_storage_name] || 'sessions'
+    storage_names[default_repository_name] = table_name
+
+    property :session_id, String, :size => 32, :nullable => false, :key => true
+    property :data, Object, :default => {}, :lazy => false
+    property :created_at, DateTime, :default => Proc.new { |r, p| DateTime.now }
+
+    ##
+    # Retrieves a session from the session store
+    #
+    # @param session_id<String> The session_id to retrieve the session for
+    #
+    # @returns <nil, DataMapperSessionStore> The session corresponding to the id, or nil
+    def self.retrieve_session(session_id)
+      if session = get(session_id)
+        session.data
       end
-
-      def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
-      def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
-    end
-
-    # Regenerate the Session ID
-    def regenerate
-      self.session_id = Merb::SessionMixin::rand_uuid
-      self.needs_new_cookie = true
-      self.save
-    end
-
-    # Recreates the cookie with the default expiration time
-    # Useful during log in for pushing back the expiration date
-    def refresh_expiration
-      self.needs_new_cookie = true
-    end
-
-    # Lazy-delete of session data
-    def delete(key = nil)
-      key ? self.data.delete(key) : self.data.clear
-    end
-
-    def empty?
-      data.empty?
-    end
-
-    def each(&b)
-      data.each(&b)
-    end
-
-    def each_with_index(&b)
-      data.each_with_index(&b)
-    end
-
-    def [](key)
-      data[key]
     end
 
-    def []=(key, val)
-      data[key] = val
+    ##
+    # Stores the data in a session with the given session_id, creating it if
+    # required
+    #
+    # @param session_id<String> The session_id to find the session by, or the id of the new session
+    # @param data<Object> The data to be stored in the session. Probably a hash
+    def self.store_session(session_id, data)
+      if session = get(session_id)
+        session.update_attributes(:data => data)
+      else
+        create(:session_id => session_id, :data => data)
+      end
     end
 
-    def data
-      @unmarshalled_data ||= self.class.unmarshal(@data) || {}
+    ##
+    # Deletes a session with the given id
+    #
+    # @param session_id<String> The session to destroy
+    def self.delete_session(session_id)
+      all(:session_id => session_id).destroy!
     end
 
-    def data=(data)
-      @data, @unmarshalled_data = data, data
+    def self.default_repository_name
+      Merb::Plugins.config[:merb_datamapper][:session_repository_name] || :default
     end
+  end
 
-  private
+  class DataMapperSession < SessionStoreContainer
 
-    before :save, :serialize_data
+    # The session store type
+    self.session_store_type = :datamapper
 
-    def serialize_data
-      attribute_set :data, self.class.marshal(self.data)
-    end
+    # The store object is the model class itself
+    self.store = DataMapperSessionStore
   end
 end

data/lib/merb_datamapper.rb

@@ -1,24 +1,41 @@
 if defined?(Merb::Plugins)
-  require 'rubygems'
-  require 'merb_datamapper/version'
+  dependency 'dm-core'
 
-  gem 'dm-core', DataMapper::MerbDataMapper::VERSION
-  require 'dm-core'
+  require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection"
+  Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
 
-  if File.file?(Merb.dir_for(:config) / "database.yml")
-    require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection")
+  class Merb::Orms::DataMapper::Connect < Merb::BootLoader
+    after BeforeAppLoads
 
-    Merb::Orms::DataMapper.connect
-    Merb::Orms::DataMapper.register_session_type
-  else
-    Merb.logger.info "No database.yml file found in #{Merb.dir_for(:config)}, assuming database connection(s) established in the environment file in #{Merb.dir_for(:config)}/environments"
-  end
+    def self.run
+      Merb.logger.debug "Merb::Orms::DataMapper::Connect block."
 
-  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "resource")
+      # check for the presence of database.yml
+      if File.file?(Merb.dir_for(:config) / "database.yml")
+        # if we have it, connect
+        Merb::Orms::DataMapper.connect
+      else
+        # assume we'll be told at some point
+        Merb.logger.info "No database.yml file found in #{Merb.dir_for(:config)}, assuming database connection(s) established in the environment file in #{Merb.dir_for(:config)}/environments"
+      end
+
+      # if we use a datamapper session store, require it.
+      Merb.logger.debug "Checking if we need to use DataMapper sessions"
+      if Merb::Config.session_stores.include?(:datamapper)
+        Merb.logger.debug "Using DataMapper sessions"
+        require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session"
+      end
+
+      # required to provide 'to_param'
+      require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "resource"
+
+      Merb.logger.debug "Merb::Orms::DataMapper::Connect complete"
+    end
+  end
 
-  Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks"
 
-  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_model')
-  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_resource_controller')
-  Merb.add_generators File.join(File.dirname(__FILE__), 'generators', 'data_mapper_migration')
+  generators = File.join(File.dirname(__FILE__), 'generators')
+  Merb.add_generators generators / 'data_mapper_model'
+  Merb.add_generators generators / 'data_mapper_resource_controller'
+  Merb.add_generators generators / 'data_mapper_migration'
 end

data/lib/merb_datamapper/merbtasks.rb

@@ -48,15 +48,19 @@ namespace :dm do
     desc "Migrate the database to the latest version"
     task :migrate => 'dm:db:migrate:up'
 
-    desc "Create the database (postgres only)"
+    desc "Create the database"
     task :create do
       config = Merb::Orms::DataMapper.config
       puts "Creating database '#{config[:database]}'"
       case config[:adapter]
       when 'postgres'
         `createdb -U #{config[:username]} #{config[:database]}`
+      when 'mysql'
+        `mysqladmin -u #{config[:username]} #{config[:password] ? "-p'#{config[:password]}'" : ''} create #{config[:database]}`
+      when 'sqlite3'
+        Rake::Task['rake:dm:db:automigrate'].invoke
       else
-        raise "Adapter #{config[:adapter]} not supported yet."
+        raise "Adapter #{config[:adapter]} not supported for creating databases yet."
       end
     end
 
@@ -68,7 +72,7 @@ namespace :dm do
       when 'postgres'
         `dropdb -U #{config[:username]} #{config[:database]}`
       else
-        raise "Adapter #{config[:adapter]} not supported yet."
+        raise "Adapter #{config[:adapter]} not supported for dropping databases yet.\ntry dm:db:automigrate"
       end
     end
 

data/lib/merb_datamapper/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module MerbDataMapper
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/spec/generators/spec_helper.rb

@@ -1,9 +1,10 @@
+# require our other spec helpers
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
 # require merb-gen and the spec helpers
 require 'merb-gen'
-require 'merb-gen/spec_helper'
+require 'templater/spec/helpers'
 
-# require our other spec helpers
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 # require the generators
 require 'generators/data_mapper_migration'
@@ -12,7 +13,7 @@ require 'generators/data_mapper_resource_controller'
 
 # include the helpers
 Spec::Runner.configure do |config|
-  config.include Merb::Test::GeneratorHelper
+  config.include Templater::Spec::Helpers
 end
 
 # copied from merb-more/merb-gen/spec/spec_helpers.rb

data/spec/session_store_spec.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+require 'merb/session/data_mapper_session'
+describe Merb::DataMapperSessionStore do
+  before(:all) do
+    DataMapper.setup(:default, "sqlite3::memory:")
+  end
+
+  before(:each) do
+    Merb::Plugins.config[:merb_datamapper] = {}
+    @session_container = Merb::DataMapperSessionStore
+    @session_container.auto_migrate!
+    @sess_id = 'a'*32
+  end
+
+
+  describe "#retrieve_session" do
+    it "responds to retrieve_session" do
+      @session_container.should respond_to(:retrieve_session)
+    end
+    it "returns the data when given an existing session id" do
+      @session_container.create(:session_id => @sess_id, :data => {:foo => 'bar'})
+      session_data = @session_container.retrieve_session(@sess_id)
+      session_data.should_not be_nil
+      session_data[:foo].should == 'bar'
+    end
+    it "returns nil when a non-existent session_id is used" do
+      @session_container.retrieve_session(@sess_id).should be_nil
+    end
+  end
+
+
+  describe "#store_session" do
+    it "responds to store_session" do
+      @session_container.should respond_to(:store_session)
+    end
+
+    describe "when a session_id doesn't exist" do
+      it "creates a new record" do
+      @session_container.all.should be_empty
+      @session_container.store_session(@sess_id, {:foo => 'bar'})
+      @session_container.all.should_not be_empty
+      end
+
+      it "saves the data" do
+        @session_container.store_session(@sess_id, {:foo => 'bar'})
+        session_data = @session_container.retrieve_session(@sess_id)
+        session_data.should_not be_nil
+        session_data[:foo].should == 'bar'
+      end
+    end
+
+    describe "when a session_id does exist" do
+      before(:each) do
+        @session_container.store_session(@sess_id, {:foo => 'bar'})
+      end
+
+      it "doesn't create a new session" do
+        @session_container.all.size.should == 1
+        @session_container.store_session(@sess_id, {:foo => 'FOOOO'})
+        @session_container.all.size.should == 1
+      end
+
+      it "saves the data" do
+        @session_container.store_session(@sess_id, {:foo => 'FOOOO'})
+        session_data = @session_container.retrieve_session(@sess_id)
+        session_data.should_not be_nil
+        session_data[:foo].should == 'FOOOO'
+      end
+    end
+  end
+
+
+  describe "#delete_session" do
+    before(:each) do
+      @session_container.store_session(@sess_id, {:foo => 'bar'})
+    end
+
+    it "responds to #delete_session" do
+      @session_container.should respond_to(:delete_session)
+    end
+
+    it "destroys an existing session" do
+      @session_container.all.size.should == 1
+      @session_container.delete_session(@sess_id)
+      @session_container.all.size.should == 0
+    end
+
+    it "doesn't destroy a session when the key doesn't match" do
+      @session_container.all.size.should == 1
+      @session_container.delete_session('b'*32)
+      @session_container.all.size.should == 1
+    end
+  end
+end
+describe "configuration options" do
+  before(:each) do
+    @session_container = Merb::DataMapperSessionStore
+  end
+  after(:each) do
+    Merb::Plugins.config[:merb_datamapper].clear
+  end
+
+  describe "repository" do
+    it "uses the :default repository when no options are set" do
+      @session_container.default_repository_name.should == :default
+    end
+    it "uses the set name when provided" do
+      Merb::Plugins.config[:merb_datamapper][:session_repository_name] = :other
+      @session_container.default_repository_name.should == :other
+    end
+  end
+
+
+  describe "table name" do
+    it "uses the 'sessions'  when no options are set" do
+      @session_container.storage_names[:default].should == 'sessions'
+    end
+    it "uses the set table name when it is set" do
+      pending "this should work but doesn't"
+      Merb::Plugins.config[:merb_datamapper][:session_storage_name] = 'foos'
+      @session_container.storage_names[:default].should == 'foos'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,13 +3,7 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 
-gem 'dm-core', '=0.9.5'
+gem 'dm-core', '=0.9.6'
 require 'dm-core'
+require 'merb-core'
 
-module Merb
-  module Plugins
-    def self.config
-      @config ||= {}
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-09-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
+        version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -99,6 +99,7 @@ files:
 - lib/merb_datamapper/merbtasks.rb
 - lib/merb_datamapper/version.rb
 - spec/connection_spec.rb
+- spec/session_store_spec.rb
 - spec/generators/data_mapper_migration_spec.rb
 - spec/generators/data_mapper_model_spec.rb
 - spec/generators/data_mapper_resource_controller_spec.rb