@@ -10,7 +10,7 @@ using System.Windows.Input; namespace IronNails.Library.Behaviors { - public class ClickBehavior + public class ClickBehavior : DependencyObject { public static DependencyProperty DoubleClickCommandProperty = DependencyProperty.RegisterAttached("DoubleClick", IronNails.Library/Behaviors/ClickBehavior.cs @@ -80,8 +80,9 @@ namespace IronNails.Library /// <param name="arg">The arg.</param> void ICommand.Execute(object arg) { + ((UIElement) arg).Dispatcher.BeginInvoke(DispatcherPriority.Normal, _handler); //((UIElement) arg).Dispatcher.Invoke(DispatcherPriority.Normal, _handler); - _handler(); + //_handler(); } #endregion IronNails.Library/DelegateCommand.cs @@ -1,12 +1,12 @@ namespace IronNails.View { - /// <summary> - /// This is just a placeholder class the real behavior is added - /// in IronRuby but this way there is a common extension point for - /// DLR and CLR based languages. - /// </summary> - public class XamlProxy - { - public XamlProxy(string name){} - } +// /// <summary> +// /// This is just a placeholder class the real behavior is added +// /// in IronRuby but this way there is a common extension point for +// /// DLR and CLR based languages. +// /// </summary> +// public class XamlProxy +// { +// public XamlProxy(string name){} +// } } \ No newline at end of file IronNails.Library/XamlProxy.cs @@ -1,7 +1,7 @@ #libs_include = "-I 'C:\\tools\\ironruby\\libs;C:\\tools\\ruby\\lib\\ruby\\site_ruby\\1.8;C:\\tools\\ruby\\lib\\ruby\\1.8'" require 'yaml' require 'ftools' -libs_include = "" +libs_include = "" #= "-I 'C:\tools\ironruby\merlin\external\languages\ruby\redist-libs\ruby;C:\tools\ironruby\merlin\external\languages\ironruby" def exec_sys(cmd) @@ -31,6 +31,8 @@ end desc "Builds the helpers and the contracts projects" task :build => ['build:helpers', 'build:contracts', "build:copy_assemblies"] +desc "Cleans and rebuilds the helpers and the contracts projects" +task :rebuild => ['build:rebuild_helpers', 'build:rebuild_contracts', "build:copy_assemblies"] namespace :build do @@ -49,17 +51,29 @@ namespace :build do system "msbuild /clp:ErrorsOnly;WarningsOnly /nologo ../IronNails.Library/IronNails.Library.csproj" end + desc "Cleans and builds the helpers project" + task :rebuild_helpers do + puts "Reuilding the helpers project" + system "msbuild /clp:ErrorsOnly;WarningsOnly /t:Clean /nologo ../IronNails.Library/IronNails.Library.csproj" + end + desc "Build the contracts project" task :contracts do puts "Building the contracts project" system "msbuild /clp:ErrorsOnly;WarningsOnly /nologo ../IronNails.Contracts/IronNails.Contracts.csproj" end + + desc "Cleans and builds the contracts project" + task :rebuild_contracts do + puts "Rebuilding the contracts project" + system "msbuild /clp:ErrorsOnly;WarningsOnly /nologo /t:Clean ../IronNails.Contracts/IronNails.Contracts.csproj" + end end desc "Opens a console with the environment of the application initialized (Doesn't work at the moment)" task :console do - system "ir #{libs_include} -D -i config/boot.rb" + system "ir #{libs_include} '-D -i config/boot.rb'" end task :default do IronNails/Rakefile.rb @@ -5,64 +5,67 @@ module IronNails class Status - def self.timeline_with_friends(credentials, &callback) - options = { :url => Constants::Urls::FRIENDS_TIMELINE, :credentials => credentials, :root_path => 'statuses/status' } - internal_request options, &callback - end - - def self.replies_timeline(credentials, &callback) - options = { :url => Constants::Urls::REPLIES_TIMELINE, :credentials => credentials, :root_path => 'statuses/status' } - internal_request options, &callback - end - - def self.timeline_for_user(user, credentials, &callback) - options = { :url => "#{Constants::Urls::USERS_TIMELINE}#{user}#{Constants::RESPONSE_FORMAT}", :credentials => credentials, :root_path => 'statuses/status' } - internal_request options, &callback - end + class << self - def self.update_status(message, credentials, &callback) - request = WebClient.new Constants::Urls::UPDATE_STATUS, credentials - params = {:status => message, :source => "Sylvester" } - parse_response = lambda{ |rdr| parse_post_response rdr, message } + def timeline_with_friends(credentials, &callback) + options = { :url => Constants::Urls::FRIENDS_TIMELINE, :credentials => credentials, :root_path => 'statuses/status' } + internal_request options, &callback + end - request.post_and_return params, parse_response, &callback - end - - def self.delete(message, credentials, &callback) - request = WebClient.new "#{Constants::Urls::DESTROY_TWEET}#{message}#{Constants::RESPONSE_FORMAT}", credentials - request.get - end - - def self.properties - %w(created_at id text source truncated in_reply_to_status_id in_reply_to_user_id favorited) - end - - def self.children - %w(user) - end - - def self.parse_post_response(reader, original_message) - item = nil - IronXml.parse(reader, :stream) do |doc| - item = self.build_from_post(doc.element('status'), original_message) + def replies_timeline(credentials, &callback) + options = { :url => Constants::Urls::REPLIES_TIMELINE, :credentials => credentials, :root_path => 'statuses/status' } + internal_request options, &callback + end + + def timeline_for_user(user, credentials, &callback) + options = { :url => "#{Constants::Urls::USERS_TIMELINE}#{user}#{Constants::RESPONSE_FORMAT}", :credentials => credentials, :root_path => 'statuses/status' } + internal_request options, &callback + end + + def update_status(message, credentials, &callback) + request = WebClient.new Constants::Urls::UPDATE_STATUS, credentials + params = {:status => message, :source => "Sylvester" } + parse_response = lambda{ |rdr| parse_post_response rdr, message } + + request.post_and_return params, parse_response, &callback + end + + def delete(message, credentials, &callback) + request = WebClient.new "#{Constants::Urls::DESTROY_TWEET}#{message}#{Constants::RESPONSE_FORMAT}", credentials + request.get + end + + def properties + %w(created_at id text source truncated in_reply_to_status_id in_reply_to_user_id favorited) + end + + def children + %w(user) + end + + def parse_post_response(reader, original_message) + item = nil + IronXml.parse(reader, :stream) do |doc| + item = self.build_from_post(doc.element('status'), original_message) + end + item end - item - end - - def self.build_from_post(element, original_message) - return nil if element.nil? - item = self.new - item.populate_properties_from(element) do |val| - if original_message.is_direct_message? - item.text = original_message - else - item.text = HttpUtility.html_decode val + def build_from_post(element, original_message) + return nil if element.nil? + + item = self.new + item.populate_properties_from(element) do |val| + if original_message.is_direct_message? + item.text = original_message + else + item.text = HttpUtility.html_decode val + end end + item.populate_children_from element + item.is_new = true + item end - item.populate_children_from element - item.is_new = true - item end end IronNails/app/models/status.rb IronNails/bin/IronNails.Contracts.dll IronNails/bin/IronNails.Contracts.pdb IronNails/bin/IronNails.Library.dll @@ -1,2 +1,2 @@ --- -ironruby_path: C:\tools\ironruby\build\debug +ironruby_path: C:\tools\ironruby\merlin\main\bin\debug IronNails/config/build_config.yml IronNails/vendor/iron_nails/bin/IronNails.Library.dll IronNails/vendor/iron_nails/bin/IronNails.Library.pdb @@ -1,3 +1,7 @@ + def include_global_namespaces(namespaces) + namespaces.each { |namespace| include(eval(namespace)) } + end + module IronNails class << self @@ -117,7 +121,8 @@ module IronNails def include_namespaces logger.debug "Including namespaces", IRONNAILS_FRAMEWORKNAME - configuration.namespaces.each { |namespace| Object.include eval(namespace) } + #include_global_namespaces configuration.namespaces + configuration.namespaces.each { |namespace| Object.send :include, eval(namespace) } end def require_application_files IronNails/vendor/iron_nails/config/initializer.rb @@ -36,10 +36,10 @@ module IronNails def refresh_view(name=nil) name ||= view_name.to_sym setup_for_showing_view - nails_engine.refresh_view(nails_engine.find_view(controller_name, name)) - on_view(name) do |proxy| - proxy.refresh - end + nails_engine.refresh_view(nails_engine.find_view(controller_name, name)) + on_view(name) do |proxy| + proxy.refresh + end end def on_view(name=nil, options={}, &b) IronNails/vendor/iron_nails/lib/controller/base.rb @@ -4,8 +4,8 @@ module IronNails module Logging - FRAMEWORK_LOGGING = true - CONSOLE_LOGGING = true + FRAMEWORK_LOGGING = true unless defined? FRAMEWORK_LOGGING + CONSOLE_LOGGING = true unless defined? CONSOLE_LOGGING class BufferedLogger module Severity IronNails/vendor/iron_nails/lib/logging/buffered_logger.rb @@ -206,7 +206,7 @@ module IronNails # should work as normally. Will revisit this later to properly fix it. vm_name = controller.view_model_name klass = Object.const_get vm_name.camelize - klass.include IronNails::View::ViewModelMixin + klass.send :include, IronNails::View::ViewModelMixin key = vm_name.to_sym view_models[key] = klass.new if view_models[key].nil? registry.register_viewmodel_for controller, view_models[key] IronNails/vendor/iron_nails/lib/nails_engine.rb @@ -13,8 +13,8 @@ module IronNails alias_method :nails_base_command_read_options, :read_options def read_options(options) nails_base_command_read_options options - raise ArgumentError.new "We need a target to be defined by the :to parameter" if options[:to].nil? - raise ArgumentError.new "We need a controller instance to be defined in the :controller parameter" if options[:controller].nil? || !options[:controller].respond_to?(:current_view) + raise ArgumentError.new("We need a target to be defined by the :to parameter") if options[:to].nil? + raise ArgumentError.new("We need a controller instance to be defined in the :controller parameter") if options[:controller].nil? || !options[:controller].respond_to?(:current_view) @controller = options[:controller] @target = options[:to] IronNails/vendor/iron_nails/lib/view/commands/add_sub_view_command.rb @@ -223,4 +223,18 @@ module IronNails end -end \ No newline at end of file +end + +#module IronNails +# +# module View + + class XamlProxy + + def initialize + puts "Hello world" + end + end + +# end +#end \ No newline at end of file IronNails/vendor/iron_nails/lib/view/xaml_proxy.rb libs/IronNails.Library.dll 762490d5aea751be76125c18134c0ad048adf856 Ivan Porto Carrero ivan@flanders.co.nz http://github.com/casualjim/ironnails/commit/1e3c37ad8af5bdfa3a6788fbef8f00ed875a1ea0 1e3c37ad8af5bdfa3a6788fbef8f00ed875a1ea0 2008-12-30T06:37:01-08:00 2008-12-30T06:37:01-08:00 It's working against the latest IronRuby revision 1d460719d6363a2b4e229618901c7eaeba588472 Ivan Porto Carrero ivan@flanders.co.nz