pakyow-presenter 0.8rc1 → 0.8.rc4

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

@@ -2,58 +2,58 @@ module Pakyow
   module Presenter
     class ViewCollection
       include Enumerable
-      
+
       def initialize
         @views = []
       end
-      
+
       def each
         @views.each { |v| yield(v) }
       end
-      
-      def attributes(*args)
+
+      def attributes(attrs = {})
         collection = AttributesCollection.new
-        self.each{|v| collection << v.attributes}
+        self.each{|v| collection << v.attributes(attrs)}
         return collection
       end
 
       alias :attrs :attributes
-      
+
       def remove
         self.each {|e| e.remove}
       end
-      
+
       alias :delete :remove
-      
+
       # SEE COMMENT IN VIEW
       # def add_class(val)
       #   self.each {|e| e.add_class(val)}
       # end
-      
+
       # SEE COMMENT IN VIEW
       # def remove_class(val)
       #   self.each {|e| e.remove_class(val)}
       # end
-      
+
       def clear
         self.each {|e| e.clear}
       end
-      
+
       def text
         self.map { |v| v.text }
       end
-      
-      def content
-        self.map { |v| v.content }
+
+      def text=(text)
+        self.each {|e| e.text = text}
       end
-      
-      alias :html :content
-      
-      def content=(content)
-        self.each {|e| e.content = content}
+
+      def html
+        self.map { |v| v.html }
+      end
+
+      def html=(html)
+        self.each {|e| e.html = html}
       end
-      
-      alias :html= :content=
 
       def to_html
         self.map { |v| v.to_html }.join('')
@@ -64,15 +64,15 @@ module Pakyow
       def append(content)
         self.each {|e| e.append(content)}
       end
-      
+
       alias :render :append
-     
+
       def <<(val)
         if val.is_a? View
           @views << val
         end
       end
-      
+
       def [](i)
         @views[i]
       end
@@ -87,7 +87,17 @@ module Pakyow
           next unless svs = v.scope(name)
           svs.each{|sv| views << sv}
         }
-        
+
+        views
+      end
+
+      def prop(name)
+        views = ViewCollection.new
+        self.each{|v|
+          next unless svs = v.prop(name)
+          svs.each{|sv| views << sv}
+        }
+
         views
       end
 
@@ -95,28 +105,31 @@ module Pakyow
       #   with {|view| block}
       #
       # Creates a context in which view manipulations can be performed.
-      # 
+      #
       # Unlike previous versions, the context can only be referenced by the
       # block argument. No `context` method will be available.s
       #
       def with
         yield(self)
+        self
       end
 
       # call-seq:
       #   for {|view, datum| block}
       #
-      # Yields a view and its matching dataum. Datums are yielded until 
-      # no more views or data is available. For the ViewCollection case, this 
+      # Yields a view and its matching dataum. Datums are yielded until
+      # no more views or data is available. For the ViewCollection case, this
       # means the block will be yielded self.length times.
-      # 
+      #
       # (this is basically Bret's `map` function)
       #
       def for(data, &block)
-        data = [data] unless data.instance_of?(Array)
+        data = data.to_a if data.is_a?(Enumerator)
+        data = [data] if (!data.is_a?(Enumerable) || data.is_a?(Hash))
+
         self.each_with_index { |v,i|
           break unless datum = data[i]
-          block.call(v, datum)
+          block.call(v, datum, i) if block_given?
         }
       end
 
@@ -128,7 +141,8 @@ module Pakyow
       # of self[data index] || self[-1], where n = data.length.
       #
       def match(data)
-        data = [data] unless data.instance_of?(Array)
+        data = data.to_a if data.is_a?(Enumerator)
+        data = [data] if (!data.is_a?(Enumerable) || data.is_a?(Hash))
 
         views = ViewCollection.new
         data.each_with_index {|datum,i|
@@ -141,15 +155,17 @@ module Pakyow
           d_v = v.doc.dup
           v.doc.before(d_v)
 
-          new_v = View.new(d_v)
+          new_v = View.from_doc(d_v)
 
           # find binding subset (keeps us from refinding)
-          new_v.bindings = v.bindings
+          new_v.bindings = v.bindings.dup
+          new_v.scoped_as = v.scoped_as
 
           views << new_v
         }
 
-        self.remove
+        # do not use self.remove since that refinds bindings
+        self.each {|v| v.doc.remove}
         views
       end
 
@@ -167,10 +183,10 @@ module Pakyow
       #
       # Binds data across existing scopes.
       #
-      def bind(data, bindings = nil, &block)
-        self.for(data) {|view, datum|
+      def bind(data, bindings = {}, &block)
+        self.for(data) {|view, datum, i|
           view.bind(datum, bindings)
-          yield(view, datum) if block_given?
+          yield(view, datum, i) if block_given?
         }
       end
 
@@ -179,7 +195,7 @@ module Pakyow
       #
       # Matches self to data then binds data to the view.
       #
-      def apply(data, bindings = nil, &block)
+      def apply(data, bindings = {}, &block)
         self.match(data).bind(data, bindings, &block)
       end
     end

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

@@ -0,0 +1,174 @@
+module Pakyow
+  class ViewStore
+    attr_reader :name
+
+    def initialize(store_path, name = :default)
+      @name = name
+      @store_path = store_path
+
+      load_templates
+      load_path_info
+    end
+
+    def at?(view_path)
+      begin
+        at_path(view_path)
+        return true
+      rescue MissingView
+        return false
+      end
+    end
+
+    def template(name_or_path)
+      if name_or_path.is_a?(Symbol)
+        return template_with_name(name_or_path)
+      else
+        return at_path(name_or_path, :template)
+      end
+    end
+
+    def page(view_path)
+      return at_path(view_path, :page).dup
+    end
+
+    def view(view_path)
+      return at_path(view_path, :view).dup
+    end
+
+    def partial(view_path, name)
+      return at_path(view_path, :partials)[name.to_sym]
+    end
+
+    # iterations through known views, yielding each
+    def views
+      @path_info.each_pair do |path, info|
+        yield(info[:view], path)
+      end
+    end
+
+    private
+
+    def at_path(view_path, obj = nil)
+      normalized_path = normalize_path(view_path)
+      info = @path_info[normalized_path]
+
+      if info.nil?
+        raise MissingView, "No view at path '#{view_path}'"
+      else
+        return obj ? info[obj.to_sym] : info
+      end
+    end
+
+    def template_with_name(name)
+      unless template = @templates[name.to_sym]
+        raise MissingTemplate, "No template named '#{name}'"
+      end
+
+      return template
+    end
+
+    def load_templates
+      @templates = {}
+
+      if File.exists?(templates_path)
+        Dir.entries(templates_path).each do |file|
+          next if file == '.' || file == '..'
+
+          template = Template.load(File.join(templates_path, file))
+          @templates[template.name] = template
+        end
+      else
+        raise MissingTemplatesDir, "No templates found at '#{templates_path}'"
+      end
+    end
+
+    def templates_path
+      return File.join(@store_path, Config::Base.presenter.template_dir(@name))
+    end
+
+    def load_path_info
+      @path_info = {}
+
+      DirUtils.walk_dir(@store_path) do |path|
+        # skip root
+        next if path == @store_path
+
+        # don't include templates
+        next if path.include?(templates_path)
+
+        # skip partial files
+        next if File.basename(path)[0,1] == '_'
+
+        # skip non-empty folders (these files will be picked up)
+        next if !Dir.glob(File.join(path, 'index.*')).empty?
+
+        normalized_path = normalize_path(path)
+
+        # if path is a directory we know there's no index page
+        # so use the previous index page instead. this allows
+        # partials to be overridden at a path while the same
+        # page is used
+        if File.directory?(path)
+          # gets the path for the previous page
+          prev_path = normalized_path.split('/')[0..-2].join("")
+          page = @path_info[prev_path][:page]
+        else
+          page = Page.load(path)
+        end
+
+        template = template_with_name(page.template).dup
+
+        #TODO more efficient way of doing this? lot
+        # of redundant calls here
+        partials = partials_at_path(path)
+
+        # construct view
+        view = template.build(page.dup.build(partials))
+
+        info = {
+          view: view,
+          page: page,
+          template: template,
+          partials: partials,
+        }
+
+        @path_info[normalized_path] = info
+      end
+    end
+
+    def normalize_path(path)
+      relative_path = path.gsub(@store_path, '')
+      relative_path = relative_path.gsub(File.extname(relative_path), '')
+      relative_path = relative_path.gsub('index', '')
+      relative_path = StringUtils.normalize_path(relative_path)
+
+      return relative_path
+    end
+
+    def partials_at_path(view_path)
+      view_path = File.dirname(view_path) unless File.directory?(view_path)
+
+      partials = {}
+      DirUtils.walk_dir(@store_path) do |path|
+        # skip non-partials
+        next unless File.basename(path)[0,1] == '_'
+
+        # skip directories
+        next if File.directory?(path)
+
+        # skip files not within `view_path`
+        next unless DirUtils.dir_within_dir?(File.dirname(path), view_path)
+
+        name = File.basename(path.split('/')[-1], '.*')[1..-1]
+        partials[name.to_sym] = path
+      end
+
+      # create instances
+      partials.each do |name, path|
+        partials[name] = Partial.load(path)
+      end
+
+      return partials
+    end
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-presenter
 version: !ruby/object:Gem::Version
-  version: 0.8rc1
-  prerelease: 3
+  version: 0.8.rc4
 platform: ruby
 authors:
 - Bryan Powell
@@ -10,57 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8rc1
+        version: 0.8.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8rc1
+        version: 0.8.rc4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
-description: pakyow-presenter
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+description: A library for building a frontend for Pakyow applications, including
+  templating and data binding.
 email: bryan@metabahn.com
 executables: []
 extensions: []
@@ -73,38 +81,41 @@ files:
 - pakyow-presenter/lib/presenter/attributes.rb
 - pakyow-presenter/lib/presenter/base.rb
 - pakyow-presenter/lib/presenter/binder.rb
-- pakyow-presenter/lib/presenter/bindings.rb
-- pakyow-presenter/lib/presenter/configuration/base.rb
-- pakyow-presenter/lib/presenter/configuration/presenter.rb
+- pakyow-presenter/lib/presenter/binder_set.rb
+- pakyow-presenter/lib/presenter/config/presenter.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/lazy_view.rb
+- pakyow-presenter/lib/presenter/page.rb
+- pakyow-presenter/lib/presenter/partial.rb
 - pakyow-presenter/lib/presenter/presenter.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_context.rb
-- pakyow-presenter/lib/presenter/view_lookup_store.rb
+- pakyow-presenter/lib/presenter/view_store.rb
 homepage: http://pakyow.com
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - pakyow-presenter/lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: pakyow-presenter
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: pakyow-presenter
+specification_version: 4
+summary: A library for building a frontend for Pakyow applications.
 test_files: []

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

@@ -1,103 +0,0 @@
-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/base.rb

@@ -1,12 +0,0 @@
-module Pakyow
-  module Configuration
-    autoload :Presenter, 'presenter/configuration/presenter'
-    
-    class Base
-      # Fetches the server configuration    
-      def self.presenter
-        Configuration::Presenter
-      end
-    end
-  end
-end

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

@@ -1,45 +0,0 @@
-module Pakyow
-  module Configuration
-    class Presenter
-      class << self
-        attr_accessor :view_caching, :javascripts, :stylesheets, :view_stores, :default_view,
-        :scope_attribute, :prop_attribute, :container_attribute
-        
-        # Location of javascripts
-        def javascripts
-          @javascripts || '/javascripts'
-        end
-        
-        # Location of stylesheets
-        def stylesheets
-          @stylesheets || '/stylesheets'
-        end
-
-        def view_stores
-          @view_stores ||= {:default => "#{Configuration::Base.app.root}/views"}
-        end
-        
-        def view_caching
-          @view_caching || false
-        end
-
-        def default_view
-          @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
-end