edango 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.5.2 / 2010-01-11
+
+* Proxy support was added
+
 === 0.5.1 / 2010-01-10
 
 * 1 major enhancement

data/README.rdoc

@@ -28,9 +28,10 @@ You can install the application and all its dependencies with the following comm
     gem install edango
 
 Now you need to add at least one account specifications to the application configuration file.
-This can be done with the -s or --site flags passed with the specs to the application starter script.
+This can be done with the <tt>-a</tt> or <tt>--account</tt> flags passed with the specs
+to the application starter script.
 
-    edango --site "URL_REGEX, TICKET_LINK_REGEX, PASSKEY[, LOGIN:PASSWORD[, LOGIN_URL]]"
+    edango --account "URL_REGEX, TICKET_LINK_REGEX, PASSKEY[, LOGIN:PASSWORD[, LOGIN_URL]]"
 
 === Other Installation Methods
 

data/lib/edango.rb

@@ -25,7 +25,7 @@ $LOAD_PATH.unshift(current_dir) unless $LOAD_PATH.include?(current_dir) or
 module EDango
   FULL_NAME = 'EDango'
   UNIX_NAME = 'edango'
-  VERSION   = '0.5.1'
+  VERSION   = '0.5.2'
 
   AUTHOR = 'Toksaitov Dmitrii Alexandrovich'
 

data/lib/edango/context/parameters.rb

@@ -22,10 +22,11 @@ module EDango
     asset :options, :file => FILES[:options] do
       {:environment    => :production,
        :server_logging => true,
-       :time_limit     => 10,
+       :time_limit     => 100,
        :servers        => ['thin', 'mongrel', 'webrick'],
        :host           => '0.0.0.0',
        :port           => 6666,
+       :proxy          => false,
        :sites          => []}
     end
 

data/lib/edango/context/services.rb

@@ -97,6 +97,13 @@ module EDango
         WWW::Mechanize.new do |agent|
           agent.user_agent_alias = 'Windows Mozilla'
           agent.history.max_size = 0
+
+          proxy = EDango::PARAMETERS[:options][:proxy]
+
+          if proxy
+            agent.set_proxy(*proxy) unless proxy[0].nil_or_empty? or
+                                           proxy[1].nil_or_empty?
+          end
         end
       end
     end

data/lib/edango/site/core.rb

@@ -56,22 +56,22 @@ module EDango
         self.class.set(param, value)
       end
 
-      set :errors, {}
+      set :errors_list, {}
     end
 
     helpers do
       def error(key, value = nil)
-        value ? options.errors[key] = value : options.errors[key]
+        value ? options.errors_list[key] = value : options.errors_list[key]
       end
       alias err error
 
       def error?(key)
-        options.errors[key] ? true : false
+        options.errors_list[key] ? true : false
       end
       alias err? error?
 
       def clear_errors
-        options.errors.clear()
+        options.errors_list.clear()
       end
 
       def current_jlib
@@ -148,7 +148,7 @@ module EDango
 
       @tickets = extract_tickets(url, passkey)
 
-      unless options.errors.empty?
+      unless options.errors_list.empty?
         response.set_cookie('url', url)
 
         redirect('/')
@@ -166,7 +166,7 @@ module EDango
         error :in_process, [[t(:specified_file), t(:file_not_found)]]
       end
 
-      unless options.errors.empty?
+      unless options.errors_list.empty?
         redirect('/')
       else
         send_file(file)

data/lib/edango/site/public/styles/layout.css

@@ -108,7 +108,7 @@ fieldset
 
 #title
 {
-    padding: 182px 0 0 250px;
+    padding: 182px 0 0 300px;
 }
 
 #title #app-name

data/lib/edango/starter.rb

@@ -22,13 +22,15 @@ module EDango
 
   class Starter
     SPECS =
-      {:site_flag =>
-         ['-s', '--site URL_REGEX,TICKET_LINK_REGEX,PASSKEY[,LOGIN:PASSWORD[,LOGIN_URL]]',
-          'Adds site specifications used to obtain a ticket.'],
+      {:account_flag =>
+         ['-a', '--account URL_REGEX,TICKET_LINK_REGEX,PASSKEY[,LOGIN:PASSWORD[,LOGIN_URL]]',
+          'Adds account specifications used to obtain a ticket.'],
        :clear_flag =>
-         ['-c', '--clear', 'Clear all site specifications from the configuration.'],
-       :parameters_flag =>
-         ['-p', '--parameters NAME:VALUE[,NAME:VALUE]', 'Specifies parameters for the Sinatra library.'],
+         ['-c', '--clear', 'Clear all account specifications from the configuration.'],
+       :server_flag =>
+         ['-s', '--server NAME:VALUE[,NAME:VALUE]', 'Specifies parameters for the "Sinatra" library.'],
+       :proxy_flag =>
+         ['-p', '--proxy HOST:PORT[:USER:PASSWORD]', 'Specifies proxy server parameters.'],
        :version_flag =>
          ['-v', '--version', 'Displays version information and exits.'],
        :help_flag =>
@@ -95,7 +97,7 @@ module EDango
           @modes[:debug] = true
         end
 
-        on_argument(:site_flag) do |specs|
+        on_argument(:account_flag) do |specs|
           specs = specs.split(',').map(&:strip) rescue []
 
           url_regex, ticket_link_regex, passkey, account, login_url = specs
@@ -110,7 +112,7 @@ module EDango
           @options[:sites] = []
         end
 
-        on_argument(:parameters_flag) do |params|
+        on_argument(:server_flag) do |params|
           params = Hash[*params.split(',').map { |item| item.split(':').map(&:strip) }.flatten] rescue nil
           params.try(:intern_keys!)
 
@@ -118,6 +120,16 @@ module EDango
           @options[:parameters] << params if params
         end
 
+        on_argument(:proxy_flag) do |specs|
+          specs = specs.split(':') rescue nil
+
+          @options[:proxy] = nil
+          if specs
+            @options[:proxy] = specs unless specs[0].nil_or_empty? or
+                                            specs[1].nil_or_empty?
+          end
+        end
+
         @parser.parse!(@environment.arguments)
         @environment.save_options(:all)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: edango
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Toksaitov Dmitrii Alexandrovich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +06:00
+date: 2010-01-11 00:00:00 +06:00
 default_executable: edango
 dependencies: 
 - !ruby/object:Gem::Dependency