cappruby 0.0.1 → 0.0.2

data/Rakefile

@@ -10,7 +10,8 @@ begin
     gem.email = "adam@adambeynon.com"
     gem.homepage = "http://github.com/adambeynon/cappruby"
     gem.authors = ["Adam Beynon"]
-    gem.add_development_dependency "vienna", ">= 0"
+    gem.add_dependency "vienna", ">= 0.0.5"
+    gem.add_development_dependency "racc", ">= 1.4.6"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cappruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cappruby}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Beynon"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-02-01}
   s.default_executable = %q{cappruby}
   s.description = %q{cappruby}
   s.email = %q{adam@adambeynon.com}
@@ -23,7 +23,10 @@ Gem::Specification.new do |s|
      "demos/simple_app/config/build.yml",
      "demos/simple_app/lib/application.rb",
      "demos/simple_app/lib/menu.rb",
+     "demos/twitter_client/config/build.yml",
+     "demos/twitter_client/lib/application.rb",
      "framework/array.js",
+     "framework/button.js",
      "framework/cappruby.js",
      "framework/class.js",
      "framework/enumerator.js",
@@ -36,12 +39,16 @@ Gem::Specification.new do |s|
      "framework/object.js",
      "framework/objj_additions.js",
      "framework/proc.js",
+     "framework/slider.js",
      "framework/string.js",
      "framework/variable.js",
      "framework/vm.js",
      "framework/window.js",
+     "gen/app/config/build.yml",
+     "gen/app/lib/application.rb",
      "lib/cappruby.rb",
      "lib/cappruby/app_builder.rb",
+     "lib/cappruby/app_generator.rb",
      "lib/cappruby/framework_builder.rb",
      "lib/cappruby/ruby_builder.rb"
   ]
@@ -56,12 +63,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<vienna>, [">= 0"])
+      s.add_runtime_dependency(%q<vienna>, [">= 0.0.5"])
+      s.add_development_dependency(%q<racc>, [">= 1.4.6"])
     else
-      s.add_dependency(%q<vienna>, [">= 0"])
+      s.add_dependency(%q<vienna>, [">= 0.0.5"])
+      s.add_dependency(%q<racc>, [">= 1.4.6"])
     end
   else
-    s.add_dependency(%q<vienna>, [">= 0"])
+    s.add_dependency(%q<vienna>, [">= 0.0.5"])
+    s.add_dependency(%q<racc>, [">= 1.4.6"])
   end
 end
 

data/demos/simple_app/lib/application.rb

@@ -1,29 +1,26 @@
 class AppController
   
-  attr_accessor :adam
-  
   def applicationWillFinishLaunching(notification)
-    puts "Woohoo!"
-    window :title => "Main Window" do |win|
-      
-    end
+    main_window
   end
   
   def applicationDidFinishLaunching(notification)
-    puts "Erm, better actually do some stuff now."
-    win = CPWindow.alloc
-    # inline javascript/objective-j
-    # `console.log(10)`
-    [1,2,3].each do |a|
-      puts a
+
+  end
+  
+  # return or build the main window
+  def main_window
+    @main_window ||= window :title => "Main Window" do |win|
+      # A button example
+      button :title => "First Button" do |btn|
+        btn.on_action { puts "Wow, button was clicked" }
+        win << btn
+      end
+      # A simple slider (doesnt send actions..)
+      slider :min => 0, :max => 1000, :value => 900 do |slider|
+        win << slider
+      end
     end
-    
-    bob = 20
-    
   end
   
 end
-
-
-
-

data/demos/twitter_client/lib/application.rb

@@ -0,0 +1,23 @@
+# AppController class is the CPApp delegate
+class AppController
+  
+  def applicationWillFinishLaunching(notification)
+    main_window
+  end
+  
+  def applicationDidFinishLaunching(notification)
+
+  end
+  
+  # return or build the main window
+  def main_window
+    @main_window ||= window :title => "Twitter Client" do |win|
+      
+      button :title => "First Button" do |btn|
+        btn.on_action { puts "Wow, button was clicked" }
+        win << btn
+      end
+    end
+  end
+  
+end

data/framework/button.js

@@ -0,0 +1,74 @@
+/* 
+ * button.js
+ * cappruby
+ * 
+ * Created by Adam Beynon.
+ * Copyright 2010 Adam Beynon.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+function cr_mappings_button(self, sel, options) {
+  var _$ = cappruby_block; cappruby_block = nil;
+  var h = cr_mappings_collate_options('button', options);
+
+  var btn = objj_msgSend(objj_msgSend(CPButton, "alloc"), "initWithFrame:", CGRectMake(100,100,84,24));
+
+  if(_$) { // if block given
+   cr_yield(_$, [btn]);
+  }
+
+  objj_msgSend(btn, "setTitle:", "My Button");
+
+  return btn;
+};
+
+/**
+  CPButton#on_action(&block)
+  
+  When the action event of the button fires, run the block.
+  
+  This method makes a fake target for the button, and adds a single method, to
+  act as the action, which essentially calls the proc. The proc will have access
+  to the scope in which it was defined.
+*/
+function cr_window_on_action(btn, sel) {
+  var _$ = cappruby_block; cappruby_block = nil;
+  if (!_$) {
+    throw "no block given for CPButton#on_action"
+  }
+  
+  var target = class_createInstance(rb_cObject);
+  rb_define_singleton_method(target, "button_action:",function(self, sel, obj) {
+    // call the proc with the "sender" as the param (if needed)
+    rb_ivar_get(self, '@button_action')(obj);
+  }, 1);
+  
+  rb_ivar_set(target, '@button_action', _$);
+  
+  objj_msgSend(btn, "setTarget:", target); 
+  objj_msgSend(btn, "setAction:", 'button_action:');  
+  
+  return btn;
+};
+
+function Init_Mappings_Button() {
+  rb_define_method(rb_mKernel, "button:", cr_mappings_button, 1);
+  rb_define_method(CPButton, "on_action", cr_window_on_action, 0);
+};

data/framework/mapings.js

@@ -82,5 +82,7 @@ function Init_Mappings() {
   // setup defaults.
   cr_mappings_default_init();
   Init_Mappings_Window();
+  Init_Mappings_Button();
+  Init_Mappings_Slider();
   Init_Mappings_Geometry();
 };

data/framework/slider.js

@@ -0,0 +1,50 @@
+/* 
+ * slider.js
+ * cappruby
+ * 
+ * Created by Adam Beynon.
+ * Copyright 2010 Adam Beynon.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+function cr_mappings_slider(self, sel, options) {
+  var _$ = cappruby_block; cappruby_block = nil;
+  var h = cr_mappings_collate_options('slider', options);
+
+  var slider = objj_msgSend(objj_msgSend(CPSlider, "alloc"), "initWithFrame:", CGRectMake(100,200,84,24));
+
+  if(_$) { // if block given
+   cr_yield(_$, [slider]);
+  }
+  
+  objj_msgSend(slider, "setMinValue:", rb_hash_delete(h, 'delete:', ID2SYM("min")));
+  
+  objj_msgSend(slider, "setMaxValue:", rb_hash_delete(h, 'delete:', ID2SYM("max")));
+  
+  objj_msgSend(slider, "setValue:", rb_hash_delete(h, 'delete:', ID2SYM("value")));
+
+  // objj_msgSend(btn, "setTitle:", "My Button");
+
+  return slider;
+};
+
+function Init_Mappings_Slider() {
+  rb_define_method(rb_mKernel, "slider:", cr_mappings_slider, 1);
+};

data/framework/variable.js

@@ -24,6 +24,14 @@
  * THE SOFTWARE.
  */
 
+function rb_ivar_set(obj, id, val) {
+  return obj[id] = val;
+};
+
+function rb_ivar_get(obj, id) {
+  return obj[id];
+};
+
 function rb_const_set(klass, id, val) {
   klass[id] = val;
 };

data/framework/window.js

@@ -45,7 +45,7 @@ function cr_mappings_window(self, sel, options) {
   }
 
   objj_msgSend(win, "orderFront:", self);
-
+  
   return win;
 };
 

data/gen/app/lib/application.rb

@@ -0,0 +1,23 @@
+# AppController class is the CPApp delegate
+class AppController
+  
+  def applicationWillFinishLaunching(notification)
+    main_window
+  end
+  
+  def applicationDidFinishLaunching(notification)
+
+  end
+  
+  # return or build the main window
+  def main_window
+    @main_window ||= window :title => "__APPLICATION_TITLE__" do |win|
+      
+      button :title => "First Button" do |btn|
+        btn.on_action { puts "Wow, button was clicked" }
+        win << btn
+      end
+    end
+  end
+  
+end

data/lib/cappruby/app_builder.rb

@@ -55,7 +55,7 @@ module CappRuby
       write_main_j_file
       write_index_html_file
     
-      File.symlink(File.join(@app_root, 'frameworks'), File.join(build_dir, 'Frameworks')) unless File.exist? File.join(build_dir, 'Frameworks')
+      File.symlink(File.join(@app_root, 'Frameworks'), File.join(build_dir, 'Frameworks')) unless File.exist? File.join(build_dir, 'Frameworks')
     end
     
     def info_plist_file

data/lib/cappruby/app_generator.rb

@@ -0,0 +1,80 @@
+# 
+# application_generator.rb
+# cappruby
+# 
+# Created by Adam Beynon.
+# Copyright 2010 Adam Beynon.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+module CappRuby
+  
+  class AppGenerator
+    
+    def initialize(args)
+      @app_name = args[0]
+      @app_title = (@app_name.split('_').collect { |p| p.capitalize }).join ' '
+      @app_root = File.join(Dir.getwd, @app_name)
+      
+      if File.exists? @app_root
+        puts "#{@app_name} already exists. Choose a different path"
+        exit
+      end
+    end
+    
+    # all source files
+    def source_files
+      File.join(CappRuby::ROOTPATH, 'gen', 'app')
+    end
+    
+    # do generate
+    def gen!
+      puts "Generating project: '#{@app_title}' in '#{@app_name}'"
+      FileUtils.mkdir_p @app_root
+
+      Dir.glob(File.join(source_files, '**', '*')) do |f|
+        relative = f[source_files.length..-1]
+        if File.directory? f
+          FileUtils.mkdir_p File.join(@app_root, relative)
+        else
+          File.open(File.join(@app_root, relative), 'w') do |o|
+            t = File.read f
+            t.gsub!(/__APPLICATION_NAME__/, @app_name)
+            t.gsub!(/__APPLICATION_TITLE__/, @app_title)
+            o.write t
+          end
+        end
+      end
+      
+      puts "Generating capp frameworks (might take a few secs)"
+      gen_capp_frameworks
+    end
+    
+    # capp frameworks
+    def gen_capp_frameworks
+      if %x{which capp} == ""
+        puts "Capp is not installed. Required for frameworks. Generating anyway."
+      else
+        %x{capp gen #{@app_name} -f}
+      end
+    end
+    
+  end
+end

data/lib/cappruby/ruby_builder.rb

@@ -287,7 +287,7 @@ module CappRuby
     
     def generate_call call, context
       # capture "function calls"
-      if call[:meth].match /^[A-Z](.*)$/
+      if call[:meth].match(/^[A-Z](.*)$/)
         return generate_function_call call, context
       end
       # capture objj
@@ -408,7 +408,7 @@ module CappRuby
     def gen_call_should_use_colon?(c)
       # basically, if a "special" method using ruby only things, then dont use
       # a colon
-      return false if c[:meth].match /(\<|\!|\?\>\=\!)/
+      return false if c[:meth].match(/(\<|\!|\?\>\=\!)/)
       
       args_len = 0
       if c[:call_args] and c[:call_args][:args]
@@ -490,5 +490,22 @@ module CappRuby
       
       write ";" if context[:full_stmt]
     end
+    
+    def generate_op_asgn(stmt, context)
+      write "return " if context[:full_stmt] and context[:last_stmt]
+      
+      if stmt[:lhs].node == :ivar
+        write %{(function(asgn)\{if(asgn!==nil && asgn!==undefined)\{}
+        write %{return asgn;\}else\{}
+        write "rb_ivar_set(_a, '#{stmt[:lhs][:name]}',"
+        generate_stmt stmt[:rhs], :full_stmt => false, :last_stmt => false
+        write ")"
+        write %{\}\})(rb_ivar_get(_a,"#{stmt[:lhs][:name]}"))}
+      else
+        abort "bad op_asgn lhs: #{stmt[:lhs].node}"
+      end
+      
+      write ";" if context[:full_stmt]
+    end
   end
 end

data/lib/cappruby.rb

@@ -44,8 +44,15 @@ module CappRuby
     
     case cmd
     when "gen"
-      gen args
+      if args.length == 0
+        print_usage 
+        exit
+      end
+      
+      require_libs
+      AppGenerator.new(args).gen!
     when "build"
+      
       require_libs
       AppBuilder.new(args).build!
     when "-f"
@@ -61,10 +68,6 @@ module CappRuby
     puts "Usage: cappruby gen <app name>"
   end
   
-  def self.gen(args)
-    puts "gen.."
-  end
-  
   def self.require_libs
     libs = File.join(File.dirname(__FILE__), 'cappruby', '**', '*.rb')
     Dir.glob(libs).each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cappruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Adam Beynon
@@ -9,18 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +00:00
+date: 2010-02-01 00:00:00 +00:00
 default_executable: cappruby
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vienna
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: racc
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.4.6
     version: 
 description: cappruby
 email: adam@adambeynon.com
@@ -39,7 +49,10 @@ files:
 - demos/simple_app/config/build.yml
 - demos/simple_app/lib/application.rb
 - demos/simple_app/lib/menu.rb
+- demos/twitter_client/config/build.yml
+- demos/twitter_client/lib/application.rb
 - framework/array.js
+- framework/button.js
 - framework/cappruby.js
 - framework/class.js
 - framework/enumerator.js
@@ -52,12 +65,16 @@ files:
 - framework/object.js
 - framework/objj_additions.js
 - framework/proc.js
+- framework/slider.js
 - framework/string.js
 - framework/variable.js
 - framework/vm.js
 - framework/window.js
+- gen/app/config/build.yml
+- gen/app/lib/application.rb
 - lib/cappruby.rb
 - lib/cappruby/app_builder.rb
+- lib/cappruby/app_generator.rb
 - lib/cappruby/framework_builder.rb
 - lib/cappruby/ruby_builder.rb
 has_rdoc: true