pakyow-presenter 0.8.rc4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf40bbef34bd10129e0986f8009446fe4c9c427a
-  data.tar.gz: afa46cf16a50b2277a1e901d8e021ed8ef7865ce
+  metadata.gz: 833e0e238ad912016ef2aa6b0a0745754a6507b3
+  data.tar.gz: d73f4a20f79596cb69f34d11a43ef9c1ebd2eac9
 SHA512:
-  metadata.gz: 044a33ab081707cd3ac31e43185a7f1f7cfb742f25fd74862fe8b8ce31a4f5fed1749eed120ffac43fd962c0350ff62efe80410e20325c853ec5873a2a5121fb
-  data.tar.gz: 457ca686a0b5ed1cb98aaaf6cd10406143a42eb6fb12996e32d9fe2301297e2817c267bd8de7d9015978880474560dbdcc49c23899a2830be20038fe94a26575
+  metadata.gz: bab66d8a3f87d2c57b67e2cc4670d401b229c1c1fff8b2e1e0c87a286170d5d722893ab2d90d77bd2a3e96eb405d076fcfeaf0b8d9b6d4db3115ce780bafc04b
+  data.tar.gz: 5fa4f5ee5cebed37990c3299e91652c7f23a763b726106309449e4104d14bc75dbd351bc4cdc63148f343418b7445b4c7a847bbd4ecb1333e987224d15e083bd

data/pakyow-presenter/CHANGES

@@ -1,3 +1,7 @@
+= 0.8.0 / 2014-03-02
+
+  * Major rewrite, including new view syntax, composer, and transformation api
+
 = 0.7.2 / 2012-02-29
 
   * No changes -- bumped version to be consistent

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

@@ -35,6 +35,20 @@ module Pakyow
         update_value
       end
 
+      # opposite of `ensure`
+      def deny(value)
+        case @type
+        when :mult
+          @value.delete(value.to_s)
+        when :bool
+          @value = !value
+        else
+          @value.gsub!(value.to_s, '')
+        end
+
+        update_value
+      end
+
       # passes method call to `value`
       def method_missing(method, *args)
         ret = @value.send(method, *args)
@@ -103,18 +117,24 @@ module Pakyow
     end
 
     class Attributes
-      def initialize(doc)
+      def initialize(doc, composer = nil)
         @doc = doc
         @attributes = {}
+        @composer = composer
       end
 
       def method_missing(method, *args)
-        attribute = method.to_s
+        method_str = method.to_s
 
-        if method.to_s.include?('=')
-          attribute = attribute.gsub('=', '')
+        if method_str[0..1] == '[]'
+          attribute = args[0]
+          value = args[1]
+        else
+          attribute = method_str.gsub('=', '')
           value = args[0]
+        end
 
+        if method_str.include?('=')
           self.set_attribute(attribute, value)
         else
           self.get_attribute(attribute)
@@ -139,12 +159,14 @@ module Pakyow
 
       def remove_attribute(attribute)
         @doc.remove_attribute(attribute)
+        @composer.dirty! unless @composer.nil?
       end
 
       protected
 
       def set_attribute(attribute, value)
         get_attribute(attribute).set(value)
+        @composer.dirty! unless @composer.nil?
       end
 
       def get_attribute(attribute)
@@ -168,9 +190,11 @@ module Pakyow
       end
 
       def method_missing(method, *args)
-        ret = []
-        @attributes.each{|a| ret << a.send(method, *args)}
-        ret
+        @attributes.inject(AttributesCollection.new) { |coll, a| coll<< a.send(method, *args) }
+      end
+
+      def to_s
+        @attributes.inject([]) { |arr, a| arr << a.to_s }
       end
 
       def class(*args)

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

@@ -1,15 +1,18 @@
 require 'yaml'
 require 'presenter/view_store'
 require 'presenter/doc_helpers'
+require 'presenter/title_helpers'
 require 'presenter/view'
 require 'presenter/template'
 require 'presenter/page'
+require 'presenter/container'
 require 'presenter/partial'
 require 'presenter/view_collection'
 require 'presenter/binder'
 require 'presenter/binder_set'
 require 'presenter/attributes'
 require 'presenter/exceptions'
+require 'presenter/view_composer'
 
 module Pakyow
   module Presenter

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

@@ -25,7 +25,8 @@ module Pakyow
         @sets[name].instance_exec(&block)
       end
 
-      def value_for_prop(prop, scope, bindable, bindings = {})
+      def value_for_prop(prop, scope, bindable, bindings = {}, context)
+        @context = context
         binding = nil
         @sets.each {|set|
           binding = set[1].match_for_prop(prop, scope, bindable, bindings)
@@ -33,12 +34,15 @@ module Pakyow
         }
 
         if binding
+          binding_eval = BindingEval.new(prop, bindable, context)
+
           case binding.arity
-            when 0
-              binding_eval = BindingEval.new(bindable)
-              binding_eval.instance_exec(&binding)
-            when 1
-              self.instance_exec(bindable, &binding)
+          when 0
+            binding_eval.instance_exec(&binding)
+          when 1
+            self.instance_exec(bindable, &binding)
+          when 2
+            self.instance_exec(bindable, binding_eval.value, &binding)
           end
         else
           # default

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

@@ -20,9 +20,9 @@ module Pakyow
         return bindings_for_scope(scope, bindings)[prop]
       end
 
-      def options_for_prop(prop, scope, bindable)
+      def options_for_prop(prop, scope, bindable, context)
         if block = (@options[scope] || {})[prop]
-          binding_eval = BindingEval.new(bindable)
+          binding_eval = BindingEval.new(bindable, prop, context)
           binding_eval.instance_exec(&block)
         end
       end
@@ -65,10 +65,10 @@ module Pakyow
 
           if id = bindable[:id]
             return_data[:view] = lambda { |view|
-              view.prepend(View.from_doc(Nokogiri::HTML.fragment('<input type="hidden" name="_method" value="put">')))
+              view.prepend(View.from_doc(Nokogiri::HTML.fragment('<input type="hidden" name="_method" value="patch">')))
             }
 
-            action = routes.path(:update, :id => id)
+            action = routes.path(:update, :"#{route_group}_id" => id)
           else
             action = routes.path(:create)
           end
@@ -85,10 +85,17 @@ module Pakyow
     class BindingEval
       include Helpers
 
+      attr_accessor :context
       attr_reader :bindable
 
-      def initialize(bindable)
+      def initialize(prop, bindable, context)
+        @prop = prop
         @bindable = bindable
+        @context = context
+      end
+
+      def value
+        bindable[@prop]
       end
     end
   end

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

@@ -0,0 +1,6 @@
+module Pakyow
+  module Presenter
+    class Container < View
+    end
+  end
+end

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

@@ -57,6 +57,9 @@ module Pakyow
         view = View.from_doc(doc_from_path(path))
         view.related_views << self
 
+        # workaround for nokogiri in jruby (see https://github.com/sparklemotion/nokogiri/issues/1060)
+        view.doc.document.errors = []
+
         return view
       end
 
@@ -65,6 +68,10 @@ module Pakyow
       end
 
       alias :to_s :to_html
+
+      def ==(o)
+        self.class == o.class && self.to_html == o.to_html
+      end
     end
   end
 end

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

@@ -3,5 +3,9 @@ module Pakyow
     class MissingTemplatesDir < Error; end
     class MissingView < Error; end
     class MissingTemplate < Error; end
+    class MissingPage < Error; end
+    class MissingPartial < Error; end
+    class MissingComposer < Error; end
+    class MissingContainer < Error; end
   end
 end

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

@@ -1,5 +1,11 @@
 module Pakyow
   module AppHelpers
+    extend Forwardable
+
+    def_delegators :@presenter, :store, :store=, :content, :view, :view=, 
+    :partial, :template, :template=, :page, :page=, :path, :path=, :compose,
+    :composer, :container
+
     def presenter
       @presenter
     end
@@ -7,9 +13,5 @@ module Pakyow
     def bindings(name)
       presenter.bindings(name).bindings
     end
-
-    def view
-      presenter.view
-    end
   end
 end

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

@@ -5,7 +5,7 @@ module Pakyow
 
       class << self
         def load(path)
-          format   = StringUtils.split_at_last_dot(path)[-1]
+          format   = Utils::String.split_at_last_dot(path)[-1]
           name     = File.basename(path, '.*').to_sym
           contents = FileTest.file?(path) ? File.read(path) : nil
 
@@ -13,65 +13,66 @@ module Pakyow
         end
       end
 
-      attr_reader :contents, :path
+      attr_reader :path, :contents
+      attr_accessor :composer
 
       def initialize(name, contents, path, format = :html)
         @name, @contents, @path, @format = name, contents, path, format
 
-        @info    = {}
-        @content = {}
+        @info    = { template: :pakyow }
+        @containers = {}
 
         unless @contents.nil?
           parse_info
           parse_content
         end
-
-        partials
       end
 
       def initialize_copy(original_page)
         super
 
         # copy content
-        @content = {}
-        original_page.content.each_pair do |k, v|
-          @content[k] = v.dup
+        @containers = {}
+        original_page.instance_variable_get(:'@containers').each_pair do |k, v|
+          @containers[k] = v.dup
         end
       end
 
-      def build(partial_map)
-        partials.each do |container, partial_list|
-          partial_list.each do |partial_name|
-            regex = /<!--\s*@include\s*#{partial_name}\s*-->/
-            @content[container].gsub!(regex, partial_map[partial_name].to_s)
+      def content(container = nil)
+        return @contents if container.nil?
 
-            partial_map.delete(partial_name)
-          end
-        end
+        container = @containers.fetch(container.to_sym) {
+          raise MissingContainer, "No container named #{container} in #{@path}"
+        }
 
-        # we have more partials
-        if partial_map.count > 0
-          # initiate another build if content contains partials
-          build(partial_map) if partials(true).count > 0
-        end
+        return container.to_html
+      end
 
-        return self
+      def info(key = nil)
+        return @info if key.nil?
+        return @info[key]
       end
 
-      def content(container = nil)
-        return container.nil? ? @content : @content[container.to_sym]
+      def ==(page)
+        @contents == page.contents
       end
 
-      def template
-        @info[:template] || :pakyow
+      def container(name)
+        @containers.fetch(name.to_sym) {
+          raise MissingContainer, "No container named #{name} in #{@path}"
+        }
       end
 
-      def ==(page)
-        @contents == page.contents
+      def each_container
+        @containers.each_pair { |name, container| yield(name, container) }
       end
 
-      def partials(refind = false)
-        @partials = (!@partials || refind) ? find_partials : @partials
+      def composer=(composer)
+        @composer = composer
+
+        @containers.each do |name, container|
+          container.composer = composer
+        end
       end
 
       private
@@ -80,7 +81,7 @@ module Pakyow
         info = parse_front_matter(@contents)
         info = {} if !info || !info.is_a?(Hash)
 
-        @info = HashUtils.symbolize(info)
+        @info.merge!(Utils::Hash.symbolize(info))
       end
 
       def parse_content
@@ -94,32 +95,24 @@ module Pakyow
         within_regex = /<!--\s*@within\s*([a-zA-Z0-9\-_]*)\s*-->(.*?)<!--\s*\/within\s*-->/m
 
         @contents.scan(within_regex) do |m|
-          container = m[0].to_sym
-          @content[container] = m[1]
+          container_name = m[0].to_sym
+          @containers[container_name] = Container.new(m[1], @format)
         end
 
         # find default content
-        @content[:default] = @contents.gsub(within_regex, '')
+        @containers[:default] = Container.new(@contents.gsub(within_regex, ''), @format)
       end
 
-      # returns an array of hashes, each with the partial name and doc
-      def find_partials
-        partials = {}
-
-        partial_regex = /<!--\s*@include\s*([a-zA-Z0-9\-_]*)\s*-->/
-        @content.each do |name, content|
-          content.scan(partial_regex) do |m|
-            partials[name] ||= []
-            partials[name] << m[0].to_sym
-          end
-        end
+      def parse_front_matter(contents)
+        # match the matter
+        matter = contents.match(MATTER_MATCHER).to_s
 
-        return partials
-      end
+        # remove the opening/closing '---'
+        matter = matter.split("\n")[1..-2]
+        # return if no matter
+        return {} if matter.nil?
 
-      def parse_front_matter(contents)
-        matter = YAML.load(contents.match(MATTER_MATCHER).to_s)
-        return matter
+        YAML.load(matter.join("\n"))
       end
     end
   end

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

@@ -1,24 +1,6 @@
 module Pakyow
   module Presenter
-    class Partial
-      include DocHelpers
-
-      class << self
-        def load(path)
-          format    = StringUtils.split_at_last_dot(path)[-1]
-          contents  = File.read(path)
-          name      = File.basename(path, '.*')[1..-1].to_sym
-
-          return self.new(name, contents, format)
-        end
-      end
-
-      def initialize(name, contents, format = :html)
-        @name = name
-
-        processed = Presenter.process(contents, format)
-        @doc = Nokogiri::HTML.fragment(processed)
-      end
+    class Partial < View
     end
   end
 end

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

@@ -28,13 +28,13 @@ module Pakyow
 
       Pakyow::App.after(:match) {
         @presenter = Pakyow.app.presenter.dup
-        @presenter.prepare_for_request(@request)
+        @presenter.prepare_with_context(context)
       }
 
       Pakyow::App.after(:route) {
         if @presenter.presented?
           @found = true
-          @response.body = [@presenter.content]
+          @context.response.body = [@presenter.content]
         else
           @found = false unless found?
         end
@@ -46,22 +46,16 @@ module Pakyow
 
       Pakyow::App.after(:error) {
         unless config.app.errors_in_browser
-          @response.body = [@presenter.content] if @presenter.presented?
+          @context.response.body = [@presenter.content] if @presenter.presented?
         end
       }
 
-      attr_accessor :processor_store, :binder, :path, :template, :page
+      attr_accessor :processor_store, :binder, :path, :context, :composer
 
       def initialize
         setup
       end
 
-      def setup
-        @view, @template, @page = nil
-        @constructed = false
-        self.store   = :default
-      end
-
       def store(name = nil)
         if name
           @view_stores[name]
@@ -73,8 +67,8 @@ module Pakyow
       def store=(name)
         @store = name
 
-        return unless @path
-        setup_for_path
+        return unless has_path?
+        setup_for_path(@path)
       end
 
       def load
@@ -83,85 +77,107 @@ module Pakyow
         load_bindings
       end
 
-      def prepare_for_request(request)        
-        @request = request
+      def prepare_with_context(context)
+        @context = context
 
-        if @request.has_route_vars?
-          @path = StringUtils.remove_route_vars(@request.route_path)
+        if @context.request.has_route_vars?
+          @path = Utils::String.remove_route_vars(@context.request.route_path)
         else
-          @path = @request.path
+          @path = @context.request.path
         end
 
         setup
       end
 
       def presented?
-        ensure_construction
-        @constructed
+        !view.nil?
+      rescue MissingView
+        false
       end
 
       def content
-        return unless view
-        view.to_html
+        to_present = view
+        view.is_a?(ViewComposer) ? view.composed.to_html : view.to_html
       end
 
       def view
-        ensure_construction
-        @view
-      end
+        view = @composer || @view
+        raise MissingView if view.nil?
 
-      def partial(name)
-        store.partial(@path, name)
+        view.context = @context
+
+        return view
       end
 
       def view=(view)
         @view = view
-        @constructed = true
+        @view.context = @context
+
+        # setting a view means we no longer use/need the composer
+        @composer = nil
       end
 
       def template=(template)
-        unless template.is_a?(Template)
-          # get template by name
-          template = store.template(template)
-        end
+        raise MissingComposer 'Cannot set template without a composer' if @composer.nil?
+        @composer.template = template
+      end
 
-        @template = template
-        @constructed = false
+      def template
+        raise MissingComposer 'Cannot get template without a composer' if @composer.nil?
+        @composer.template
       end
 
       def page=(page)
-        @page = page
-        @constructed = false
+        raise MissingComposer, 'Cannot set page without a composer' if @composer.nil?
+        @composer.page = page
+      end
+
+      def page
+        raise MissingComposer 'Cannot get page without a composer' if @composer.nil?
+        @composer.page
+      end
+
+      def container(name)
+        raise MissingComposer 'Cannot get container without a composer' if @composer.nil?
+        @composer.container(name)
+      end
+
+      def partial(name)
+        raise MissingComposer 'Cannot get partial without a composer' if @composer.nil?
+        @composer.partial(name)
       end
 
       def path=(path)
-        @path = path
-        setup_for_path(true)
+        setup_for_path(path, true)
       end
 
-      def ensure_construction
-        # only construct once
-        return if @constructed
+      def compose(opts = {}, &block)
+        compose_at(@path, opts, &block)
+      end
 
-        # if no template/page was found, we can't construct
-        return if @template.nil? || @page.nil?
+      def compose_at(path, opts = {}, &block)
+        composer = ViewComposer.from_path(store, path, opts, &block)
+        return composer unless opts.empty? || block_given?
 
-        # construct
-        @view = @template.dup.build(@page)
-        @constructed = true
+        @composer = composer
+      end
+
+      def has_path?
+        !@path.nil?
       end
 
       protected
 
-      def setup_for_path(explicit = false)
-        self.template = store.template(@path)
-        self.page     = store.page(@path)
-        self.view     = store.view(@path)
+      def setup
+        @view, @composer = nil
+        self.store = :default
+      end
 
-        @constructed = true
+      def setup_for_path(path, explicit = false)
+        @composer = store.composer(path)
+        @path = path
       rescue MissingView => e # catches no view path error
         explicit ? raise(e) : Pakyow.logger.debug(e.message)
-        @constructed = false
       end
 
       def load_views