tumblargh 0.1.0 → 0.2.0

data/README.md

@@ -27,14 +27,15 @@ The recommended way to use tumblargh is in conjuction with
 templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more).
 
 Tumblargh includes a simple Middleman extension that turns any Middleman project
-into a local Tumblr theme building machine.
+into a local Tumblr theme building machine. As of `0.2.0`, Tumblargh requires
+Middleman `>= 3.0`.
 
 Tumblargh will automatically parse any html files served by Middleman, and 
 populate them with content from the Tumblr of your choosing. It will not
-parse any HTML during Middleman's build process. The output of`middleman build` 
+parse any HTML during Middleman's build process. The output of `middleman build` 
 is ready for use on your blog, or submission to the Tumblr theme store.
 
-To get up an running with Middleman, first create a new Middleman project:
+To get up and running with Middleman, first create a new Middleman project:
 
 ```
 $ middleman init MY_PROJECT_NAME
@@ -46,24 +47,19 @@ If one does not already exist, create a Gemfile and add the following as needed:
 source "http://rubygems.org"
 
 gem 'middleman'
-gem 'tumblargh', :git => 'git://github.com/jasonwebster/tumblargh.git'
+gem 'tumblargh'
 ```
 
-Note that there has not yet been an official release of tumblargh to RubyGems,
-so currently, specifying the gem via git is necessary.
-
 Run `bundle install`.
 
 The bare minimum setup in your Middleman config.rb is:
 
 ```ruby
 require 'tumblargh'
-require 'middleman/features/tumblargh'
-
-activate :tumblargh
 
-set_tumblr_api_key 'API KEY' # This is your OAuth consumer key
-set_tumblr_blog 'staff.tumblr.com'
+activate :tumblargh,
+  api_key: 'API KEY', # This is your OAuth consumer key
+  blog: 'staff.tumblr.com'
 ```
 
 It is highly recommended to run the Middleman server via `bundle exec`.

data/Rakefile

@@ -28,7 +28,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |s|
   s.name        = 'tumblargh'
   s.summary     = 'Groan-less Tumblr theme development.'
-  s.description = `cat README.md`
+  s.description = "If you've ever had to build a Tumblr theme, you've probably cried out in pain while tweaking locally, copying, pasting into the theme editor, saving, switching tabs and finally refreshing and waiting for your tesing blog to reload. Tumblargh aims to reduce suffering involved with building a theme by offering a way to fully develop, lint and test Tumblr themes locally, with real posts from any existing Tumblog."
   s.authors     = ['Jason Webster']
   s.email       = 'jason@metalabdesign.com'
   s.homepage    = 'http://github.com/jasonwebster/tumblargh'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/examples/middleman_config.rb

@@ -1,7 +1,6 @@
 require 'tumblargh'
-require 'middleman/features/tumblargh'
 
+activate :tumblargh,
+  api_key: 'API KEY',
+  blog: 'staff.tumblr.com'
 
-activate :tumblargh
-set_tumblr_api_key 'API KEY'
-set_tumlbr_blog 'staff.tumblr.com'

data/lib/middleman/extensions/tumblargh.rb

@@ -0,0 +1,39 @@
+require 'rack/tumblargh'
+
+module Middleman
+  module Extensions
+    module Tumblargh
+      class << self
+
+        def registered(app, options={})
+          ::Tumblargh::API::set_api_key(options[:api_key])
+
+          app.after_configuration do
+            unless build?
+              use ::Rack::Tumblargh, options
+            end
+          end
+
+        end
+
+        alias :included :registered
+      end
+
+    end
+  end
+
+  # So, page proxies don't support globs or regex matching anymore, due to how the
+  # new Sitemap stuff works (at least as far as I can tell). This is what I came
+  # up with as a workaround.
+  module Sitemap
+    class Store
+      alias_method :orig_find_resource_by_destination_path, :find_resource_by_destination_path
+
+      def find_resource_by_destination_path(request_path)
+        request_path = "/index.html" if request_path.match(/^\/post\//)
+        orig_find_resource_by_destination_path(request_path)
+      end
+    end
+  end
+
+end

data/lib/rack/tumblargh.rb

@@ -1,6 +1,5 @@
 module Rack
   class Tumblargh
-    Tumblargh = ::Tumblargh
 
     def initialize(app, options={})
       @app = app
@@ -11,10 +10,18 @@ module Rack
     attr_reader :options
 
     def call(env)
+      request = Rack::Request.new(env)
+
+      ['/tweets.js', %r{/api.*}].each do |route|
+        if request.path.match route
+          url = "http://#{@options[:blog]}#{request.path}?#{request.query_string}"
+          return [301, { "Location" => url }, []]
+        end
+      end
+
       status, headers, response = @app.call(env)
 
       if should_parse?(status, headers)
-
         content = response.respond_to?(:body) ? response.body : response
         render_opts = { :permalink => permalink?(env['PATH_INFO']) }
 
@@ -44,7 +51,7 @@ module Rack
     end
 
     def render(content, opts)
-      Tumblargh::render_html(content.first, options[:blog], opts)
+      ::Tumblargh::render_html(content.first, options[:blog], opts)
     end
 
   end

data/lib/tumblargh.rb

@@ -58,3 +58,8 @@ module Tumblargh
   end
 
 end
+
+if Kernel.const_defined? :Middleman
+  require "middleman/extensions/tumblargh"
+  Middleman::Extensions.register(:tumblargh, Middleman::Extensions::Tumblargh)
+end

data/lib/tumblargh/renderer.rb

@@ -1,6 +1,7 @@
 require 'cgi'
 
 require 'tumblargh/renderer/base'
+require 'tumblargh/renderer/blocks'
 require 'tumblargh/renderer/document'
 require 'tumblargh/renderer/literal'
 require 'tumblargh/renderer/tag'
@@ -37,280 +38,5 @@ module Tumblargh
       klass.new(node, context, *args)
     end
 
-
-    module Blocks
-
-      require 'tumblargh/renderer/blocks/base'
-
-      class Description < Base
-        def should_render?
-          !description.blank?
-        end
-      end
-
-      class NumberedPost < Base
-        attr_reader :num
-
-        def initialize(node, context, *args)
-          @num = args[0]
-          super(node, context)
-        end
-
-        def should_render?
-          num == context.posts.index(context_post) + 1
-        end
-      end
-
-
-
-      # Common post blocks
-      class Title < Base
-        def should_render?
-          !(title.nil? || title.blank?)
-        end
-      end
-
-      class Caption < Base
-        def should_render?
-          !(caption.nil? || caption.blank?)
-        end
-      end
-
-      # Base post type
-      class Post < Base
-        def should_render?
-          # TODO Looks like photosets come as type = 'photo'
-          self.class.name.split('::').last.downcase == context.type
-        end
-      end
-
-      # Source block for Quote posts
-      class Source < Base
-        def should_render?
-          !source.blank?
-        end
-
-        def source
-          context.source
-        end
-      end
-
-      class Text < Post
-      end
-
-      class Photo < Post
-        def photo_url(size=500)
-          context.photo_url(size)
-        end
-
-        def photo_alt
-          strip_html(context.caption)
-        end
-      end
-
-      class Photoset < Photo
-      end
-
-      class Video < Photo
-      end
-
-
-
-      class Quote < Post
-        def quote
-          context.text
-        end
-      end
-
-      class Chat < Post
-      end
-
-      class Link < Post
-      end
-
-
-      # Meta-block for Appearance booleans, like {block:IfSomething}
-      class Boolean < Base
-        attr_reader :variable
-
-        def initialize(node, context, *args)
-          @variable = args[0]
-          super(node, context)
-        end
-
-        def should_render?
-          context.boolean(variable.downcase)
-        end
-      end
-
-      class InverseBoolean < Boolean
-        def should_render?
-          ! super
-        end
-      end
-
-
-      # Rendered on permalink pages. (Useful for displaying the current post's
-      # title in the page title)
-      class PostTitle < Base
-        def should_render?
-          false
-        end
-
-        def post_title
-          # TODO: Implementation
-        end
-      end
-
-      # Identical to {PostTitle}, but will automatically generate a summary 
-      # if a title doesn't exist.
-      class PostSummary < PostTitle
-        def post_summary
-          # TODO: Implementation
-        end
-      end
-
-
-
-      class ContentSource < Base
-        def should_render?
-          !source_title.nil?
-        end
-
-        contextual_tag :source_url
-        contextual_tag :source_title
-
-        # TODO: Impl.
-        def black_logo_url
-        end
-
-        def logo_width
-        end
-
-        def logo_height
-        end
-
-      end
-
-      class SourceLogo < Base
-        # TODO: Impl.
-      end
-
-      class NoSourceLogo < SourceLogo
-        def should_render?
-          ! super
-        end
-      end
-
-      class HasTags < Base
-        def should_render?
-          !(tags.nil? || tags.blank?)
-        end
-      end
-
-
-      # Rendered on index (post) pages.
-      class IndexPage < Base
-        def should_render?
-          ! context.permalink?
-        end
-      end
-
-      # Rendered on post permalink pages.
-      class PermalinkPage < Base
-        def should_render?
-          context.permalink?
-        end
-      end
-
-      class SearchPage < Base
-        def should_render?
-          false
-        end
-      end
-
-      class NoSearchResults < Base
-        def should_render?
-          false
-        end
-      end
-
-      class TagPage < Base
-        def should_render?
-          false
-        end
-      end
-
-      # Rendered if you have defined any custom pages.
-      class HasPages < Base
-        # TODO: Implementation
-
-        def should_render?
-          false
-        end
-      end
-
-      # Rendered for each custom page.
-      class Pages < Base
-        # TODO: Implementation
-
-        def should_render?
-          false
-        end
-
-        # custom page url
-        def url
-        end
-
-        # custom page name/label
-        def label
-        end
-
-      end
-
-      # Rendered if you have Twitter integration enabled.
-      class Twitter < Base
-        # TODO: Implementation
-
-        def should_render?
-          false
-        end
-
-        def twitter_username
-        end
-
-      end
-
-
-      # {block:Likes} {/block:Likes}  Rendered if you are sharing your likes.
-      # {Likes} Standard HTML output of your likes.
-      # {Likes limit="5"} Standard HTML output of your last 5 likes.
-      # Maximum: 10
-      # {Likes width="200"} Standard HTML output of your likes with Audio and Video players scaled to 200-pixels wide.
-      # Scale images with CSS max-width or similar.
-      # {Likes summarize="100"} Standard HTML output of your likes with text summarize to 100-characters.
-      # Maximum: 250
-      class Likes < Base
-        # TODO: Implementation
-
-        def should_render?
-          false
-        end
-
-        def likes
-        end
-
-      end
-
-      require 'tumblargh/renderer/blocks/answer'
-      require 'tumblargh/renderer/blocks/audio'
-      require 'tumblargh/renderer/blocks/dates'
-      require 'tumblargh/renderer/blocks/navigation'
-      require 'tumblargh/renderer/blocks/notes'
-      require 'tumblargh/renderer/blocks/posts'
-      require 'tumblargh/renderer/blocks/reblogs'
-      require 'tumblargh/renderer/blocks/tags'
-
-    end
   end
 end