anvil-gui-cocoa/lib/anvil-gui-cocoa/app.rb anvil-gui-cocoa/lib/anvil-gui-cocoa/delegates.rb anvil-gui-cocoa/lib/anvil-gui-cocoa/delegates/app.rb anvil-gui-cocoa/lib/anvil-gui-cocoa/object.rb anvil-gui-cocoa/lib/anvil-gui-cocoa/version.rb anvil-gui-cocoa/lib/anvil-gui-cocoa/window.rb anvil-gui-cocoa/spec/anvil-gui-cocoa/window_spec.rb anvil-gui-cocoa/spec/spec.opts anvil-gui-cocoa/spec/spec_helper.rb anvil-gui-qt/lib/anvil-gui-qt/app.rb anvil-gui-qt/lib/anvil-gui-qt/object.rb anvil-gui-qt/lib/anvil-gui-qt/version.rb anvil-gui-qt/lib/anvil-gui-qt/widget.rb anvil-gui-qt/lib/anvil-gui-qt/window.rb anvil-gui-qt/spec/anvil-gui-qt/app_spec.rb anvil-gui-qt/spec/anvil-gui-qt/window_spec.rb anvil-gui-qt/spec/spec.opts anvil-gui-qt/spec/spec_helper.rb demos/hello_world/app/views/hello_worlds/show.rb @@ -2,4 +2,6 @@ anvil/pkg/ anvil-db/pkg/ anvil-gen/pkg/ anvil-gui/pkg/ +anvil-gui-cocoa/pkg/ anvil-gui-fox/pkg/ +anvil-gui-qt/pkg/ .gitignore @@ -3,9 +3,9 @@ require 'rake/gempackagetask' require 'rake/rdoctask' require 'rake/testtask' require 'spec/rake/spectask' +require 'lib/anvil-gui-cocoa/version' NAME = "anvil-gui-cocoa" -VERSION = "0.0.1" AUTHOR = "Lance Carlson" EMAIL = "lancecarlson@gmail.com" HOMEPAGE = "http://anvil.rubyforge.org" @@ -17,7 +17,7 @@ dist_dirs = [ "lib", "spec" ] spec = Gem::Specification.new do |s| s.name = NAME - s.version = VERSION + s.version = Anvil::GUI::Cocoa::VERSION s.platform = Gem::Platform::RUBY s.summary = SUMMARY s.description = s.summary @@ -54,7 +54,7 @@ end desc 'Run :package and install the resulting .gem' task :install => :package do - sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri} + sh %{#{SUDO} gem install pkg/#{NAME}-#{Anvil::GUI::Cocoa::VERSION} --no-rdoc --no-ri} end desc 'Run :clean and uninstall the .gem' @@ -64,13 +64,13 @@ end desc "Run all specs" Spec::Rake::SpecTask.new('spec') do |t| - t.spec_files = FileList['spec/anvil-gui-fox/**/*_spec.rb'] + t.spec_files = FileList['spec/anvil-gui-cocoa/**/*_spec.rb'] t.spec_opts = ['--options', 'spec/spec.opts'] end desc "Run all specs and generate an rcov report" Spec::Rake::SpecTask.new('spec:rcov') do |t| - t.spec_files = FileList['spec/anvil-gui-fox/**/*_spec.rb'] + t.spec_files = FileList['spec/anvil-gui-cocoa/**/*_spec.rb'] t.spec_opts = ['--options', 'spec/spec.opts'] t.rcov = true t.rcov_dir = 'coverage' @@ -78,5 +78,5 @@ Spec::Rake::SpecTask.new('spec:rcov') do |t| end task :release => :package do - sh %{rubyforge add_release #{NAME} #{NAME} "#{VERSION}" pkg/#{NAME}-#{VERSION}.gem} + sh %{rubyforge add_release #{NAME} #{NAME} "#{Anvil::GUI::Cocoa::VERSION}" pkg/#{NAME}-#{Anvil::GUI::Cocoa::VERSION}.gem} end \ No newline at end of file anvil-gui-cocoa/Rakefile @@ -1 +1,6 @@ -require 'osx/cocoa' \ No newline at end of file +require 'anvil-gui' +require 'osx/cocoa' + +%w(app delegates version window).each do |file| + require File.join(File.dirname(__FILE__), "anvil-gui-cocoa", file) +end anvil-gui-cocoa/lib/anvil-gui-cocoa.rb @@ -1,7 +1,6 @@ +require 'anvil-gui' require 'fox16' %w(app window button).each do |file| require File.join(File.dirname(__FILE__), "anvil-gui-fox", file) -end - -require 'anvil-gui' unless Anvil::GUI.const_defined? "Initializer" \ No newline at end of file +end \ No newline at end of file anvil-gui-fox/lib/anvil-gui-fox.rb @@ -3,19 +3,23 @@ require 'rake/gempackagetask' require 'rake/rdoctask' require 'rake/testtask' require 'spec/rake/spectask' +require 'lib/anvil-gui-qt/version' NAME = "anvil-gui-qt" -VERSION = "0.0.1" AUTHOR = "Lance Carlson" EMAIL = "lancecarlson@gmail.com" HOMEPAGE = "http://anvil.rubyforge.org" SUMMARY = "Anvil adapter for the Qt library" +windows = (PLATFORM =~ /win32|cygwin/) + +SUDO = windows ? "" : "sudo" + dist_dirs = [ "lib", "spec" ] spec = Gem::Specification.new do |s| s.name = NAME - s.version = VERSION + s.version = Anvil::GUI::Qt::VERSION s.platform = Gem::Platform::RUBY s.summary = SUMMARY s.description = s.summary @@ -25,7 +29,6 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.add_dependency('anvil-gui') - s.add_dependency('Qt') s.add_dependency('rspec') s.add_dependency('rake') @@ -52,7 +55,7 @@ end desc 'Run :package and install the resulting .gem' task :install => :package do - sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri} + sh %{#{SUDO} gem install pkg/#{NAME}-#{Anvil::GUI::Qt::VERSION} --no-rdoc --no-ri} end desc 'Run :clean and uninstall the .gem' @@ -62,13 +65,13 @@ end desc "Run all specs" Spec::Rake::SpecTask.new('spec') do |t| - t.spec_files = FileList['spec/anvil-gui-fox/**/*_spec.rb'] + t.spec_files = FileList['spec/anvil-gui-qt/**/*_spec.rb'] t.spec_opts = ['--options', 'spec/spec.opts'] end desc "Run all specs and generate an rcov report" Spec::Rake::SpecTask.new('spec:rcov') do |t| - t.spec_files = FileList['spec/anvil-gui-fox/**/*_spec.rb'] + t.spec_files = FileList['spec/anvil-gui-qt/**/*_spec.rb'] t.spec_opts = ['--options', 'spec/spec.opts'] t.rcov = true t.rcov_dir = 'coverage' @@ -76,5 +79,5 @@ Spec::Rake::SpecTask.new('spec:rcov') do |t| end task :release => :package do - sh %{rubyforge add_release #{NAME} #{NAME} "#{VERSION}" pkg/#{NAME}-#{VERSION}.gem} + sh %{rubyforge add_release #{NAME} #{NAME} "#{Anvil::GUI::Qt::VERSION}" pkg/#{NAME}-#{Anvil::GUI::Qt::VERSION}.gem} end \ No newline at end of file anvil-gui-qt/Rakefile @@ -0,0 +1,6 @@ +require 'anvil-gui' +require 'qt' + +%w(app version window).each do |file| + require File.join(File.dirname(__FILE__), "anvil-gui-qt", file) +end anvil-gui-qt/lib/anvil-gui-qt.rb @@ -1,6 +1,8 @@ module Anvil module GUI class Window + attr_accessor :properties + def initialize(name) @toolkit = Toolkit @name = name @@ -11,10 +13,19 @@ module Anvil @toolkit.window @name end - def title(title) + def title=(title) + @properties[:title] = title + @real_window.title=(title) + end + + def size=(width, height) + @properties[:size] = { :width => width, :height => height } + @real_window.size = width, height end - def size(width, height) + def method_missing(method, *args) + @properties[method] = *args + @real_window.send(method, *args) end def button(name, options = {}) anvil-gui/lib/anvil-gui/window.rb @@ -9,7 +9,8 @@ describe "The DSL for" do describe Anvil::GUI, "window" do it "should be friggin cool" do Anvil::GUI.window :test_window do - title "Hello World" + title = "Hello World" + size = 300, 400 end end end anvil-gui/spec/anvil-gui/window_spec.rb @@ -11,7 +11,7 @@ module Anvil @defaults ||= { :environment => "development", :anvil_root => Dir.pwd, - :toolkit_name => "Cocoa" # Fox or Cocoa or Qt + :toolkit_name => "Qt" # Fox or Cocoa or Qt } end anvil/lib/anvil/configuration.rb @@ -13,5 +13,9 @@ module Anvil def _run(action) self.action_name = action end + + def render(action) + + end end end \ No newline at end of file anvil/lib/anvil/controller.rb @@ -1,10 +1,11 @@ module Anvil # To be cool, we use the launcher class. BootLoader and Initializer were taken (Merb/Rails) - class Launcher + class Launcher def initialize(config) @config = config configure_application launch_toolkit + load_files end def configure_application @@ -17,7 +18,18 @@ module Anvil end def launch_toolkit - Anvil::GUI::Toolkit.new Anvil.toolkit_name + Anvil::GUI::Toolkit.register! Anvil.toolkit_name end + + def load_files + # Require all the files in the registered load paths + Anvil.load_paths.each do |name, path| + next unless path.last + Dir[path.first / path.last].each do |file| + load file + end + end + end + end end \ No newline at end of file anvil/lib/anvil/launcher.rb @@ -3,10 +3,19 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper") describe Anvil do before do @toolkit = mock(Anvil::GUI::Toolkit) + @app_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..")) end it "should launch the project" do - Anvil::GUI::Toolkit.should_receive(:new).and_return(@toolkit) + Anvil::GUI::Toolkit.should_receive(:register!).and_return(@toolkit) Anvil.launch! + Anvil.load_paths.should == { + :view=>["#{@app_path}/app/views", "**/*.rb"], + :application=>["#{@app_path}/app/controllers/application.rb", "**/*.rb"], + :log=>["#{@app_path}/log", "**/*.rb"], + :model=>["#{@app_path}/app/models", "**/*.rb"], + :controller=>["#{@app_path}/app/controllers", "**/*.rb"], + :config=>["#{@app_path}/config", "**/*.rb"] + } end end \ No newline at end of file anvil/spec/anvil/anvil_spec.rb @@ -1,5 +1,4 @@ class HelloWorldController < ApplicationController def show - display :hello_world end end \ No newline at end of file demos/hello_world/app/controllers/hello_world_controller.rb demos/hello_world/app/views/windows/hello_world.window.rb b7d0ce1396808f9a474c961a9e34f2537cc261b6 Lance Carlson lancecarlson@gmail.com http://github.com/lancecarlson/anvil/commit/745ae3390b66ba960141229bb5e68494e9743333 745ae3390b66ba960141229bb5e68494e9743333 2008-08-03T09:38:58-07:00 2008-08-03T09:38:58-07:00 Initial integration 7620c37cb0e12038583d0c1b75f5b32580ea199e Lance Carlson lancecarlson@gmail.com