hotcocoa 0.5 → 0.5.1

data/lib/hotcocoa/application_builder.rb

@@ -21,17 +21,12 @@ module HotCocoa
         @sources = yml["sources"] || []
         @resources = yml["resources"] || []
         @overwrite = yml["overwrite"] == true ? true : false
-        @secure = yml["secure"] == true ? true : false
       end
       
       def overwrite?
         @overwrite
       end
 
-      def secure?
-        @secure
-      end
-      
       def icon_exist?
         @icon ? File.exist?(@icon) : false
       end
@@ -40,7 +35,7 @@ module HotCocoa
     
     ApplicationBundlePackage = "APPL????"
     
-    attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string, :secure, :resources, :deploy
+    attr_accessor :name, :load_file, :sources, :overwrite, :icon, :version, :info_string, :resources, :deploy
     
     def self.build(config, options={:deploy => false})
       if !config.kind_of?(Configuration) || !$LOADED_FEATURES.detect {|f| f.include?("standard_rake_tasks")}
@@ -51,7 +46,6 @@ module HotCocoa
       end
       builder = new
       builder.deploy = options[:deploy] == true ? true : false
-      builder.secure = config.secure?
       builder.name = config.name
       builder.load_file = config.load
       builder.icon = config.icon if config.icon_exist?
@@ -117,10 +111,6 @@ module HotCocoa
       end
     end
     
-    def secure?
-      secure
-    end
-    
     private
     
       def check_for_bundle_root
@@ -153,22 +143,11 @@ module HotCocoa
       end
       
       def copy_sources
-        if secure?
-          data = {}
-          data["/"+load_file] = File.open(load_file, "r") {|f| f.read}
-          sources.each do |source|
-            data["/"+source] = File.open(source, "r") {|f| f.read}
-          end
-          File.open(File.join(resources_root, "vfs.db"), "wb") do |db|
-            db.write Marshal.dump(data)
-          end
-        else
-          FileUtils.cp_r load_file, resources_root unless sources.include?(load_file)
-          sources.each do |source|
-            destination = File.join(resources_root, source)
-            FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination))
-            FileUtils.cp_r source, destination
-          end
+        FileUtils.cp_r load_file, resources_root unless sources.include?(load_file)
+        sources.each do |source|
+          destination = File.join(resources_root, source)
+          FileUtils.mkdir_p(File.dirname(destination)) unless File.exist?(File.dirname(destination))
+          FileUtils.cp_r source, destination
         end
       end
       
@@ -240,14 +219,9 @@ module HotCocoa
       
       def write_ruby_main
         File.open(main_ruby_source_file, "wb") do |f|
-          if secure?
-            require 'hotcocoa/virtual_file_system'
-            f.puts VirtualFileSystem.code_to_load(load_file)
-          else
-            f.puts "$:.map! { |x| x.sub(/^\\/Library\\/Frameworks/, NSBundle.mainBundle.privateFrameworksPath) }" if deploy?
-            f.puts "$:.unshift NSBundle.mainBundle.resourcePath.fileSystemRepresentation"
-            f.puts "load '#{load_file}'"
-          end
+          f.puts "$:.map! { |x| x.sub(/^\\/Library\\/Frameworks/, NSBundle.mainBundle.privateFrameworksPath) }" if deploy?
+          f.puts "$:.unshift NSBundle.mainBundle.resourcePath.fileSystemRepresentation"
+          f.puts "load '#{load_file}'"
         end
       end
       

data/lib/hotcocoa/graphics/color.rb

@@ -196,8 +196,11 @@ module HotCocoa::Graphics
     ]
 
     COLORNAMES.each_key do |name|
-      (class << self; self; end).define_method(name) do
-        named(name)
+      metaclass = (class << self; self; end)
+      metaclass.instance_eval do
+        define_method(name) do
+          named(name)
+        end
       end
     end
   

data/lib/hotcocoa/graphics/image.rb

@@ -57,12 +57,9 @@ module HotCocoa::Graphics
         # if it's the path to an image file, load as a CGImage
         @path = img
         File.exists?(@path) or raise "ERROR: file not found: #{@path}"
-
-        nsimage = NSImage.alloc.initWithContentsOfFile(img)
-        nsdata = nsimage.TIFFRepresentation
-        @nsbitmapimage = NSBitmapImageRep.imageRepWithData(nsdata)
-        # cgimagesource = CGImageSourceCreateWithData(nsdata) # argh, doesn't work
-        @ciimage = CIImage.alloc.initWithBitmapImageRep(@nsbitmapimage)
+        image_source = CGImageSourceCreateWithURL(NSURL.fileURLWithPath(@path), nil)
+        @cgimage = CGImageSourceCreateImageAtIndex(image_source, 0, nil)
+        @ciimage = CIImage.imageWithCGImage(@cgimage)
       when Canvas
         puts "Image.new with canvas" if @verbose
         @path = 'canvas'
@@ -80,7 +77,7 @@ module HotCocoa::Graphics
   
     # reload the bitmap image
     def reset
-      @ciimage = CIImage.alloc.initWithBitmapImageRep(@nsbitmapimage)
+      @ciimage = CIImage.imageWithCGImage(@cgimage)
       self
     end
   

data/lib/hotcocoa/mappings/toolbar.rb

@@ -51,11 +51,13 @@ HotCocoa::Mappings.map :toolbar => :NSToolbar do
       def build_custom_items
         if @allowed && @default
           ary = @default.select { |x| x.is_a?(NSToolbarItem) }
-          @default -= ary
+
+          @default.map! { |x| x.is_a?(NSToolbarItem) ? x.itemIdentifier : x }
+          @allowed.map! { |x| x.is_a?(NSToolbarItem) ? x.itemIdentifier : x }
+
           @custom_items = {}
-          ary.each { |x| @custom_items[x.itemIdentifier] = x } 
+          ary.each { |x| @custom_items[x.itemIdentifier] = x }
           @allowed.concat(@custom_items.keys)
-          @default.concat(@custom_items.keys)
 
           [@allowed, @default].each do |a|
             a.map! do |i|
@@ -81,6 +83,7 @@ HotCocoa::Mappings.map :toolbar => :NSToolbar do
           end
           allowed_items { @allowed }
           default_items { @default }
+
           item_for_identifier { |identifier, will_be_inserted| @custom_items[identifier] }
         end
       end

data/lib/hotcocoa/mappings.rb

@@ -101,7 +101,13 @@ module HotCocoa
     
     # Returns whether or not the framework has been loaded yet.
     def self.loaded_framework?(name)
-      NSBundle.allFrameworks.map {|bundle| bundle.bundlePath.split("/").last}.select {|framework| framework.split(".")[1] == 'framework'}.map {|framework| framework.split(".")[0]}.include?(name.to_s)
+      NSBundle.allFrameworks.map { |bundle|
+        bundle.bundlePath.split("/").last
+      }.select { |framework|
+        framework.split(".")[1] == 'framework'
+      }.map { |framework|
+        framework.split(".")[0]
+      }.include?(name.to_s)
     end
     
   end

data/lib/hotcocoa/standard_rake_tasks.rb

@@ -1,17 +1,21 @@
 AppConfig = HotCocoa::ApplicationBuilder::Configuration.new("config/build.yml")
 
+desc "Build a deployable version of the application"
 task :deploy => [:clean] do
   HotCocoa::ApplicationBuilder.build(AppConfig, :deploy => true)
 end
 
+desc "Build the application"
 task :build do
   HotCocoa::ApplicationBuilder.build(AppConfig)
 end
 
+desc "Build and execute the application"
 task :run => [:build] do
   `"./#{AppConfig.name}.app/Contents/MacOS/#{AppConfig.name.gsub(/ /, '')}"`
 end
 
+desc "Cleanup build files"
 task :clean do
   `/bin/rm -rf "#{AppConfig.name}.app"`
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hotcocoa
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Richard Kilmer
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: hotcocoa
 dependencies: []
 
-description: HotCocoa is a Cococa mapping library for MacRuby.  It simplifies the use of complex Cocoa classes using DSL techniques.
+description: HotCocoa is a Cocoa mapping library for MacRuby.  It simplifies the use of complex Cocoa classes using DSL techniques.
 email: rich@infoether.com
 executables: 
 - hotcocoa
@@ -94,7 +94,6 @@ files:
 - lib/hotcocoa/plist.rb
 - lib/hotcocoa/standard_rake_tasks.rb
 - lib/hotcocoa/template.rb
-- lib/hotcocoa/virtual_file_system.rb
 - lib/hotcocoa.rb
 - template/config/build.yml
 - template/lib/application.rb

data/lib/hotcocoa/virtual_file_system.rb

@@ -1,172 +0,0 @@
-class VirtualFileSystem
-  
-  def self.code_to_load(main_file, password = "\320\302\354\024\215\360P\235\2244\261\214\276:'\274%\270<\350t\212\003\340\t'\004\345\334\256\315\277")
-    <<-VFS
-    module DatabaseRuntime
-
-      class VirtualFilesystem
-
-        attr_reader :password, :encryption_method
-
-        def initialize(password, encryption_method="aes256")
-          @password = password
-          @encryption_method = encryption_method
-        end
-
-        def open_database(main_database)
-          @main_database = main_database
-          begin
-            @db = Marshal.load(File.open(main_database, "rb") {|f| f.read})
-          rescue 
-            puts $!
-            puts $!.backtrace.join("\\n")
-          end
-        end
-
-        def read_file_and_key(filename)
-          data, key = read_file_using_path(filename)
-          if data.nil? && filename[0,1] != "/"
-            $:.each do |loadpath|
-              data, key = read_file_using_path(filename, expand_path(loadpath))
-              break if data
-            end
-          end
-          [data, key]
-        end
-
-        def read_file_using_path(filename, pathname="/")
-          path = expand_path(File.join(pathname, filename))
-          rb_ext = false
-          if has_key?(path)
-            key = filename
-          elsif self.has_key?(path+".rb")
-            key = filename+".rb"
-            rb_ext = true
-          end
-          if key
-            result = rb_ext ? self[path+".rb"] : self[path]
-            if result
-              result.gsub!(/__FILE__/, "'\#{path + (rb_ext ? ".rb" : '')}'")
-              return result, key
-            end
-          end
-          nil
-        end
-
-        def has_key?(key)
-          @db.has_key?(key)
-        end
-
-        def delete(key)
-        end
-
-        def [](key)
-          read(@db, key)
-        end
-
-        def close
-        end
-
-        def keys
-          @db.keys
-        end
-
-        def []=(key, value)
-        end
-
-        def normalize(filename)
-          f = filename.split(File::Separator)
-          f.delete(".")
-          while f.include?("..")
-            f[f.index("..")-1,2] = []
-          end
-          f.join(File::Separator)
-        end
-
-        private 
-
-          def expand_path(filename, dirstring=nil)
-            filename = File.join(dirstring, filename) if dirstring
-            f = filename.split(File::Separator)
-            f.delete(".")
-            f.delete("")
-            while f.include?("..")
-              f[f.index("..")-1,2] = []
-            end
-            "/"+f.join(File::Separator)
-          end
-
-
-          def read(db, key)
-            if db.has_key?(key)
-              #decrypt = OpenSSL::Cipher::Cipher.new(encryption_method)
-              #decrypt.decrypt
-              #decrypt.key = password
-              #data = decrypt.update(db[key])
-              #data << decrypt.final
-              #::Zlib::Inflate.inflate(data)
-              db[key]
-            else
-              nil
-            end
-          end
-
-      end
-
-    end
-
-    $ROOT_BINDING = binding
-
-    module Kernel
-
-      def virtual_filesystems(options)
-        vfs = DatabaseRuntime::VirtualFilesystem.new(options["password"])
-        vfs.open_database(options["database"])
-        Kernel.const_set("VIRTUAL_FILESYSTEM", vfs)
-        vfs
-      end
-
-      alias_method :original_require, :require
-
-      def require(path)
-        path = VIRTUAL_FILESYSTEM.normalize(path)
-        path_loaded =  $".include?(path) || $".include?(path+".rb") || $".include?(path+".so")
-        unless path_loaded
-          data, key = VIRTUAL_FILESYSTEM.read_file_and_key(path)
-          if data
-            $" << key
-            eval(data, $ROOT_BINDING, key, 0)
-            return true
-          else
-            original_require(path)
-          end
-        else
-          return false
-        end
-      end
-
-      alias_method :original_load, :load
-
-      def load(path)
-        path = VIRTUAL_FILESYSTEM.normalize(path)
-        data, key = VIRTUAL_FILESYSTEM.read_file_and_key(path)
-        if data
-          eval(data, $ROOT_BINDING, key, 0)
-          return true
-        else
-          begin
-            original_load(path)
-          rescue LoadError => e
-            raise e
-          end
-        end
-      end
-
-    end
-
-    virtual_filesystems("database"=>File.join(NSBundle.mainBundle.resourcePath.fileSystemRepresentation, 'vfs.db'), "password"=>#{password.inspect})
-    $:.unshift "/lib"
-    load '#{main_file}'
-    VFS
-  end
-end