broadway 0.1.1 → 0.1.2

data/lib/broadway.rb

@@ -15,7 +15,6 @@ requirements = %w(builders processors mixins resources).map { |dir| Dir["#{this}
 if defined?(::Sinatra)
   requirements << Dir["#{this}/sinatra/**/*"]
 end
-
 requirements.flatten.each { |file| require file if File.extname(file) == ".rb" }
 
 module Broadway
@@ -59,6 +58,30 @@ module Broadway
       site.index_path
     end
   end
+  # from Rack::Utils
+  module Utils
+    def unescape(s)
+      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+        [$1.delete('%')].pack('H*')
+      }
+    end
+    
+    def parse_query(qs, d = nil)
+      params = {}
+      (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
+        k, v = p.split('=', 2).map { |x| unescape(x) }
+        if cur = params[k]
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+    end
+  end
 end
 
 def Broadway(*args, &block)

data/lib/broadway/mixins/assetable.rb

@@ -13,10 +13,19 @@ module Broadway
         unless @assets
           @assets = []
           if self.data.has_key?("asset")
-            @assets << ::Broadway::Asset.new(self, "asset", data["asset"])
+            options = data["asset"].is_a?(Hash) ? data["asset"] : {:src => data["asset"]}            
+            @assets << ::Broadway::Asset.new(self, "asset", options.symbolize_keys)
           elsif self.data.has_key?("assets")
-            self.data["assets"].each do |name, asset|
-              @assets << ::Broadway::Asset.new(self, name, asset)
+            if self.data["assets"].is_a?(Array)
+              self.data["assets"].each do |asset|
+                options = asset.is_a?(Hash) ? asset : {:src => asset}
+                @assets << ::Broadway::Asset.new(self, "asset", options.symbolize_keys)
+              end
+            elsif self.data["assets"].is_a?(Hash)
+              self.data["assets"].each do |name, asset|
+                options = asset.is_a?(Hash) ? asset : {:src => asset}            
+                @assets << ::Broadway::Asset.new(self, name, options.symbolize_keys)
+              end
             end
           end
         end

data/lib/broadway/mixins/hierarchical.rb

@@ -5,7 +5,11 @@ module Broadway
     end
     
     module InstanceMethods
-      attr_accessor :parent, :children, :show_children
+      attr_accessor :parent, :children, :show_children, :categories
+      
+      def categories
+        @categories ||= []
+      end
       
       def show_children
         unless defined?(@show_children)
@@ -31,22 +35,6 @@ module Broadway
         @children ||= []
         @children
       end
-
-=begin      
-      def children
-        unless @children
-          key = self.categories.last
-          length = self.path.split("/").length
-          @children = site.send("find_#{short_name.pluralize}_by_category", key)
-          @children.delete_if do |child|
-            (child.path == self.path) ||
-            (child.path.split("/").length <= length)
-          end
-        end
-        
-        @children
-      end
-=end
       
       def show_children?
         return true if self.data.blank?

data/lib/broadway/mixins/linkable.rb

@@ -0,0 +1,32 @@
+module Broadway
+  module Linkable
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+    
+    module InstanceMethods
+      attr_accessor :links
+      
+      def links
+        unless @links
+          @links = []
+          if self.data.has_key?("link")
+            options = data["link"].is_a?(Hash) ? data["link"] : {:href => data["link"]}
+            @links << ::Broadway::Link.new(self, options.symbolize_keys)
+          elsif self.data.has_key?("links")
+            self.data["links"].each do |link|
+              options = link.is_a?(Hash) ? link : {:href => link}
+              @links << ::Broadway::Link.new(self, options.symbolize_keys)
+            end
+          end
+        end
+        
+        @links
+      end
+      
+      def link
+        links.first
+      end
+    end
+  end
+end

data/lib/broadway/mixins/publishable.rb

@@ -31,6 +31,11 @@ module Broadway
       def draft?
         state == "draft"
       end
+      
+      def updated_at
+        date
+      end
+      alias created_at updated_at
     end
   end
 end

data/lib/broadway/processors/link.rb

@@ -35,9 +35,9 @@ module Broadway
       
       def initialize(link, site, options = {})
         link.site = site
-        link.href = options[:href]
-        link.title = options[:title]
-        link.categories = options[:categories]
+        link.href = options[:href] unless options[:href].blank?
+        link.title = options[:title] unless options[:title].blank?
+        link.categories = options[:categories] unless options[:categories].blank?
       end
       
     end

data/lib/broadway/processors/post.rb

@@ -92,7 +92,7 @@ module Broadway
         post.kind = "page" if post.file.slug == "index"
         post.slug = Broadway::Slug.new(post.file.slug, post)
         post.data = post.file.header
-        post.title = post.data["title"].blank? ? post.slug.titleize : post.data["title"]
+        post.title = (post.data["title"].blank? ? post.slug.titleize : post.data["title"]).to_s
         if post.title.downcase == "index"
           post.title = ::File.basename(post.file.directory).titleize
         end

data/lib/broadway/resources/asset.rb

@@ -12,7 +12,7 @@ module Broadway
     def initialize(resource, name, options = {})
       self.resource = resource
       self.name     = name
-      self.data     = options.recursively_symbolize_keys!
+      self.data     = options
       self.path     = options.delete(:path) || options.delete(:src) || options.delete(:url) || options.delete(:href)
       options.each do |k,v|
         self.send("#{k}=", v) if self.respond_to?(k)
@@ -28,5 +28,9 @@ module Broadway
     def site
       resource.site
     end
+    
+    def extension
+      ::File.extname(self.path).split(".").last
+    end
   end
 end

data/lib/broadway/resources/configuration.rb

@@ -57,6 +57,7 @@ module Broadway
       # then, we need to know where to look for _settings.yml
       source        = overrides[:source] || DEFAULTS[:source]
       settings_file = overrides[:settings] || DEFAULTS[:settings]
+      settings_file = ::File.join(source, "_config.yml") unless ::File.exists?(settings_file)
       # Get configuration from <source>/_config.yml
       begin
         settings    = YAML.load_file(settings_file).recursively_symbolize_keys!

data/lib/broadway/resources/link.rb

@@ -4,13 +4,27 @@ module Broadway
     include Broadway::Processable
     include Broadway::Convertible
     include Broadway::Configurable
-    include Broadway::Resourceful
     include Broadway::Hierarchical
     include Broadway::Sortable
     include Broadway::Taggable
+    include Broadway::Resourceful
     
     # link category is the menu it's in, or null
-    attr_accessor :href, :rel, :target, :resource, :categories
+    attr_accessor :href, :rel, :target, :resource
+    
+    def href=(value)
+      @href = value
+      @url = nil
+      @href
+    end
+    
+    def uri
+      @uri ||= Broadway::Uri.new(href)
+    end
+    
+    def inspect
+      "#<#{self.class.name.to_s} @href='#{self.href.to_s}' @rel='#{self.rel.to_s}' @target='#{self.target.to_s}'/>"
+    end
     
   end
 end

data/lib/broadway/resources/post.rb

@@ -5,6 +5,7 @@ module Broadway
     include Broadway::Processable
     include Broadway::Convertible
     include Broadway::Resourceful
+    include Broadway::Hierarchical
     include Broadway::Readable
     include Broadway::Configurable
     include Broadway::Sluggable
@@ -12,8 +13,8 @@ module Broadway
     include Broadway::Taggable
     include Broadway::Layoutable
     include Broadway::Assetable
-    include Broadway::Hierarchical
     include Broadway::Publishable
+    include Broadway::Linkable
     include Broadway::Themeable
     
     def sluggify
@@ -39,10 +40,7 @@ module Broadway
     def format
       extension
     end
-    def updated_at
-      date
-    end
-    alias created_at updated_at
+    
     def body
       read
     end
@@ -99,6 +97,35 @@ module Broadway
     def parent_path
       ("/" + categories.join("/")).squeeze("/")
     end
+
+    class << self
+      def yaml(attributes = nil, &block)
+        @yaml = [attributes, block]
+      end
+      
+      def to_yaml(record)
+        result = "---\n"
+        @yaml[0].each do |attribute|
+          result << "#{attribute.to_s}: \"#{record.send(attribute)}\"\n"
+        end
+        result << "\n"
+        result << record.instance_eval(&@yaml[1])
+        result
+      end
+      
+      def from_yaml(content)
+        if content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
+          self.data = YAML.load($1)
+          self.data.each do |k, v|
+            if self.respond_to?("#{k}=")
+              self[k] = v
+            end
+          end
+          content = content[($1.size + $2.size)..-1]
+        end
+        self.body = content
+      end
+    end
     
   end
 end

data/lib/broadway/resources/uri.rb

@@ -0,0 +1,49 @@
+module Broadway
+  class Uri
+    def initialize(url, query = {})
+      unless query.blank?
+        url << "?" unless url =~ /\?/
+        url << query.map do |k, v|
+          url << "#{k}=#{v}"
+        end.join("&")
+      end
+      @uri = URI.parse(url)
+    end
+    
+    def url
+      @uri.to_s
+    end
+    
+    def to_s
+      url
+    end
+    
+    def path
+      uri.path
+    end
+    
+    def host
+      uri.host
+    end
+    
+    def http?
+      scheme == "http"
+    end
+    
+    def https?
+      scheme == "https"
+    end
+    
+    def scheme
+      uri.scheme
+    end
+    
+    def query
+      uri.query
+    end
+    
+    def query_hash
+      @query_hash ||= Broadway::Utils.parse_query(query)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: broadway
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -05:00
+date: 2010-09-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,6 +70,7 @@ files:
 - lib/broadway/mixins/convertible.rb
 - lib/broadway/mixins/hierarchical.rb
 - lib/broadway/mixins/layoutable.rb
+- lib/broadway/mixins/linkable.rb
 - lib/broadway/mixins/pageable.rb
 - lib/broadway/mixins/processable.rb
 - lib/broadway/mixins/publishable.rb
@@ -91,6 +92,7 @@ files:
 - lib/broadway/resources/post.rb
 - lib/broadway/resources/site.rb
 - lib/broadway/resources/slug.rb
+- lib/broadway/resources/uri.rb
 - lib/broadway/run.rb
 - lib/broadway/sinatra/app.rb
 - lib/broadway/sinatra/helpers/collection_helper.rb