shopqi-app-webhook 0.1.4 → 0.1.5

data/README.md

@@ -26,6 +26,6 @@
 ## 启动
 
     $ rails s
-    $ QUEUE=* bundle exec rake resque:work
+    $ script/delayed_job start
 
 访问 [http://localhost:3000](http://localhost:3000)

data/app/models/shop.rb

@@ -3,6 +3,6 @@ class Shop
   after_create :add_webhook
 
   def add_webhook
-    Resque.enqueue(WebhookWorker, self.id)
+    Delayed::Job.enqueue WebhookJob.new(self.id)
   end
 end

data/lib/generators/shopqi_app_webhook/shopqi_app_webhook_generator.rb

@@ -7,6 +7,7 @@ class ShopQiAppWebhookGenerator < Rails::Generators::Base
 
   def copy_files
     directory 'app'
+    directory 'script'
   end
 
   def add_routes
@@ -16,11 +17,10 @@ class ShopQiAppWebhookGenerator < Rails::Generators::Base
   def update_files
     prepend_to_file "app/models/shop.rb", "require \"\#{ShopQiAppWebhook::Engine.models_dir}/shop\"\n"
     insert_into_file "app/models/shop.rb", "\s\shas_many :orders\n", after: /class Shop( < ActiveRecord::Base){0,1}\n/
-    insert_into_file "config/app_secret_config.yml", "\s\s\s\shost: 'lvh.me:3000'\n", after: /defaults:(.|\n|\s)+?domain:\n/
-    insert_into_file "config/app_secret_config.yml", "\s\s\s\shost: 'example.shopqiapp.com'\n", after: /production:(.|\n|\s)+?domain:\n/
   end
 
   def install_migration
+    migration_template 'db/migrate/create_delayed_jobs.rb', 'db/migrate/create_delayed_jobs.rb'
     migration_template 'db/migrate/create_orders.rb', 'db/migrate/create_orders.rb'
   end
 

data/lib/generators/shopqi_app_webhook/templates/README

@@ -5,6 +5,6 @@ Step 1.
 
 Step 2.
   $ rails server
-  $ QUEUE=* bundle exec rake resque:work
+  $ script/delayed_job start
 
 ===============================================================================

data/lib/generators/shopqi_app_webhook/templates/app/controllers/webhook_controller.rb

@@ -1,16 +1,16 @@
 class WebhookController < ShopQiAppWebhook::WebhookController
 
   def orders_fulfilled
-    attrs = JSON(request.body.read)['order']
+    order = JSON(request.body.read)['order']
     shop.orders.where(order_id: order_id).first_or_create!({
-      name: attrs['name'],
-      financial_status_name: attrs['financial_status_name'],
-      financial_status: attrs['financial_status'],
-      fulfillment_status: attrs['fulfillment_status'],
-      fulfillment_status_name: attrs['fulfillment_status_name'],
-      order_id: attrs['id'],
-      total_price: attrs['total_price'],
-      created_at: attrs['created_at']
+      name: order['name'],
+      financial_status_name: order['financial_status_name'],
+      financial_status: order['financial_status'],
+      fulfillment_status: order['fulfillment_status'],
+      fulfillment_status_name: order['fulfillment_status_name'],
+      order_id: order['id'],
+      total_price: order['total_price'],
+      created_at: order['created_at']
     })
     render nothing: true
   end

data/lib/generators/shopqi_app_webhook/templates/app/jobs/webhook_job.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+class WebhookJob < Struct.new(:shop_id)
+
+  def perform
+    Shop.find(shop_id).use_shopkit
+    Shopkit.create_webhook event: 'orders/fulfilled', callback_url: "http://#{SecretSetting.domain.host}/webhook"
+  end
+
+end

data/lib/generators/shopqi_app_webhook/templates/app/models/order.rb

@@ -3,6 +3,6 @@ class Order < ActiveRecord::Base
   attr_accessible :name, :financial_status, :financial_status_name, :fulfillment_status, :fulfillment_status_name, :order_id, :total_price, :created_at
 
   def admin_url
-    "#{SecretSetting.shopqi_domain.protocol}#{shop.shopqi_domain}/admin/orders/#{order_id}"
+    "#{shop.admin_url}/orders/#{order_id}"
   end
 end

data/lib/generators/shopqi_app_webhook/templates/db/migrate/create_delayed_jobs.rb

@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.text     :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.string   :queue                        # The name of the queue this job is in
+      table.timestamps
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end

data/lib/generators/shopqi_app_webhook/templates/script/delayed_job

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize

data/lib/shopqi-app-webhook.rb

@@ -1,4 +1,5 @@
 require "shopqi_app_webhook/engine"
+require "delayed_job_active_record"
 
 module ShopQiAppWebhook
 

data/lib/shopqi_app_webhook/engine.rb

@@ -17,11 +17,5 @@ module ShopQiAppWebhook
       end
     end
 
-    initializer "shopqi_app_webhook.resque" do
-      require 'resque/server'
-      current_app_name = ::Rails.application.class.to_s.split("::").first
-      Resque.redis.namespace = "resque:#{current_app_name}"
-    end
-
   end
 end

data/lib/shopqi_app_webhook/rails/routes.rb

@@ -4,7 +4,6 @@ module ShopQiAppWebhook
       module Helper
         def use_shopqi_webhook(options = {}, &block)
           self.post '/webhook', to: 'webhook#orders_fulfilled'#, format: :json
-          #self.mount Resque::Server.new, :at => "/resque"
         end
       end
 

data/lib/shopqi_app_webhook/version.rb

@@ -1,3 +1,3 @@
 module ShopQiAppWebhook
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/tasks/shopqi-app-webhook_tasks.rake

@@ -2,6 +2,3 @@
 # task :shopqi-app-webhook do
 #   # Task goes here
 # end
-
-task "resque:setup" => :environment
-require 'resque/tasks'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app-webhook
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.10.1
-- !ruby/object:Gem::Dependency
-  name: resque_spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -152,12 +136,14 @@ files:
 - app/models/shop.rb
 - app/assets/javascripts/shopqi_app_webhook/application.js
 - app/assets/stylesheets/shopqi_app_webhook/application.css
+- lib/generators/shopqi_app_webhook/templates/db/migrate/create_delayed_jobs.rb
 - lib/generators/shopqi_app_webhook/templates/db/migrate/create_orders.rb
-- lib/generators/shopqi_app_webhook/templates/app/jobs/webhook_worker.rb
+- lib/generators/shopqi_app_webhook/templates/app/jobs/webhook_job.rb
 - lib/generators/shopqi_app_webhook/templates/app/controllers/webhook_controller.rb
 - lib/generators/shopqi_app_webhook/templates/app/controllers/home_controller.rb
 - lib/generators/shopqi_app_webhook/templates/app/models/order.rb
 - lib/generators/shopqi_app_webhook/templates/app/views/home/index.html.haml
+- lib/generators/shopqi_app_webhook/templates/script/delayed_job
 - lib/generators/shopqi_app_webhook/templates/README
 - lib/generators/shopqi_app_webhook/shopqi_app_webhook_generator.rb
 - lib/generators/shopqi_app_webhook/USAGE
@@ -183,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 272106625
+      hash: 715442061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 272106625
+      hash: 715442061
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/generators/shopqi_app_webhook/templates/app/jobs/webhook_worker.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-module WebhookWorker
-
-  @queue = "webhook_worker"
-
-  def self.perform(shop_id)
-    shop = Shop.find(shop_id)
-    Shopkit.setup url: shop.shopqi_domain, access_token: shop.access_token
-    Shopkit.create_webhook event: 'orders/fulfilled', callback_url: "http://#{SecretSetting.domain.host}/webhook"
-  end
-
-end