pakyow-presenter 0.10.2 → 0.11.0

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

@@ -10,6 +10,13 @@ module Pakyow
         @scoped_as = scope
       end
 
+      def initialize_copy(original_view)
+        super
+
+        @views = Pakyow::Utils::Dup.deep(original_view.views)
+        @scoped_as = original_view.scoped_as
+      end
+
       def ==(other)
         @views.each_with_index do |view, i|
           return false if view != other.views[i]
@@ -70,11 +77,10 @@ module Pakyow
         end
       end
 
+      # TODO: decide if we care to check the type of
+      # objects being added to the collection
       def <<(val)
-        if val.is_a? View
-          @views << val
-        end
-
+        @views << val
         self
       end
 

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

@@ -27,14 +27,47 @@ module Pakyow
           (@page.is_a?(Page) && @page.info(:template)) || path
         }
 
-        @partials = {}
-
+        # Setting up partials is a bit complicated, but here's how it works.
+        #
+        # First we set `@partials` to the ones passed or the partials from the
+        # store for the path that we're composing at. We do this so that
+        # partials are included in `parts` after this (important since we
+        # want partials defined in partials to be found properly).
         begin
+          @partials = {}
           @partials = includes(opts.fetch(:includes))
         rescue
           @partials = store.partials(path) unless path.nil?
         end
 
+        # Now we need to build the actual set of partials used by parts of the
+        # view that we're composing. This bit of code counts the number of each
+        # partial present; if it's greater than one we represent them as a view
+        # collection, otherwise it's just a partial.
+        #
+        # FIXME: It's possible there's a more straight-forward way to write this
+        # code; it should be explored at some poitn in the future.
+        partials  = {}
+        @partials.each do |name, view|
+          count = parts.select { |part|
+            part.doc.partials.key?(name)
+          }.map { |part|
+            part.doc.partials[name].count
+          }.inject(&:+) || 0
+
+          partials[name] = view; next if count < 2
+
+          collection = ViewCollection.new
+
+          count.times do
+            collection << view.dup
+          end
+
+          partials[name] = collection
+        end
+
+        @partials = partials
+
         instance_exec(&block) if block_given?
       end
 
@@ -102,6 +135,7 @@ module Pakyow
 
       def partial(name)
         partial = @partials[name]
+        partial.includes(partials)
         return partial
       end
 
@@ -178,7 +212,13 @@ module Pakyow
       def partials_for_parts(parts, acc = [])
         # determine the partials to be included
         available_partials = parts.inject([]) { |sum, part|
-          sum.concat(part.doc.partials.keys)
+          if part.is_a?(ViewCollection)
+            part.each do |view|
+              sum.concat(view.doc.partials.keys)
+            end
+          else
+            sum.concat(part.doc.partials.keys)
+          end
         }
 
         # add available partials as parts

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

@@ -44,16 +44,20 @@ module Pakyow
         end
       end
 
-      def scope(name)
-        collection = @view.scope(name)
+      # View methods that support versioning.
+      #
+      %i[scope prop].each do |method|
+        define_method(method) do |*args|
+          collection = @view.send(method, *args)
 
-        if !collection.is_a?(ViewVersion) && collection.versioned?
-          ret = ViewVersion.new(collection.views)
-        else
-          ret = collection
-        end
+          if collection.views && collection.versioned?
+            ret = ViewVersion.new(collection.views)
+          else
+            ret = collection
+          end
 
-        handle_return_value(ret)
+          handle_return_value(ret)
+        end
       end
 
       # Pass these through, handling the return value.

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

@@ -109,7 +109,7 @@ module Pakyow
           #TODO need to consider whose responsibility it is to make the dups
           view = obj ? info[obj.to_sym] : info
           raise MissingView, "No #{obj} at path '#{view_path}'" if view.nil?
-          return view.dup
+          return Pakyow::Utils::Dup.deep(view)
         end
       end
 
@@ -208,6 +208,8 @@ module Pakyow
             @path_info[normalized_path] = info
           end
         end
+
+        @path_info = Hash[@path_info.sort { |a, b| a <=> b }]
       end
 
       def normalize_path(path, store_path = nil)

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

@@ -3,7 +3,7 @@ class Pakyow::Presenter::ViewVersion
 
   def initialize(views)
     @empty    = views.find { |view| view.version == :empty }
-    @default  = views.find { |view| !view.doc.get_attribute(:'data-default').nil? } || views.find { |view| view.version != :empty }
+    @default  = views.find { |view| view.doc.attribute?(:'data-default') } || views.find { |view| view.version != :empty }
     @versions = views
   end
 
@@ -15,6 +15,16 @@ class Pakyow::Presenter::ViewVersion
     @default = versions.first
   end
 
+  def with(&block)
+    if block.arity == 0
+      instance_exec(&block)
+    else
+      yield(self)
+    end
+
+    self
+  end
+
   def apply(data, bindings: {}, context: nil, &block)
     data = Array.ensure(data)
 
@@ -31,7 +41,7 @@ class Pakyow::Presenter::ViewVersion
 
   def version(data, &block)
     data = Array.ensure(data)
-    coll = Pakyow::Presenter::ViewCollection.new
+    coll = Pakyow::Presenter::ViewCollection.new(@default.scoped_as)
 
     if data.empty?
       @versions.each(&:remove)
@@ -79,7 +89,13 @@ class Pakyow::Presenter::ViewVersion
 
   def method_missing(method, *args, &block)
     if @default.respond_to?(method)
-      @default.send(method, *args, &block)   
+      ret = @default.send(method, *args, &block)
+
+      # because `match` mutates the default view (turning it into a collection), we
+      # need to set default to this new collection so that things continue to work
+      @default = ret if method == :match
+
+      ret
     end
   end
 

data/pakyow-presenter/lib/pakyow/views/errors/404.erb

@@ -0,0 +1,26 @@
+<%
+  path = String.normalize_path(request.path)
+  path = '/' if path.empty?
+
+  view_path = path == '/' ? 'index.html' : "#{path}.html"
+%>
+
+<h1>
+  Pakyow couldn't find anything to do :(
+</h1>
+
+<p class="lead">
+  If you want back-end code to execute for this request, create a route in <code>app/lib/routes.rb</code>:
+</p>
+
+<pre>
+  <code><span class="n">get</span> <span class="s1">'<%=path%>'</span> <span class="k">do</span>
+  <span class="c1"># your code goes here</span>
+<span class="k">end</span></code>
+</pre>
+
+<p class="lead">
+  But, we recommend you start by creating a view at <code>app/views/<%=view_path%></code>.
+  The view will be served up automatically without writing any back-end code! This pattern
+  is called view-first development (you could also call it <em>awesome</em>).
+</p>

data/pakyow-presenter/lib/pakyow/views/errors/500.erb

@@ -0,0 +1,23 @@
+<%
+  nice_source = req.error.backtrace[0].match(/^(.+?):(\d+)(|:in `(.+)')$/)
+  file = nice_source[1].gsub(File.expand_path(Config.app.root) + '/', '')
+  line = nice_source[2]
+  msg = CGI.escapeHTML("#{req.error.class}: #{req.error}")
+  trace = req.error.backtrace.map { |bt| CGI.escapeHTML(bt) }.join('<br>')
+%>
+
+<h1>
+  Pakyow found something wrong :(
+</h1>
+
+<p class="lead">
+  The error originated on line <%=line%> of <code><%=file%></code>.
+</p>
+
+<h5 class="error">
+  <%=msg%>
+</h5>
+
+<pre>
+  <code><%=trace%></code>
+</pre>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-presenter
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Bryan Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-support
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: pakyow-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -105,33 +105,35 @@ files:
 - pakyow-presenter/LICENSE
 - pakyow-presenter/README.md
 - pakyow-presenter/lib/pakyow-presenter.rb
-- pakyow-presenter/lib/presenter/attributes.rb
-- pakyow-presenter/lib/presenter/base.rb
-- pakyow-presenter/lib/presenter/binder.rb
-- pakyow-presenter/lib/presenter/binder_set.rb
-- pakyow-presenter/lib/presenter/binding_eval.rb
-- pakyow-presenter/lib/presenter/config/presenter.rb
-- pakyow-presenter/lib/presenter/container.rb
-- pakyow-presenter/lib/presenter/doc_helpers.rb
-- pakyow-presenter/lib/presenter/exceptions.rb
-- pakyow-presenter/lib/presenter/ext/app.rb
-- pakyow-presenter/lib/presenter/helpers.rb
-- pakyow-presenter/lib/presenter/page.rb
-- pakyow-presenter/lib/presenter/partial.rb
-- pakyow-presenter/lib/presenter/presenter.rb
-- pakyow-presenter/lib/presenter/string_doc.rb
-- pakyow-presenter/lib/presenter/string_doc_parser.rb
-- pakyow-presenter/lib/presenter/string_doc_renderer.rb
-- pakyow-presenter/lib/presenter/template.rb
-- pakyow-presenter/lib/presenter/view.rb
-- pakyow-presenter/lib/presenter/view_collection.rb
-- pakyow-presenter/lib/presenter/view_composer.rb
-- pakyow-presenter/lib/presenter/view_context.rb
-- pakyow-presenter/lib/presenter/view_store.rb
-- pakyow-presenter/lib/presenter/view_store_loader.rb
-- pakyow-presenter/lib/presenter/view_version.rb
-- pakyow-presenter/lib/views/errors/404.html
-- pakyow-presenter/lib/views/errors/500.html
+- pakyow-presenter/lib/pakyow/presenter.rb
+- pakyow-presenter/lib/pakyow/presenter/attributes.rb
+- pakyow-presenter/lib/pakyow/presenter/base.rb
+- pakyow-presenter/lib/pakyow/presenter/binder.rb
+- pakyow-presenter/lib/pakyow/presenter/binder_set.rb
+- pakyow-presenter/lib/pakyow/presenter/binding_eval.rb
+- pakyow-presenter/lib/pakyow/presenter/config/presenter.rb
+- pakyow-presenter/lib/pakyow/presenter/container.rb
+- pakyow-presenter/lib/pakyow/presenter/doc_helpers.rb
+- pakyow-presenter/lib/pakyow/presenter/exceptions.rb
+- pakyow-presenter/lib/pakyow/presenter/ext/app.rb
+- pakyow-presenter/lib/pakyow/presenter/ext/call_context.rb
+- pakyow-presenter/lib/pakyow/presenter/helpers.rb
+- pakyow-presenter/lib/pakyow/presenter/page.rb
+- pakyow-presenter/lib/pakyow/presenter/partial.rb
+- pakyow-presenter/lib/pakyow/presenter/presenter.rb
+- pakyow-presenter/lib/pakyow/presenter/string_doc.rb
+- pakyow-presenter/lib/pakyow/presenter/string_doc_parser.rb
+- pakyow-presenter/lib/pakyow/presenter/string_doc_renderer.rb
+- pakyow-presenter/lib/pakyow/presenter/template.rb
+- pakyow-presenter/lib/pakyow/presenter/view.rb
+- pakyow-presenter/lib/pakyow/presenter/view_collection.rb
+- pakyow-presenter/lib/pakyow/presenter/view_composer.rb
+- pakyow-presenter/lib/pakyow/presenter/view_context.rb
+- pakyow-presenter/lib/pakyow/presenter/view_store.rb
+- pakyow-presenter/lib/pakyow/presenter/view_store_loader.rb
+- pakyow-presenter/lib/pakyow/presenter/view_version.rb
+- pakyow-presenter/lib/pakyow/views/errors/404.erb
+- pakyow-presenter/lib/pakyow/views/errors/500.erb
 homepage: http://pakyow.org
 licenses:
 - MIT
@@ -152,9 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pakyow Presenter
 test_files: []
-has_rdoc: 

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

@@ -1,27 +0,0 @@
-require 'yaml'
-
-require 'presenter/view_store'
-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'
-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
-  end
-end

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

@@ -1,63 +0,0 @@
-module Pakyow
-  class App
-    class << self
-      @@bindings = {}
-      @@processors = {}
-
-      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
-
-    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