pakyow-presenter 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03aed00a4341ef92f5c05f9e2154a46259c8bc4
-  data.tar.gz: d22155fe2adad963042ba51b15d10ab98572fe20
+  metadata.gz: bf054d209c01b7b382b09b1e1a01730781d8f1df
+  data.tar.gz: ab58a2cfde9f832773b94b15315a84f488768ece
 SHA512:
-  metadata.gz: 0e5e1f65609f24045e2ef75bd45f7bb50e877d1f606a2b54ba17b7ad3096b0c90d3624b7beecde1fd41abff86824992e8c021c089b48c6cb333481c91310143e
-  data.tar.gz: 28c195177d878332fe18f91e46f3786f70bd32459a89d112fcd8d326c76579c27d4356987bbdeec3a17645de389341065df972a1942cddd33377f8ec978eb365
+  metadata.gz: 0780b1e866ae3de214d7166cba28564eb0ddf64a737d6fae768bf0bd9c372597802b174fe75c6885f24994d8bfcbdb2d5d3282608c5c1389056958143d12dc62
+  data.tar.gz: e2ae8354a5e0f68c0052c62a3d194cb1ac5ee557661b9238f8ff9e7319c543bf7484951ca31fca7e3e2d3a71e95fe0834556f5b2f2220d5ccb853a1a927a57e4

data/pakyow-presenter/CHANGELOG.md

@@ -0,0 +1,94 @@
+# 0.10.0 (to be released)
+
+  * Adds precomposition to composer
+  * Fixes binding action for nested resources
+  * Fixes variable name in remap_partials
+  * Setup form on `_root` rather than `action` prop
+  * Handles view paths that don't define an `index` view
+  * Adds `ViewCollection#scoped_as` convenience method
+  * Renames default template to `default` (instead of `pakyow`)
+  * Adds convenience method to check for view existence
+  * Support binding hashes with `String` keys
+  * Fixes a bug when a node is inserted after another node that also has a sibling
+  * Fixes binding to props nested in partial
+  * Now allows views for a view store to be fragmented across multiple directories
+  * Adds versioned scopes with auto empty handling
+  * Now sets scope name explicitly for `ViewCollection` built from a `View`
+  * Adds a helper method for checking if a attribute exists
+  * Adds support for components and channels (realtime ftw)
+  * Adds id of object to scoped node during binding
+  * Fixes a bug with view contexts in presenter helpers
+  * Ported all tests to rspec
+  * Fixes a bug finding scopes in a nested partial
+  * Fixes a bug where unused partials still being included as parts in the composer
+  * Fixes a `StringDoc` bug when structure is empty
+  * Fixes bug preventing passed binding functions from being used when no binding sets are registered for scope
+  * Fixes namespace collisions
+  * Fixes error when matching data empty collection
+  * Renames `inner_html` to `html`
+  * Now only reloads a view store if the contents have changed
+  * Yields `prop` node rather than full `scope` in bindings
+  * Handles `AttributesCollection#<<` for all use cases
+  * Adds `to_html` method on composer
+  * No longer complains about a view store missing a template directory
+  * Now finds view info for a path that doesn't contain a page
+  * Allows root nodes to be appendable in string doc
+  * Removes nokogiri doc
+
+# 0.9.1 / 2014-12-06
+
+  * Fixes bug where name attribute wasn't set on form fields when binding without a value
+  * Fixes bug causing all partials (not just available ones) to be defined as view parts
+  * Fixes bug causing form action binding to break
+
+# 0.9.0 / 2014-11-09
+
+  * Introduces StringDoc, replacing Nokogiri for view rendering with a performant alternative
+  * Adds the ability to set an empty first option in bindings
+  * Remove the annoying "no content" for container log message
+  * Binding context must now be explicitly passed when binding
+  * Yield bindable value before bindable in view binding fns
+  * Fixes bug causing non-html view contents to be processed twice
+  * Removes support for Ruby versions < 2.0.0
+
+# 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
+
+# 0.7.1 / 2012-01-08
+
+  * View caching fixes
+  * Changed binder to allow definition for multiple endpoints
+  * Changed in_context to accept context as block argument
+  * Changed action binder to add leading slash if needed
+  * Change to allow a view's content to be set to nil
+  * Fixed Views#find method
+
+# 0.7.0 / 2011-11-19
+
+  * Cleaned up core/presenter interface
+  * Optimized view caching
+  * Binding occurs on the label an object is being bound to, not the object type
+  * Root view override in index directories no longer specify a root view for siblings
+  * Fixed problem binding to a checkbox who’s value attribute is not set
+
+# 0.6.3 / 2011-09-13
+
+  * Fixes binding to bindings defined by HTML 'name' attribute
+
+# 0.6.2 / 2011-08-20
+
+  * Fixes issue binding object to root nodes
+  * JRuby Support
+
+# 0.6.1 / 2011-08-20
+
+  * Fixes gemspec problem
+
+# 0.6.0 / 2011-08-20
+
+ * Initial gem release of 0.6.0 codebase

data/pakyow-presenter/{MIT-LICENSE → LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Bryan Powell
+Copyright (c) 2011-2015 Bryan Powell
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/pakyow-presenter/README.md

@@ -0,0 +1,36 @@
+# pakyow-presenter
+
+A view-first presentation layer for Pakyow.
+
+# Download
+
+The latest version of Pakyow Presenter can be installed with RubyGems:
+
+```
+gem install pakyow-presenter
+```
+
+Source code can be downloaded as part of the Pakyow project on Github:
+
+- https://github.com/pakyow/pakyow/tree/master/pakyow-presenter
+
+# License
+
+Pakyow Presenter is released free and open-source under the [MIT
+License](http://opensource.org/licenses/MIT).
+
+# Support
+
+Documentation is available here:
+
+- http://pakyow.org/docs/view-composition
+- http://pakyow.org/docs/data-binding
+- http://pakyow.org/docs/view-management
+
+Found a bug? Tell us about it here:
+
+- https://github.com/pakyow/pakyow/issues
+
+We'd love to have you in the community:
+
+- http://pakyow.org/get-involved

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

@@ -1,13 +1,10 @@
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
-# Gems 
+# Gems
 require 'nokogiri'
 
-# Base
 require 'presenter/base'
-include Presenter
-
 require 'presenter/presenter'
 require 'presenter/config/presenter'
 require 'presenter/helpers'

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

@@ -49,6 +49,10 @@ module Pakyow
         update_value
       end
 
+      def include?(attribute)
+        @doc.has_attribute?(attribute)
+      end
+
       # passes method call to `value`
       def method_missing(method, *args)
         ret = @value.send(method, *args)
@@ -182,7 +186,12 @@ module Pakyow
       end
 
       def <<(attributes)
-        @attributes << attributes
+        if attributes.is_a?(Attribute) || attributes.is_a?(Attributes)
+          @attributes << attributes
+        else
+          method_missing(:<<, *attributes)
+        end
+
         self
       end
 

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

@@ -12,13 +12,14 @@ require 'presenter/binder_set'
 require 'presenter/attributes'
 require 'presenter/exceptions'
 require 'presenter/view_composer'
-require 'presenter/nokogiri_doc'
 require 'presenter/string_doc'
 require 'presenter/string_doc_parser'
 require 'presenter/string_doc_renderer'
 require 'presenter/binding_eval'
 require 'presenter/doc_helpers'
+require 'presenter/view_version'
 require 'presenter/view_context'
+require 'presenter/view_store_loader'
 
 module Pakyow
   module Presenter

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

@@ -47,18 +47,22 @@ module Pakyow
       # @param context [Symbol] context passed through to the defined bindings
       #
       def value_for_scoped_prop(scope, prop, bindable, bindings, context)
-        binding_fn = @sets.lazy.map { |set|
-          set[1].match_for_prop(prop, scope, bindable, bindings)
-        }.find { |match|
-          !match.nil?
-        }
+        if @sets.empty?
+          binding_fn = bindings[prop]
+        else
+          binding_fn = @sets.lazy.map { |set|
+            set[1].match_for_prop(prop, scope, bindable, bindings)
+          }.find { |match|
+            !match.nil?
+          }
+        end
 
         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[prop]
+            bindable.fetch(prop) { bindable[prop.to_s] }
           elsif bindable.class.method_defined?(prop)
             bindable.send(prop)
           end
@@ -84,6 +88,16 @@ module Pakyow
           !options.nil?
         }
       end
+
+      def bindings_for_scope(scope, bindings = {})
+        return bindings if @sets.empty?
+
+        @sets.map { |set|
+          set[1].bindings_for_scope(scope, bindings)
+        }.inject({}) { |acc, bindings|
+          acc.merge(bindings)
+        }
+      end
     end
   end
 end

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

@@ -67,27 +67,31 @@ module Pakyow
       end
 
       def restful(route_group)
-        binding(:action) {
+        binding :_root do
           routes = Router.instance.group(route_group)
-          return_data = {}
 
-          if id = bindable[:id]
-            return_data[:view] = lambda { |view|
-              view.prepend(View.new('<input type="hidden" name="_method" value="patch">'))
+          {
+            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'
+              end
             }
-
-            action = routes.path(:update, :"#{route_group}_id" => id)
-          else
-            action = routes.path(:create)
-          end
-
-          return_data[:action] = action
-          return_data[:method] = 'post'
-          return_data
-        }
+          }
+        end
       end
-
-      #TODO options
     end
   end
 end

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

@@ -8,7 +8,7 @@ Pakyow::Config.register(:presenter) { |config|
   }
 
   # the default view for each view store
-  config.opt :default_views, { default: 'pakyow.html' }
+  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|
@@ -32,5 +32,5 @@ Pakyow::Config.register(:presenter) { |config|
   config.opt :prop_attribute, 'data-prop'
 
   # the document class used to parse and render views
-  config.opt :view_doc_class, StringDoc
+  config.opt :view_doc_class, Pakyow::Presenter::StringDoc
 }

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

@@ -3,7 +3,7 @@ module Pakyow
     class << self
       @@bindings = {}
       @@processors = {}
-      
+
       def bindings(set_name = :main, &block)
         if set_name && block
           @@bindings[set_name] = block
@@ -28,5 +28,36 @@ module Pakyow
     def bindings(set_name = :main, &block)
       self.class.bindings(set_name, &block)
     end
+
+    def content_for_code(code)
+      content = File.open(
+        File.join(
+          File.expand_path(
+            '../../../../../', __FILE__),
+            'pakyow-core',
+            'lib',
+            'views',
+            'errors',
+            code.to_s + '.html'
+          )
+      ).read + File.open(
+        File.join(
+          File.expand_path(
+            '../../../', __FILE__),
+            'views',
+            'errors',
+            code.to_s + '.html'
+          )
+      ).read
+
+      path = String.normalize_path(request.path)
+      path = '/' if path.empty?
+
+      content.gsub!('{view_path}', path == '/' ? 'index.html' : "#{path}.html")
+
+      template = presenter.store.template(:default)
+      template.container(:default).replace(content)
+      template.to_html
+    end
   end
 end

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

@@ -7,26 +7,26 @@ module Pakyow
     extend Forwardable
 
     def_delegators :@presenter, :store, :store=, :content, :view=,
-    :template=, :page=, :path, :path=, :compose, :composer
+    :template=, :page=, :path, :path=, :compose, :composer, :precompose!
 
     def view
-      ViewContext.new(@presenter.view, context)
+      Presenter::ViewContext.new(@presenter.view, self)
     end
 
     def partial(*args)
-      ViewContext.new(@presenter.partial(*args), context)
+      Presenter::ViewContext.new(@presenter.partial(*args), self)
     end
 
     def template
-      ViewContext.new(@presenter.template, context)
+      Presenter::ViewContext.new(@presenter.template, self)
     end
 
     def page
-      ViewContext.new(@presenter.page, context)
+      Presenter::ViewContext.new(@presenter.page, self)
     end
 
     def container(*args)
-      ViewContext.new(@presenter.container(*args), context)
+      Presenter::ViewContext.new(@presenter.container(*args), self)
     end
 
     def presenter

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

@@ -4,21 +4,21 @@ module Pakyow
       MATTER_MATCHER = /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
 
       class << self
-        def load(path)
+        def load(path, view_store_name = :default)
           format   = String.split_at_last_dot(path)[-1]
           name     = File.basename(path, '.*').to_sym
           contents = FileTest.file?(path) ? File.read(path) : nil
 
-          return Page.new(name, contents, path, format)
+          return Page.new(name, contents, path, format, view_store_name)
         end
       end
 
       attr_reader :path, :contents
 
-      def initialize(name, contents, path, format = :html)
+      def initialize(name, contents, path, format = :html, view_store_name = :default)
         @name, @contents, @path, @format = name, contents, path, format
 
-        @info    = { template: :pakyow }
+        @info    = { template: Pakyow::App.config.presenter.default_view(view_store_name) }
         @containers = {}
 
         unless @contents.nil?

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

@@ -24,6 +24,7 @@ module Pakyow
 
       Pakyow::App.before(:init) {
         @presenter = Presenter.new
+        ViewStoreLoader.instance.reset
       }
 
       Pakyow::App.after(:match) {
@@ -104,6 +105,18 @@ module Pakyow
         @composer || @view || raise(MissingView)
       end
 
+      def view?(path)
+        if composer_for_path(path)
+          true
+        else
+          false
+        end
+      end
+
+      def precompose!
+        self.view = @composer.view
+      end
+
       def view=(view)
         @view = view
 
@@ -168,23 +181,21 @@ module Pakyow
       end
 
       def setup_for_path(path, explicit = false)
-        @view_stores.each do |name, store|
-          begin
-            @composer = store.composer(path)
-            @path = path
-            return
-          rescue MissingView
-          end
+        if composer = composer_for_path(path)
+          @composer = composer
+          @path = path
+          return
         end
 
         e = MissingView.new("No view at path '#{path}'")
-        explicit ? raise(e) : Pakyow.logger.debug(e.message)
+        explicit ? raise(e) : Pakyow.logger.info(e.message)
       end
 
       def load_views
-        @view_stores = {}
+        @view_stores ||= {}
 
-        Pakyow::Config.presenter.view_stores.each_pair {|name, path|
+        Pakyow::Config.presenter.view_stores.each_pair { |name, path|
+          next unless ViewStoreLoader.instance.modified?(name, path)
           @view_stores[name] = ViewStore.new(path, name)
         }
       end
@@ -200,6 +211,17 @@ module Pakyow
       def load_processors
         @processor_store = Pakyow::App.processors
       end
+
+      def composer_for_path(path)
+        @view_stores.each do |name, store|
+          begin
+            return store.composer(path)
+          rescue MissingView
+          end
+        end
+
+        return nil
+      end
     end
   end
 end

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

@@ -24,13 +24,12 @@ module Pakyow
       def initialize_copy(original_doc)
         super
 
-        original_structure = original_doc.instance_variable_get(:@structure)
-        @structure = Utils::Dup.deep(original_structure) if original_structure
+        if original_structure = original_doc.instance_variable_get(:@structure)
+          @structure = Utils::Dup.deep(original_structure)
+        end
 
-        original_node = original_doc.instance_variable_get(:@node)
-        if original_node
-          node_index = original_structure.index(original_node)
-          @node = @structure[node_index]
+        if original_doc.node?
+          @node = @structure[original_doc.node_index]
         end
       end
 
@@ -68,6 +67,8 @@ module Pakyow
 
       def remove
         @structure.delete_if { |n| n.equal?(node) }
+        @node = ['', {}, [['', {}, []]]]
+        @removed = true
       end
 
       def clear
@@ -116,7 +117,7 @@ module Pakyow
         doc = StringDoc.ensure(doc)
 
         if doc.node?
-          @structure.push(doc.node)
+          @structure.insert(node_index + 1, doc.node)
         else
           @structure.concat(doc.structure)
         end
@@ -134,7 +135,7 @@ module Pakyow
 
       def replace(doc)
         doc = StringDoc.ensure(doc)
-        index = @structure.index(node) || 0
+        index = node_index || 0
 
         if doc.node?
           @structure.insert(index + 1, node)
@@ -158,6 +159,14 @@ module Pakyow
         containers.fetch(name, {})[:doc]
       end
 
+      def component(name)
+        components.select { |c| c[:component] == name }
+      end
+
+      def channel(name)
+        find_channel(scopes, name)
+      end
+
       def containers
         find_containers(@node ? [@node] : @structure)
       end
@@ -170,6 +179,10 @@ module Pakyow
         find_scopes(@node ? [@node] : @structure)
       end
 
+      def components
+        find_components(@node ? [@node] : @structure)
+      end
+
       def to_html
         StringDocRenderer.render(@node ? [@node] : @structure)
       end
@@ -186,8 +199,15 @@ module Pakyow
         return @node || @structure[0]
       end
 
+      def node_index
+        return nil unless node?
+        @structure.index { |n| n.equal?(@node) }
+      end
+
       def node?
-        !@node.nil?
+        return false if @node.nil?
+        return false if @removed
+        return true
       end
 
       def tagname
@@ -200,6 +220,10 @@ module Pakyow
         })
       end
 
+      def exists?
+        @structure.include?(node)
+      end
+
       private
 
       def title_search
@@ -217,8 +241,16 @@ module Pakyow
         node[1]
       end
 
+      def has_attribute?(name)
+        attributes.key?(name)
+      end
+
       def children
-        node[2][0][2]
+        if @structure.empty?
+          @structure
+        else
+          node[2][0][2]
+        end
       end
 
       def find_containers(structure, primary_structure = @structure, containers = {})
@@ -245,12 +277,18 @@ module Pakyow
       def find_scopes(structure, primary_structure = @structure, scopes = [])
         ret_scopes = structure.inject(scopes) { |s, e|
           if e[1].has_key?(:'data-scope')
-            s << {
+            scope = {
               doc: StringDoc.from_structure(primary_structure, node: e),
               scope: e[1][:'data-scope'].to_sym,
               props: find_node_props(e).concat(find_props(e[2])),
               nested: find_scopes(e[2]),
             }
+
+            if version = e[1][:'data-version']
+              scope[:version] = version.to_sym
+            end
+
+            s << scope
           end
           # only find scopes if `e` is the root node or we're not decending into a nested scope
           find_scopes(e[2], e[2], s) if e == node || !e[1].has_key?(:'data-scope')
@@ -282,6 +320,35 @@ module Pakyow
 
         props
       end
+
+      def find_channel(scopes, name)
+        scopes.each do |scope|
+          if scope[:doc].get_attribute(:'data-channel') == name
+            return scope[:doc]
+          end
+
+          if doc = find_channel(scope[:nested], name)
+            return doc
+          end
+        end
+
+        nil
+      end
+
+      def find_components(structure, primary_structure = @structure, components = [])
+        ret_components = structure.inject(components) { |s, e|
+          if e[1].has_key?(:'data-ui')
+            s << {
+              doc: StringDoc.from_structure(primary_structure, node: e),
+              component: e[1][:'data-ui'].to_sym,
+            }
+          end
+          find_components(e[2], e[2], s)
+          s
+        } || []
+
+        ret_components
+      end
     end
   end
 end