confluence 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/confluence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "confluence"
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Chen"]
-  s.date = "2013-02-18"
+  s.date = "2013-02-19"
   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"]
@@ -44,7 +44,10 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/assets/html/_%project_name%.html.haml.tt",
     "lib/confluence/templates/assets/images/README.markdown.tt",
     "lib/confluence/templates/assets/javascripts/README.markdown.tt",
+    "lib/confluence/templates/assets/javascripts/application.js",
     "lib/confluence/templates/assets/stylesheets/README.markdown.tt",
+    "lib/confluence/templates/assets/stylesheets/application.css",
+    "lib/confluence/templates/component.json.tt",
     "lib/confluence/templates/config.ru",
     "lib/confluence/templates/lib/%project_name%.rb.tt",
     "lib/confluence/templates/lib/%project_name%/presenter.rb.tt",
@@ -52,22 +55,11 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/spec/%project_name%_spec.rb.tt",
     "lib/confluence/templates/spec/spec_helper.rb.tt",
     "lib/confluence/templates/src/images/README.markdown.tt",
-    "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/README.rdoc",
     "lib/confluence/templates/test/integration/Rakefile",
-    "lib/confluence/templates/test/integration/app/assets/images/rails.png",
-    "lib/confluence/templates/test/integration/app/assets/javascripts/application.js",
-    "lib/confluence/templates/test/integration/app/assets/javascripts/pages.js",
-    "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/html_controller.rb.tt",
-    "lib/confluence/templates/test/integration/app/helpers/application_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/config/application.rb",
@@ -84,7 +76,6 @@ Gem::Specification.new do |s|
     "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.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",
     "lib/confluence/templates/test/integration/public/404.html",

data/lib/confluence/templates/.gitignore

@@ -52,10 +52,11 @@ pkg
 node_modules
 
 # for jamjs
-jam
+components
 
 # for haskell
 dist
 
 # For integration testing logs
-log
+log
+*.log

data/lib/confluence/templates/component.json.tt

@@ -0,0 +1,5 @@
+{
+  "name": "<%= project_name %>",
+  "version": "0.0.1",
+  "description": "WRITE ME"
+}

data/lib/confluence/templates/package.json.tt

@@ -4,10 +4,11 @@
   "description": "WRITE ME",
   "dependencies": {
     "jamjs":"0.2.x" ,
+    "bower":"0.7.x" ,
     "coffee-script":"1.4.x"
   },
   "jam": {
-    "packageDir": "assets/javascripts",
+    "packageDir": "components",
     "dependencies": {
       "jquery": "1.9.x"
     }

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

@@ -5,7 +5,7 @@ require File.expand_path('../boot', __FILE__)
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
-# require "sprockets/railtie"
+require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
 if defined?(Bundler)
@@ -59,5 +59,16 @@ module Integration
     # parameters by using an attr_accessible or attr_protected declaration.
     # config.active_record.whitelist_attributes = true
 
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+
+    # Define where the assets live
+    config.assets.paths.unshift File.expand_path( "../../../components", File.dirname(__FILE__))
+    config.assets.paths.unshift File.expand_path( "../../../assets/stylesheets", File.dirname(__FILE__))
+    config.assets.paths.unshift File.expand_path( "../../../assets/javascripts", File.dirname(__FILE__))
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confluence
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -176,7 +176,10 @@ files:
 - lib/confluence/templates/assets/html/_%project_name%.html.haml.tt
 - lib/confluence/templates/assets/images/README.markdown.tt
 - lib/confluence/templates/assets/javascripts/README.markdown.tt
+- lib/confluence/templates/assets/javascripts/application.js
 - lib/confluence/templates/assets/stylesheets/README.markdown.tt
+- lib/confluence/templates/assets/stylesheets/application.css
+- lib/confluence/templates/component.json.tt
 - lib/confluence/templates/config.ru
 - lib/confluence/templates/lib/%project_name%.rb.tt
 - lib/confluence/templates/lib/%project_name%/presenter.rb.tt
@@ -184,22 +187,11 @@ files:
 - lib/confluence/templates/spec/%project_name%_spec.rb.tt
 - lib/confluence/templates/spec/spec_helper.rb.tt
 - lib/confluence/templates/src/images/README.markdown.tt
-- 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/README.rdoc
 - lib/confluence/templates/test/integration/Rakefile
-- lib/confluence/templates/test/integration/app/assets/images/rails.png
-- lib/confluence/templates/test/integration/app/assets/javascripts/application.js
-- lib/confluence/templates/test/integration/app/assets/javascripts/pages.js
-- 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/html_controller.rb.tt
-- lib/confluence/templates/test/integration/app/helpers/application_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/config/application.rb
@@ -216,7 +208,6 @@ files:
 - 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.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
 - lib/confluence/templates/test/integration/public/404.html
@@ -248,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1243186819851039794
+      hash: 1833576747292622181
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/confluence/templates/src/javascripts/%project_name%.hs.tt

@@ -1,4 +0,0 @@
--- Haskell-fay based javascript source code
-
-main :: IO ()
-main = putStrLn "WRITE ME!"

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

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

data/lib/confluence/templates/test/integration/app/assets/javascripts/pages.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/lib/confluence/templates/test/integration/app/assets/stylesheets/pages.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

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

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

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

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

data/lib/confluence/templates/test/integration/db/seeds.rb

@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)