pakyow-presenter 0.7.2 → 0.8rc1

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

@@ -0,0 +1,187 @@
+module Pakyow
+  module Presenter
+    class ViewCollection
+      include Enumerable
+      
+      def initialize
+        @views = []
+      end
+      
+      def each
+        @views.each { |v| yield(v) }
+      end
+      
+      def attributes(*args)
+        collection = AttributesCollection.new
+        self.each{|v| collection << v.attributes}
+        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 }
+      end
+      
+      alias :html :content
+      
+      def content=(content)
+        self.each {|e| e.content = content}
+      end
+      
+      alias :html= :content=
+
+      def to_html
+        self.map { |v| v.to_html }.join('')
+      end
+
+      alias :to_s :to_html
+
+      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
+
+      def length
+        @views.length
+      end
+
+      def scope(name)
+        views = ViewCollection.new
+        self.each{|v|
+          next unless svs = v.scope(name)
+          svs.each{|sv| views << sv}
+        }
+        
+        views
+      end
+
+      # call-seq:
+      #   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)
+      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 
+      # 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)
+        self.each_with_index { |v,i|
+          break unless datum = data[i]
+          block.call(v, datum)
+        }
+      end
+
+      # call-seq:
+      #   match(data) => ViewCollection
+      #
+      # Returns a ViewCollection object that has been manipulated to match the data.
+      # For the ViewCollection case, the returned ViewCollection collection will consist n copies
+      # of self[data index] || self[-1], where n = data.length.
+      #
+      def match(data)
+        data = [data] unless data.instance_of?(Array)
+
+        views = ViewCollection.new
+        data.each_with_index {|datum,i|
+          unless v = self[i]
+
+            # we're out of views, so use the last one
+            v = self[-1]
+          end
+
+          d_v = v.doc.dup
+          v.doc.before(d_v)
+
+          new_v = View.new(d_v)
+
+          # find binding subset (keeps us from refinding)
+          new_v.bindings = v.bindings
+
+          views << new_v
+        }
+
+        self.remove
+        views
+      end
+
+      # call-seq:
+      #   repeat(data) {|view, datum| block}
+      #
+      # Matches self to data and yields a view/datum pair.
+      #
+      def repeat(data, &block)
+        self.match(data).for(data, &block)
+      end
+
+      # call-seq:
+      #   bind(data)
+      #
+      # Binds data across existing scopes.
+      #
+      def bind(data, bindings = nil, &block)
+        self.for(data) {|view, datum|
+          view.bind(datum, bindings)
+          yield(view, datum) if block_given?
+        }
+      end
+
+      # call-seq:
+      #   apply(data)
+      #
+      # Matches self to data then binds data to the view.
+      #
+      def apply(data, bindings = nil, &block)
+        self.match(data).bind(data, bindings, &block)
+      end
+    end
+  end
+end

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

@@ -82,7 +82,7 @@ module Pakyow
               if route == '/'
                 r_p = '/'
               else
-                r_p = vpath.sub(absolute_path_prefix, '')
+                r_p = File.join(@view_dir, vpath.sub(absolute_path_prefix, ''))
               end
               @view_store[:abstract_paths][route] = {:real_path => r_p, :file_or_dir => :dir}
               # duplicate real path under routes permuted with leading/trailing slash
@@ -90,24 +90,24 @@ module Pakyow
             else
               # files here are direct overrides of the route's views
               parent,route = pakyow_path_to_route_and_parent(vpath, view_dir, :file)
+              route_with_leading_slash = "#{route}/#{File.basename(vpath)}"
+              route_without_leading_slash = route_with_leading_slash.sub('/','')
               view_key = File.basename(vpath,".*")
               unless @view_store[:view_dirs][route]
                 @view_store[:view_dirs][route] = deep_hash_clone(@view_store[:view_dirs][parent])
               end
-              @view_store[:view_dirs][route][:views][view_key] = vpath.sub(absolute_path_prefix, '')
+              @view_store[:view_dirs][route][:views][view_key] = route_without_leading_slash
               # see if view overrides the root view
               if File.basename(@view_store[:view_dirs][route][:root_view],".*") == view_key
-                @view_store[:view_dirs][route][:root_view] = vpath.sub(absolute_path_prefix, '')
+                @view_store[:view_dirs][route][:root_view] = route_without_leading_slash
               end
               # set the abstract path for this file
               # duplicating real path under route without the leading slash
-              r_p = vpath.sub(absolute_path_prefix, '')
+              r_p = File.join(@view_dir, vpath.sub(absolute_path_prefix, ''))
               if route == '/'
                 @view_store[:abstract_paths]["/#{File.basename(vpath)}"] = {:real_path => r_p, :file_or_dir => :file}
                 @view_store[:abstract_paths][File.basename(vpath)] = {:real_path => r_p, :file_or_dir => :file}
               else
-                route_with_leading_slash = "#{route}/#{File.basename(vpath)}"
-                route_without_leading_slash = route_with_leading_slash.sub('/','')
                 @view_store[:abstract_paths][route_with_leading_slash] = {:real_path => r_p, :file_or_dir => :file}
                 @view_store[:abstract_paths][route_without_leading_slash] = {:real_path => r_p, :file_or_dir => :file}
               end
@@ -169,6 +169,10 @@ module Pakyow
       def real_path(abstract_path)
         @view_store[:abstract_paths][abstract_path][:real_path] if @view_store[:abstract_paths][abstract_path]
       end
+
+      def root_path(abstract_path)
+        @view_store[:view_dirs][abstract_path][:root_view] if @view_store[:view_dirs][abstract_path]
+      end
       
       private
 

metadata

@@ -1,127 +1,110 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pakyow-presenter
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+version: !ruby/object:Gem::Version
+  version: 0.8rc1
+  prerelease: 3
 platform: ruby
-authors: 
+authors:
 - Bryan Powell
 - Bret Young
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pakyow-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8rc1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8rc1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 description: pakyow-presenter
 email: bryan@metabahn.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - pakyow-presenter/CHANGES
 - pakyow-presenter/README
 - pakyow-presenter/MIT-LICENSE
 - 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/bindings.rb
 - pakyow-presenter/lib/presenter/configuration/base.rb
 - pakyow-presenter/lib/presenter/configuration/presenter.rb
 - pakyow-presenter/lib/presenter/helpers.rb
 - pakyow-presenter/lib/presenter/lazy_view.rb
 - pakyow-presenter/lib/presenter/presenter.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/views.rb
 homepage: http://pakyow.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - pakyow-presenter/lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: pakyow-presenter
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: pakyow-presenter
 test_files: []
-

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

@@ -1,112 +0,0 @@
-module Pakyow
-  module Presenter
-    class Views
-      include Enumerable
-      
-      def initialize
-        @views = []
-      end
-      
-      def each
-        @views.each { |v| yield(v) }
-      end
-      
-      def in_context(&block)
-        ViewContext.new(self).instance_exec(self, &block)
-      end
-      
-      def attributes(*args)
-        self.each {|e| e.attributes(*args)}
-        return self
-      end
-      
-      def remove
-        self.each {|e| e.remove}
-      end
-      
-      alias :delete :remove
-      
-      def add_class(val)
-        self.each {|e| e.add_class(val)}
-      end
-      
-      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 }
-      end
-      
-      alias :html :content
-      
-      def content=(content)
-        self.each {|e| e.content = content}
-      end
-      
-      alias :html= :content=
-
-      def to_html
-        self.map { |v| v.to_html }.join('')
-      end
-
-      alias :to_s :to_html
-
-      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 method_missing(method, *args)
-        if method.to_s.include?('=')
-          self.each {|e| e.send(method, *args)}
-        else
-          self.map {|e| e.send(method, *args)}
-        end
-      end
-      
-      def class(*args)
-        method_missing(:class, *args)
-      end
-      
-      def id
-        method_missing(:id)
-      end
-      
-      def repeat_for(objects, opts = {}, &block)
-        first_found = self.first
-        
-        # Remove other matches
-        self.drop(1).each {|found| found.remove}
-        
-        # Repeat for first match
-        first_found.repeat_for(objects, opts, &block)
-      end
-      
-      def bind(object, opts = {})
-        self.each {|e| e.bind(object, opts)}
-      end
-      
-      def find(element, &block)
-        views = Views.new
-        self.each {|e| e.find(element, &block).each { |v| views << v }}
-        views
-      end
-    end
-  end
-end