RubyGems - qwirk - Versions diffs - 0.1.0 → 0.2.0 - Mend

qwirk 0.1.0 → 0.2.0

Files changed (60) hide show

data/History.md +5 -0
data/lib/qwirk.rb +51 -10
data/lib/qwirk/adapter/base/expanding_worker_config.rb +31 -18
data/lib/qwirk/adapter/base/worker_config.rb +34 -11
data/lib/qwirk/adapter/in_memory/publisher.rb +1 -1
data/lib/qwirk/adapter/in_memory/queue.rb +27 -29
data/lib/qwirk/adapter/in_memory/topic.rb +10 -12
data/lib/qwirk/adapter/in_memory/worker.rb +9 -0
data/lib/qwirk/adapter/in_memory/worker_config.rb +4 -0
data/lib/qwirk/adapter/inline/worker.rb +4 -0
data/lib/qwirk/adapter/inline/worker_config.rb +4 -0
data/lib/qwirk/adapter_factory.rb +5 -1
data/lib/qwirk/base_worker.rb +1 -5
data/lib/qwirk/engine.rb +2 -6
data/lib/qwirk/manager.rb +18 -10
data/lib/qwirk/marshal_strategy/json.rb +1 -1
data/lib/qwirk/remote_exception.rb +9 -1
data/lib/qwirk/task.rb +61 -44
data/lib/qwirk/worker.rb +16 -7
data/test/dummy/README.rdoc +261 -0
data/test/dummy/Rakefile +1 -1
data/test/dummy/app/assets/javascripts/application.js +15 -0
data/test/dummy/app/assets/stylesheets/application.css +13 -0
data/test/dummy/app/views/layouts/application.html.erb +3 -3
data/test/dummy/config/application.rb +22 -8
data/test/dummy/config/database.yml +3 -0
data/test/dummy/config/environments/development.rb +15 -4
data/test/dummy/config/environments/production.rb +31 -13
data/test/dummy/config/environments/test.rb +9 -7
data/test/dummy/config/initializers/inflections.rb +5 -0
data/test/dummy/config/initializers/secret_token.rb +1 -1
data/test/dummy/config/initializers/session_store.rb +1 -1
data/test/dummy/config/initializers/wrap_parameters.rb +14 -0
data/test/dummy/config/locales/en.yml +1 -1
data/test/dummy/config/routes.rb +2 -56
data/test/dummy/public/500.html +0 -1
data/test/dummy/script/rails +1 -1
data/test/fixtures/qwirk/jobs.yml +11 -0
data/test/functional/qwirk/jobs_controller_test.rb +9 -0
data/test/{base_test.rb → models/base_worker_test.rb} +1 -4
data/test/models/marshal_strategy_test.rb +61 -0
data/test/{unit → models}/qwirk/batch/acquire_file_strategy_test.rb +0 -0
data/test/{unit → models}/qwirk/batch/active_record/batch_job_test.rb +0 -0
data/test/{unit → models}/qwirk/batch/parse_file_strategy_test.rb +0 -0
data/test/test_helper.rb +7 -4
data/test/unit/helpers/qwirk/jobs_helper_test.rb +6 -0
data/test/unit/qwirk/job_test.rb +9 -0
metadata +179 -117
data/lib/qwirk/task.rb.sav +0 -194
data/test/dummy/log/development.log +0 -0
data/test/dummy/log/production.log +0 -0
data/test/dummy/log/server.log +0 -0
data/test/dummy/log/test.log +0 -0
data/test/dummy/public/javascripts/application.js +0 -2
data/test/dummy/public/javascripts/controls.js +0 -965
data/test/dummy/public/javascripts/dragdrop.js +0 -974
data/test/dummy/public/javascripts/effects.js +0 -1123
data/test/dummy/public/javascripts/prototype.js +0 -6001
data/test/dummy/public/javascripts/rails.js +0 -191
data/test/marshal_strategy_test.rb +0 -62

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 Dummy::Application.load_tasks

data/test/dummy/app/assets/javascripts/application.js ADDED

@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css ADDED

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/test/dummy/app/views/layouts/application.html.erb CHANGED

@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>

data/test/dummy/config/application.rb CHANGED

@@ -1,10 +1,6 @@
 require File.expand_path('../boot', __FILE__)
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 Bundler.require
 require "qwirk"
@@ -33,13 +29,31 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    # Enable escaping HTML in JSON.
+    config.active_support.escape_html_entities_in_json = true
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+    # Enable the asset pipeline
+    config.assets.enabled = true
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end

data/test/dummy/config/database.yml CHANGED

@@ -1,5 +1,8 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3

data/test/dummy/config/environments/development.rb CHANGED

@@ -2,8 +2,8 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ Dummy::Application.configure do
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
   # Don't care if the mailer can't send
@@ -22,5 +21,17 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Do not compress assets
+  config.assets.compress = false
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

data/test/dummy/config/environments/production.rb CHANGED

@@ -1,7 +1,6 @@
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
@@ -9,31 +8,46 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+  # Generate digests for assets URLs
+  config.assets.digest = true
+  # Defaults to nil and saved in location specified by config.assets.prefix
+  # config.assets.manifest = YOUR_PATH
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
   # See everything in the log (default is :info)
   # config.log_level = :debug
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
@@ -46,4 +60,8 @@ Dummy::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/test/dummy/config/environments/test.rb CHANGED

@@ -2,12 +2,16 @@ Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
   # Show full error reports and disable caching
@@ -25,10 +29,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/test/dummy/config/initializers/inflections.rb CHANGED

@@ -8,3 +8,8 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end

data/test/dummy/config/initializers/secret_token.rb CHANGED

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'f12fb952461450ff9a377ccd4ce01d3af219394efef18ce7544e8e85b8b5c2b6626caf0eef0a6f11e667c9ddccaae54f211f3947341deb2d55213de5ca6d05fa'
+Dummy::Application.config.secret_token = 'c0d7138e57b353db9b6afe9174bbd7c903a432a2bb320926bbee6b7026b3e12a667b0150fc62876828426ffa5f73b9861bcb447de3af8dfd5c9bbc633a21a05d'

data/test/dummy/config/initializers/session_store.rb CHANGED

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb ADDED

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/test/dummy/config/locales/en.yml CHANGED

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
   hello: "Hello world"

data/test/dummy/config/routes.rb CHANGED

@@ -1,58 +1,4 @@
-Dummy::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
+Rails.application.routes.draw do
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-  # See how all your routes lay out with "rake routes"
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+  mount Qwirk::Engine => "/qwirk"
 end

data/test/dummy/public/500.html CHANGED

@@ -20,7 +20,6 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>

data/test/dummy/script/rails CHANGED

@@ -1,4 +1,4 @@
-#!/usr/bin/env jruby
+#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 APP_PATH = File.expand_path('../../config/application',  __FILE__)

data/test/fixtures/qwirk/jobs.yml ADDED

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+one:
+  status: MyString
+  host: MyString
+  queue: MyString
+two:
+  status: MyString
+  host: MyString
+  queue: MyString

data/test/functional/qwirk/jobs_controller_test.rb ADDED

@@ -0,0 +1,9 @@
+require 'test_helper'
+module Qwirk
+  class JobsControllerTest < ActionController::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

data/test/{base_test.rb → models/base_worker_test.rb} RENAMED

@@ -1,7 +1,4 @@
-require 'qwirk'
-require 'shoulda'
-require 'test/unit'
-require 'fileutils'
+require File.expand_path('../../test_helper', __FILE__)
 class DummyWorker
   include Qwirk::BaseWorker

data/test/models/marshal_strategy_test.rb ADDED

@@ -0,0 +1,61 @@
+require File.expand_path('../../test_helper', __FILE__)
+class Klass
+  def initialize(str)
+    @str = str
+  end
+  def hello
+    @str
+  end
+end
+module SpockMarshalStrategy
+  extend self
+  def marshal_type
+    :text
+  end
+  def to_sym
+    :spock
+  end
+  # Change days to hours
+  def marshal(i)
+    (i.to_i * 24).to_s
+  end
+  # Change hours to days
+  def unmarshal(str)
+    str.to_i / 24
+  end
+  Qwirk::MarshalStrategy.register(self)
+end
+describe Qwirk::MarshalStrategy, 'test the various marshaling strategies and the homegrown spock one' do
+  before do
+    @bson   = Qwirk::MarshalStrategy.find(:bson)
+    @json   = Qwirk::MarshalStrategy.find(:json)
+    @none   = Qwirk::MarshalStrategy.find(:none)
+    @ruby   = Qwirk::MarshalStrategy.find(:ruby)
+    @string = Qwirk::MarshalStrategy.find(:string)
+    @yaml   = Qwirk::MarshalStrategy.find(:yaml)
+    @spock  = Qwirk::MarshalStrategy.find(:spock)
+  end
+  it 'should marshal and unmarshal correctly' do
+    hash = {'foo' => 42, 'bar' => 'zulu'}
+    str  = 'abcdef1234'
+    obj  = Klass.new('hello')
+    i    = 6
+    @bson.unmarshal(@bson.marshal(hash)).must_equal hash
+    @json.unmarshal(@json.marshal(hash)).must_equal hash
+    @none.unmarshal(@none.marshal(hash)).must_equal hash
+    @ruby.unmarshal(@ruby.marshal(hash)).must_equal hash
+    @yaml.unmarshal(@yaml.marshal(hash)).must_equal hash
+    @string.unmarshal(@string.marshal(str)).must_equal str
+    @ruby.unmarshal(@ruby.marshal(obj)).hello.must_equal obj.hello
+    @spock.unmarshal(@spock.marshal(i)).must_equal i
+  end
+end