spandex 0.0.2 → 0.0.3

data/.gitignore

@@ -10,3 +10,4 @@ tmp/**/*
 bin/**
 .sass-cache/**
 Gemfile.lock
+pkg

data/lib/spandex/finder.rb

@@ -16,6 +16,7 @@ module Spandex
     end
 
     def get(path)
+      path = Page.pathify path
       load(Page.file_from_path(path, @base_dir), path)
     end
 
@@ -39,6 +40,10 @@ module Spandex
         .sort {|x, y| y.date <=> x.date }
     end
 
+    def find_pages(conditions)
+      find_inside(all_pages, conditions)
+    end
+
     def find_articles(conditions)
       find_inside(all_articles, conditions)
     end
@@ -64,6 +69,7 @@ module Spandex
     private
 
     def load(filename, key = Page.path_from_file(filename, @base_dir))
+      key = key.to_s
       return nil unless filename && key && File.exists?(filename)
       if @pages && @pages[key] && File.mtime(filename) < @pages[key].mtime
         @pages[key]
@@ -81,6 +87,7 @@ module Spandex
         next unless v
         cond = case k
                when :tag then lambda {|p| p.tags.include?(v) }
+               when :title then lambda {|p| p.title.match(v)}
                else lambda{|p| true}
                end
         output = output.select(&cond)

data/lib/spandex/page.rb

@@ -7,16 +7,6 @@ module Spandex
   class Page
     attr_reader :path, :mtime, :extension, :render_options
 
-    def self.from_path(path, base_path, render_options = {})
-      path = fix_path path
-      filename = file_from_path(path, base_path)
-      if filename
-        metadata, content = parse_file(filename)
-        Page.new(path, content, filename.extname, metadata, render_options)
-      else nil
-      end
-    end
-
     def self.from_filename(filename, base_path, render_options = {})
       pathname = Pathname.new(filename)
       return nil unless pathname.exist?
@@ -27,14 +17,6 @@ module Spandex
       Page.new(path, content, pathname.extname, metadata, render_options)
     end
 
-    def self.mtime(path, base_path)
-      file = file_from_path(path, base_path)
-      if File.exists?(path)
-        File.mtime(file) 
-      else nil
-      end
-    end
-
     def self.file_from_path(path, base_path)
       path = fix_path path
       paths = Pathname.glob(File.join(base_path, "#{path}.*"))
@@ -101,7 +83,7 @@ module Spandex
     end
 
     def self.pathify(path_or_string)
-      path_or_string.is_a?(String) ? Pathname.new(path_or_string) : path_or_string
+      path_or_string.is_a?(String) ? Pathname.new(fix_path path_or_string) : path_or_string
     end
     
     def self.parse_file(filename)

data/lib/spandex/version.rb

@@ -1,3 +1,3 @@
 module Spandex
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spandex.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Isaac Cambron"]
   s.email       = ["icambron@alum.mit.edu"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/icambron/spandex"
   s.summary     = "A simple content engine"
   s.description = "Spandex manages a store of markup files and their metadata, useful in building blogs or blog engines"
 

data/spec/finder_spec.rb

@@ -9,23 +9,23 @@ describe Spandex::Finder do
   context "when getting all pages" do
   
     it "can find files" do
-      create_file("lasers.md", "You know it's 18 when you throw your dice.")
-      create_file("cheese.textile", "You've climbed that mountain not only once but twice.")
+      create_file("lasers.md")
+      create_file("cheese.textile")
       make_finder.all_pages.size.should == 2
     end
     
     it "won't find repeated files roots" do
-      create_file("stuff.md", "Some say you're a loner but I know your kind.")
-      create_file("stuff.textile", "It's sad to see that's why I fake that I'm blind.")
+      create_file("stuff.md")
+      create_file("stuff.textile")
       
       make_finder.all_pages.size.should == 1
     end
 
     it "finds thing with populated attributes" do
-      create_file("stuff.md", "Some say you're a loner but I know your kind.", :title => "The")
-      create_file("more_stuff.textile", "It's sad to see that's why I fake that I'm blind.", :title => "Sounds")
+      create_file("stuff.md", :title => "The")
+      create_file("more_stuff.textile", :title => "Sounds")
 
-      make_finder.all_pages.map{|p| p.title}.should == ["The", "Sounds"]
+      make_finder.all_pages.map{|p| p.title}.should =~ ["The", "Sounds"]
     end
   
   end
@@ -37,8 +37,8 @@ describe Spandex::Finder do
     end
     
     it "only finds pages with dates" do
-      create_file("stuff.md", "You don't float like butterfly or fight like Ali.", :date => "2011/5/25")
-      create_file("more_stuff.md", "Dress like Prince but to the lowest degree.")
+      create_file("stuff.md", :date => "2011/5/25")
+      create_file("more_stuff.md")
       
       results = make_finder.all_articles
       results.size.should == 1
@@ -46,9 +46,9 @@ describe Spandex::Finder do
     end
 
     it "sorts by date descending" do
-      create_file("stuff.md", "I like that you can't slow down.", :date => "1986/5/25")
-      create_file("more_stuff.md", "Step back! 'Cause you ain't no one.", :date => "1982/5/25") 
-      create_file("even_more_stuff.md", "You're living in a lie.", :date => "2011/5/25")
+      create_file("stuff.md", :date => "1986/5/25")
+      create_file("more_stuff.md", :date => "1982/5/25") 
+      create_file("even_more_stuff.md", :date => "2011/5/25")
 
       results = make_finder.all_articles
 
@@ -59,7 +59,7 @@ describe Spandex::Finder do
     end
 
     it "ignores stray files" do
-      create_file("stuff.md~", "I like that you can't slow down.", :date => "1986/5/25")
+      create_file("stuff.md~", :date => "1986/5/25")
       make_finder.all_articles.should be_empty
     end
     
@@ -68,8 +68,8 @@ describe Spandex::Finder do
   context "when generating an atom feed" do
     
     it "generates real atom content" do
-      create_file("stuff.md", "You ain't nothing but a BFI", :date => "1986/5/25", :title => "BFI")
-      create_file("more_stuff.md", "Leaving town on a two wheeler while your kids are home", :date => "1982/5/25")
+      create_file("stuff.md", :date => "1986/5/25", :title => "BFI")
+      create_file("more_stuff.md", :date => "1982/5/25")
 
       #generate and then reparse
       feed = make_finder.atom_feed(3, "The Sounds", "sounds.test.org", "articles.xml")
@@ -85,9 +85,9 @@ describe Spandex::Finder do
     end 
 
     it "should only show the top n articles" do
-      create_file("stuff.md", "Giving up your love and life for some silver chrome", :date => "1986/5/25")
-      create_file("more_stuff.md", "You're acting like a fool so take my advice.", :date => "1986/5/25")
-      create_file("even_more_stuff.md", "It's not so hard to keep your eyes on the price.", :date => "1986/5/25")
+      create_file("stuff.md", :date => "1986/5/25")
+      create_file("more_stuff.md", :date => "1986/5/25")
+      create_file("even_more_stuff.md", :date => "1986/5/25")
 
       feed = make_finder.atom_feed(2, "The Sounds", "sounds.test.org", "articles.xml")
       ratom = Atom::Feed.load_feed(feed)
@@ -96,8 +96,8 @@ describe Spandex::Finder do
     end
 
     it "only includes pages with dates" do
-      create_file("stuff.md", "You don't float like butterfly or fight like Ali.", :date => "2011/5/25")
-      create_file("more_stuff.md", "Dress like Prince but to the lowest degree.")
+      create_file("stuff.md", :date => "2011/5/25")
+      create_file("more_stuff.md")
 
       feed = make_finder.atom_feed(2, "The Sounds", "sounds.test.org", "articles.xml")
       ratom = Atom::Feed.load_feed(feed)
@@ -110,33 +110,33 @@ describe Spandex::Finder do
   context "when listing tags" do
     
     it "can list tags" do
-      create_file("stuff.md",  "Excuses are all I ever get from you", :tags => "Sweedish, New Wave")
-      create_file("more_stuff.md", "And we both know it's true", :tags => "Indie Rock") 
+      create_file("stuff.md", :tags => "Sweedish, New Wave")
+      create_file("more_stuff.md", :tags => "Indie Rock") 
       
       tags = make_finder.tags
-      tags.should == ["Sweedish", "New Wave", "Indie Rock"]
+      tags.should =~ ["Sweedish", "New Wave", "Indie Rock"]
     end
 
     it "has unique tags" do
-      create_file("stuff.md", "It's not me, it is you", :tags => "Sweedish, Indie Rock")
-      create_file("more_stuff.md", "And nothing matters at all", :tags => "Indie Rock") 
+      create_file("stuff.md", :tags => "Sweedish, Indie Rock")
+      create_file("more_stuff.md", :tags => "Indie Rock") 
       
       tags = make_finder.tags
-      tags.should == ["Sweedish", "Indie Rock"]
+      tags.should =~ ["Sweedish", "Indie Rock"]
     end
   end
 
   context "loading a specific page" do
 
     it "does in fact load it" do
-      create_file("stuff.md", "It felt so right at the time")
+      create_file("stuff.md")
       page = make_finder.get("stuff")
       page.should_not be_nil
     end
 
     it "finds the first file tilt knows" do
-      create_file("stuff.snoogledoobers", "But we lost it all")
-      create_file("stuff.md", "You committed a crime")
+      create_file("stuff.snoogledoobers")
+      create_file("stuff.md")
       page = make_finder.get("stuff")
       page.extension.should == "md"
     end
@@ -149,23 +149,40 @@ describe Spandex::Finder do
     it "caches individual files" do
       finder = make_finder
 
-      create_file("stuff.md", "And did it matter to you", :tags => "yeah")
+      create_file("stuff.md", :tags => "yeah")
       finder.get("stuff").tags.should == ["yeah"]
 
-      create_file("stuff.md", "Now you lost it all", :tags => "nah")
+      create_file("stuff.md", :tags => "nah")
       finder.get("stuff").tags.should == ["yeah"]
     end
 
+    it "doesn't muck up the cache" do
+      create_file("stuff.md")
+      finder = make_finder
+      finder.all_pages
+      finder.get("stuff")
+      finder.all_pages.size.should == 1
+    end
+
     it "ignores trailing slashes" do
-      create_file("stuff.md", "Well, you're not so bright")
+      create_file("stuff.md")
       make_finder.get("stuff/").should_not be_nil
     end
 
+    it "doesn't create a separate cache entry for trailing slashes" do
+      create_file("stuff.md")
+      finder = make_finder
+      finder.all_pages
+      finder.get("stuff/")
+
+      finder.all_pages.size.should == 1
+    end
+
   end
 
   context "when loading by filename" do
     it "does in fact load something" do
-      create_file("stuff.md", "You don't have to say you're sorry")
+      create_file("stuff.md")
       page = make_finder.get_by_filename(File.join(TEMP_DIR, "stuff.md"))
       page.should_not be_nil
     end
@@ -177,21 +194,35 @@ describe Spandex::Finder do
 
   end
 
-  context "when finding articles" do
+  context "when find pages" do
     it "can find them by tag" do
-      create_file("no.md", "You never mean it when you say you're sorry", :tags => "nono", :date => "2011/5/25")
-      create_file("yeah.md", "No guts, no glory, no time to worry", :tags => "yeahyeah", :date => "2011/5/26", :title => "Yeah Yeah Yeah")
+      create_file("no.md", :tags => "nono")
+      create_file("yeah.md", :tags => "yeahyeah")
       
       
-      results = make_finder.find_articles(:tag => "yeahyeah")
+      results = make_finder.find_pages(:tag => "yeahyeah")
       results.size.should == 1
       results.first.title == "Yeah Yeah Yeah"
     end
 
+    it "can find them by titles" do
+      create_file("no.md", :title => "This has the wrong title")
+      create_file("yeah.md", :title => "This has the correct title")
+    end
+
+    it "can find them by multiple metrics" do
+      create_file("no.md", :tags => "yeah", :title => "This has the wrong title")
+      create_file("yeah.md", :tags => "no", :title => "This has the correct title")
+      create_file("definitely.md", :tags => "yeah", :title => "This has the correct title")
+
+      make_finder.find_pages(:tags => "yeah", :title => "correct")
+    end
+  end
+
+  context "when finding articles" do
     it "only finds articles" do
-      create_file("no.md", "No happy ending to your story", :tags => "yeahyeah")
-      create_file("yeah.md", "In moments like this, don't give a fuck about you", :tags => "yeahyeah", :date => "2011/5/26", :title => "Yeah Yeah Yeah")
-      
+      create_file("no.md", :tags => "yeahyeah")
+      create_file("yeah.md", :tags => "yeahyeah", :date => "2011/5/26", :title => "Yeah Yeah Yeah")      
       
       results = make_finder.find_articles(:tag => "yeahyeah")
       results.size.should == 1

data/spec/page_spec.rb

@@ -9,44 +9,44 @@ describe Spandex::Page do
 
   context "when parsing a file" do
     it "determines the extension" do 
-      page = create_page("test.md", "Oh my love we gotta save ourselves")
+      page = create_page("test.md")
       page.extension.should=="md"
     end
     
     it "can have a title" do
-      page = create_page("test.md", "If we wanna safe the world", :title => "The Best of Me")
+      page = create_page("test.md", :title => "The Best of Me")
       page.title.should == "The Best of Me"
     end
 
     it "can have a tag" do
-      page = create_page("test.md", "Don't give in to your hate", :tags => "sappy")
+      page = create_page("test.md", :tags => "sappy")
       page.tags.should have(1).tags
       page.tags.should == ["sappy"]
     end
     
     it "can have multiple tags" do
-      page = create_page("test.md", "When you know you can change", :tags => "sappy,slightly trite")
+      page = create_page("test.md", :tags => "sappy,slightly trite")
       page.tags.should == ['sappy', 'slightly trite']
     end
 
     it "can have multiple tags with weird spacing" do
-      page = create_page("test.md", "It's hitting home when you feel so strange", :tags => " sappy  , slightly trite ")
+      page = create_page("test.md", :tags => " sappy  , slightly trite ")
       page.tags.should == ['sappy', 'slightly trite']
     end
     
     it "can also have tags called 'categories'" do
-      page = create_page("test.md", "I wanna say those words", :categories => "sappy,slightly trite")
+      page = create_page("test.md", :categories => "sappy,slightly trite")
       page.tags.should have(2).tags
     end
 
     it "can parse the body" do
-      page = create_page("test.md", "But it's not that easy")
+      page = create_page("test.md", :content => "But it's not that easy")
       page.body.should == Redcarpet::Markdown.new(Redcarpet::Render::HTML).render("But it's not that easy")
     end
 
     it "pass in rendering options" do
       text = "```\nI smile but it doesn't make things right```"
-      create_file("test.md", text)
+      create_file("test.md", :content => text)
       page = Spandex::Page.from_filename(File.join(TEMP_DIR, "test.md"), TEMP_DIR, :fenced_code_blocks => true) 
       page.render_options.should have_key(:fenced_code_blocks)
       markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :fenced_code_blocks => true)
@@ -54,17 +54,17 @@ describe Spandex::Page do
     end
 
     it "can have a date" do
-      page = create_page("test.md", "test_content", :date => "2011/5/25")
+      page = create_page("test.md", :date => "2011/5/25")
       page.date.should == Date.civil(2011, 5, 25)
     end
 
     it "can omit the date" do
-      page = create_page("test.md", "test_content")
+      page = create_page("test.md")
       page.date.should be_nil
     end
 
     it "produces good atom output" do
-      page = create_page("test.md", "test_content", :title => "hello!", :date => "2011/5/25")
+      page = create_page("test.md", :title => "hello!", :date => "2011/5/25")
       entry = page.to_atom_entry("http://test.org")
       entry.title.should == "hello!"
     end

data/spec/spec_helper.rb

@@ -17,9 +17,12 @@ end
 module PageFactory
   include TempFileHelper
 
-  def create_file(name, content, metadata = {})
+  def create_file(name, metadata = {})
     full_name = File.join(TEMP_DIR, name)
-    metatext = metadata.map { |key, value| "#{key}: #{value}" }.join("\n")
+    metatext = metadata
+      .select { |key, value| key != :content}
+      .map { |key, value| "#{key}: #{value}" }.join("\n")
+    content = metadata[:content] ? metadata[:content] : "Some stuff"
     contents =<<-EOF
 #{metatext}
 
@@ -29,8 +32,8 @@ EOF
     full_name
   end
 
-  def create_page(name, content, metadata = {})
-    full_name = create_file(name, content, metadata)
+  def create_page(name, metadata = {})
+    full_name = create_file(name, metadata)
     Spandex::Page.from_filename(full_name, TEMP_DIR)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: spandex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Isaac Cambron
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -04:00
-default_executable: 
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -80,8 +79,7 @@ files:
 - spec/page_spec.rb
 - spec/spec_helper.rb
 - spec/wrapper_spec.rb
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/icambron/spandex
 licenses: []
 
 post_install_message: 
@@ -104,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple content engine