mack-data_mapper 0.6.1.2 → 0.7.0

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

@@ -0,0 +1,15 @@
+module DataMapper # :nodoc:
+  class PropertySet # :nodoc:
+    
+    def []=(name, property)
+      if existing_property = detect { |p| p.name == name }
+        property.hash
+        @entries[@entries.index(existing_property)] = property
+      else
+        add(property)
+      end
+      property
+    end
+    
+  end # class PropertySet
+end # module DataMapper

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

@@ -0,0 +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

data/lib/mack-data_mapper/generators.rb

@@ -0,0 +1,11 @@
+module Mack
+  module Database
+    module Generators
+      
+      def self.controller_template_location
+        File.join(File.dirname(__FILE__), "scaffold_generator", "templates", "app", "controllers", "controller.rb.template")
+      end
+      
+    end # Generators
+  end # Database
+end # Mack

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

@@ -3,17 +3,15 @@ module Mack
     module DataMapperHelpers
 
       DEFAULT_PARTIAL = %{
-<div>
-  <div class="errorExplanation" id="errorExplanation">
-    <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
-    <ul>
-      <% for error in errors %>
-        <li><%= error %></li>
-      <% end %>  
-    </ul>
-  </div>
+<div class="errorExplanation" id="errorExplanation">
+  <h2><%= pluralize_word(errors.size, "error") %> occured.</h2>
+  <ul>
+    <% for error in errors %>
+      <li><%= error %></li>
+    <% end %>  
+  </ul>
 </div>
-      } unless Mack::ViewHelpers::DataMapperHelpers.const_defined?("DEFAULT_PARTIAL")
+}.strip unless Mack::ViewHelpers::DataMapperHelpers.const_defined?("DEFAULT_PARTIAL")
       
       # Provides view level support for printing out all the errors associated with the
       # models you tell it. 
@@ -51,28 +49,6 @@ module Mack
         end
       end
       
-      # Generates a text input tag for a given model and field
-      # 
-      # Example:
-      # model_text_field(@user, :username) # => <input id="user_username" name="user[username]" type="text" value="<@user.username's value>" />
-      def model_text_field(model, property, options = {})
-        m_name = model.class.to_s.underscore
-        non_content_tag(:input, {:type => :text, :name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :value => model.send(property)}.merge(options))
-      end
-      
-      # Generates a password input tag for a given model and field
-      # 
-      # Example:
-      # model_password_field(@user, :password) # => <input id="user_username" name="user[username]" type="password" value="<@user.username's value>" />
-      def model_password_field(model, property, options = {})
-        model_text_field(model, property, {:type => :password}.merge(options))
-      end
-      
-      def model_textarea(model, property, options = {})
-        m_name = model.class.to_s.underscore
-        content_tag(:textarea, {:name => "#{m_name}[#{property}]", :id => "#{m_name}_#{property}", :cols => 60, :rows => 20}.merge(options), model.send(property))
-      end
-
     end # OrmHelpers
   end # ViewHelpers
 end # Mack

data/lib/mack-data_mapper/migration_generator/migration_generator.rb

@@ -42,7 +42,7 @@ class MigrationGenerator < Genosaurus
   end
   
   def migration_columns # :nodoc:
-    [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten
+    [Mack::Genosaurus::Orm::ModelColumn.new(param(:name), "id:serial"), columns].flatten
   end
   
   def get_column_type(column) # :nodoc:

data/lib/mack-data_mapper/model_generator/manifest.yml

@@ -9,10 +9,10 @@ model_template:
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "test_case.rb.template") %>
-  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_test.rb") %>
+  output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_test.rb") %>
 <% elsif app_config.mack.testing_framework == "rspec" -%>
 test_template:
   type: file
   template_path: <%= File.join(templates_directory_path, "rspec.rb.template") %>
-  output_path: <%= File.join("test", "unit", "#{param(:name).singular.underscore}_spec.rb") %>
+  output_path: <%= File.join("test", "models", "#{param(:name).singular.underscore}_spec.rb") %>
 <% end -%>

data/lib/mack-data_mapper/model_generator/model_generator.rb

@@ -53,7 +53,7 @@ class ModelGenerator < Genosaurus
   end
   
   def migration_columns # :nodoc:
-    [Mack::Genosaurus::DataMapper::ModelColumn.new(param(:name), "id:serial"), columns].flatten
+    [Mack::Genosaurus::Orm::ModelColumn.new(param(:name), "id:serial"), columns].flatten
   end
   
 end

data/lib/mack-data_mapper_tasks.rb

@@ -1,3 +1,4 @@
+require 'mack-orm_tasks'
 Dir.glob(File.join(File.dirname(__FILE__), "mack-data_mapper", "tasks", "*.rake")).each do |f|
   load(f)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-data_mapper
 version: !ruby/object:Gem::Version 
-  version: 0.6.1.2
+  version: 0.7.0
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -04:00
+date: 2008-08-25 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.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-validations
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-observer
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-types
@@ -90,7 +90,27 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mack-orm
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    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: 
 description: "mack-data_mapper was developed by: markbates"
 email: mark@mackframework.com
@@ -102,13 +122,16 @@ extra_rdoc_files:
 - README
 files: 
 - lib/mack-data_mapper/database.rb
+- lib/mack-data_mapper/database_migrations.rb
 - lib/mack-data_mapper/dm_patches/dm-timestamps.rb
 - lib/mack-data_mapper/dm_patches/migrations.rb
-- lib/mack-data_mapper/genosaurus_helpers.rb
+- lib/mack-data_mapper/dm_patches/model.rb
+- lib/mack-data_mapper/dm_patches/property_set.rb
+- lib/mack-data_mapper/dm_patches/validations.rb
+- lib/mack-data_mapper/generators.rb
 - lib/mack-data_mapper/helpers/orm_helpers.rb
 - lib/mack-data_mapper/migration_generator/migration_generator.rb
 - lib/mack-data_mapper/migration_generator/templates/db/migrations/%=@migration_name%.rb.template
-- lib/mack-data_mapper/model_column.rb
 - lib/mack-data_mapper/model_generator/manifest.yml
 - lib/mack-data_mapper/model_generator/model_generator.rb
 - lib/mack-data_mapper/model_generator/templates/model.rb.template
@@ -116,25 +139,14 @@ files:
 - lib/mack-data_mapper/model_generator/templates/test_case.rb.template
 - lib/mack-data_mapper/resource.rb
 - lib/mack-data_mapper/runner.rb
-- lib/mack-data_mapper/scaffold_generator/manifest.yml
-- lib/mack-data_mapper/scaffold_generator/scaffold_generator.rb
 - lib/mack-data_mapper/scaffold_generator/templates/app/controllers/controller.rb.template
-- lib/mack-data_mapper/scaffold_generator/templates/app/helpers/controllers/helper.rb.template
-- lib/mack-data_mapper/scaffold_generator/templates/app/views/edit.html.erb.template
-- lib/mack-data_mapper/scaffold_generator/templates/app/views/index.html.erb.template
-- lib/mack-data_mapper/scaffold_generator/templates/app/views/new.html.erb.template
-- lib/mack-data_mapper/scaffold_generator/templates/app/views/show.html.erb.template
-- lib/mack-data_mapper/scaffold_generator/templates/test/functional/rspec.rb.template
-- lib/mack-data_mapper/scaffold_generator/templates/test/functional/test_case.rb.template
-- lib/mack-data_mapper/tasks/db_create_drop_tasks.rake
-- lib/mack-data_mapper/tasks/db_migration_tasks.rake
-- lib/mack-data_mapper/tasks/test_tasks.rake
 - lib/mack-data_mapper/test_extensions.rb
 - lib/mack-data_mapper.rb
 - lib/mack-data_mapper_tasks.rb
 - README
 - doc/classes/DataMapper/Resource.html
-- doc/classes/DataMapper/Timestamp.html
+- doc/classes/Mack/Database/Generators.html
+- doc/classes/Mack/Database/Migrations.html
 - doc/classes/Mack/Database.html
 - doc/classes/Mack/Testing/DataMapperHelpers.html
 - doc/classes/Mack/Testing/Helpers.html
@@ -142,19 +154,20 @@ files:
 - doc/classes/Mack.html
 - doc/classes/MigrationGenerator.html
 - doc/classes/ModelGenerator.html
-- doc/classes/ScaffoldGenerator.html
 - doc/created.rid
+- doc/files/lib/mack-data_mapper/database_migrations_rb.html
 - doc/files/lib/mack-data_mapper/database_rb.html
 - doc/files/lib/mack-data_mapper/dm_patches/dm-timestamps_rb.html
 - doc/files/lib/mack-data_mapper/dm_patches/migrations_rb.html
-- doc/files/lib/mack-data_mapper/genosaurus_helpers_rb.html
+- doc/files/lib/mack-data_mapper/dm_patches/model_rb.html
+- doc/files/lib/mack-data_mapper/dm_patches/property_set_rb.html
+- doc/files/lib/mack-data_mapper/dm_patches/validations_rb.html
+- doc/files/lib/mack-data_mapper/generators_rb.html
 - doc/files/lib/mack-data_mapper/helpers/orm_helpers_rb.html
 - doc/files/lib/mack-data_mapper/migration_generator/migration_generator_rb.html
-- doc/files/lib/mack-data_mapper/model_column_rb.html
 - 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/scaffold_generator/scaffold_generator_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

data/doc/classes/ScaffoldGenerator.html

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: ScaffoldGenerator</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">ScaffoldGenerator</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/mack-data_mapper/scaffold_generator/scaffold_generator_rb.html">
-                lib/mack-data_mapper/scaffold_generator/scaffold_generator.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Genosaurus
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-Generates scaffold for <a href="Mack.html">Mack</a> applications.
-</p>
-<p>
-Example:
-</p>
-<pre>
-  rake generate:scaffold name=post
-</pre>
-
-    </div>
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/lib/mack-data_mapper/genosaurus_helpers.rb

@@ -1,40 +0,0 @@
-module Mack
-  module Genosaurus # :nodoc:
-    module DataMapper # :nodoc:
-      module Helpers # :nodoc:
-      
-        def columns(name = param(:name))
-          ivar_cache("form_columns") do
-            cs = []
-            cols = (param(:cols) || param(:columns))
-            if cols
-              cols.split(",").each do |x|
-                cs << Mack::Genosaurus::DataMapper::ModelColumn.new(name, x)
-              end
-            end
-            cs
-          end
-        end
-
-        def db_directory
-          File.join(Mack.root, "db")
-        end
-      
-        def migrations_directory
-          File.join(db_directory, "migrations")
-        end
-      
-        def next_migration_number
-          last = Dir.glob(File.join(migrations_directory, "*.rb")).last
-          if last
-            return File.basename(last).match(/^\d+/).to_s.succ
-          end
-          return "001"
-        end
-      
-        ::Genosaurus.send(:include, self)
-      
-      end # Helpers
-    end # DataMapper
-  end # Genosaurus
-end # Mack