hightouch 0.1.0 → 0.1.2

data/Gemfile

@@ -5,6 +5,8 @@ gem 'rygments'
 gem 'rack-codehighlighter'
 gem 'redcarpet'
 gem 'virtus'
+gem 'octokit'
+#gem 'hightouch'
 
 # Development dependencies
 gem 'pry'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/middleman/middleman.git
-  revision: 3c78d9f171e44806165bf2a5c710b376a23bcd7b
+  revision: f76883b53aec64cf583979d170f392c73d618765
   specs:
     middleman (3.0.0.beta.2)
       middleman-core (= 3.0.0.beta.2)
@@ -16,7 +16,7 @@ GIT
       tilt (~> 1.3.1)
     middleman-more (3.0.0.beta.2)
       coffee-script (~> 2.2.0)
-      compass (~> 0.12.0)
+      compass (~> 0.12.1)
       execjs (~> 1.2)
       haml (~> 3.1.0)
       middleman-core (= 3.0.0.beta.2)
@@ -32,13 +32,14 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.2.7)
     chunky_png (1.2.5)
     coderay (1.0.5)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    compass (0.12.0)
+    compass (0.12.1)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
@@ -49,9 +50,16 @@ GEM
       multi_json (~> 1.0)
     factory_girl (2.6.3)
       activesupport (>= 2.3.9)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    faraday_middleware (0.8.5)
+      faraday (>= 0.7.4, < 0.9)
     ffi (1.0.11)
     fssm (0.2.8.1)
     haml (3.1.4)
+    hashie (1.2.0)
     hike (1.2.1)
     i18n (0.6.0)
     listen (0.3.3)
@@ -60,7 +68,14 @@ GEM
       rb-inotify (~> 0.8.8)
     method_source (0.7.1)
     multi_json (1.1.0)
+    multipart-post (1.1.5)
     nokogiri (1.5.2)
+    octokit (1.0.0)
+      addressable (~> 2.2)
+      faraday (~> 0.7)
+      faraday_middleware (~> 0.8)
+      hashie (~> 1.2)
+      multi_json (~> 1.0)
     pry (0.9.8.4)
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
@@ -113,6 +128,7 @@ PLATFORMS
 DEPENDENCIES
   factory_girl
   middleman!
+  octokit
   pry
   rack-codehighlighter
   redcarpet

data/README.md

@@ -5,6 +5,18 @@ hightouch (HT) is a static website generator based on
 inspired by
 [middleman-blog](https://github.com/middleman/middleman-blog).
 
-### Start to write a blog posting
+# Install
 
+```ruby
+gem install hightouch
+```
+
+# Usage
+
+```ruby
+hightouch new app_name # Or ht new app_name
+cd app_name
+bundle install
+middleman
+```
 

data/config.rb

@@ -1,7 +1,6 @@
 Bundler.require
-require 'i18n'
-require 'hightouch'
 
+require 'hightouch'
 activate :hightouch
 
 Encoding.default_external = 'utf-8'

data/lib/hightouch/archive.rb

@@ -4,23 +4,27 @@ module Hightouch
 
     attribute :name, String
     attribute :blog, Blog
-    attribute :blog_postings, Hash, default: {}
+    attribute :blog_posting_cache, Hash, default: {}
+
+    def blog_postings
+      Hash[blog_posting_cache.sort_by { |k, v| v.date_created }.reverse]
+    end
 
     def add_blog_posting(blog_posting)
-      blog_postings[blog_posting.name] = blog_posting
+      blog_posting_cache[blog_posting.name] = blog_posting
     end
 
     def remove_blog_posting(blog_posting)
-      blog_postings.delete(blog_posting.name)
+      blog_posting_cache.delete(blog_posting.name)
       blog.remove_archive(self) if empty?
     end
 
     def empty?
-      blog_postings.empty?
+      blog_posting_cache.empty?
     end
 
     def count
-      blog_postings.size
+      blog_posting_cache.size
     end
 
     def path

data/lib/hightouch/archive_page_generator.rb

@@ -1,9 +1,14 @@
 module Hightouch
   module ArchivePageGenerator
-    def generate_archive_page(archive)
-      page archive.path, proxy: "/templates/archive.html", ignore: true do
-        @collection = archive.class.name.split(/::/).last.downcase.pluralize.to_sym
-        @archive_name = archive.name
+    def generate_archive_pages
+      [:categories, :tags, :archives].each do |i|
+        blog.send(i).each do |k, v|
+          template_name = v.class.name.split(/::/).last.downcase
+          page v.path, proxy: "/templates/archive.html", ignore: true do
+            @collection = i
+            @archive_name = v.name
+          end
+        end
       end
     end
   end

data/lib/hightouch/blog.rb

@@ -2,10 +2,10 @@ module Hightouch
   class Blog
     include Virtus
 
-    attribute :archives, Hash, default: {}
-    attribute :categories, Hash, default: {}
-    attribute :tags, Hash, default: {}
-    attribute :blog_postings, Hash, default: {}
+    attribute :archive_cache, Hash, default: {}
+    attribute :category_cache, Hash, default: {}
+    attribute :tag_cache, Hash, default: {}
+    attribute :blog_posting_cache, Hash, default: {}
 
     attr_reader :app
 
@@ -13,28 +13,48 @@ module Hightouch
       @app = app
     end
 
+    def archives
+      Hash[archive_cache.sort_by { |k, v| v.name }.reverse]
+    end
+
+    def categories
+      Hash[category_cache.sort_by { |k, v| v.name }]
+    end
+
+    def tags
+      Hash[tag_cache.sort_by { |k, v| v.name }]
+    end
+
+    def blog_postings
+      Hash[blog_posting_cache.sort_by { |k, v| v.date_created }.reverse]
+    end
+
     def create_archive(type, attrs)
-      send(type.name.split(/::/).last.downcase.pluralize.to_sym)[attrs[:name]] = type.new(attrs)
+      send("#{type.name.split(/::/).last.downcase}_cache".to_sym)[attrs[:name]] = type.new(attrs)
+    end
+
+    def find_archive(type, key)
+      send("#{type.name.split(/::/).last.downcase}_cache".to_sym)[key]
     end
 
     def remove_archive(archive)
       key = archive.name
-      send(archive.class.name.split(/::/).last.downcase.pluralize.to_sym).delete(key)
+      send("#{archive.class.name.split(/::/).last.downcase}_cache".to_sym).delete(key)
     end
 
     def touch_blog_posting(page)
       key = page.data.title
-      blog_posting = blog_postings[key]
+      blog_posting = blog_posting_cache[key]
 
       if blog_posting
         blog_posting.update
       else
-        blog_postings[key] = BlogPosting.new(page, self)
+        blog_posting_cache[key] = BlogPosting.new(page, self)
       end
     end
 
     def blog_posting(path)
-      blog_postings.values.select { |v| v.url == path }.first
+      blog_posting_cache.values.select { |v| v.url == path }.first
     end
   end
 end

data/lib/hightouch/blog_posting.rb

@@ -40,14 +40,19 @@ module Hightouch
       update_archive(@date_created)
 
       @description = nil
-      @article_body = nil
+      @body = nil
     end
 
     def article_body
-      @article_body ||= begin
-                          body = page.render(layout: false)
-                          body.sub!(DESC_SEPARATOR, '')
-                        end
+      @body ||= begin
+                  body = page.render(layout: false)
+
+                  if body =~ DESC_SEPARATOR
+                    body.sub!(DESC_SEPARATOR, '')
+                  else
+                    body
+                  end
+                end
     end
 
     def description
@@ -77,7 +82,7 @@ module Hightouch
         a = association[u]
         next if a
 
-        a = blog.send(association_name)[u] || blog.send(:create_archive, type, name: u, blog: blog)
+        a = blog.find_archive(type, u) || blog.send(:create_archive, type, name: u, blog: blog)
 
         a.add_blog_posting(self)
         association[u] = a
@@ -88,7 +93,7 @@ module Hightouch
       name = date_created.strftime('%Y/%m')
       return if archive && archive.name == name
 
-      archive = blog.archives[name] || blog.create_archive(Archive, name: name, blog: blog)
+      archive = blog.find_archive(Archive, name) || blog.create_archive(Archive, name: name, blog: blog)
       archive.add_blog_posting(self)
     end
   end

data/lib/hightouch/version.rb

@@ -1,3 +1,3 @@
 module Hightouch
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/hightouch.rb

@@ -37,12 +37,6 @@ module Hightouch
       @blog ||= Blog.new(self)
     end
 
-    def generate_archive_pages
-      [:categories, :tags, :archives].each do |i|
-        blog.send(i).each { |k, v| generate_archive_page(v) }
-      end
-    end
-
     def font_size_for_tag(tag, opts = {})
       max_font_size = opts[:max_font_size] || 36
       min_font_size = opts[:min_font_size] || 11
@@ -60,20 +54,6 @@ module Hightouch
     end
 
     private
-    def generate_category_page(category)
-      name = category.is_a?(String) ? category : category.name
-      page "/blog/#{name}.html", proxy: "/templates/category.html", ignore: true do
-        @category_name = name
-      end
-    end
-
-    def generate_tag_page(tag)
-      name = tag.is_a?(String) ? tag : tag.name
-      page "/blog/tags/#{name}.html", proxy: "/templates/tag.html", ignore: true do
-        @tag_name = name
-      end
-    end
-
     def max_tag
       blog.tags.values.max { |x, y| x.count <=> y.count }
     end
@@ -81,8 +61,6 @@ module Hightouch
     def min_tag
       blog.tags.values.min { |x, y| x.count <=> y.count }
     end
-
-
   end
 end
 

data/source/partials/_sidebar.html.haml

@@ -5,13 +5,13 @@
       %ul
         - blog.categories.each do |k, v|
           %li=link_to "#{titleize(humanize(k))} (#{v.count})", v.path
-    %li
-      %h2 Tags
-      %div
-        - blog.tags.each do |k, v|
-          =link_to k, v.path, style: "font-size: #{font_size_for_tag(v)}px;", title: "#{v.count} blog posting#{"s" if v.count > 1}"
     %li
       %h2 Archives
       %ul
         - blog.archives.each do |k, v|
           %li=link_to "#{titleize(humanize(k))} (#{v.count})", v.path
+    %li
+      %h2 Tags
+      %div
+        - blog.tags.each do |k, v|
+          =link_to k, v.path, style: "font-size: #{font_size_for_tag(v)}px;", title: "#{v.count} blog posting#{"s" if v.count > 1}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hightouch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman
-  requirement: &21019520 !ruby/object:Gem::Requirement
+  requirement: &20215420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *21019520
+  version_requirements: *20215420
 - !ruby/object:Gem::Dependency
   name: rygments
-  requirement: &21018000 !ruby/object:Gem::Requirement
+  requirement: &20214560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21018000
+  version_requirements: *20214560
 - !ruby/object:Gem::Dependency
   name: rack-codehighlighter
-  requirement: &20987280 !ruby/object:Gem::Requirement
+  requirement: &20213660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *20987280
+  version_requirements: *20213660
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &20985020 !ruby/object:Gem::Requirement
+  requirement: &20163380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *20985020
+  version_requirements: *20163380
 - !ruby/object:Gem::Dependency
   name: virtus
-  requirement: &20982200 !ruby/object:Gem::Requirement
+  requirement: &20161900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *20982200
+  version_requirements: *20161900
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: &20160140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20160140
 description: Hightouch(HT) will help you to build your web blog in minutes and with
   helpers to deploy your site to github pages
 email:
@@ -88,8 +99,6 @@ files:
 - lib/hightouch/tag.rb
 - lib/hightouch/version.rb
 - lib/hightouch.rb
-- source/templates/tag.html.haml
-- source/templates/category.html.haml
 - source/templates/archive.html.haml
 - source/stylesheets/pygments-github.css
 - source/stylesheets/pygments.css

data/source/templates/category.html.haml

@@ -1,5 +0,0 @@
-- blog.categories.each do |k, v|
-  - if k == @archive_name
-    - v.blog_postings.each do |url, p|
-      = partial "partials/blog_posting_summary", locals: { blog_posting: p }
-

data/source/templates/tag.html.haml

@@ -1,4 +0,0 @@
-- blog.tags.each do |k, v|
-  - if k == @archive_name
-    - v.blog_postings.each do |url, p|
-      = partial "partials/blog_posting_summary", locals: { blog_posting: p }