hirb 0.3.0 → 0.3.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.3.1
+* Bug fix on DynamicView.class_to_method to allow overrides of default views
+* Modified mongo_mapper view to have _id first
+
 == 0.3.0
 * Added dynamic views.
 * Added default table views for the following database classes/modules:

data/lib/hirb/dynamic_view.rb

@@ -53,15 +53,16 @@ module Hirb
     end
 
     def self.generate_single_view_module(output_mod, &block) #:nodoc:
-      mod_name = class_to_method output_mod.to_s
-      Views::Single.send(:remove_const, mod_name) if Views::Single.const_defined?(mod_name)
-      mod = Views::Single.const_set(mod_name, Module.new)
-      mod.send(:define_method, mod_name.downcase, block)
+      meth = class_to_method output_mod.to_s
+      view_mod = meth.capitalize
+      Views::Single.send(:remove_const, view_mod) if Views::Single.const_defined?(view_mod)
+      mod = Views::Single.const_set(view_mod, Module.new)
+      mod.send(:define_method, meth, block)
       mod
     end
 
     def self.class_to_method(mod) #:nodoc:
-      mod.gsub("::","__").gsub(/([A-Z])/, '_\1').gsub(/(^|::)_/,'\1') + '_view'
+      mod.gsub(/(?!^)([A-Z])/) {|e| '_'+e }.gsub('::_', '__').downcase + '_view'
     end
 
     # Returns a hash of options based on dynamic views defined for the object's ancestry. If no config is found returns nil.

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/hirb/views/mongo_db.rb

@@ -4,12 +4,11 @@ module Hirb::Views::MongoDb #:nodoc:
   end
 
   def mongo_mapper__document_view(obj)
-    {:fields=>obj.class.column_names}
-  end
-
-  def mongo_mapper__embedded_document_view(obj)
-    {:fields=>obj.class.column_names}
+    fields = obj.class.column_names
+    fields.delete('_id') && fields.unshift('_id')
+    {:fields=>fields}
   end
+  alias_method :mongo_mapper__embedded_document_view, :mongo_mapper__document_view
 end
 
 Hirb::DynamicView.add Hirb::Views::MongoDb, :helper=>:auto_table

data/test/dynamic_view_test.rb

@@ -53,6 +53,10 @@ module Hirb
       end
     end
 
+    test "class_to_method converts correctly" do
+      DynamicView.class_to_method("DBI::Row").should == 'd_b_i__row_view'
+    end
+
     context "dynamic_view" do
       def define_view(mod_name= :Blah, &block)
         mod = Views.const_set(mod_name, Module.new)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -05:00
+date: 2010-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: []