motr 0.0.7 → 0.0.8

data/Rakefile

@@ -16,23 +16,23 @@ require 'rspec/core/rake_task'
 require 'rake/testtask'
 
 RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'motr'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+# 
+# #task :default => :spec
+# 
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << 'lib'
+#   t.libs << 'test'
+#   t.pattern = 'test/**/*_test.rb'
+#   t.verbose = false
+# end
+# 
+# Rake::RDocTask.new(:rdoc) do |rdoc|
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title    = 'motr'
+#   rdoc.options << '--line-numbers' << '--inline-source'
+#   rdoc.rdoc_files.include('README.rdoc')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end
 
 
 

data/lib/motr.rb

@@ -24,6 +24,9 @@ module Motr
     autoload :ModuleMissing,  'motr/errors/module_missing'
   end
   
+  # @private
+  mattr_accessor :applied_mods
+  @@applied_mods = ActiveSupport::OrderedHash.new 
   
   ##
   # 
@@ -33,23 +36,43 @@ module Motr
   # @param [Hash] options Hash including options for the mod
   # 
   # @option options [String, Boolean] :autoload The path to autoload the module from (optional)
-  # @option options [Hash, Boolean] :mapping Routing options for the mod
-  #   if a Hash is provided, it should contain a :controller option, and an optional :route option
-  #   Passing "true" assumes a controller matching :modnames_controller (the mod name, plural) and
-  #   a route matching the same.
   # 
   # 
-  def self.add_mod(module_name, options = {})
+  def self.add_mod(mod_name, options = {})
+    
+    const_name  = ActiveSupport::Inflector.camelize(mod_name.to_s)
+    mod_name_pl = ActiveSupport::Inflector.pluralize(mod_name.to_s)
+    
+    # Setup a tracking array
+    self.applied_mods[mod_name] ||= []
     
-    const_name = ActiveSupport::Inflector.camelize(module_name.to_s)
 
     if autoload_path = options.delete(:autoload)
-      path = (autoload_path == true ? "motr/mods/#{module_name.to_s}" : autoload_path)
+      path = (autoload_path == true ? "motr/mods/#{mod_name.to_s}" : autoload_path)
       Motr::Mods.send(:autoload, const_name, path)
     end
     
   end
   
+  ##
+  # Tracks which models have been modded by any given mod, providing 
+  # an easy way to do lookups.
+  # 
+  # @since 0.0.8
+  def self.track_mod(mod_name, ref)
+    self.applied_mods[mod_name.to_sym] |= [ ActiveSupport::Inflector.camelize(ref.to_s) ]
+  end
+  
+  ##
+  # Apply helpers from mods at load time.
+  # 
+  # @since 0.0.8
+  def self.apply_helpers(helper_name)    
+    ActiveSupport.on_load(:action_controller) do
+      include helper_name
+    end    
+  end
+  
   # Support initializer configuration
   # @private
   # 

data/lib/motr/defaults.rb

@@ -1 +1,2 @@
+require 'motr/mods/scopeable'
 Motr.add_mod(:sluggable, :autoload => true)

data/lib/motr/mods.rb

@@ -15,14 +15,13 @@ module Motr
     # 
     # 
     def modded_with(*mods)
-
-      class_attribute :motr_mods, :instance_writer => false
-      self.motr_mods ||= []
+      
+      include Motr::Mods::Scopeable
       
       options  = mods.extract_options!
       modules  = mods.map(&:to_sym).uniq
       
-      modules.each do |mod|          
+      modules.each do |mod|  
         const_name = mod.to_s.classify
         next unless Motr::Mods.const_defined?(:"#{const_name}")
         
@@ -54,6 +53,7 @@ module Motr
         end
         
         include const_incl
+        Motr.track_mod(mod, self.name.to_s)
         
       end
       

data/lib/motr/mods/scopeable.rb

@@ -0,0 +1,27 @@
+module Motr
+  module Mods
+    ##
+    # Scopeable is simply a base mod for setting up model "scoping". 
+    # This allows for helpers, routes, and other things to operate on particular 
+    # model "scopes" where mods may exist on multiple different models.
+    # 
+    module Scopeable
+      extend ActiveSupport::Concern
+      
+      included do
+        class_attribute :motr_mods, :instance_writer => false
+        self.motr_mods ||= []
+      end
+      
+      def motr_scope_name
+        self.class.name.underscore
+      end
+      
+      def motr_scope_id
+        self.id
+      end
+      
+    end
+    
+  end
+end

data/lib/motr/orm/active_record.rb

@@ -10,6 +10,9 @@ module Motr
       
       module ClassMethods
         def motr_orm_type; :active_record; end
+        
+        def create_mod_attribute!(name, type, options)
+        end
       end
       
     end

data/lib/motr/orm/mongoid.rb

@@ -3,6 +3,11 @@ module Motr
     
     module Mongoid #:nodoc:
       def motr_orm_type; :mongoid; end
+      
+      def create_mod_attribute!(name, type, options = {})
+        type = Time if type == DateTime
+        field name, { :type => type }.merge!(options)
+      end
     end
     
   end

data/lib/motr/rails.rb

@@ -6,6 +6,8 @@ module Motr
     require 'active_support/i18n'
     I18n.load_path << File.expand_path('../../config/locales/en.yml', __FILE__)
     
+    config.before_eager_load { |app| app.reload_routes! }
+    
     initializer 'motr.initializer' do
       require 'motr/orm/mongoid' if defined?(Mongoid)
       require 'motr/forms'

data/lib/motr/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: motr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Brent Kirby
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -04:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,13 +137,12 @@ files:
 - lib/motr/helpers/elements.rb
 - lib/motr/helpers/layout_helpers.rb
 - lib/motr/helpers/navigation.rb
-- lib/motr/mapper.rb
 - lib/motr/modding.rb
+- lib/motr/mods/scopeable.rb
 - lib/motr/mods/sluggable.rb
 - lib/motr/mods.rb
 - lib/motr/orm/active_record.rb
 - lib/motr/orm/mongoid.rb
-- lib/motr/rails/routes.rb
 - lib/motr/rails.rb
 - lib/motr/version.rb
 - lib/motr.rb
@@ -166,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2281357879590670203
+      hash: -3091450084673038537
       segments: 
       - 0
       version: "0"

data/lib/motr/mapper.rb

@@ -1,14 +0,0 @@
-module Motr
-  ##
-  # Mapper handles configuring mod based routes within an application
-  # 
-  class Mapper
-    class_attribute :map_options, :instance_writer => false
-    self.map_options = {}
-    
-    def self.add_mapping(mod_name, options)
-      
-    end
-        
-  end
-end

data/lib/motr/rails/routes.rb

@@ -1,11 +0,0 @@
-module ActionDispatch::Routing
-  
-  class Mapper
-    
-    def route_motr_mod
-      
-    end
-    
-  end
-  
-end