0
@@ -26,14 +26,17 @@ Dependencies for MerbMart:
0
         * *dm-types*
0
         * *dm-validations*
0
         * *merb\_datamapper*  
0
-        (do not use the *merb\_datamapper* included in the 0.9.2 distribution of
0
+        (NOTE: do not use the *merb\_datamapper* included in the 0.9.2 distribution of
0
          *merb_plugins*, as it was designed for DataMapper 0.3 series)
0
  * **Merb 0.9.3** (or above)
0
     * *merb-core*           : `sudo gem install merb-core`
0
     * *merb-more*           : `sudo gem install merb-more`
0
     * *merb\_plugins*
0
         * *merb\_helpers*   : `sudo gem install merb_helpers`
0
-        * *merb\_stories*   : `sudo gem install merb_stories`
0
+        * *merb\_stories*  
0
+        (NOTE:> 0.9.3 required. Install from merb\_plugins source.
0
+        See merb-plugins issue 
0
+        [106](http://merb.lighthouseapp.com/projects/7588/tickets/106-merb_stories-require-old-rspec-plugin) )
0
     
0
 Running Specs
0
 -------------

0
@@ -1,3 +1,6 @@
0
+#
0
+# A generic representation of an Address.
0
+#
0
 class Address
0
 
0
   include DataMapper::Resource

0
@@ -1,7 +1,14 @@
0
 #
0
-# A representation of a State or Province (e.g. New York/NY, Alberta, Northern
0
-# Ireland, etc.) for those countries that use them as an administrative 
0
-# division.
0
+# A representation of a State, Province, or sub-national administrative
0
+# division, for those countries that use such administrative divisions.
0
+#
0
+# Useful for the purposes of addresses, local taxation purposes, etc.
0
+#
0
+# e.g.
0
+#   US State                          => New York/NY
0
+#   Canadian Province                 => Alberta/AB
0
+#   UK Province/Constituent Country   => Northern Ireland
0
+#   German Bundesland                 => Baden-Württemburg/BW
0
 #
0
 class State
0
 
0
@@ -12,6 +19,8 @@ class State
0
   property :name,         String, :length => 50, :nullable => false
0
   property :country_code, String  # foreign-key
0
   
0
+  ## TODO   country_code and abbr a composite-key
0
+  
0
   belongs_to :country
0
   
0
 end
0
\ No newline at end of file

0
@@ -1,17 +1,16 @@
0
 require 'dm-validations'
0
-
0
+#
0
+# A free-form, flat taxonomoy.
0
+#
0
 class Tag
0
   
0
   include DataMapper::Resource
0
   include DataMapper::Validate
0
-  #include DataMapper::Is::Tree
0
   
0
   property :id,         Fixnum, :serial => true
0
   property :name,       String, :length => 100, :nullable => false, :key => :unique
0
   property :rank,       Fixnum
0
-  property :parent_id,  Fixnum
0
-
0
-  #many_to_many :products #, :join_table => 'products_tags'    
0
+  
0
   validates_presence_of   :name
0
   validates_uniqueness_of :rank
0
   
0
@@ -19,9 +18,4 @@ class Tag
0
     all(:order => [ :name.asc ])
0
   end
0
   
0
-  def self.all_parents
0
-    all(:conditions => [:parent_id => 0],  # parent_id => nil, 
0
-        :order => [ :rank.desc ])
0
-  end
0
-  
0
 end
0
\ No newline at end of file

0
@@ -1,16 +1,22 @@
0
 !!! Strict
0
 %html{ "xml:lang" => "en-us", :lang => "en-us", :xmlns => "http://www.w3.org/1999/xhtml" }
0
   %head
0
-    %title= title @title unless @title.nil?
0
+    %title= @title unless @title.nil?
0
     %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }
0
+    %meta{ :generator => "MerbMart" }
0
     = css_include_tag :master
0
-    / = css_include_tag :more
0
-    / = js_include_tag :js
0
+    = include_required_css
0
+    = include_required_js
0
   %body
0
     #container
0
       #header
0
-        %p Header
0
+        %h1 MerbMart
0
+        #navigation
0
+          %ul
0
+            %li 
0
+              =link_to 'Store', ''
0
       #content
0
         = catch_content :for_layout
0
       #footer
0
-        %p Footer
0
\ No newline at end of file
0
+        %p Powered by MerbMart, Merb and DataMapper.
0
+        %p Copyright © 2008, Alex Coles.
0
\ No newline at end of file

0
@@ -1 +1 @@
0
-This is the front-page of the store.
0
+This is the frontpage of the MerbMart store.
0
\ No newline at end of file

0
@@ -37,6 +37,8 @@ dependency "merb-haml"
0
 dependency "merb_helpers"
0
 dependency "merb-mailer"
0
 #dependency "merb_paginate"
0
+dependency "merb_stories"
0
+
0
 require "ezcrypto"
0
 
0
 #MerbPaginate.activate! :finder => :datamapper # require the custom finder for datamapper