simple_site 0.0.1 → 0.0.2

data/README.rdoc

@@ -17,3 +17,6 @@ Description goes here.
 Copyright (c) 2011 David Radcliffe. See LICENSE.txt for
 further details.
 
+== Dependency Status
+
+{<img src="https://gemnasium.com/dwradcliffe/simple_site.png" alt="Dependency Status" />}[https://gemnasium.com/dwradcliffe/simple_site]

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/simple_site.rb

@@ -1,16 +1,32 @@
 require 'aws/s3'
 require 'uglifier'
+require 'simple_site/tasks'
+require 'simple_site/haml_context'
+require 'haml'
 
 class SimpleSite
   
+  attr_reader :options
+  
   def initialize(options = {})
-    @options = options
+    @options = {}
+    @options[:buckets] ||= [options.delete(:bucket)].compact
+    options[:buckets].each {|bucket| @options[:buckets] << bucket } unless options[:buckets].nil?
+    @options.merge!(options)
     @options[:js_files] ||= Dir['_js/*.js']
-    @options[:buckets] ||= []
+  end
+  
+  def js_files=(files)
+    @options[:js_files] = files
+  end
+  
+  def buckets=(buckets)
+    @options[:buckets] = buckets
   end
   
   def generate_html
-    system "haml -r simple_site/haml_helper.rb _src/index.haml public/index.html"
+    engine = Haml::Engine.new(File.read('_src/index.haml'))
+    File.open('public/index.html', 'w') {|f| f.write(engine.render(SimpleSite::HamlContext.new)) }
     puts "Regenerated site!"
   end
   
@@ -49,8 +65,8 @@ class SimpleSite
       age = 7*24*60*60
       options = {
         :access => :public_read,
-        :cache_control => "max-age=#{age}",
-        :expires => age.from_now.httpdate
+        :cache_control => "max-age=#{age}"
+        # :expires => age.from_now.httpdate
       }
       puts "  --> #{file}"
       @options[:buckets].each do |bucket|

data/lib/simple_site/haml_context.rb

@@ -0,0 +1,14 @@
+class SimpleSite
+  class HamlContext
+
+    def render_file filename
+      contents = File.read(filename)
+      Haml::Engine.new(contents).render
+    end
+
+    def partial partial_name
+      render_file "_src/_#{partial_name}.haml"
+    end
+
+  end
+end

data/lib/simple_site/tasks.rb

@@ -0,0 +1,77 @@
+require 'rake'
+require 'rake/tasklib'
+
+class SimpleSite
+  # Rake tasks for managing your site.
+  #
+  # Here's a basic usage example:
+  #
+  #   SimpleSite::Tasks.new do |site|
+  #     site.js_files = "site.js"
+  #     site.buckets = %w(www.myawesomesite.com www.myotherdomain.com)
+  #   end
+  class Tasks < ::Rake::TaskLib
+    
+    attr_reader :site
+    
+    def initialize(&site_building_block)
+      @site = SimpleSite.new
+      site_building_block.call @site
+      define
+    end
+    
+    private
+    
+      def define
+        
+        desc "Show SimpleSite config"
+        task :config do
+          
+          puts " "
+          puts "SimpleSite config:"
+          puts "AWS S3 buckets: #{@site.options[:buckets].join(', ')}"
+          puts "JS files: #{@site.options[:js_files].join(', ')}"
+          puts " "
+          
+        end
+      
+        desc "Generate Entire Site"
+        task :gen => ["gen:html", "gen:css", "gen:js"]
+      
+        namespace :gen do
+        
+          desc "Generate HTML"
+          task :html do
+            @site.generate_html
+          end
+        
+          desc "Generate CSS"
+          task :css do
+            @site.generate_css
+          end
+        
+          desc "Generate JS"
+          task :js do
+            @site.generate_js
+          end
+        
+        end
+      
+        desc "Deploy website"
+        task :deploy do
+          @site.deploy!
+        end
+      
+        namespace :deploy do
+        
+          task :file do
+            @site.deploy_file!
+          end
+        
+        end
+      
+      end
+    
+  end
+  
+end

data/simple_site.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_site"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Radcliffe"]
-  s.date = "2011-12-15"
+  s.date = "2011-12-27"
   s.description = "Helps build simple websites using haml and sass. Compresses your js. Deploys to AWS S3."
   s.email = "radcliffe.david@gmail.com"
   s.extra_rdoc_files = [
@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/simple_site.rb",
-    "lib/simple_site/haml_helper.rb",
+    "lib/simple_site/haml_context.rb",
+    "lib/simple_site/tasks.rb",
     "simple_site.gemspec",
     "test/helper.rb",
     "test/test_simple_site.rb"

data/test/test_simple_site.rb

@@ -1,7 +1,35 @@
 require 'helper'
 
 class TestSimpleSite < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  
+  should "have empty buckets on init" do
+    s = SimpleSite.new
+    assert_equal [], s.options[:buckets]
   end
+  
+  should "have one bucket" do
+    s = SimpleSite.new(:bucket => 'www.myawesomesite.com')
+    assert_equal ['www.myawesomesite.com'], s.options[:buckets]
+  end
+  
+  should "have two buckets" do
+    s = SimpleSite.new(:buckets => %w(www.myawesomesite.com www.myotherdomain.com))
+    assert_equal ['www.myawesomesite.com', 'www.myotherdomain.com'], s.options[:buckets]
+  end
+  
+  should "have empty list of js files" do
+    s = SimpleSite.new
+    assert_equal [], s.options[:js_files]
+  end
+  
+  should "have one js file" do
+    s = SimpleSite.new(:js_files => %w(site.js))
+    assert_equal ['site.js'], s.options[:js_files]
+  end
+  
+  should "have two js files" do
+    s = SimpleSite.new(:js_files => %w(site.js lib.js))
+    assert_equal ['site.js', 'lib.js'], s.options[:js_files]
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_site
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Radcliffe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-15 00:00:00 Z
+date: 2011-12-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -248,7 +248,8 @@ files:
 - Rakefile
 - VERSION
 - lib/simple_site.rb
-- lib/simple_site/haml_helper.rb
+- lib/simple_site/haml_context.rb
+- lib/simple_site/tasks.rb
 - simple_site.gemspec
 - test/helper.rb
 - test/test_simple_site.rb

data/lib/simple_site/haml_helper.rb

@@ -1,8 +0,0 @@
-def render_file(filename)
-  contents = File.read(filename)
-  Haml::Engine.new(contents).render
-end
-
-def partial partial_name
-  render_file "_src/_#{partial_name}.haml"
-end