ruhl 0.17.0 → 0.18.0

data/VERSION

@@ -1 +1 @@
-0.17.0
+0.18.0

data/lib/ruhl/engine.rb

@@ -210,9 +210,9 @@ module Ruhl
       else
         args = code.strip.split('|').collect{|p| p.strip}
 
-        if block_object.respond_to?(code)
+        if block_object.respond_to?(args.first)
           block_object.send(*args)
-        elsif local_object.respond_to?(code)
+        elsif local_object.respond_to?(args.first)
           local_object.send(*args)
         else
           scope.send(*args)

data/lib/ruhl/rails.rb

@@ -11,8 +11,10 @@ module Ruhl
     def render(template, options = {})
       layout = @action_view.controller.send(:active_layout)
 
-      options[:layout]        = layout.filename
-      options[:layout_source] = layout.source
+      if layout
+        options[:layout]        = layout.filename 
+        options[:layout_source] = layout.source
+      end
 
       Ruhl::Engine.new(template.source, options).render(@action_view)
     end

data/lib/ruhl/rails/helper.rb

@@ -4,6 +4,15 @@ module Ruhl
       def form_authenticity
         {:value => form_authenticity_token, :type => "hidden", :name => "authenticity_token"}
       end  
+
+      def i(type,column)
+        model = presentee.class.name.underscore
+        { :type => type,
+          :id   => "#{model}_#{column}", 
+          :name => "#{model}[#{column}]",
+          :value => presentee.send(column)
+        }
+      end
     end
   end
-end
+end

data/lib/ruhl/rails/ruhl_presenter.rb

@@ -9,10 +9,14 @@ module Ruhl
   
       attr_reader :presentee, :context
   
-      def initialize(obj, context)
-        @presentee = obj
+      def initialize(context, obj = nil)
         @context = context
-        define_paths(obj.class.name.underscore.downcase)
+
+        # May only want to use the form helper
+        if obj
+          @presentee = obj
+          define_paths(obj.class.name.underscore.downcase)
+        end
       end
     
       def method_missing(name, *args)
@@ -44,15 +48,29 @@ module ActionController
 
     protected
 
-    def present(object_sym, action_sym)
-      render  :template => "#{object_sym.to_s.pluralize}/#{action_sym}", 
-        :locals => {:object => presenter_for( instance_variable_get("@#{object_sym}") )}    
+    def present(action_sym = action_name, object = nil)
+      object_sym = object || controller_name.singularize
+
+      render  :template => "#{controller_name}/#{action_sym}", 
+        :locals => {:object => presenter_for(object_sym) }    
     end
 
-    def presenter_for(obj)
-      Object.const_get("#{obj.class.name}Presenter").new(obj, @template)
+    def presenter_for(object)
+
+      if object.is_a?(Symbol) || object.is_a?(String)
+        # Set instance variable if it exists
+        if instance_variables.include?("@#{object}")
+          obj = instance_variable_get("@#{object}")
+        end
+        name = object.to_s.camelize
+      else
+        name = object.class.name.camelize
+        obj = object
+      end
+
+      Object.const_get("#{name}Presenter").new(@template, obj)
     end
-    
+
     helper_method :presenter_for   
   end
 end

data/ruhl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruhl}
-  s.version = "0.17.0"
+  s.version = "0.18.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Stone"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruhl
 version: !ruby/object:Gem::Version 
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors: 
 - Andrew Stone