glinda 0.1.0 → 0.1.1

data/Gemfile

@@ -14,3 +14,7 @@ group :development do
   gem 'jeweler'
   gem 'gemcutter'
 end
+
+group :test, :development do
+  gem 'pry'
+end

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     ffi (1.1.5)
     fuubar (1.0.0)
@@ -28,9 +29,14 @@ GEM
     json (1.7.5)
     libwebsocket (0.1.5)
       addressable
+    method_source (0.7.1)
     mime-types (1.19)
     multi_json (1.3.6)
     nokogiri (1.5.5)
+    pry (0.9.8.4)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
@@ -54,6 +60,7 @@ GEM
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+    slop (2.4.4)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -66,6 +73,7 @@ DEPENDENCIES
   fuubar
   gemcutter
   jeweler
+  pry
   rake
   rdiscount
   rspec

data/Glinda.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "glinda"
-  s.version = "0.1.0"
+  s.name = %q{glinda}
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["rschmukler"]
-  s.date = "2012-09-05"
-  s.description = "Toto, expanded"
-  s.email = "ryan@slingingcode.com"
+  s.date = %q{2012-09-08}
+  s.description = %q{Toto, expanded}
+  s.email = %q{ryan@slingingcode.com}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -42,12 +42,13 @@ Gem::Specification.new do |s|
     "spec/templates/index.builder",
     "spec/templates/index.rhtml",
     "spec/templates/layout.rhtml",
-    "spec/templates/repo.rhtml"
+    "spec/templates/repo.rhtml",
+    "spec/templates/tags.rhtml"
   ]
-  s.homepage = "http://github.com/rschmukler/glinda"
+  s.homepage = %q{http://github.com/rschmukler/glinda}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Toto, expanded"
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Toto, expanded}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
@@ -70,6 +72,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<gemcutter>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
@@ -82,6 +85,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<gemcutter>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])

data/README.md

@@ -21,6 +21,29 @@ blog in 10 seconds
     $ heroku create myblog
     $ git push heroku master
 
+differences from toto
+---------------------
+
+### 1. Tagging Support
+
+Glinda supports tagging on articles. You may specify tags in articles by
+passing in a comma delimited list of tags.
+
+    title: the wizard of oz
+    date: 12/10/1932
+    tags: wizards, bears
+
+    This is a test
+
+After that, you may access a few variables.
+
+You may access a list of tags in all articles by using
+`tag_list` in any view.
+
+If a tag is passed such as: `/tags/wizards` you can access the tag in
+the `tags.rhtml` view by calling the variable `tag`. You may access all
+articles tagged with the specified tag by calling `archives`
+
 philosophy
 ----------
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/glinda.rb

@@ -4,6 +4,7 @@ require 'erb'
 require 'rack'
 require 'digest'
 require 'open-uri'
+require 'pry'
 
 if RUBY_PLATFORM =~ /win32/
   require 'maruku'
@@ -75,10 +76,11 @@ module Glinda
       articles = type == :html ? self.articles.reverse : self.articles
       {:articles => articles.map do |article|
         Article.new article, @config
-      end}.merge archives
+      end}.merge(archives)
     end
 
-    def archives filter = ""
+
+    def archives filter = "", tag = nil
       entries = ! self.articles.empty??
         self.articles.select do |a|
           filter !~ /^\d{4}/ || File.basename(a) =~ /^#{filter}/
@@ -86,7 +88,20 @@ module Glinda
           Article.new article, @config
         end : []
 
-      return :archives => Archives.new(entries, @config)
+      if tag.nil?
+        return :archives => Archives.new(entries, @config)
+      else
+        tagged_entries = entries.select do |e|
+          if e[:tags]
+            tags = e[:tags].split(',').map(&:strip).map(&:slugize)
+            tags.include? tag.slugize
+          else
+            false
+          end
+        end
+
+        return :archives => Archives.new(tagged_entries, @config), :tag => tag
+      end
     end
 
     def article route
@@ -113,6 +128,13 @@ module Glinda
               context[article(route), :article]
             else http 400
           end
+        elsif route.first == 'tags'
+          data = {}
+          if route.length == 2
+            context[archives("", route[1]), :tags]
+          else
+            context[{tag: nil}, :tags]
+          end
         elsif respond_to?(path)
           context[send(path, type), path.to_sym]
         elsif (repo = @config[:github][:repos].grep(/#{path}/).first) &&
@@ -145,6 +167,20 @@ module Glinda
       Dir["#{Paths[:articles]}/*.#{ext}"].sort_by {|entry| File.basename(entry) }
     end
 
+    def self.tag_list(ext)
+      tag_list = []
+      if !self.articles(ext).empty?
+        entries = self.articles(ext).map do |article|
+          Article.new(article, @config)
+        end
+
+        entries.map(&:tags).each do |tags|
+          tag_list += tags
+        end
+      end
+      return tag_list
+    end
+
     class Context
       include Template
       attr_reader :env
@@ -160,6 +196,10 @@ module Glinda
         end
       end
 
+      def tag_list
+        @tag_list ||= Site.tag_list(@config[:ext])
+      end
+
       def title
         @config[:title]
       end
@@ -275,6 +315,14 @@ module Glinda
       "/#{@config[:prefix]}#{self[:date].strftime("/%Y/%m/%d/#{slug}/")}".squeeze('/')
     end
 
+    def tags
+      if self[:tags]
+        self[:tags].split(',').map(&:strip)
+      else
+        []
+      end
+    end
+
     def title()   self[:title] || "an article"               end
     def date()    @config[:date].call(self[:date])           end
     def author()  self[:author] || @config[:author]          end

data/spec/articles/2001-01-01-two-thousand-and-one.txt

@@ -1,5 +1,6 @@
 title: the wizard of oz
 date: 12/10/1932
+tags: lions, tigers, bears
 
 Once upon a time...
 

data/spec/articles/2009-12-11-the-dichotomy-of-design.txt

@@ -1,5 +1,6 @@
 title: the wizard of oz
 date: 12/10/1932
+tags: wizards, bears
 
 Once upon a time...
 

data/spec/glinda_spec.rb

@@ -14,6 +14,7 @@ describe Glinda do
     Glinda::Paths[:articles] = "spec/articles"
     Glinda::Paths[:pages] = "spec/templates"
     Glinda::Paths[:templates] = "spec/templates"
+    Glinda.env = 'test'
   end
 
   describe "GET /" do
@@ -41,6 +42,11 @@ describe Glinda do
       page.all('#archives li').count.should == 2
     end
 
+    it "should have access to the tag_list" do
+      visit '/'
+      page.all('#tag_list li').count.should >= 2
+    end
+
     context "with no articles" do
       let(:response) { Rack::MockRequest.new(Glinda::Server.new(@config.merge(:ext => 'oxo'))).get('/') }
 
@@ -93,6 +99,42 @@ describe Glinda do
     end
   end
 
+  context "GET /tags" do
+    context "with a tag passed" do
+      let(:response) { @glinda.get '/tags/wizards' }
+
+      it "should return status code 200" do
+        response.status.should == 200
+      end
+
+      it "should set the content-type" do
+        response.content_type.should == "text/html"
+      end
+
+      it "should set the body to not enty" do
+        response.body.should_not be_empty
+      end
+
+      it "should include articles with the right tag" do
+        visit '/tags/wizards'
+        page.all('#articles li').count.should == 1
+      end
+
+
+      it "should have access to the tag passed in" do
+        visit '/tags/wizards'
+        page.find('#tag').should have_content 'wizards'
+      end
+    end
+
+    context "without a tag passed" do
+      it "should have access to a list of all tags" do
+        visit '/tags'
+        page.find('#tags').all('li').count.should >= 2
+      end
+    end
+  end
+
   context "GET /about" do
     let(:response) { @glinda.get('/about') }
     it "should return status code 200" do

data/spec/templates/index.rhtml

@@ -3,6 +3,11 @@
     <li><%= article %></li>
   <% end %>
 </ul>
+<ul id="tag_list">
+  <% tag_list.each do |tag| %>
+    <li><%= tag %></li>
+  <% end %>
+</ul>
 <div id="archives">
   <%= archives[3...5] %>
 </div>

data/spec/templates/tags.rhtml

@@ -0,0 +1,13 @@
+<% if !tag.nil? %>
+  <span id="tag"><%= tag %></span>
+  <ul id="articles">
+    <% archives.each do |a| %>
+      <li><%= a.title %></li>
+    <% end %>
+  </ul>
+<% else %>
+  <ul id="tags">
+    <% tag_list.each do |t| %>
+      <li><%= t %></li>
+    <% end %>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glinda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157562360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157562360
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157559960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157559960
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157558040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157558040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157555200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157555200
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157553100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157553100
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157550360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +77,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2157550360
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &2157548980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157548980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157547300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157547300
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157544480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157544480
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157539800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157539800
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2157536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,12 +132,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2157536780
 description: Toto, expanded
 email: ryan@slingingcode.com
 executables: []
@@ -205,6 +167,8 @@ files:
 - spec/templates/index.rhtml
 - spec/templates/layout.rhtml
 - spec/templates/repo.rhtml
+- spec/templates/tags.rhtml
+has_rdoc: true
 homepage: http://github.com/rschmukler/glinda
 licenses: []
 post_install_message: 
@@ -219,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1161747196556854221
+      hash: 2552251103154411482
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Toto, expanded