pakyow-presenter 0.6.3.1 → 0.7.0

data/pakyow-presenter/lib/presenter/presenter.rb

@@ -2,22 +2,21 @@ module Pakyow
   module Presenter
     class Presenter < PresenterBase
       attr_accessor :current_context
-      
+
+      def initialize
+        reset_state()
+      end
+
       #
       # Methods that are called by core. This is the interface that core expects a Presenter to have
       #
 
-      def reload!
+      def load
         load_views
       end
-      
-      def present_for_request(request)
-        @presented = false
-        @root_path = nil
-        @root_view_is_built = false
-        @root_view = nil
-        @view_path = nil
-        @container_name = nil
+
+      def prepare_for_request(request)
+        reset_state()
         @request = request
       end
       
@@ -99,6 +98,25 @@ module Pakyow
         v
       end
 
+      # This is also for creating views from within a controller using the route based lookup mechanism.
+      # This method takes either a dir or file path and builds either a root_view or view, respectively.
+      def view_for_full_view_path(f_v_p, deep = false)
+        v = nil
+        real_path_info = @view_lookup_store.real_path_info(f_v_p)
+        if real_path_info
+          if real_path_info[:file_or_dir] == :file
+            v = View.new(real_path_info[:real_path])
+          elsif real_path_info[:file_or_dir] == :dir
+            root_view = @view_lookup_store.view_info(f_v_p)[:root_view]
+            v = View.new(root_view)
+            if v && deep
+              populate_view(v, @view_lookup_store.view_info(f_v_p)[:views])
+            end
+          end
+        end
+        v
+      end
+
       def populate_view_for_view_path(view, v_p)
         return view unless view_info = @view_lookup_store.view_info(v_p)
         views = view_info[:views]
@@ -124,27 +142,44 @@ module Pakyow
       #
       protected
       #
-      
+
+      def reset_state
+        @presented = false
+        @root_path = nil
+        @root_view_is_built = false
+        @root_view = nil
+        @view_path = nil
+        @container_name = nil
+      end
+
       def build_root_view
         @root_view_is_built = true
 
         if @view_path
           v_p = @view_path
-        elsif @request.restful
+        elsif @request && @request.restful
           v_p = restful_view_path(@request.restful)
-        elsif @request.route_spec && @request.route_spec.index(':')
+        elsif @request && @request.route_spec && !@request.route_spec.is_a?(Regexp) && @request.route_spec.index(':')
           v_p = StringUtils.remove_route_vars(@request.route_spec)
         else
-          v_p = @request.env['PATH_INFO']
+          v_p = @request && @request.working_path
         end
         return unless v_p
-        return unless view_info = @view_lookup_store.view_info(v_p)
 
-        @presented = true
-        @root_path ||= view_info[:root_view]
-        @root_view = LazyView.new(@root_path, true)
-        views = view_info[:views]
-        populate_view(self.view, views)
+        if Configuration::Base.presenter.view_caching
+          r_v = @populated_root_view_cache[v_p]
+          if r_v then
+            @root_view = r_v.dup
+            @presented = true
+          end
+        else
+          return unless view_info = @view_lookup_store.view_info(v_p)
+          @root_path ||= view_info[:root_view]
+          @root_view = LazyView.new(@root_path, true)
+          views = view_info[:views]
+          populate_view(self.view, views)
+          @presented = true
+        end
       end
       
       def restful_view_path(restful_info)
@@ -157,6 +192,19 @@ module Pakyow
 
       def load_views
         @view_lookup_store = ViewLookupStore.new("#{Configuration::Presenter.view_dir}")
+        if Configuration::Base.presenter.view_caching then
+          @populated_root_view_cache = build_root_view_cache(@view_lookup_store.view_info)
+        end
+      end
+
+      def build_root_view_cache(view_info)
+        r_v_c = {}
+        view_info.each{|dir,info|
+          r_v = LazyView.new(info[:root_view], true)
+          populate_view(r_v, info[:views])
+          r_v_c[dir] = r_v
+        }
+        r_v_c
       end
 
       # populates the top_view using view_store data by recursively building
@@ -168,7 +216,7 @@ module Pakyow
           path = views[name]
           if path
             v = populate_view(View.new(path), views)
-            top_view.reset_container(name)
+            top_view.reset_container(name) # TODO revisit how this is implemented; assumes all LazyViews are root views
             top_view.add_content_to_container(v, name)
           end
         }

data/pakyow-presenter/lib/presenter/view.rb

@@ -2,7 +2,7 @@ module Pakyow
   module Presenter
     class View
       class << self
-        attr_accessor :binders, :cache, :default_view_path, :default_is_root_view
+        attr_accessor :binders, :default_view_path, :default_is_root_view
 
         def view_path(dvp, dirv=false)
           self.default_view_path = dvp
@@ -11,12 +11,16 @@ module Pakyow
       end
 
       attr_accessor :doc
-            
+
+      def dup
+        self.class.new(@doc.dup)
+      end
+
       def initialize(arg=nil, is_root_view=false)
         arg = self.class.default_view_path if arg.nil? && self.class.default_view_path
         is_root_view = self.class.default_is_root_view if arg.nil? && self.class.default_is_root_view
         
-        if arg.is_a?(Nokogiri::XML::Element)
+        if arg.is_a?(Nokogiri::XML::Element) || arg.is_a?(Nokogiri::XML::Document)
           @doc = arg
         elsif arg.is_a?(Pakyow::Presenter::Views)
           @doc = arg.first.doc.dup
@@ -28,18 +32,11 @@ module Pakyow
           else
             view_path = "#{Configuration::Presenter.view_dir}/#{arg}"
           end
-          # Only load one time if view caching is enabled
-          self.class.cache ||= {}
-          
-          if !self.class.cache.has_key?(view_path) || !Configuration::Base.presenter.view_caching
-            if is_root_view then
-              self.class.cache[view_path] = Nokogiri::HTML::Document.parse(File.read(view_path))
-            else
-              self.class.cache[view_path] = Nokogiri::HTML.fragment(File.read(view_path))
-            end
+          if is_root_view then
+            @doc = Nokogiri::HTML::Document.parse(File.read(view_path))
+          else
+            @doc = Nokogiri::HTML.fragment(File.read(view_path))
           end
-          
-          @doc = self.class.cache[view_path].dup
         else
           raise ArgumentError, "No View for you! Come back, one year."
         end
@@ -91,8 +88,8 @@ module Pakyow
         ViewContext.new(self).instance_eval(&block)
       end
       
-      def bind(object, type = nil)
-        type = type || StringUtils.underscore(object.class.name)
+      def bind(object, opts = {})
+        bind_as = opts[:to] ? opts[:to].to_s : StringUtils.underscore(object.class.name.split('::').last)
         
         @doc.traverse do |o|
           if attribute = o.get_attribute('itemprop')
@@ -105,16 +102,10 @@ module Pakyow
           
           next unless attribute
           
-          if selector.include?('[')
-            type_len    = type.length
-            object_type = selector[0,type_len]
-            attribute   = selector[type_len + 1, attribute.length - type_len - 2]
-          else
-            object_type = nil
-            attribute = selector
-          end
+          type_len    = bind_as.length
+          next if selector[0, type_len + 1] != "#{bind_as}["
           
-          next if !object_type.nil? && object_type != type          
+          attribute   = selector[type_len + 1, attribute.length - type_len - 2]
           
           binding = {
             :element => o,
@@ -122,15 +113,15 @@ module Pakyow
             :selector => selector
           }
           
-          bind_object_to_binding(object, binding, object_type.nil?)
+          bind_object_to_binding(object, binding, bind_as)
         end
       end
       
-      def repeat_for(objects, &block)
+      def repeat_for(objects, opts = {}, &block)
         if o = @doc
           objects.each do |object|
             view = View.new(self)
-            view.bind(object)
+            view.bind(object, opts)
             ViewContext.new(view).instance_exec(object, &block) if block_given?
             
             o.add_previous_sibling(view.doc)
@@ -239,23 +230,7 @@ module Pakyow
       end
       
       alias :render :append
-      
-      def +(value)
-        if @previous_method
-          append_value(val)
-        else
-          super
-        end
-      end
-      
-      def <<(value)
-        if @previous_method
-          append_value(val)
-        else
-          super
-        end
-      end
-      
+     
       def method_missing(method, *args)
         return unless @previous_method == :attributes
         @previous_method = nil
@@ -264,7 +239,15 @@ module Pakyow
           attribute = method.to_s.gsub('=', '')
           value = args[0]
 
-          self.doc[attribute] = value
+          if value.is_a? Proc
+            value = value.call(self.doc[attribute])
+          end
+
+          if value.nil?
+            self.doc.remove_attribute(attribute)
+          else
+            self.doc[attribute] = value
+          end
         else
           return self.doc[method.to_s]
         end
@@ -298,32 +281,20 @@ module Pakyow
 
       protected
 
-      def append_value(value_to_append)
-        case @previous_method
-        when :content
-          append(value_to_append)
-        end
-        
-        @previous_method = nil
-      end
-      
-      def bind_object_to_binding(object, binding, wild = false)
+      def bind_object_to_binding(object, binding, bind_as)
         binder = nil
         
-        # fetch value
-        if object.is_a? Hash
-          value = object[binding[:attribute]]
+        if View.binders
+          b = View.binders[bind_as.to_sym] and binder = b.new(object, binding[:element])
+        end
+        
+        if binder && binder.class.method_defined?(binding[:attribute])
+          value = binder.send(binding[:attribute])
         else
-          if View.binders
-            b = View.binders[object.class.to_s.to_sym] and binder = b.new(object, binding[:element])
-          end
-          
-          if binder && binder.class.method_defined?(binding[:attribute])
-            value = binder.send(binding[:attribute])
+          if object.is_a? Hash
+            value = object[binding[:attribute]]
           else
-            if wild && !object.class.method_defined?(binding[:attribute])
-              return
-            elsif Configuration::Base.app.dev_mode == true && !object.class.method_defined?(binding[:attribute])
+            if Configuration::Base.app.dev_mode == true && !object.class.method_defined?(binding[:attribute])
               Log.warn("Attempting to bind object to #{binding[:html_tag]}#{binding[:selector].gsub('*', '').gsub('\'', '')} but #{object.class.name}##{binding[:attribute]} is not defined.")
               return
             else
@@ -334,7 +305,13 @@ module Pakyow
         
         if value.is_a? Hash
           value.each do |k, v|
-            if k == :content
+            if v.is_a? Proc
+              v = v.call(binding[:element][k.to_s])
+            end
+            
+            if v.nil?
+              binding[:element].remove_attribute(k.to_s)
+            elsif k == :content
               bind_value_to_binding(v, binding, binder)
             else
               binding[:element][k.to_s] = v.to_s
@@ -382,7 +359,7 @@ module Pakyow
             binding[:element].inner_html = Nokogiri::HTML.fragment(value.to_s)
           end
         elsif binding[:element].name == 'input' && binding[:element][:type] == 'checkbox'
-          if value == true || binding[:element].attributes['value'].value == value.to_s
+          if value == true || (binding[:element].attributes['value'] && binding[:element].attributes['value'].value == value.to_s)
             binding[:element]['checked'] = 'checked'
           else
             binding[:element].delete('checked')

data/pakyow-presenter/lib/presenter/view_lookup_store.rb

@@ -21,8 +21,8 @@ module Pakyow
       #                                      }
       #                    },
       #      :abstract_paths =>  {
-      #                            "/abstract/path/file.html" => "/abstract.root1/path/file.html",
-      #                            "/some/other/path" => "/some/other.root1/path.root2"
+      #                            "/abstract/path/file.html" => {:real_path => "/abstract.root1/path/file.html", :file_or_dir => :file},
+      #                            "/some/other/path" => {:real_path => "/some/other.root1/path.root2", :file_or_dir => :dir}
       #                          }
       #  }
       # This takes into account that a view directory may have a .root suffix.
@@ -46,11 +46,6 @@ module Pakyow
         default_views = {} # view_basename => path_to_view.html
         if File.exist?(view_dir) then
           default_root_view_file_path = "#{absolute_path_prefix}/#{Configuration::Presenter.default_view}"
-          # See if the top level index directory overrides the default root view
-          index_dirs = Dir.entries(view_dir).partition{|e| File.directory?("#{absolute_path_prefix}/#{e}") && e.start_with?('index.')}[0]
-          if index_dirs.length == 1
-            default_root_view_file_path = "#{absolute_path_prefix}/#{StringUtils.split_at_last_dot(index_dirs[0])[1]}.html"
-          end
           # The logic depends on this traversing top down
           DirUtils.walk_dir(view_dir) { |vpath|
             if File.directory?(vpath)
@@ -89,9 +84,9 @@ module Pakyow
               else
                 r_p = vpath.sub(absolute_path_prefix, '')
               end
-              @view_store[:abstract_paths][route] = r_p
+              @view_store[:abstract_paths][route] = {:real_path => r_p, :file_or_dir => :dir}
               # duplicate real path under routes permuted with leading/trailing slash
-              permute_route(route).each { |r| @view_store[:abstract_paths][r] = r_p } unless route == '/'
+              permute_route(route).each { |r| @view_store[:abstract_paths][r] = {:real_path => r_p, :file_or_dir => :dir} } unless route == '/'
             else
               # files here are direct overrides of the route's views
               parent,route = pakyow_path_to_route_and_parent(vpath, view_dir, :file)
@@ -108,13 +103,13 @@ module Pakyow
               # duplicating real path under route without the leading slash
               r_p = vpath.sub(absolute_path_prefix, '')
               if route == '/'
-                @view_store[:abstract_paths]["/#{File.basename(vpath)}"] = r_p
-                @view_store[:abstract_paths][File.basename(vpath)] = r_p
+                @view_store[:abstract_paths]["/#{File.basename(vpath)}"] = {:real_path => r_p, :file_or_dir => :file}
+                @view_store[:abstract_paths][File.basename(vpath)] = {:real_path => r_p, :file_or_dir => :file}
               else
                 route_with_leading_slash = "#{route}/#{File.basename(vpath)}"
                 route_without_leading_slash = route_with_leading_slash.sub('/','')
-                @view_store[:abstract_paths][route_with_leading_slash] = r_p
-                @view_store[:abstract_paths][route_without_leading_slash] = r_p
+                @view_store[:abstract_paths][route_with_leading_slash] = {:real_path => r_p, :file_or_dir => :file}
+                @view_store[:abstract_paths][route_without_leading_slash] = {:real_path => r_p, :file_or_dir => :file}
               end
             end
           }
@@ -162,9 +157,17 @@ module Pakyow
           return @view_store[:view_dirs]
         end
       end
+      
+      def real_path_info(abstract_path = nil)
+        if abstract_path then
+          @view_store[:abstract_paths][abstract_path]
+        else
+          @view_store[:abstract_paths]
+        end
+      end
 
       def real_path(abstract_path)
-        @view_store[:abstract_paths][abstract_path]
+        @view_store[:abstract_paths][abstract_path][:real_path] if @view_store[:abstract_paths][abstract_path]
       end
       
       private
@@ -200,7 +203,7 @@ module Pakyow
       end
 
       # Takes a route with a leading slash and no trailing slash (/route) and
-      # returns the three other permutaions (/route/, route/, and route).
+      # returns the three other permutations (/route/, route/, and route).
       def permute_route(route0)
         route3 = route0.sub('/','')
         route2 = "#{route3}/"

data/pakyow-presenter/lib/presenter/views.rb

@@ -65,16 +65,10 @@ module Pakyow
       end
       
       alias :render :append
-      
-      def +(val)
-        self.each {|e| e + val}
-      end
-      
+     
       def <<(val)
         if val.is_a? View
           @views << val
-        else
-          self.each {|e| e << val}
         end
       end
       
@@ -94,18 +88,18 @@ module Pakyow
         method_missing(:id)
       end
       
-      def repeat_for(objects, &block)
+      def repeat_for(objects, opts = {}, &block)
         first_found = self.first
         
         # Remove other matches
         self.drop(1).each {|found| found.remove}
         
         # Repeat for first match
-        first_found.repeat_for(objects, &block)
+        first_found.repeat_for(objects, opts, &block)
       end
       
-      def bind(object)
-        self.each {|e| e.bind(object)}
+      def bind(object, opts = {})
+        self.each {|e| e.bind(object, opts)}
       end
       
       def find(element)

metadata

@@ -1,66 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pakyow-presenter
-version: !ruby/object:Gem::Version 
-  hash: 113
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 3
-  - 1
-  version: 0.6.3.1
 platform: ruby
-authors: 
+authors:
 - Bryan Powell
 - Bret Young
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-13 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pakyow-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70363184265360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 113
-        segments: 
-        - 0
-        - 6
-        - 3
-        - 1
-        version: 0.6.3.1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70363184265360
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70363184264680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70363184264680
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70363184263960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: *70363184263960
 description: pakyow-presenter
 email: bryan@metabahn.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - pakyow-presenter/CHANGES
 - pakyow-presenter/README
 - pakyow-presenter/MIT-LICENSE
@@ -76,41 +66,29 @@ files:
 - pakyow-presenter/lib/presenter/view_context.rb
 - pakyow-presenter/lib/presenter/view_lookup_store.rb
 - pakyow-presenter/lib/presenter/views.rb
-has_rdoc: true
 homepage: http://pakyow.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - pakyow-presenter/lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pakyow-presenter
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: pakyow-presenter
 test_files: []
-
+has_rdoc: