motr 0.0.4 → 0.0.5

data/lib/motr.rb

@@ -7,6 +7,11 @@ require 'motr/model'
 
 module Motr
 
+  module Schema
+    autoload :Base,      'motr/schema/base'
+    autoload :Generator, 'motr/schema/generator'
+  end
+
   module Controller #:nodoc:
     autoload :Helpers,    'motr/controller/helpers'
     autoload :Responder,  'motr/controller/responder'

data/lib/motr/helpers/navigation.rb

@@ -25,7 +25,7 @@ module Motr
       #   nav_link_to('Current Page', '/current_url') #=> <li class="on"><a href="/current_url" class="on">Current Page</a></li>
       # 
       def nav_link_to(text, path, attrs = {}, wrapper = :li)
-        
+
         link_attrs    = update_link_attrs(path, attrs)
         wrapper_attrs = link_attrs.delete(:wrapper)      
         child_link    = link_to(text, path, link_attrs)
@@ -85,10 +85,7 @@ module Motr
         klasses  ||= []
         wklasses ||= []
         
-        if proc && proc.call(path)
-          klasses  << on_class
-          wklasses << on_class
-        elsif regex && path.match(regex)
+        if ((proc && proc.call(path)) || (regex && request.path =~ regex) || (request.path == path || request.path.match(/#{path}\/.*/i)))
           klasses  << on_class
           wklasses << on_class
         end

data/lib/motr/model.rb

@@ -76,6 +76,12 @@ module Motr
       options  = mods.extract_options!
       modules  = mods.map(&:to_sym).uniq
 
+      # Track what modules have been added to each class.
+      self.class_eval do
+        class_attribute :motr_modules, :instance_writer => false unless defined?(self.motr_modules)
+        self.motr_modules ||= []
+      end
+      
       motrize_model! do
         
         modules.each do |mod|          
@@ -104,7 +110,11 @@ module Motr
           include const_incl
           
         end
+        
+        self.motr_modules |= modules
+        
       end
+      
     end
     
     # Raise a ModuleMissing error if a module cannot be loaded.

data/lib/motr/orm/active_record.rb

@@ -8,9 +8,15 @@ module Motr
         extend Motr::Model
       end
       
+      module Schema
+        include Motr::Schema::Base
+      end
+      
     end
     
   end
 end
 
-ActiveRecord::Base.send :include, Motr::Orm::ActiveRecord
+ActiveRecord::Base.send :include, Motr::Orm::ActiveRecord
+# ActiveRecord::ConnectionAdapters::Table.send :include, Motr::Orm::ActiveRecord::Schema
+# ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Motr::Orm::ActiveRecord::Schema

data/lib/motr/orm/mongoid.rb

@@ -2,6 +2,22 @@ module Motr
   module Orm
     
     module Mongoid #:nodoc:
+      def motrize_model!
+        extend Schema
+        yield
+        motrize_schema!
+      end
+      
+      module Schema
+        include Motr::Schema::Base
+        
+        def apply_motr_schema(field_name, field_type, options = {})
+          field_type = Time if field_type == DateTime
+          field field_name, { :type => field_type }.merge!(options)
+        end
+        
+      end
+      
     end
     
   end

data/lib/motr/rails.rb

@@ -18,6 +18,10 @@ module Motr
         include Motr::Controller::Helpers
         self.responder = Motr::Controller::Responder
       end
+      ActiveSupport.on_load(:after_initialize) do
+        require 'motr/orm/mongoid' if defined?(Mongoid)          
+        require 'motr/orm/active_record' if defined?(ActiveRecord)  
+      end
       
     end
     

data/lib/motr/schema/base.rb

@@ -0,0 +1,20 @@
+module Motr
+  module Schema
+    
+    ##
+    # Stubs schema methods to ensure ORM's implement them
+    # @private
+    # 
+    module Base #:nodoc:
+      
+      def motrize_schema!
+        Motr::Schema::Generator.set_target(self)        
+      end
+            
+      def apply_motr_schema(name, type, options={})
+        raise NotImplementedError
+      end
+    end
+    
+  end
+end

data/lib/motr/schema/generator.rb

@@ -0,0 +1,79 @@
+module Motr
+  module Schema
+    ##
+    # Generates a schema for a Motr module. To define a module schema, create a 
+    # subclass that implements a "generate" class method. Generator classes
+    # should follow the convention Motr::Schema::ModuleGenerator where "Module" is the module the 
+    # schema applies to. For instance if you have a module: Motr::Model::Sample, your generator class 
+    # would be called Motr::Schema::SampleGenerator
+    # 
+    # @example A generator for the module "sample"
+    # 
+    #   class Motr::Schema::SampleGenerator < Motr::Schema::Generator
+    #     def self.generate
+    #       apply(:field_name, String, {})  # => creates the field "field_name" with the type of String
+    # 
+    #       # only run for mongoid models
+    #       apply_for(:mongoid) do
+    #           embeds_many :children
+    #       end
+    #     end
+    #   end
+    # 
+    #
+    class Generator
+      
+      # Make er clean
+      instance_methods.each { |m| undef_method m unless m =~ /^(__.*__|object_id)$/ }
+      
+      class_attribute :schema_runner, :instance_writer => false
+      
+      # @private
+      # Delegates callbacks to a particular class/module. This allows generators to be flexible and 
+      # somewhat similar to migrations.
+      # 
+      def self.set_target(target) #:nodoc:
+        self.schema_runner = target
+      end
+     
+      # Override in subclasses to run.
+      # 
+      def self.generate
+        raise NotImplementedError
+      end
+      
+      protected
+      
+      ##
+      # Apply a callback only if the including module implements the specified ORM
+      # 
+      # @param [Symbol] orm The ORM which handles the block (ie: :mongoid or :active_record)
+      # @param [Block] &block The block to be run.
+      # 
+      # @example Apply an option only to mongoid based models
+      #   apply_for(:mongoid) do |model|
+      #     model.embeds_many :children
+      #   end
+      # 
+      def self.apply_for(orm, &block)
+        # TODO: This should maybe be more efficient?
+        puts self.schema_runner.inspect
+        return unless self.schema_runner.ancestors.map(&:to_s).detect{ |a| a.to_s.match(/#{orm.to_s.classify}/) }
+        yield self.schema_runner
+      end
+      
+      ##
+      # Creates a field on the model (or migration method in ActiveRecord)
+      # 
+      # @param [Symbol] name The name of the field to create
+      # @param [Class] type The class type to create (ie: String, DateTime...)
+      # @param [Hash] options Specific options for the class type (ie: :default => nil)
+      # 
+      def self.apply(name, type, options = {})
+        self.schema_runner.__send__(:apply_motr_schema, name, type, options)
+      end
+      
+    end
+    
+  end
+end

data/lib/motr/version.rb

@@ -1,3 +1,3 @@
 module Motr #:nodoc:
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

metadata

@@ -2,7 +2,7 @@
 name: motr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Brent Kirby
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 -04:00
+date: 2011-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,16 +113,16 @@ extra_rdoc_files: []
 files: 
 - app/helpers/motr_helper.rb
 - lib/config/locales/en.yml
-- lib/generator/motr/compass_generator.rb
-- lib/generator/motr/install_generator.rb
-- lib/generator/motr/motr_generator.rb
-- lib/generator/templates/compass/ie.scss
-- lib/generator/templates/compass/includes/_base.scss
-- lib/generator/templates/compass/includes/_defaults.scss
-- lib/generator/templates/compass/includes/_mixins.scss
-- lib/generator/templates/compass/screen.scss
-- lib/generator/templates/motr.rb
-- lib/generator/templates/post_install
+- lib/generators/motr/compass_generator.rb
+- lib/generators/motr/install_generator.rb
+- lib/generators/motr/motr_generator.rb
+- lib/generators/templates/compass/ie.scss
+- lib/generators/templates/compass/includes/_base.scss
+- lib/generators/templates/compass/includes/_defaults.scss
+- lib/generators/templates/compass/includes/_mixins.scss
+- lib/generators/templates/compass/screen.scss
+- lib/generators/templates/motr.rb
+- lib/generators/templates/post_install
 - lib/motr/controller/helpers.rb
 - lib/motr/controller/responder.rb
 - lib/motr/defaults.rb
@@ -141,6 +141,8 @@ files:
 - lib/motr/orm/active_record.rb
 - lib/motr/orm/mongoid.rb
 - lib/motr/rails.rb
+- lib/motr/schema/base.rb
+- lib/motr/schema/generator.rb
 - lib/motr/version.rb
 - lib/motr.rb
 - config/en.yml
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2672633965524668472
+      hash: -3118347757184532695
       segments: 
       - 0
       version: "0"