amiba 0.0.2 → 0.0.3

data/lib/amiba/all.rb

@@ -11,3 +11,4 @@ require 'amiba/page'
 require 'amiba/entry'
 require 'amiba/site'
 require 'amiba/scope'
+require 'webrick'

data/lib/amiba/entry.rb

@@ -1,3 +1,5 @@
+require 'etc'
+
 module Amiba
   module Entry
 
@@ -11,6 +13,7 @@ module Amiba
       class_option :title, :required => true
       class_option :state, :default => 'draft'
       class_option :layout, :default => 'default'
+      class_option :author, :default => Etc.getpwnam(ENV["USER"])["gecos"].split(",")[0]
       class_option :slug
 
       def init_source
@@ -18,7 +21,7 @@ module Amiba
                                            name,
                                            format,
                                            options,
-                                           "h1. New post\n")
+                                           "# New post\n")
       end
 
       def should_not_exist

data/lib/amiba/page.rb

@@ -1,4 +1,5 @@
 require 'amiba/source'
+require 'etc'
 
 module Amiba
   module Page
@@ -17,6 +18,7 @@ module Amiba
       class_option :description, :required => true
       class_option :category, :default => "plain"
       class_option :state, :default => "draft"
+      class_option :author, :default => Etc.getpwnam(ENV["USER"])["gecos"].split(",")[0]
 
       def init_source
         @source = Amiba::Source::Page.new(name, format, options, Templates.send(format.to_sym))

data/lib/amiba/scope.rb

@@ -29,14 +29,18 @@ module Amiba
     end
 
     def site_name
+       Amiba::Configuration.site_name.nil? ? "" : Amiba::Configuration.site_name
+    end
+
+    def site_url
       Amiba::Configuration.site_name.nil? ? "" : "http://#{Amiba::Configuration.site_name}/"
     end
 
     def full_url(frag)
-      if site_name.empty?
+      if site_url.empty?
         frag
       else
-        URI.join(site_name, frag).to_s
+        URI.join(site_url, frag).to_s
       end
     end
 

data/lib/amiba/site.rb

@@ -1,6 +1,34 @@
 module Amiba
   module Site
 
+    class Preview < Thor::Group
+      include Amiba::Generator
+
+      namespace :"site:preview"
+      class_option :port, :default => 4321
+
+      def create
+        invoke Amiba::Site::Generate
+      end
+
+      def preview
+        root = File.expand_path(File.join(Amiba::Configuration.site_dir, "public"))
+        logger = WEBrick::Log.new($stderr, WEBrick::Log::ERROR)
+        server = WEBrick::HTTPServer.new({:Port => options[:port], :DocumentRoot => root, :Logger => logger})
+
+        ['INT', 'TERM'].each {|signal| 
+          trap(signal) {server.shutdown}
+        }
+
+        say ""
+        say ""
+        say "Preview available at http://localhost:#{options[:port]}/"
+        say "To end, press Ctrl+C"
+
+        server.start
+      end
+    end
+
     class S3Upload < Thor::Group
       include Amiba::Generator
 

data/lib/amiba/source/entry.rb

@@ -4,6 +4,10 @@ module Amiba
       extend Amiba::Source::EntryFinder
       include Amiba::Source
       
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.uncountable "blog"
+      end
+
       attr_accessor :category
       metadata_fields :title, :slug, :state, :layout
 

data/lib/amiba.rb

@@ -57,14 +57,18 @@ module Amiba
         empty_directory File.join(target, dirname)
       end
     end
-    
+
+    def create_default_feeds
+      directory File.join("templates", "feeds"), File.join(target, dirname)
+    end
+
     def create_default_page
       inside(target, :verbose => true) do
         invoke(Amiba::Page::Create,
                [options[:default_page]],
                :title => name.titleize,
                :description => "#{name.titleize} Homepage. Please change this to be more descriptive")
-      end   
+      end
     end
 
     def commit_to_git

data/templates/feeds/index.atom.builder

@@ -0,0 +1,21 @@
+xml.instruct!
+xml.feed "xml:lang" => "en-GB", "xmlns" => 'http://www.w3.org/2005/Atom' do
+  xml.id "tag:#{site_name},2005:/index.atom"
+  xml.link(:rel => 'alternate', :type => 'text/html', :href => full_url("/"))
+  xml.link(:rel => 'self', :type => 'application/atom+xml', :href => full_url("/index.atom"))
+  xml.title "Template atom feed"
+  xml.updated entries.first.pubdate.xmlschema
+
+  entries.each do |entry|
+    xml.item do |item|
+      item.title entry.title
+      item.link(:rel => 'alternate', :type => 'text/html', :href => full_url(entry.link))
+      item.id "tag:#{site_name},2005:#{entry.link}"
+      item.published entry.pubdate.xmlschema
+      item.author do |author|
+        author.name entry.author
+      end
+      item.content(entry.render, :type => "html")
+    end
+  end
+end

data/templates/feeds/index.rss2.builder

@@ -0,0 +1,19 @@
+xml.instruct!
+xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/" do
+  xml.channel do
+    xml.title "Template RSS Feed"
+    xml.link full_url "/index.rss2"
+    xml.pubDate Time.now.rfc822
+    xml.description ""
+    entries.published.each do |entry|
+      xml.item do
+        xml.title entry.title
+        xml.link full_url entry.link
+        xml.description entry.render
+        xml.pubDate entry.pubdate.rfc822
+        xml.guid full_url entry.link
+        xml.author entry.author
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amiba
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Steven Mohapi-Banks
@@ -147,9 +147,25 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: grit
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 4
+        - 1
+        version: 2.4.1
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,11 +175,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec_tag_matchers
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,11 +189,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,11 +203,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -205,7 +221,7 @@ dependencies:
         - 1
         version: 2.0.0.beta1
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 description: Description TBD
 email: 
 - s.mohapi-banks@digital-science.com
@@ -234,6 +250,8 @@ files:
 - lib/amiba/source/partial.rb
 - lib/amiba/source.rb
 - lib/amiba.rb
+- templates/feeds/index.atom.builder
+- templates/feeds/index.rss2.builder
 - templates/layouts/default.haml.tt
 - templates/skeletons/page.haml.tt
 - templates/skeletons/page.md.tt