confluence 0.0.1 → 0.1.0

data/Gemfile

@@ -9,7 +9,7 @@ gem "rdoc"
 gem "simplecov"
 gem "rspec"
 gem "thor"
-
+gem "activesupport"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -2,10 +2,14 @@ GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
   specs:
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     git (1.2.5)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -46,6 +50,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler
   jeweler (~> 1.8.4)
   rake

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/confluence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "confluence"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Chen"]
-  s.date = "2013-02-14"
+  s.date = "2013-02-18"
   s.description = "confluence is the merging of rivers. In particular, it is the merging of the fay-haskell-coffee-js river with the scss-css river with the psd-png river into the rails-ruby-haml rivers"
   s.email = "foxnewsnetwork@gmail.com"
   s.executables = ["confluence"]
@@ -45,7 +45,9 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/assets/images/README.markdown.tt",
     "lib/confluence/templates/assets/javascripts/README.markdown.tt",
     "lib/confluence/templates/assets/stylesheets/README.markdown.tt",
+    "lib/confluence/templates/config.ru",
     "lib/confluence/templates/lib/%project_name%.rb.tt",
+    "lib/confluence/templates/lib/%project_name%/presenter.rb.tt",
     "lib/confluence/templates/package.json.tt",
     "lib/confluence/templates/spec/%project_name%_spec.rb.tt",
     "lib/confluence/templates/spec/spec_helper.rb.tt",
@@ -53,8 +55,6 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/src/javascripts/%project_name%.hs.tt",
     "lib/confluence/templates/src/stylesheets/%project_name%.scss.tt",
     "lib/confluence/templates/test/integration/.gitignore",
-    "lib/confluence/templates/test/integration/Gemfile",
-    "lib/confluence/templates/test/integration/Gemfile.lock",
     "lib/confluence/templates/test/integration/README.rdoc",
     "lib/confluence/templates/test/integration/Rakefile",
     "lib/confluence/templates/test/integration/app/assets/images/rails.png",
@@ -63,14 +63,13 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/test/integration/app/assets/stylesheets/application.css",
     "lib/confluence/templates/test/integration/app/assets/stylesheets/pages.css",
     "lib/confluence/templates/test/integration/app/controllers/application_controller.rb",
-    "lib/confluence/templates/test/integration/app/controllers/pages_controller.rb",
+    "lib/confluence/templates/test/integration/app/controllers/html_controller.rb.tt",
     "lib/confluence/templates/test/integration/app/helpers/application_helper.rb",
-    "lib/confluence/templates/test/integration/app/helpers/pages_helper.rb",
+    "lib/confluence/templates/test/integration/app/helpers/html_helper.rb.tt",
     "lib/confluence/templates/test/integration/app/mailers/.gitkeep",
     "lib/confluence/templates/test/integration/app/models/.gitkeep",
+    "lib/confluence/templates/test/integration/app/views/html/index.html.haml.tt",
     "lib/confluence/templates/test/integration/app/views/layouts/application.html.erb",
-    "lib/confluence/templates/test/integration/app/views/pages/index.html.haml",
-    "lib/confluence/templates/test/integration/config.ru",
     "lib/confluence/templates/test/integration/config/application.rb",
     "lib/confluence/templates/test/integration/config/boot.rb",
     "lib/confluence/templates/test/integration/config/environment.rb",
@@ -84,7 +83,7 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/test/integration/config/initializers/session_store.rb",
     "lib/confluence/templates/test/integration/config/initializers/wrap_parameters.rb",
     "lib/confluence/templates/test/integration/config/locales/en.yml",
-    "lib/confluence/templates/test/integration/config/routes.rb",
+    "lib/confluence/templates/test/integration/config/routes.rb.tt",
     "lib/confluence/templates/test/integration/db/seeds.rb",
     "lib/confluence/templates/test/integration/lib/assets/.gitkeep",
     "lib/confluence/templates/test/integration/lib/tasks/.gitkeep",
@@ -119,6 +118,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<simplecov>, [">= 0"])
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
@@ -127,6 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
@@ -136,6 +137,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end

data/lib/confluence/templates/{test/integration/config.ru → config.ru}

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.join(::File.dirname(__FILE__), "test", "integration", "config", "environment")
 run Integration::Application

data/lib/confluence/templates/lib/%project_name%/presenter.rb.tt

@@ -0,0 +1,7 @@
+module <%= project_name.camelcase %>
+  class Presenter < Presentable::Presenter
+    def self.from_nothing
+      throw :NotImplementedError
+    end
+  end
+end

data/lib/confluence/templates/lib/%project_name%.rb.tt

@@ -1,3 +1,3 @@
-Dir[File.join(File.dirname(__FILE__), "<%= project_name %>", "*.rb")].each { |source| require source }
+Dir[File.join(File.dirname(__FILE__), "<%= project_name.underscore %>", "*.rb")].each { |source| require source }
 
-module <%= project_name.capitalize %>; end
+module <%= project_name.camelcase %>; end

data/lib/confluence/templates/spec/%project_name%_spec.rb.tt

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe <%= project_name %> do
+describe <%= project_name.camelcase %> do
 
   pending "Write some tests here!"
 

data/lib/confluence/templates/spec/spec_helper.rb.tt

@@ -1,5 +1,5 @@
 require "simplecov"
 SimpleCov.start
 require "rspec"
-require File.join File.expand_path("../lib", File.dirname(__FILE__)), "<%= project_name %>"
+require File.join File.expand_path("../lib", File.dirname(__FILE__)), "<%= project_name.underscore %>"
 

data/lib/confluence/templates/src/stylesheets/%project_name%.scss.tt

@@ -1,3 +1,3 @@
-.<%= project_name %>_box {
+.<%= project_name.dasherize %>-box {
   font-size: 20px;
 }

data/lib/confluence/templates/test/integration/app/controllers/html_controller.rb.tt

@@ -0,0 +1,6 @@
+class HtmlController < ApplicationController
+  append_view_path File.expand_path("../../../../assets", File.dirname(__FILE__))
+  append_view_path File.expand_path("../../../../assets/html", File.dirname(__FILE__))append_view_path
+  expose(:presenter) { <%= project_name.camelcase %>::Presenter.from_nothing %> }
+  def index; end
+end

data/lib/confluence/templates/test/integration/app/helpers/html_helper.rb.tt

@@ -0,0 +1,2 @@
+module HtmlHelper
+end

data/lib/confluence/templates/test/integration/app/views/html/index.html.haml.tt

@@ -0,0 +1 @@
+= render "<%= project_name.underscore %>", :presenter => presenter

data/lib/confluence/templates/test/integration/config/application.rb

@@ -22,7 +22,7 @@ module Integration
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
+    config.autoload_paths += %W(#{config.root}/extras #{File.expand_path('../../../lib', File.dirname(__FILE__))})
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

data/lib/confluence/templates/test/integration/config/boot.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/lib/confluence/templates/test/integration/config/{routes.rb → routes.rb.tt}

@@ -1,5 +1,5 @@
 Integration::Application.routes.draw do
-  get "pages/index"
+  get "html/index"
 
   # The priority is based upon order of creation:
   # first created -> highest priority.
@@ -50,7 +50,7 @@ Integration::Application.routes.draw do
 
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root :to => 'pages#index'
+  root :to => 'html#index'
 
   # See how all your routes lay out with "rake routes"
 

data/lib/confluence.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "thor"
+require "active_support/core_ext/string"
 Dir[File.join(File.dirname(__FILE__), "confluence", "*.rb")].each { |source| require source }
 
 module Confluence

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confluence
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +177,9 @@ files:
 - lib/confluence/templates/assets/images/README.markdown.tt
 - lib/confluence/templates/assets/javascripts/README.markdown.tt
 - lib/confluence/templates/assets/stylesheets/README.markdown.tt
+- lib/confluence/templates/config.ru
 - lib/confluence/templates/lib/%project_name%.rb.tt
+- lib/confluence/templates/lib/%project_name%/presenter.rb.tt
 - lib/confluence/templates/package.json.tt
 - lib/confluence/templates/spec/%project_name%_spec.rb.tt
 - lib/confluence/templates/spec/spec_helper.rb.tt
@@ -169,8 +187,6 @@ files:
 - lib/confluence/templates/src/javascripts/%project_name%.hs.tt
 - lib/confluence/templates/src/stylesheets/%project_name%.scss.tt
 - lib/confluence/templates/test/integration/.gitignore
-- lib/confluence/templates/test/integration/Gemfile
-- lib/confluence/templates/test/integration/Gemfile.lock
 - lib/confluence/templates/test/integration/README.rdoc
 - lib/confluence/templates/test/integration/Rakefile
 - lib/confluence/templates/test/integration/app/assets/images/rails.png
@@ -179,14 +195,13 @@ files:
 - lib/confluence/templates/test/integration/app/assets/stylesheets/application.css
 - lib/confluence/templates/test/integration/app/assets/stylesheets/pages.css
 - lib/confluence/templates/test/integration/app/controllers/application_controller.rb
-- lib/confluence/templates/test/integration/app/controllers/pages_controller.rb
+- lib/confluence/templates/test/integration/app/controllers/html_controller.rb.tt
 - lib/confluence/templates/test/integration/app/helpers/application_helper.rb
-- lib/confluence/templates/test/integration/app/helpers/pages_helper.rb
+- lib/confluence/templates/test/integration/app/helpers/html_helper.rb.tt
 - lib/confluence/templates/test/integration/app/mailers/.gitkeep
 - lib/confluence/templates/test/integration/app/models/.gitkeep
+- lib/confluence/templates/test/integration/app/views/html/index.html.haml.tt
 - lib/confluence/templates/test/integration/app/views/layouts/application.html.erb
-- lib/confluence/templates/test/integration/app/views/pages/index.html.haml
-- lib/confluence/templates/test/integration/config.ru
 - lib/confluence/templates/test/integration/config/application.rb
 - lib/confluence/templates/test/integration/config/boot.rb
 - lib/confluence/templates/test/integration/config/environment.rb
@@ -200,7 +215,7 @@ files:
 - lib/confluence/templates/test/integration/config/initializers/session_store.rb
 - lib/confluence/templates/test/integration/config/initializers/wrap_parameters.rb
 - lib/confluence/templates/test/integration/config/locales/en.yml
-- lib/confluence/templates/test/integration/config/routes.rb
+- lib/confluence/templates/test/integration/config/routes.rb.tt
 - lib/confluence/templates/test/integration/db/seeds.rb
 - lib/confluence/templates/test/integration/lib/assets/.gitkeep
 - lib/confluence/templates/test/integration/lib/tasks/.gitkeep
@@ -233,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3048967056017507046
+      hash: 3894050816172877045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/confluence/templates/test/integration/Gemfile

@@ -1,26 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '3.2.11'
-gem 'haml'
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-
-
-
-
-
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
-
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'

data/lib/confluence/templates/test/integration/Gemfile.lock

@@ -1,88 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    erubis (2.7.0)
-    haml (3.1.7)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.20.1)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
-      bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  haml
-  rails (= 3.2.11)

data/lib/confluence/templates/test/integration/app/controllers/pages_controller.rb

@@ -1,35 +0,0 @@
-require 'singleton'
-
-class PagesController < ApplicationController
-  class IntegrationsResolver < ActionView::Resolver
-    include Singleton
-    # Follow convention when using this!
-    # Actually, you, dear user, really
-    # should have no reason for changing
-    # the code here at all since it will be
-    # autogenerated for you for testing purposes
-    def find_templates(name, prefix, partial, details)
-      if partial
-        identifier = "#{prefix}-#{name}"
-        p_name = name.split "/"
-        p_name.push("_" + p_name.pop)
-        f_path = File.join( File.expand_path("../../../../assets/html", File.dirname(__FILE__)), p_name.join("/")  )
-        throw "#{name}--#{prefix}--#{partial}--#{details}--#{f_path}" unless File.exist?( f_path + ".html.haml")
-        source = File.read f_path + ".html.haml"
-        handler = ActionView::Template.registered_template_handler("haml")
-        details = {
-          :format => Mime[:html] ,
-          :updated_at => 1.seconds.ago ,
-          :virtual_path => f_path
-        }
-        [ActionView::Template::new( source, identifier, handler, details )]
-      else
-        []
-      end
-    end
-  end
-
-  append_view_path IntegrationsResolver.instance
-
-  def index; end
-end

data/lib/confluence/templates/test/integration/app/helpers/pages_helper.rb

@@ -1,2 +0,0 @@
-module PagesHelper
-end

data/lib/confluence/templates/test/integration/app/views/pages/index.html.haml

@@ -1 +0,0 @@
-= render "comment"