confluence 0.2.0 → 1.0.0

data/Gemfile

@@ -10,10 +10,16 @@ gem "simplecov"
 gem "rspec"
 gem "thor"
 gem "activesupport"
+gem "git"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "jeweler", "~> 1.8.4"
+  gem "rails"
+  gem "haml"
+  gem "rspec"
+  gem "rspec-rails"
+  gem "header_navigation", "~>0.0.1" # used only in the spec files
 end
 
 group :debug do

data/Gemfile.lock

@@ -2,23 +2,87 @@ GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
   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)
     archive-tar-minitar (0.5.2)
+    arel (3.0.2)
+    builder (3.0.4)
     columnize (0.3.6)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
+    faker (1.1.2)
+      i18n (~> 0.5)
     git (1.2.5)
+    haml (3.1.7)
+    header_navigation (0.0.1)
+      faker
+      presentable
+    hike (1.2.1)
     i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.4)
     json (1.7.6)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.21)
     multi_json (1.5.0)
+    polyglot (0.3.3)
+    presentable (0.0.0)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      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)
@@ -30,6 +94,13 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -44,7 +115,17 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    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
@@ -52,10 +133,15 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   bundler
+  git
+  haml
+  header_navigation (~> 0.0.1)
   jeweler (~> 1.8.4)
+  rails
   rake
   rdoc
   rspec
+  rspec-rails
   ruby-debug19
   simplecov
   thor

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/confluence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "confluence"
-  s.version = "0.2.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Chen"]
-  s.date = "2013-02-19"
+  s.date = "2013-02-20"
   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"]
@@ -29,7 +29,8 @@ Gem::Specification.new do |s|
     "bin/confluence",
     "confluence.gemspec",
     "lib/confluence.rb",
-    "lib/confluence/navigator.rb",
+    "lib/confluence/railtie.rb",
+    "lib/confluence/railties/resolver.rb",
     "lib/confluence/templates/%project_name%.cabal.tt",
     "lib/confluence/templates/.document",
     "lib/confluence/templates/.gitignore",
@@ -88,10 +89,49 @@ Gem::Specification.new do |s|
     "lib/confluence/templates/test/integration/vendor/assets/stylesheets/.gitkeep",
     "lib/confluence/templates/test/integration/vendor/plugins/.gitkeep",
     "lib/confluence/templates/test/javascripts/README.markdown.tt",
-    "spec/confluence/navigator_spec.rb",
+    "spec/confluence/railtie_spec.rb",
+    "spec/confluence/railties/resolver_spec.rb",
+    "spec/confluence/welcome_controller_spec.rb",
     "spec/confluence_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/file_sytem/navigator.rb"
+    "spec/fixture/.gitignore",
+    "spec/fixture/README.rdoc",
+    "spec/fixture/Rakefile",
+    "spec/fixture/app/assets/images/rails.png",
+    "spec/fixture/app/assets/javascripts/application.js",
+    "spec/fixture/app/assets/stylesheets/application.css",
+    "spec/fixture/app/controllers/application_controller.rb",
+    "spec/fixture/app/controllers/welcome_controller.rb",
+    "spec/fixture/app/views/layouts/application.html.erb",
+    "spec/fixture/app/views/welcome/index.html.haml",
+    "spec/fixture/config.ru",
+    "spec/fixture/config/application.rb",
+    "spec/fixture/config/boot.rb",
+    "spec/fixture/config/environment.rb",
+    "spec/fixture/config/environments/development.rb",
+    "spec/fixture/config/environments/production.rb",
+    "spec/fixture/config/environments/test.rb",
+    "spec/fixture/config/initializers/backtrace_silencers.rb",
+    "spec/fixture/config/initializers/inflections.rb",
+    "spec/fixture/config/initializers/mime_types.rb",
+    "spec/fixture/config/initializers/secret_token.rb",
+    "spec/fixture/config/initializers/session_store.rb",
+    "spec/fixture/config/initializers/wrap_parameters.rb",
+    "spec/fixture/config/locales/en.yml",
+    "spec/fixture/config/routes.rb",
+    "spec/fixture/lib/assets/.gitkeep",
+    "spec/fixture/lib/tasks/.gitkeep",
+    "spec/fixture/log/.gitkeep",
+    "spec/fixture/public/404.html",
+    "spec/fixture/public/422.html",
+    "spec/fixture/public/500.html",
+    "spec/fixture/public/favicon.ico",
+    "spec/fixture/public/index.html",
+    "spec/fixture/public/robots.txt",
+    "spec/fixture/script/rails",
+    "spec/fixture/vendor/assets/javascripts/.gitkeep",
+    "spec/fixture/vendor/assets/stylesheets/.gitkeep",
+    "spec/fixture/vendor/plugins/.gitkeep",
+    "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/foxnewsnetwork/confluence"
   s.licenses = ["MIT"]
@@ -110,7 +150,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rails>, [">= 0"])
+      s.add_development_dependency(%q<haml>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<header_navigation>, ["~> 0.0.1"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -119,7 +165,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<header_navigation>, ["~> 0.0.1"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
@@ -129,7 +181,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<header_navigation>, ["~> 0.0.1"])
   end
 end
 

data/lib/confluence.rb

@@ -1,18 +1,21 @@
 require "rubygems"
 require "thor"
+require "git"
 require "active_support/core_ext/string"
-Dir[File.join(File.dirname(__FILE__), "confluence", "*.rb")].each { |source| require source }
+require File.join(File.dirname(__FILE__), "confluence", "railtie") if defined?(Rails)
 
 module Confluence
   class Application < Thor
     include Thor::Actions
 
-    attr_accessor :project_name, :project_author
+    attr_accessor :project_name, :project_author, :project_email, :project_github_user
 
     desc "new", "Creates a new confluence assets project for you in your specified directory"
     def new(project_name)
       @project_name = project_name
-      @project_author = "Me"
+      @project_author = Git.global_config["user.name"]
+      @project_email = Git.global_config["user.email"]
+      @project_github_user = Git.global_config["github.email"]
       source_path = File.join File.dirname(__FILE__), "confluence", "templates"
       destination_path = project_name
       directory( source_path, destination_path )

data/lib/confluence/railtie.rb

@@ -0,0 +1,14 @@
+require File.join File.dirname(__FILE__), "railties", "resolver"
+
+module Confluence
+  module Rails
+    class Railtie < ::Rails::Railtie
+      # expose the confluence controller runtime
+      initializer "confluence.setup" do |app|
+        ActiveSupport.on_load(:action_controller) do
+          append_view_path Confluence::Railties::Resolver.instance
+        end
+      end
+    end
+  end
+end

data/lib/confluence/railties/resolver.rb

@@ -0,0 +1,78 @@
+require "singleton"
+module Confluence
+  module Railties
+    class Resolver < ActionView::Resolver
+      include Singleton
+      def find_templates(name, prefix, partial, details)
+        if partial
+          gem_directory = _get_gem_directory prefix
+          partial_path = _get_partial_path name, gem_directory
+          handler = _get_handler_from_nothing
+          source = _get_source_from_path(partial_path)
+          identifier = _get_identifier name, prefix
+          _get_templates( source, identifier, handler, details )
+          
+        else
+          []
+        end
+      end
+
+      private
+
+      def _checks
+        @_checks ||= [
+          lambda do |not_null|
+            !not_null.nil?
+          end
+        ]
+      end
+
+      def _get_templates( *stuffs )
+        results = _checks.inject(true) do |status, check|
+          stuffs.inject(status) do |mem, stuff|
+            mem && check.call(stuff)
+          end 
+        end
+        if results
+          [ActionView::Template.new(stuffs.shift, stuffs.shift, stuffs.shift, stuffs.shift)]
+        else
+          []
+        end
+      end
+
+      def _get_gem_directory(prefix)
+        return nil if prefix.nil? || prefix.blank?
+        prefixes = prefix.split("/")
+        gem_name = prefixes.first 
+        if gem_root_path = Gem.loaded_specs[gem_name].try( :full_gem_path)
+          File.join(gem_root_path, "assets", "html", *prefixes[1..-1])
+        else
+          nil
+        end
+      end
+
+      # This assumes, of course, our gem is built from confluence
+      # TODO: throw an error if our gem isn't confluent
+      def _get_partial_path(name, path)
+        return nil if name.nil? || path.nil?
+        names = name.split("/")
+        names.push( "_#{names.pop}" )
+        File.join(path, *names)
+      end
+
+      def _get_source_from_path(path)
+        return nil if path.nil?
+        File.read( path + ".html.haml" )
+      end
+
+      def _get_handler_from_nothing
+        ActionView::Template.registered_template_handler("haml")
+      end
+
+      def _get_identifier(name, prefix)
+        "#{name.hash}-#{prefix.hash}"
+      end
+
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ synopsis:            WRITE ME!
 -- description:      WRITE ME
 
 -- URL for the project homepage or repository.
-homepage:            WRITE ME
+homepage:            https://github.com/<%= project_github_user %>/<%= project_name %>
 
 -- The license under which the package is released.
 license:             MIT
@@ -28,11 +28,11 @@ license:             MIT
 license-file:        LICENSE.txt
 
 -- The package author(s).
-author:              WRITE ME
+author:              <%= project_author %>
 
 -- An email address to which users can send suggestions, bug reports, and 
 -- patches.
-maintainer:          WRITE ME
+maintainer:          <%= project_author %>
 
 -- A copyright notice.
 -- copyright:           
@@ -60,5 +60,5 @@ library
 
   
   -- Directories containing source files.
-  hs-source-dirs:      src/javascripts
+  hs-source-dirs:      assets/javascripts
   

data/lib/confluence/templates/Rakefile.tt

@@ -15,12 +15,12 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "<%= project_name %>"
-  gem.homepage = %Q{TODO: your homepage}
+  gem.homepage = "https://github.com/<%= project_github_user %>/<%= project_name %>"
   gem.license = "MIT"
   gem.summary = %Q{TODO: one-line summary of your gem}
   gem.description = %Q{TODO: longer description of your gem}
-  gem.email = %Q{TODO: your email}
-  gem.authors = [%Q{TODO: YOU}]
+  gem.email = "<%= project_email %>"
+  gem.authors = ["<%= project_author %>"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
@@ -30,7 +30,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "comment #{version}"
+  rdoc.title = "<%= project_name %> #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end