darkhelmet-darkext 0.9.7 → 0.10.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 9
-:patch: 7
+:minor: 10
+:patch: 0
 :major: 0

data/app_generators/sinatra_app_generator.rb

@@ -0,0 +1,52 @@
+require 'rbconfig'
+
+class SinatraAppGenerator < RubiGen::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  default_options(:shebang => DEFAULT_SHEBANG)
+
+  attr_accessor :app_name, :module_name, :app_name_fixed
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @destination_root = args.shift
+    self.app_name = File.basename(File.expand_path(@destination_root))
+    self.app_name_fixed = self.app_name.split('-').map(&:capitalize).join
+    self.module_name = app_name.camelize
+  end
+
+  def manifest
+    # Use /usr/bin/env if no special shebang was specified
+    script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+    windows = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
+
+    record do |m|
+      # Root directory and all subdirectories.
+      m.directory('')
+      %w(lib public views).each { |path| m.directory(path) }
+      %w(get put post delete).each do |path|
+        m.template('http_method.rb', "lib/#{path}.rb", :assigns => { :method => path })
+      end
+      m.template('helpers.rb', 'lib/helpers.rb')
+      m.template('options.rb', 'lib/options.rb')
+      m.template('error.rb', 'lib/error.rb')
+      m.template('app.rb', "#{app_name}.rb", script_options)
+      #m.dependency "install_rubigen_scripts", [destination_root, "rubygems"], :shebang => options[:shebang]
+    end
+  end
+
+  protected
+  def banner
+    "Create a stub for #{File.basename $0} to get started."
+  end
+
+  def add_options!(opts)
+    opts.separator ''
+    opts.separator 'Options:'
+    opts.on("-r", "--ruby=path", String,
+            "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
+            "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
+  end
+end

data/app_generators/templates/app.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+%w(rubygems sinatra/base darkext darkext/sinatra).each { |lib| require lib }
+Dir['lib/*.rb'].each { |file| load file }
+
+load 'local_options.rb' if File.exists?('local_options.rb')
+
+class <%= app_name_fixed %>Site < Sinatra::Default
+  set(:app_file, File.expand_path(__FILE__))
+  register Sinatra::DarkHelpers
+  <% for lib in %w(Options Helpers Error Get Post Put Delete) %>
+  register Sinatra::<%= app_name_fixed %><%= lib %><% end %>
+  register Sinatra::LocalOptions unless defined?(Sinatra::LocalOptions).nil?
+end
+
+<%= app_name_fixed %>Site.run! if __FILE__ == $0

data/app_generators/templates/error.rb

@@ -0,0 +1,8 @@
+module Sinatra
+  module <%= app_name_fixed %>Error
+    def self.registered(app)
+    end
+  end
+
+  register <%= app_name_fixed %>Error
+end

data/app_generators/templates/helpers.rb

@@ -0,0 +1,12 @@
+module Sinatra
+  module <%= app_name_fixed %>Helpers
+    module HelperMethods
+    end
+
+    def self.registered(app)
+      app.helpers(HelperMethods)
+    end
+  end
+
+  register <%= app_name_fixed %>Helpers
+end

data/app_generators/templates/http_method.rb

@@ -0,0 +1,8 @@
+module Sinatra
+  module <%= app_name_fixed %><%= method.capitalize %>
+    def self.registered(app)
+    end
+  end
+
+  register <%= app_name_fixed %><%= method.capitalize %>
+end

data/app_generators/templates/options.rb

@@ -0,0 +1,9 @@
+module Sinatra
+  module <%= app_name_fixed %>Options
+    def self.registered(app)
+      app.set(:site_name,<%= "'#{app_name_fixed}'" %>)
+    end
+  end
+
+  register <%= app_name_fixed %>Options
+end

data/bin/sinatra-app

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rubigen'
+
+if %w(-v --version).include? ARGV.first
+  require 'newgem/version'
+  puts "#{File.basename($0)} #{Newgem::VERSION}"
+  exit(0)
+end
+
+require 'rubigen/scripts/generate'
+RubiGen::Base.use_application_sources!
+RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'SinatraApp')

data/lib/darkext/beagle.rb

@@ -17,16 +17,16 @@ module Beagle
           loop do
             line = @io.gets
             break if line.nil?
+            line.chomp!
+            break if line.empty? && 0 < result.keys.size
             if !line.include?('=') || line.starts_with?(' Snip')
               parts = line.split(':')
               k = parts.shift.strip
-              break if result.keys.include?(k)
               v = parts.join(':').strip
               result[k] = v unless k.empty? || v.empty?
             elsif line.include?('=')
               k,v = line.split('=')
               k = k.split(':').last.strip
-              break if result.keys.include?(k)
               v = v.gsub("'",'').strip
               result[k] = v unless k.empty? || v.empty?
             end
@@ -71,7 +71,7 @@ module Beagle
     args << '--verbose'
     args << '--max-hits'
     args << max_hits.to_s
-    args << query
+    args << "\"#{query.gsub('"','\"')}\""
     return BeagleResultsHelper.new(IO.popen(args.join(' ')))
   end
 

data/lib/darkext/net.rb

@@ -1,8 +1,19 @@
 require 'net/http'
 
 module Net
-  def self.download(url)
-    Net::HTTP.get_response(URI.parse(url))
+  def self.download(url,limit = 10)
+    raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+    #url = URI.parse(url)
+    #req = Net::HTTP::Get.new(url.path)
+    #req['User-Agent'] = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.7) Gecko/2009030422 Ubuntu/8.10 (intrepid) Firefox/3.0.7"
+    #resp = Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
+    resp = Net::HTTP.get_response(URI.parse(url))
+    case resp
+    when Net::HTTPSuccess     then resp
+    when Net::HTTPRedirection then download(resp['location'], limit - 1)
+    else
+      resp.error!
+    end
   end
 
   def self.download_and_save(url,path = nil)
@@ -12,6 +23,6 @@ module Net
       path = File.expand_path(path)
     end
     resp = download(url)
-    open(path,'w') { |file| file.write(resp) } if resp.to_s.include?('HTTPOK')
+    open(path,'w') { |file| file.write(resp.body) } if resp.is_a?(Net::HTTPSuccess)
   end
 end

data/lib/darkext/object.rb

@@ -1,6 +1,11 @@
 class Object
   def try(*args, &block)
-    return if self.nil?
+    return nil if self.nil?
     block.given? ? yield(self) : self.__send__(args.shift, *args)
   end
+
+  def tap
+    yield(self)
+    return self
+  end
 end

data/lib/darkext/sinatra.rb

@@ -61,8 +61,9 @@ module Sinatra
     end
 
     def self.registered(app)
-      app.helpers HelperMethods
+      app.helpers(HelperMethods)
       app.disable(:slash)
+      app.set(:site_base, '/')
       app.enable(:sessions)
     end
   end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--diff
+--color

data/test/{test_darkext.rb → darkext_test.rb}

@@ -1,11 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 
 class TestDarkext < Test::Unit::TestCase
-
   def setup
   end
-  
+
   def test_truth
-    assert true
+    assert(true)
   end
 end

data/test/{test_helper.rb → helper.rb}

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'stringio'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/darkext'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-darkext
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -9,22 +9,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-02 00:00:00 -08:00
-default_executable: 
+date: 2009-03-18 00:00:00 -07:00
+default_executable: sinatra-app
 dependencies: []
 
 description: Just some useful Ruby functionality. No particular focus, except usefulness
 email: darkhelmet@darkhelmetlive.com
-executables: []
-
+executables: 
+- sinatra-app
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
 - VERSION.yml
 - README.rdoc
 - History.txt
+- bin/sinatra-app
+- app_generators/sinatra_app_generator.rb
+- app_generators/templates
+- app_generators/templates/http_method.rb
+- app_generators/templates/app.rb
+- app_generators/templates/helpers.rb
+- app_generators/templates/options.rb
+- app_generators/templates/error.rb
 - lib/darkext
 - lib/darkext/numeric.rb
 - lib/darkext/string.rb
@@ -43,8 +51,9 @@ files:
 - lib/darkext/float.rb
 - lib/darkext/integer.rb
 - lib/darkext.rb
-- test/test_helper.rb
-- test/test_darkext.rb
+- test/helper.rb
+- test/darkext_test.rb
+- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/darkhelmet/darkext
 post_install_message: 
@@ -70,7 +79,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Just some useful Ruby functionality
 test_files: []