pakyow-presenter 0.7.2 → 0.8rc1

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

@@ -0,0 +1,92 @@
+module Pakyow
+  module Presenter
+    class Attributes
+      @@types = {
+        :boolean  => [:selected, :checked, :disabled, :readonly, :multiple],
+        :multiple => [:class]
+      }
+
+      def initialize(view)
+        @view = view
+      end
+
+      def method_missing(method, *args)
+        attribute = method.to_s
+
+        if method.to_s.include?('=')
+          attribute = attribute.gsub('=', '')
+          value = args[0]
+
+          self.set_attribute(attribute, value)
+        else
+          self.get_attribute(attribute)
+        end
+      end
+
+      def class(*args)
+        method_missing(:class, *args)
+      end
+      
+      def id(*args)
+        method_missing(:id, *args)
+      end
+
+      protected
+
+      def set_attribute(attribute, value)
+        type = self.type_of_attribute(attribute)
+
+        value = value.call(self.deconstruct_attribute_value_of_type(@view.doc[attribute], type)) if value.is_a? Proc
+        value = construct_attribute_value_of_type(value, type, attribute)
+        
+        if value.nil?
+          @view.doc.remove_attribute(attribute)
+        else
+          @view.doc[attribute] = value
+        end
+      end
+
+      def get_attribute(attribute)
+        self.deconstruct_attribute_value_of_type(@view.doc[attribute], self.type_of_attribute(attribute))
+      end
+
+      def type_of_attribute(attribute)
+        attribute = attribute.to_sym
+
+        return :boolean  if @@types[:boolean].include?(attribute)
+        return :multiple if @@types[:multiple].include?(attribute)
+        return :single
+      end
+
+      def deconstruct_attribute_value_of_type(value, type)
+        return value                          if type == :single
+        return value ? value.split(' ') : []  if type == :multiple
+        return !value.nil?                    if type == :boolean
+      end
+
+      def construct_attribute_value_of_type(value, type, attribute)
+        return value if type == :single
+        return value.join(' ') if type == :multiple
+
+        # pp value
+        return value ? attribute : nil if type == :boolean
+      end
+    end
+
+    class AttributesCollection
+      include Enumerable
+
+      def initialize
+        @attributes = []
+      end
+
+      def <<(attributes)
+        @attributes << attributes
+      end
+
+      def method_missing(method, *args)
+        @attributes.each{|a| a.send(method, *args)}
+      end
+    end
+  end
+end

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

@@ -1,9 +1,11 @@
 require 'presenter/view_lookup_store'
 require 'presenter/view'
 require 'presenter/lazy_view'
+require 'presenter/view_collection'
 require 'presenter/binder'
-require 'presenter/views'
 require 'presenter/view_context'
+require 'presenter/attributes'
+require 'presenter/bindings'
 
 module Pakyow
   module Presenter

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

@@ -17,11 +17,14 @@ module Pakyow
         end
       end
       
-      attr_accessor :bindable, :object
+      attr_accessor :bindable
       
-      def initialize(bindable, object)
+      def initialize(bindable)
         self.bindable = bindable
-        self.object = object
+      end
+
+      def value_for_prop(prop)
+        self.class.method_defined?(prop) ? self.send(prop) : bindable[prop]
       end
       
       def fetch_options_for(attribute)
@@ -35,26 +38,6 @@ module Pakyow
           end
         end
       end
-      
-      def action
-        unless routes = Pakyow.app.restful_routes[bindable.class.name.to_sym]
-          Log.warn "Attempting to bind object to #{bindable.class.name.downcase}[action] but could not find restful routes for #{bindable.class.name}."
-          return {}
-        end
-        
-        if id = bindable.id
-          self.object.add_child('<input type="hidden" name="_method" value="put">')
-          
-
-          action = routes[:update].gsub(':id', id.to_s)
-          method = "post"
-        else
-          action = routes[:create]
-          method = "post"
-        end
-        
-        return { :action => File.join('/', action), :method => method }
-      end
     end
   end
 end

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

@@ -0,0 +1,103 @@
+module Pakyow
+  module Presenter
+    class Bindings
+      attr_accessor :bindable
+      attr_reader :bindings, :binding_options, :mapping
+
+      include GeneralHelpers
+
+      def fn(name, &block)
+        @funcs[name] = block and return if block
+        @funcs[name]
+      end
+
+      def self.for(block)
+        Bindings.new(block)
+      end
+
+      def initialize(block = nil)
+        @funcs = {}
+        @bindings = {}
+        @binding_options = {}
+        self.instance_exec(&block) if block
+      end
+
+      def binding(name, func = nil, &block)
+        @bindings[name] = func || block
+      end
+
+      def options(name, func = nil, &block)
+        @binding_options[name] = func || block
+      end
+
+      def options_for_prop(prop)
+        if fn = @binding_options[prop]
+          fn.call
+        end
+      end
+
+      def value_for_prop(prop)
+        # mapping always overrides fns for a scope
+        if @mapping
+          @binder ||= Kernel.const_get(@mapping).new(@bindable)
+          @binder.value_for_prop(prop)
+        elsif binding = @bindings[prop]
+          case binding.arity
+            when 0
+              self.instance_exec(&binding)
+            when 1
+              self.instance_exec(@bindable[prop], &binding)
+          end
+        else
+          # default
+          @bindable[prop]
+        end
+      end
+
+      # Merges a Bindings instance or Hash of bindings to self
+      def merge(bindings)
+        if bindings.is_a?(Hash)
+          @bindings = @bindings.merge(bindings)
+        elsif bindings
+          @bindings = bindings.bindings.merge(@bindings)
+          @mapping = bindings.mapping if bindings.mapping
+          @binding_options = bindings.binding_options if bindings.binding_options && !bindings.binding_options.empty?
+        end
+        
+        self
+      end
+
+      def map(klass)
+        #TODO make sure klass is subclass of Binder
+        @mapping = klass
+        self
+
+        # klass must be a subclass of Binder
+        # sets flag on self to indicate it's a mapping
+        # value_for_prop checks flag, if set call Binder (just like 0.7)
+      end
+
+      def restful(route_group)
+        self.binding(:action) {
+          routes = router.group(route_group)
+          return_data = {}
+
+          if id = bindable[:id]
+            return_data[:content] = lambda { |content|
+              '<input type="hidden" name="_method" value="put">' + content
+            }
+
+            action = routes.populate(:update, :id => id)
+          else
+            action = routes.populate(:create)
+          end
+
+          return_data[:action] = action
+          return_data[:method] = 'post' 
+          return_data
+        }
+      end
+    end
+  end
+end
+

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

@@ -2,7 +2,8 @@ module Pakyow
   module Configuration
     class Presenter
       class << self
-        attr_accessor :view_caching, :javascripts, :stylesheets, :view_dir, :default_view
+        attr_accessor :view_caching, :javascripts, :stylesheets, :view_stores, :default_view,
+        :scope_attribute, :prop_attribute, :container_attribute
         
         # Location of javascripts
         def javascripts
@@ -14,8 +15,8 @@ module Pakyow
           @stylesheets || '/stylesheets'
         end
 
-        def view_dir
-          @view_dir || "#{Configuration::Base.app.root}/app/views"
+        def view_stores
+          @view_stores ||= {:default => "#{Configuration::Base.app.root}/views"}
         end
         
         def view_caching
@@ -26,6 +27,18 @@ module Pakyow
           @default_view || "pakyow.html"
         end
 
+        def scope_attribute
+          @scope_attribute || "data-scope"
+        end
+
+        def prop_attribute
+          @prop_attribute || "data-prop"
+        end
+
+        def container_attribute
+          @container_attribute || "data-container"
+        end
+
       end
     end
   end

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

@@ -4,5 +4,13 @@ module Pakyow
       Pakyow.app.presenter.current_context = self
       Pakyow.app.presenter
     end
+
+    def bindings(name)
+      presenter.bindings(name).bindings
+    end
+    
+    def view
+      self.presenter.view
+    end
   end
 end

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

@@ -1,10 +1,37 @@
 module Pakyow
   module Presenter
     class Presenter < PresenterBase
-      attr_accessor :current_context
+      class << self
+        attr_accessor :proc
+      end
+
+      attr_accessor :current_context, :parser_store, :view_store
 
       def initialize
-        reset_state()
+        reset_state
+        reset_bindings
+      end
+
+      def scope(name, set = :default, &block)
+        @bindings[set] ||= {}
+
+        bs = Bindings.for(block)
+        @bindings[set][name] = bs
+        bs
+      end
+
+      def bindings(scope)
+        #TODO think about merging on launch instead
+        @bindings.inject(Bindings.new) { |bs, b| bs.merge(b[1][scope]) }
+      end
+
+      def reset_bindings(set = :default)
+        @bindings ||= {}
+        @bindings[set] = {}
+      end
+
+      def current_view_lookup_store
+        @view_stores[self.view_store]
       end
 
       #
@@ -13,20 +40,38 @@ module Pakyow
 
       def load
         load_views
+
+        self.reset_bindings
+        self.instance_eval(&Presenter.proc) if Presenter.proc
       end
 
       def prepare_for_request(request)
         reset_state()
         @request = request
+
+        if @request && @request.route_path && !@request.route_path.is_a?(Regexp) && @request.route_path.index(':')
+          @view_path = StringUtils.remove_route_vars(@request.route_path)
+        else
+          @view_path = @request && @request.working_path
+        end
+        @root_path = self.current_view_lookup_store.root_path(@view_path)
+      end
+      
+      def reset
+        @request = nil
+        reset_state
       end
       
       def presented?
+        #TODO the right thing to do?
+        self.ensure_root_view_built
+        
         @presented
       end
       
       def content
         return unless view
-        request_container = @request.params[:_container]
+        request_container = @request.params[:_container] if @request
         return view.to_html(request_container) if request_container
         view.to_html(@container_name)
       end
@@ -40,7 +85,7 @@ module Pakyow
       #
 
       def view_for_path(abstract_path, is_root_view=false, klass=View)
-        real_path = @view_lookup_store.real_path(abstract_path)
+        real_path = self.current_view_lookup_store.real_path(abstract_path)
         klass.new(real_path, is_root_view)
       end
 
@@ -54,74 +99,48 @@ module Pakyow
         @root_view
       end
 
-      def set_view(view)
-        @root_view = View.new(view)
+      def view=(v)
+        # TODO: Why is it important to dup here?
+        @root_view = View.new(v)
         @root_view_is_built = true
         @presented = true
+
+        # reset paths
         @view_path = nil
         @root_path = nil
       end
 
-      def limit_to_container(id)
-        @container_name = id
+      def root
+        @is_compiled = false
+        @root ||= View.root_at_path(@root_path) 
       end
 
-      def use_view_path(path)
-        @view_path = path
-        @root_view_is_built = false
+      def root=(v)
+        @is_compiled = false
+        @root = v
+      end
+
+      def limit_to_container(id)
+        @container_name = id
       end
 
       def view_path
         @view_path
       end
 
-      def use_root_view_file(abstract_view_file)
-        real_path = @view_lookup_store.real_path(abstract_view_file)
-        @root_path = real_path
-        @root_view_is_built = false
+      def view_path=(path)
+        @is_compiled = false
+        @view_path = path
       end
 
-      def use_root_view_at_view_path(abstract_view_dir)
-        @root_path = @view_lookup_store.view_info(abstract_view_dir)[:root_view]
-        @root_view_is_built = false
-      end
-      
-      # This is for creating views from within a controller using the route based lookup mechanism
-      def view_for_view_path(v_p, name, deep = false)
-        v = nil
-        view_info = @view_lookup_store.view_info(v_p)
-        vpath = view_info[:views][name] if view_info
-        v = View.new(vpath) if vpath
-        if v && deep
-          populate_view(v, view_info[:views])
-        end
-        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
+      def root_path
+        @root_path
       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]
-        populate_view(view, views)
-        view
+      def root_path=(abstract_path)
+        @is_compiled = false
+        @root = nil
+        @root_path = abstract_path
       end
 
       # Call as part of View DSL for DOM manipulation
@@ -145,6 +164,7 @@ module Pakyow
       #
 
       def reset_state
+        @view_store = :default
         @presented = false
         @root_path = nil
         @root_view_is_built = false
@@ -156,18 +176,9 @@ module Pakyow
       def build_root_view
         @root_view_is_built = true
 
-        if @view_path
-          v_p = @view_path
-        elsif @request && @request.restful
-          v_p = restful_view_path(@request.restful)
-        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 && @request.working_path
-        end
-        return unless v_p
+        return unless v_p = @view_path
 
-        return unless view_info = @view_lookup_store.view_info(v_p)
+        return unless view_info = self.current_view_lookup_store.view_info(v_p)
         @root_path ||= view_info[:root_view]
 
         if Configuration::Base.presenter.view_caching
@@ -191,9 +202,13 @@ module Pakyow
       end
 
       def load_views
-        @view_lookup_store = ViewLookupStore.new("#{Configuration::Presenter.view_dir}")
+        @view_stores = {}
+        Configuration::Presenter.view_stores.each_pair {|name, path|
+          @view_stores[name] = ViewLookupStore.new(path)
+        }
+
         if Configuration::Base.presenter.view_caching then
-          @populated_root_view_cache = build_root_view_cache(@view_lookup_store.view_info)
+          @populated_root_view_cache = build_root_view_cache(self.current_view_lookup_store.view_info)
         end
       end
 
@@ -211,19 +226,30 @@ module Pakyow
       # populates the top_view using view_store data by recursively building
       # and substituting in child views named in the structure
       def populate_view(top_view, views)
-        containers = top_view.elements_with_ids
-        containers.each {|e|
-          name = e.attr("id")
-          path = views[name]
-          if path
-            v = populate_view(View.new(path), views)
-            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
+        top_view.containers.each {|e|
+          next unless path = views[e[:name]]
+
+          v = populate_view(View.new(path), views)
+          self.reset_container(e[:doc])
+          self.add_content_to_container(v, e[:doc])
         }
         top_view
       end
 
+      def parser(format, &block)
+        @parser_store ||= {}
+        @parser_store[format.to_sym] = block
+      end
+
+      def add_content_to_container(content, container)
+        content = content.doc unless content.class == String || content.class == Nokogiri::HTML::DocumentFragment || content.class == Nokogiri::XML::Element
+        container.add_child(content)
+      end
+
+      def reset_container(container)
+        container.inner_html = ''
+      end
+
     end
   end
 end