forge 0.1.3 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+== 0.2 ==
+- Added preliminary LESS support
+- Added ERB processing on templates, functions and assets with filenames that end with .erb
+- Adding --config=filename flag for specifying an alternate config file
+- Scaffolding template cleanup
+
 == 0.1.3 ==
 - Fixed bug where forge watch crashed when a file was at the root of the includes folder
 

data/Gemfile

@@ -13,6 +13,7 @@ gem "sprockets-sass", "~> 0.3.0"
 gem "compass", "~> 0.11.5"
 gem 'rack', '~> 1.3.5'
 gem "guard-livereload", "~> 0.3.1"
+gem "less", "~> 2.0.7"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -46,6 +46,9 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.6.1)
+    less (2.0.7)
+      therubyracer (~> 0.9.2)
+    libv8 (3.3.10.2)
     multi_json (1.0.3)
     rack (1.3.5)
     rake (0.9.2)
@@ -68,6 +71,8 @@ GEM
     sprockets-sass (0.3.0)
       sprockets (~> 2.0)
     term-ansicolor (1.0.6)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
 
@@ -83,6 +88,7 @@ DEPENDENCIES
   guard-livereload (~> 0.3.1)
   jeweler (~> 1.6.4)
   json (~> 1.6.1)
+  less (~> 2.0.7)
   rack (~> 1.3.5)
   rcov
   rspec

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/forge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "forge"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Adams", "Drew Strojny", "Matt Button"]
-  s.date = "2011-10-27"
+  s.date = "2011-11-12"
   s.description = "A toolkit for bootstrapping and developing WordPress themes."
   s.email = "aadams@jestro.com"
   s.executables = ["forge"]
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
     "bin/forge",
     "features/step_definitions/forge_steps.rb",
     "features/support/env.rb",
-    "forge-0.1.2.gem",
     "forge.gemspec",
     "layouts/config/config.json.erb",
     "layouts/config/stylesheet_header.erb",
@@ -53,17 +52,11 @@ Gem::Specification.new do |s|
     "layouts/default/templates/search.php.erb",
     "layouts/default/templates/sidebar.php",
     "layouts/default/templates/single.php.erb",
-    "layouts/lib/struts/README.md",
-    "layouts/lib/struts/classes/settings.php",
-    "layouts/lib/struts/classes/settings/collection.php",
-    "layouts/lib/struts/classes/settings/option.php",
-    "layouts/lib/struts/classes/settings/option/select.php",
-    "layouts/lib/struts/classes/settings/option/text.php",
-    "layouts/lib/struts/classes/settings/section.php",
     "lib/forge.rb",
     "lib/forge/builder.rb",
     "lib/forge/cli.rb",
     "lib/forge/config.rb",
+    "lib/forge/engines.rb",
     "lib/forge/error.rb",
     "lib/forge/generator.rb",
     "lib/forge/guard.rb",
@@ -97,6 +90,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<compass>, ["~> 0.11.5"])
       s.add_runtime_dependency(%q<rack>, ["~> 1.3.5"])
       s.add_runtime_dependency(%q<guard-livereload>, ["~> 0.3.1"])
+      s.add_runtime_dependency(%q<less>, ["~> 2.0.7"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<aruba>, [">= 0"])
@@ -114,6 +108,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<compass>, ["~> 0.11.5"])
       s.add_dependency(%q<rack>, ["~> 1.3.5"])
       s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
+      s.add_dependency(%q<less>, ["~> 2.0.7"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<aruba>, [">= 0"])
@@ -132,6 +127,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<compass>, ["~> 0.11.5"])
     s.add_dependency(%q<rack>, ["~> 1.3.5"])
     s.add_dependency(%q<guard-livereload>, ["~> 0.3.1"])
+    s.add_dependency(%q<less>, ["~> 2.0.7"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<aruba>, [">= 0"])

data/layouts/default/functions/functions.php.erb

@@ -1,14 +1,13 @@
 <?php
 
-add_action( 'after_setup_theme', '<%= theme_id %>_setup' );
+add_action( 'wp_enqueue_scripts', '<%= theme_id %>_enqueue_scripts' );
 
-if ( ! function_exists( '<%= theme_id %>_setup' ) ) :
+if ( ! function_exists( '<%= theme_id %>_enqueue_scripts' ) ) :
 
 /**
-* Set up your theme here
+* Add theme styles and scripts here
 */
-function <%= theme_id %>_setup() {
-	add_theme_support( 'post-thumbnails' );
+function <%= theme_id %>_enqueue_scripts() {
 
 	if ( ! is_admin() ) {
 		wp_enqueue_style(
@@ -16,6 +15,20 @@ function <%= theme_id %>_setup() {
 			get_bloginfo( 'stylesheet_url' )
 		);
 	}
+
+}
+
+endif; // <%= theme_id %>_enqueue_scripts
+
+add_action( 'after_setup_theme', '<%= theme_id %>_setup' );
+
+if ( ! function_exists( '<%= theme_id %>_setup' ) ) :
+
+/**
+* Set up your theme here
+*/
+function <%= theme_id %>_setup() {
+	add_theme_support( 'post-thumbnails' );
 }
 
-endif; // <%= theme_id %>_setup
+endif; // <%= theme_id %>_setup

data/lib/forge/builder.rb

@@ -1,8 +1,10 @@
 require 'sprockets'
 require 'sprockets-sass'
 require 'sass'
+require 'less'
 require 'zip/zip'
 require 'compass'
+require 'forge/engines'
 
 module Forge
   class Builder
@@ -76,12 +78,35 @@ module Forge
 
     def copy_templates
       template_paths.each do |template_path|
-        FileUtils.cp template_path, @project.build_path unless File.directory?(template_path)
+        # Skip directories
+        next if File.directory?(template_path)
+
+        if template_path.end_with?('.erb')
+          # Chop the .erb extension off the filename
+          destination = File.join(@project.build_path, File.basename(template_path).slice(0..-5))
+
+          write_erb(template_path, destination)
+        else
+          # Regular old copy of PHP-only files
+          FileUtils.cp template_path, @project.build_path
+        end
       end
     end
 
+    def clean_functions
+      FileUtils.rm File.join(@project.build_path, 'functions.php')
+    end
+
     def copy_functions
-      FileUtils.cp_r File.join(@functions_path, 'functions.php'), @project.build_path
+      functions_erb_path = File.join(@functions_path, 'functions.php.erb')
+      functions_php_path = File.join(@functions_path, 'functions.php')
+
+      if File.exists?(functions_erb_path)
+        destination = File.join(@project.build_path, 'functions.php')
+        write_erb(functions_erb_path, destination)
+      elsif File.exists?(functions_php_path)
+        FileUtils.cp functions_php_path, @project.build_path
+      end
     end
 
     def clean_includes
@@ -96,9 +121,6 @@ module Forge
         # Iterate over all files in source/includes, so we can exclude if necessary
         paths = Dir.glob(File.join(@includes_path, '**', '*'))
         paths.each do |path|
-          # Skip over hidden files and folders (.git, .svn, etc)
-          continue if File.basename(path)[0] == '.'
-
           # Remove @includes_path from full file path to get the relative path
           relative_path = path.gsub(@includes_path, '')
           destination = File.join(@project.build_path, 'includes', relative_path)
@@ -168,11 +190,16 @@ module Forge
         @sprockets.append_path File.join(@assets_path, dir)
       end
 
-      @sprockets.context_class.instance_eval do
-        def config
-          return {:name => 'asd'}
-          p "CALLING CONFIG"
-          @project.config
+      # Add assets/styleshets to load path for Less Engine
+      Tilt::LessTemplateWithPaths.load_path = File.join(@assets_path, 'stylesheets')
+
+      @sprockets.register_engine '.less', Tilt::LessTemplateWithPaths
+
+      # Passing the @project instance variable to the Sprockets::Context instance
+      # used for processing the asset ERB files. Ruby meta-programming, FTW.
+      @sprockets.context_class.instance_exec(@project) do |project|
+        define_method :config do
+          project.config
         end
       end
     end
@@ -202,5 +229,20 @@ module Forge
       file = @task.find_in_source_paths(File.join('config', 'stylesheet_header.erb'))
       @stylesheet_header = File.expand_path(file)
     end
+
+    # Write an .erb from source to destination, catching and reporting errors along the way
+    def write_erb(source, destination)
+      begin
+        @task.shell.mute do
+          @task.create_file(destination) do
+            @project.parse_erb(source)
+          end
+        end
+      rescue Exception => e
+        @task.say "Error while building #{File.basename(source)}:"
+        @task.say e.message + "\n", Thor::Shell::Color::RED
+        exit
+     end
+    end
   end
 end

data/lib/forge/cli.rb

@@ -14,7 +14,6 @@ module Forge
     end
 
     desc "create DIRECTORY", "Creates a Forge project"
-    method_option :struts, :type => :boolean, :desc => "Include Struts Options Framework"
     def create(dir)
       theme = {}
       theme[:name] = dir
@@ -35,8 +34,9 @@ module Forge
 
     desc "watch", "Start watch process"
     long_desc "Watches the source directory in your project for changes, and reflects those changes in a compile folder"
+    method_option :config, :type => :string, :desc => "Name of alternate config file"
     def watch
-      project = Forge::Project.new('.', self)
+      project = Forge::Project.new('.', self, nil, options[:config])
 
       # Empty the build directory before starting up to clean out old files
       FileUtils.rm_rf project.build_path
@@ -46,19 +46,24 @@ module Forge
     end
 
     desc "build DIRECTORY", "Build your theme into specified directory"
+    method_option :config, :type => :string, :desc => "Name of alternate config file"
     def build(dir='build')
-      project = Forge::Project.new('.', self)
+      project = Forge::Project.new('.', self, nil, options[:config])
 
       builder = Builder.new(project)
       builder.build
 
-      FileUtils.rm_rf Dir.glob(File.join(dir, '*'))
+      Dir.glob(File.join(dir, '**', '*')).each do |file|
+        shell.mute { remove_file(file) }
+      end
+
       directory(project.build_path, dir)
     end
 
     desc "package FILENAME", "Compile and zip your project to FILENAME.zip"
+    method_option :config, :type => :string, :desc => "Name of alternate config file"
     def package(filename=nil)
-      project = Forge::Project.new('.', self)
+      project = Forge::Project.new('.', self, nil, options[:config])
 
       builder = Builder.new(project)
       builder.build

data/lib/forge/engines.rb

@@ -0,0 +1,12 @@
+module Tilt
+  class LessTemplateWithPaths < LessTemplate
+    class << self
+      attr_accessor :load_path
+    end
+
+    def prepare
+      parser = ::Less::Parser.new(:filename => eval_file, :line => line, :paths => [self.class.load_path])
+      @engine = parser.parse(data)
+    end
+  end
+end

data/lib/forge/generator.rb

@@ -66,15 +66,6 @@ module Forge
       self
     end
 
-    def copy_settings_library
-      settings_path = @task.find_in_source_paths(File.join('lib', 'struts', 'classes'))
-
-      source = File.expand_path(settings_path)
-      target = File.expand_path(File.join(@project.includes_path, 'struts', '.'))
-
-      @task.directory(source, target)
-    end
-
     def copy_functions
       source = File.expand_path(File.join(self.layout_path, 'functions', 'functions.php.erb'))
       target = File.expand_path(File.join(@project.source_path, 'functions', 'functions.php'))
@@ -93,7 +84,6 @@ module Forge
       copy_javascript
       copy_templates
       copy_functions
-      copy_settings_library if @task.options[:struts]
       return self
     end
 

data/lib/forge/project.rb

@@ -16,10 +16,11 @@ module Forge
 
     attr_accessor :root, :config, :task
 
-    def initialize(root, task, config={})
+    def initialize(root, task, config={}, config_file=nil)
       @root        = File.expand_path(root)
       @config      = config || {}
       @task        = task
+      @config_file = config_file
 
       self.load_config if @config.empty?
     end

data/lib/guard/forge/functions.rb

@@ -15,6 +15,7 @@ module Guard
 
     def run_all
       UI.info "Rebuilding all functions"
+      ::Forge::Guard.builder.clean_functions
       ::Forge::Guard.builder.copy_functions
       ::Forge::Guard.builder.clean_includes
       ::Forge::Guard.builder.copy_includes
@@ -23,6 +24,7 @@ module Guard
     # Called on file(s) modifications
     def run_on_change(paths)
       UI.info "Functions have changed, copying over"
+      ::Forge::Guard.builder.clean_functions
       ::Forge::Guard.builder.copy_functions
       ::Forge::Guard.builder.clean_includes
       ::Forge::Guard.builder.copy_includes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000 Z
+date: 2011-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152502800 !ruby/object:Gem::Requirement
+  requirement: &2156553020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152502800
+  version_requirements: *2156553020
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152502260 !ruby/object:Gem::Requirement
+  requirement: &2156552520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152502260
+  version_requirements: *2156552520
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2152501740 !ruby/object:Gem::Requirement
+  requirement: &2156552040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152501740
+  version_requirements: *2156552040
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2152495220 !ruby/object:Gem::Requirement
+  requirement: &2156551540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152495220
+  version_requirements: *2156551540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152494720 !ruby/object:Gem::Requirement
+  requirement: &2156551000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152494720
+  version_requirements: *2156551000
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152494160 !ruby/object:Gem::Requirement
+  requirement: &2156550500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 3.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152494160
+  version_requirements: *2156550500
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &2152493460 !ruby/object:Gem::Requirement
+  requirement: &2156531840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152493460
+  version_requirements: *2156531840
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &2152492820 !ruby/object:Gem::Requirement
+  requirement: &2156531300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152492820
+  version_requirements: *2156531300
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152491980 !ruby/object:Gem::Requirement
+  requirement: &2156530740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152491980
+  version_requirements: *2156530740
 - !ruby/object:Gem::Dependency
   name: guard-livereload
-  requirement: &2152490940 !ruby/object:Gem::Requirement
+  requirement: &2156530260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,21 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152490940
+  version_requirements: *2156530260
+- !ruby/object:Gem::Dependency
+  name: less
+  requirement: &2156529780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156529780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152490340 !ruby/object:Gem::Requirement
+  requirement: &2156529280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152490340
+  version_requirements: *2156529280
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152489540 !ruby/object:Gem::Requirement
+  requirement: &2156528800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152489540
+  version_requirements: *2156528800
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152488740 !ruby/object:Gem::Requirement
+  requirement: &2156528320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152488740
+  version_requirements: *2156528320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152487620 !ruby/object:Gem::Requirement
+  requirement: &2156527780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +177,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152487620
+  version_requirements: *2156527780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152487000 !ruby/object:Gem::Requirement
+  requirement: &2156527240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -177,10 +188,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152487000
+  version_requirements: *2156527240
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152486500 !ruby/object:Gem::Requirement
+  requirement: &2156526640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,7 +199,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152486500
+  version_requirements: *2156526640
 description: A toolkit for bootstrapping and developing WordPress themes.
 email: aadams@jestro.com
 executables:
@@ -211,7 +222,6 @@ files:
 - bin/forge
 - features/step_definitions/forge_steps.rb
 - features/support/env.rb
-- forge-0.1.2.gem
 - forge.gemspec
 - layouts/config/config.json.erb
 - layouts/config/stylesheet_header.erb
@@ -233,17 +243,11 @@ files:
 - layouts/default/templates/search.php.erb
 - layouts/default/templates/sidebar.php
 - layouts/default/templates/single.php.erb
-- layouts/lib/struts/README.md
-- layouts/lib/struts/classes/settings.php
-- layouts/lib/struts/classes/settings/collection.php
-- layouts/lib/struts/classes/settings/option.php
-- layouts/lib/struts/classes/settings/option/select.php
-- layouts/lib/struts/classes/settings/option/text.php
-- layouts/lib/struts/classes/settings/section.php
 - lib/forge.rb
 - lib/forge/builder.rb
 - lib/forge/cli.rb
 - lib/forge/config.rb
+- lib/forge/engines.rb
 - lib/forge/error.rb
 - lib/forge/generator.rb
 - lib/forge/guard.rb

data/layouts/lib/struts/README.md

@@ -1,43 +0,0 @@
-## Struts is a simple theme options framework for WordPress.
-
-The goal of this library is to abstract away as much of the WordPress settings API as possible, and make setting up options a breeze!
-
-## Basic setup
-
-* Clone this repository
-* Symlink the 'classes' folder from this library into your functions folder in your theme
-* In your functions.php file, use this code to setup your theme's options:
-
-		<?php
-		
-		add_action( 'after_setup_theme', 'react_options' );
-		
-		function react_options() {
-			require( dirname( __FILE__ ) . '/functions/settings/settings.php' );
-		
-			global $react_options;
-		
-			$react_options = new Settings_Collection( 'react', 'theme_react_options' );
-		
-			$react_options->add_section( 'first_section', 'Text for First Section' );
-			$react_options->add_section( 'second_section', 'Text for Second Section' );
-		
-			$react_options->add_option( 'my_first_option', 'text', 'first_section' )
-				->default_value( 'The default text' )
-				->tab( 'general')
-				->label( 'Enable Featured Slider' );
-			
-			$react_options->add_option( 'select_this', 'select', 'second_section' )
-				->valid_values( array(
-					'one' => 'ONE',
-					'two' => 'TWO',
-					'three' => 'THREE' ) )
-				->default_value( 'two' )
-				->label( 'Select Your Character' );
-			
-			/* More options go here... */
-		
-			$react_options->initialize();
-		}
-
-Bam! You have theme options!

data/layouts/lib/struts/classes/settings.php

@@ -1,11 +0,0 @@
-<?php
-
-require( dirname( __FILE__ ) . '/settings/collection.php' );
-require( dirname( __FILE__ ) . '/settings/option.php' );
-require( dirname( __FILE__ ) . '/settings/section.php' );
-require( dirname( __FILE__ ) . '/settings/option/text.php' );
-require( dirname( __FILE__ ) . '/settings/option/select.php' );
-
-class Settings {
-
-}

data/layouts/lib/struts/classes/settings/collection.php

@@ -1,190 +0,0 @@
-<?php
-
-class Settings_Collection {
-	protected $_sections, $_options, $_name, $_slug;
-
-	public function __construct( $slug, $name ) {
-		$this->sections( array() );
-		$this->options( array() );
-		$this->slug( $slug );
-		$this->name( $name );
-		$this->register_hooks();
-	}
-
-	/***** Attribute accessors *****/
-	public function sections( $sections = NULL ) {
-		if ( NULL === $sections )
-			return $this->_sections;
-
-		$this->_sections = $sections;
-
-		return $this;
-	}
-
-	public function options( $options = NULL ) {
-		if ( NULL === $options )
-			return $this->_options;
-
-		$this->_options = $options;
-
-		return $this;
-	}
-
-	public function slug( $slug = NULL ) {
-		if ( NULL === $slug )
-			return $this->_slug;
-
-		$this->_slug = $slug;
-
-		return $this;
-	}
-
-	public function name( $name = NULL ) {
-		if ( NULL === $name )
-			return $this->_name;
-
-		$this->_name = $name;
-
-		return $this;
-	}
-
-	/***** WordPress setup *****/
-
-	public function register_hooks() {
-		// Load the Admin Options page
-		add_action( 'admin_menu', array( &$this, 'add_options_page' ) );
-		// Register the sections and options
-		add_action( 'admin_init', array( &$this, 'register' ) );
-	}
-
-	public function initialize() {
-		$option_values = get_option( $this->name() );
-
-		if ( false === $option_values || empty( $option_values ) ) {
-			$option_values = $this->defaults();
-		}
-		update_option( $this->name(), $option_values );
-
-		foreach ( $option_values as $name => $value ) {
-			foreach ( $this->_options as $option ) {
-				if ( $option->name() == $name ){
-					$option->value($value);
-				}
-			}
-		}
-	}
-
-	public function add_options_page() {
-		add_theme_page(
-			'Theme Options',
-			'Theme Options',
-			'edit_theme_options',
-			$this->slug() . '-settings',
-			array( &$this, 'echo_form_html' ) );
-	}
-
-	public function register() {
-		register_setting( $this->name(), $this->name(), array( &$this, 'validate' ) );
-		$this->register_sections();
-		$this->register_options();
-	}
-
-	protected function register_options() {
-		foreach( $this->options() as $option ) {
-			$option->register();
-		}
-	}
-
-	protected function register_sections() {
-		foreach( $this->sections() as $section ) {
-			$section->register();
-		}
-	}
-
-	public function validate( $inputs ) {
-		$validated_input = array();
-
-		foreach ( $inputs as $key => $value ) {
-			$option = $this->_options[$key];
-			$validated_input[$key] = $option->validate( $value );
-		}
-
-		return $validated_input;
-	}
-
-	/**
-	 *
-	 */
-	public function add_section( $id, $title, $description = NULL ) {
-		$this->_sections[] = new Settings_Section( $id, $title, $description, $this->name() );
-	}
-
-	/**
-	 * Adds an option with the given name and type to this collection
-	 * Sets the option's parent_name to this collection's name, and returns the option
-	 *
-	 * @param $name - unique (within the collection ) name for this option
-	 * @param $type - type of option (text/select/checkbox/etc)
-	 * @param $section - name of the section this option goes in
-	 *
-	 * @return Settings_Option
-	 */
-	public function add_option( $name, $type, $section = NULL ) {
-		$option_class = 'Settings_Option_' . ucfirst( $type );
-
-		$option = new $option_class;
-		$option->name( $name );
-		$option->parent_name( $this->name() );
-		$option->section( $section );
-
-		$this->_options[$name] = $option;
-
-		return $option;
-	}
-
-	public function get_value( $option_name ) {
-		$options = $this->options();
-		$option = $options[$option_name];
-		return $option->value();
-	}
-
-	/**
-	 * Returns the default values of all options in this collection as a hash
-	 *
-	 * @return array
-	 */
-	public function defaults() {
-		$defaults = array();
-
-		$options = $this->options();
-
-		foreach( $options as $option ) {
-			$defaults[ $option->name() ] = $option->default_value();
-		}
-
-		return $defaults;
-	}
-
-	/***** HTML Output *****/
-
-	public function echo_form_html() { ?>
-		 <div class="wrap">
-			<?php echo $this->settings_updated_html(); ?>
-			<form action="options.php" method="post">
-				<?php
-				settings_fields( $this->name() );
-				do_settings_sections( $this->name() );
-				?>
-				<input type="submit" class="button-primary" value="<?php esc_attr_e('Save Settings'); ?>" />
-				<input type="submit" class="button-secondary" value="<?php esc_attr_e('Reset Defaults'); ?>" />
-			</form>
-		</div>
-	<?php }
-
-	public function settings_updated_html() {
-		if ( isset( $_GET['settings-updated'] ) )
-			return "<div class='updated'><p>Theme settings updated successfully.</p></div>";
-	}
-}
-
-class SectionNotFoundException extends Exception { }

data/layouts/lib/struts/classes/settings/option.php

@@ -1,125 +0,0 @@
-<?php
-
-abstract class Settings_Option {
-	protected $_name, $_valid_values, $_value, $_type, $_default_value,
-			  $_tab, $_label, $_description, $_parent_name, $_validation_function;
-
-	public function name( $name = NULL ) {
-		if ( NULL === $name )
-			return $this->_name;
-
-		$this->_name = $name;
-		return $this;
-	}
-
-	public function valid_values( $valid_values = NULL ) {
-		if ( NULL === $valid_values )
-			return $this->_valid_values;
-
-		$this->_valid_values = $valid_values;
-		return $this;
-	}
-
-	public function value( $value = NULL ) {
-		if ( NULL === $value ) {
-			return $this->_value;
-		}
-
-		$this->_value = $value;
-		return $this;
-	}
-
-	public function type( $type = NULL ) {
-		if ( NULL === $type )
-			return $this->_type;
-
-		$this->_type = $type;
-		return $this;
-	}
-
-	public function default_value( $default_value = NULL ) {
-		if ( NULL === $default_value )
-			return $this->_default_value;
-
-		$this->_default_value = $default_value;
-		return $this;
-	}
-
-	public function tab( $tab = NULL ) {
-		if ( NULL === $tab )
-			return $this->_tab;
-
-		$this->_tab = $tab;
-		return $this;
-	}
-
-	public function label( $label = NULL ) {
-		if ( NULL === $label )
-			return $this->_label;
-
-		$this->_label = $label;
-		return $this;
-	}
-
-	public function description( $description = NULL ) {
-		if ( NULL === $description )
-			return $this->_description;
-
-		$this->_description = $description;
-		return $this;
-	}
-
-	public function parent_name( $parent_name = NULL ) {
-		if ( NULL === $parent_name )
-			return $this->_parent_name;
-
-		$this->_parent_name = $parent_name;
-		return $this;
-	}
-
-	public function section( $section = NULL ) {
-		if ( NULL === $section )
-			return $this->_section;
-
-		$this->_section = $section;
-		return $this;
-	}
-
-	public function validation_function( $validation_function = NULL ) {
-		if ( NULL === $validation_function )
-			return $this->_validation_function;
-
-		$this->_validation_function = $validation_function;
-		return $this;
-	}
-
-	// The HTML ID takes the form 'parentname-optionname'
-	protected function html_id() {
-		return $this->parent_name() . '-' . $this->name();
-	}
-
-	// Name takes the form 'parentname[optionname]'
-	protected function html_name() {
-		return $this->parent_name() . '[' . $this->name() . ']';
-	}
-
-	public function register() {
-		add_settings_field(
-			$this->name(),
-			$this->label(),
-			array( &$this, 'to_html' ),
-			$this->parent_name(),
-			$this->section() );
-	}
-
-	public function validate( $value ) {
-		if ( $validation_function = $this->validation_function() ) {
-			return $validation_function( $value );
-		} else {
-			return $this->standard_validation( $value );
-		}
-	}
-
-	abstract public function to_html();
-	abstract protected function standard_validation( $value );
-}

data/layouts/lib/struts/classes/settings/option/select.php

@@ -1,30 +0,0 @@
-<?php
-
-class Settings_Option_Select extends Settings_Option {
-	public function to_html() {
-		$id = $this->html_id();
-		$name = $this->html_name();
-
-		$output = "<select id='$id' name='$name'>";
-
-		foreach ( $this->valid_values() as $value => $text ) {
-			// If this value is selected, mark it so
-			$selected = selected( $this->value(), $value, false );
-
-			$output .= "<option value='$value' $selected >$text</option>";
-		}
-
-		$output .= "</select>";
-
-		echo $output;
-	}
-
-	protected function standard_validation( $value ) {
-		$valid_values = $this->valid_values();
-		if ( array_key_exists( $value, $valid_values ) ) {
-			return $value;
-		}
-
-		return $this->default_value();
-	}
-}

data/layouts/lib/struts/classes/settings/option/text.php

@@ -1,15 +0,0 @@
-<?php
-
-class Settings_Option_Text extends Settings_Option {
-	public function to_html() {
-		$id = $this->html_id();
-		$name = $this->html_name();
-		$value = $this->value();
-
-		echo "<input type='text' id='$id' name='$name' value='$value' />";
-	}
-
-	protected function standard_validation( $value ) {
-		return trim( $value );
-	}
-}

data/layouts/lib/struts/classes/settings/section.php

@@ -1,56 +0,0 @@
-<?php
-
-class Settings_Section {
-	protected $_id, $_title, $_description, $_parent_name;
-
-	public function __construct( $id, $title, $description, $parent_name ) {
-		$this->id( $id );
-		$this->title( $title );
-		$this->description( $description );
-		$this->parent_name( $parent_name );
-	}
-
-	public function id( $id = NULL ) {
-		if ( NULL === $id )
-			return $this->_id;
-
-		$this->_id = $id;
-		return $this;
-	}
-
-	public function title( $title = NULL ) {
-		if ( NULL === $title )
-			return $this->_title;
-
-		$this->_title = $title;
-		return $this;
-	}
-
-	public function description( $description = NULL ) {
-		if ( NULL === $description )
-			return $this->_description;
-
-		$this->_description = $description;
-		return $this;
-	}
-
-	public function parent_name( $parent_name = NULL ) {
-		if ( NULL === $parent_name )
-			return $this->_parent_name;
-
-		$this->_parent_name = $parent_name;
-		return $this;
-	}
-
-	public function description_html() {
-		echo "<p>{$this->description()}</p>";
-	}
-
-	public function register() {
-		add_settings_section(
-			$this->id(),
-			$this->title(),
-			array( &$this, 'description_html' ),
-			$this->parent_name() );
-	}
-}