pakyow-presenter 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 901a17c34b45df79bb990ed3253e7bda1000859b
-  data.tar.gz: 28581cf21dae5f2b3b6a44e253b09843628f101e
+  metadata.gz: f22ae8bbc000b21b49861cdd2319f2aed3ee137f
+  data.tar.gz: 1f565dcb4c706fd63d5082d841dc1c849461b7b1
 SHA512:
-  metadata.gz: 7c6b0c8bff73444ff667022d860c343bf06f7f50add710dd212cd5f66eceae71209ca555358f6a89bc4d9f998397ca832dae80c66868d61db6926a6f760b5aa4
-  data.tar.gz: 098f651f7932f30151d173c432901e0475af25de286c32e8e739872245a783d18c769a548dc64012b4087cea644bd2b373ce54946c66d60e4c58daa252266bdb
+  metadata.gz: 4a24146da5ccf0c9b59e7053556f81bb11537983c0ec0b9d18ed46ec72b88756e9464621fcbf32462a40de5f850849574d60f65945930b76a8cd8c87ca58701e
+  data.tar.gz: 0012d2741b5d85896d5532db529a8876574a3d5b4ae0ad05265f3f94dd47223609ee61c3153e3372c8367cb2ae96f3cfeb172824b50fc2a54df6e2f457b391c7

data/pakyow-presenter/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.11.0
+
+  * Fixes several bugs related to nested partials
+  * Reprocesses view contents with html processor
+  * Fixes a bug causing partials not to be duped
+  * Automatically defines bindings as restful
+  * Introduces binding parts
+  * Fixes a bug removing a node from StringDoc
+  * Renames `app.all_views_visible` config option to `presenter.require_route`
+  * Fixes some bugs caused by not properly duping view objects
+  * Replaces Nokogiri with Oga
+  * Moves everything into the Pakyow namespace
+  * Adds support for versioned props
+  * Prioritize root view paths over child paths
+  * ViewVersion state is now properly updated when matching
+
 # 0.10.0 / 2015-10-19
 
   * Adds precomposition to composer

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

@@ -1,11 +1 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
-# Gems
-require 'nokogiri'
-
-require 'presenter/base'
-require 'presenter/presenter'
-require 'presenter/config/presenter'
-require 'presenter/helpers'
-require 'presenter/ext/app'
+require 'pakyow/presenter'

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

@@ -0,0 +1,8 @@
+require 'oga'
+
+require 'pakyow/presenter/base'
+require 'pakyow/presenter/presenter'
+require 'pakyow/presenter/config/presenter'
+require 'pakyow/presenter/helpers'
+require 'pakyow/presenter/ext/app'
+require 'pakyow/presenter/ext/call_context'

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/attributes.rb

@@ -1,12 +1,6 @@
 module Pakyow
   module Presenter
     class Attribute
-      @@types = {
-        :hash => [:style],
-        :bool => [:selected, :checked, :disabled, :readonly, :multiple],
-        :mult => [:class]
-      }
-
       def initialize(name, raw_value, control, doc)
         @type = type_of_attribute(name)
         @name = name
@@ -77,6 +71,14 @@ module Pakyow
         self.class.ancestors
       end
 
+      def types
+        @types ||= {
+          :hash => [:style],
+          :bool => [:selected, :checked, :disabled, :readonly, :multiple],
+          :mult => [:class]
+        }
+      end
+
       private
 
       def update_value
@@ -92,9 +94,9 @@ module Pakyow
       def type_of_attribute(attribute)
         attribute = attribute.to_sym
 
-        return :bool  if @@types[:bool].include?(attribute)
-        return :mult if @@types[:mult].include?(attribute)
-        return :hash     if @@types[:hash].include?(attribute)
+        return :bool if types[:bool].include?(attribute)
+        return :mult if types[:mult].include?(attribute)
+        return :hash if types[:hash].include?(attribute)
         return :single
       end
 
@@ -155,6 +157,10 @@ module Pakyow
         method_missing(:id, *args)
       end
 
+      def method(*args)
+        method_missing(:method, *args)
+      end
+
       def update_value_for_attribute(attribute, value)
         @doc.update_attribute(attribute, value)
       end
@@ -163,6 +169,10 @@ module Pakyow
         @doc.remove_attribute(attribute)
       end
 
+      def include?(attribute)
+        @doc.has_attribute?(attribute)
+      end
+
       protected
 
       def set_attribute(attribute, value)
@@ -170,11 +180,8 @@ module Pakyow
       end
 
       def get_attribute(attribute)
-        unless a = @attributes[attribute]
-          a = Attribute.new(attribute, @doc.get_attribute(attribute), self, @doc)
-        end
-
-        return a
+        @attributes[attribute] ||
+          Attribute.new(attribute, @doc.get_attribute(attribute), self, @doc)
       end
     end
 

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

@@ -0,0 +1,38 @@
+require 'yaml'
+
+require 'pakyow/presenter/view_store'
+require 'pakyow/presenter/view'
+require 'pakyow/presenter/template'
+require 'pakyow/presenter/page'
+require 'pakyow/presenter/container'
+require 'pakyow/presenter/partial'
+require 'pakyow/presenter/view_collection'
+require 'pakyow/presenter/binder'
+require 'pakyow/presenter/binder_set'
+require 'pakyow/presenter/attributes'
+require 'pakyow/presenter/exceptions'
+require 'pakyow/presenter/view_composer'
+require 'pakyow/presenter/string_doc'
+require 'pakyow/presenter/string_doc_parser'
+require 'pakyow/presenter/string_doc_renderer'
+require 'pakyow/presenter/binding_eval'
+require 'pakyow/presenter/doc_helpers'
+require 'pakyow/presenter/view_version'
+require 'pakyow/presenter/view_context'
+require 'pakyow/presenter/view_store_loader'
+
+module Pakyow
+  module Presenter
+    Pakyow::App.after :load do
+      routes :__presenter do
+        handler 404 do
+          presenter_handle_error(404)
+        end
+
+        handler 500 do
+          presenter_handle_error(500)
+        end
+      end
+    end
+  end
+end

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/binder.rb

@@ -59,16 +59,29 @@ module Pakyow
 
         if binding_fn
           binding_eval = BindingEval.new(prop, bindable, context)
-          binding_eval.instance_exec(binding_eval.value, bindable, context, &binding_fn)
-        else # default value
-          if bindable.is_a?(Hash)
-            bindable.fetch(prop) { bindable[prop.to_s] }
-          elsif bindable.class.method_defined?(prop)
-            bindable.send(prop)
+          result = binding_eval.eval(&binding_fn)
+
+          if result.nil?
+            value = value_from_data(prop, bindable)
+
+            fn = bindings[prop]
+            result = fn.call(value, bindable, context) if fn
           end
+          result
+        else # default value
+          value_from_data(prop, bindable)
         end
       end
 
+      def value_from_data(prop, bindable)
+        if bindable.is_a?(Hash)
+          bindable.fetch(prop) { bindable[prop.to_s] }
+        elsif bindable.class.method_defined?(prop)
+          bindable.send(prop)
+        end
+      end
+
+
       # Returns true if a binding is defined for the scope->prop.
       #
       def has_scoped_prop?(scope, prop, bindings)

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/binder_set.rb

@@ -68,28 +68,25 @@ module Pakyow
 
       def restful(route_group)
         binding :_root do
-          routes = Router.instance.group(route_group)
-
-          {
-            view: lambda { |view|
-              action = view.attrs.action.value
-              return if (action && !action.empty?)
-
-              route_params = params.dup
-              if view.doc.tagname == 'form'
-                if id = bindable[:id]
-                  view.prepend(View.new('<input type="hidden" name="_method" value="patch">'))
-                  route_params[:"#{route_group}_id"] = id
-                  action = :update
-                else
-                  action = :create
-                end
-
-                view.attrs.action = routes.path(action, route_params)
-                view.attrs.method = 'post'
+          part :view do |view|
+            routes = Router.instance.group(route_group)
+            action = view.attrs.action.value
+            next if (action && !action.empty?)
+
+            route_params = params.dup
+            if view.doc.tagname == 'form'
+              if id = bindable[:id]
+                view.prepend(View.new('<input type="hidden" name="_method" value="patch">'))
+                route_params[:"#{route_group}_id"] = id
+                action = :update
+              else
+                action = :create
               end
-            }
-          }
+
+              view.attrs.action = routes.path(action, route_params)
+              view.attrs.method = 'post'
+            end
+          end
         end
       end
     end

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/binding_eval.rb

@@ -6,6 +6,7 @@ module Pakyow
       attr_reader :context, :bindable
 
       def initialize(prop, bindable, context)
+        @parts = {}
         @prop = prop
         @bindable = bindable
         @context = context
@@ -18,6 +19,19 @@ module Pakyow
           bindable.send(@prop)
         end
       end
+
+      def eval(&block)
+        ret = instance_exec(value, bindable, context, &block)
+        if ret.respond_to?(:to_hash)
+          @parts.merge!(ret.to_hash)
+        end
+        @parts.empty? ? ret : @parts
+      end
+
+      def part(name, &block)
+        @parts[name.to_sym] = block
+        nil # Return nil so #part return value is ignored
+      end
     end
   end
 end

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/config/presenter.rb

@@ -1,7 +1,6 @@
-Pakyow::Config.register(:presenter) { |config|
-
+Pakyow::Config.register :presenter do |config|
   # registered view stores
-  config.opt :view_stores, lambda {
+  config.opt :view_stores, -> {
     @stores ||= {
       default: File.join(Pakyow::Config.app.root, 'app', 'views')
     }
@@ -11,7 +10,7 @@ Pakyow::Config.register(:presenter) { |config|
   config.opt :default_views, { default: :default }
 
   # a convenience option to lookup the default_view for a view store by name
-  config.opt :default_view, lambda { |store_name|
+  config.opt :default_view, -> (store_name) {
     views = Pakyow::Config.presenter.default_views
     views.fetch(store_name) { views[:default] }
   }
@@ -20,7 +19,7 @@ Pakyow::Config.register(:presenter) { |config|
   config.opt :template_dirs, { default: '_templates' }
 
   # a convenience option to lookup the template_dir for a view store by name
-  config.opt :template_dir, lambda { |store_name|
+  config.opt :template_dir, -> (store_name) {
     dirs = Pakyow::Config.presenter.template_dirs
     dirs.fetch(store_name) { dirs[:default] }
   }
@@ -31,6 +30,13 @@ Pakyow::Config.register(:presenter) { |config|
   # the attribute expected for prop definitions
   config.opt :prop_attribute, 'data-prop'
 
+  # if true, views are visible without a route defined
+  config.opt :require_route, true
+
   # the document class used to parse and render views
   config.opt :view_doc_class, Pakyow::Presenter::StringDoc
-}
+end.env :development do |opts|
+  opts.require_route = false
+end.env :production do |opts|
+  opts.require_route = true
+end

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

@@ -0,0 +1,33 @@
+module Pakyow
+  class App
+    class << self
+      RESOURCE_ACTIONS[:presenter] = Proc.new { |app, set_name, _, _|
+        app.bindings { scope(set_name) { restful(set_name) } }
+      }
+
+      def bindings(set_name = :main, &block)
+        if set_name && block
+          bindings[set_name] = block
+        else
+          @bindings ||= {}
+        end
+      end
+
+      def processor(*args, &block)
+        args.each {|format|
+          processors[format] = block
+        }
+      end
+
+      def processors
+        @processors ||= {}
+      end
+    end
+
+    # Convenience method for defining bindings on an app instance.
+    #
+    def bindings(set_name = :main, &block)
+      self.class.bindings(set_name, &block)
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'erb'
+
+module Pakyow
+  class CallContext
+    protected
+
+    def presenter_handle_error(code)
+      return if !config.app.errors_in_browser || req.format != :html
+      response.body = [content_for_code(code)]
+    end
+
+    def content_for_code(code)
+      content = ERB.new(File.read(path_for_code(code))).result(binding)
+      page = Presenter::Page.new(:presenter, content, '/')
+      composer = presenter.compose_at('/', page: page)
+      composer.to_html
+    end
+
+    def path_for_code(code)
+      File.join(
+        File.expand_path('../../../', __FILE__),
+        'views',
+        'errors',
+        code.to_s + '.erb'
+      )
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'forwardable'
+
+module Pakyow
+  module Helpers
+    module Context
+      extend Forwardable
+
+      def_delegators :@presenter, :store, :store=, :content, :view=,
+      :template=, :page=, :path, :path=, :compose, :composer, :precompose!
+
+      def view
+        Presenter::ViewContext.new(presenter.view, self)
+      end
+
+      def partial(*args)
+        Presenter::ViewContext.new(presenter.partial(*args), self)
+      end
+
+      def template
+        Presenter::ViewContext.new(presenter.template, self)
+      end
+
+      def page
+        Presenter::ViewContext.new(presenter.page, self)
+      end
+
+      def container(*args)
+        Presenter::ViewContext.new(presenter.container(*args), self)
+      end
+
+      def bindings(name)
+        presenter.bindings(name).bindings
+      end
+
+      def presenter
+        @presenter
+      end
+    end
+
+    module App
+      def presenter
+        @presenter
+      end
+    end
+  end
+end