bulky 0.9.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a45d126e1968738d9f33985879957c942ee7967
-  data.tar.gz: 4cef29b207f4fef17f494866d95a9dd78835c322
+  metadata.gz: 999ba588ee91221f137ec28ba41c87dbb6175abf
+  data.tar.gz: 8bb0db2a47673d74a37931ced4af31f798bde1a1
 SHA512:
-  metadata.gz: 61819e46dfb0f506bc216015012d754d00d8ddea1b2539e79399b72c027dde363130e45bab96bd5668cf3c714896efd0900486f57d327db2e8d8121e1e116b53
-  data.tar.gz: f8e3b4919d8cfa5b43805041c0cb8e73df8ca4a16ce2facc432f89dfe769fb79bacb082c39ef625fe37ab2216c1f6e90ea56cc4b9f6712b00cf5a1c6944929ab
+  metadata.gz: 8ce5fe1e6170abf327e8157b29236f303c7e91d469247540d087b328c892771bb1e34ba9c497c04fee4b414fed2887d0a622c7988c4bef5f6f3c677c08b2b674
+  data.tar.gz: 33b23828b38639dda4db435bec6a32ca37da8faa299f32b1e6ff0c8c7d625dd704722648af701f498ffa9f96ea74c718439df7b82e949bf3fb60b2571d24a8b7

data/README.md

@@ -1,18 +1,31 @@
 # Bulky
 
+[![Circle CI](https://circleci.com/gh/tma1/bulky.svg?style=svg)](https://circleci.com/gh/tma1/bulky)
+
 ## Installation
 
-In your Gemfile
+In your Gemfile use one of the following
 ``` ruby
-  gem 'bulky', github: 'adamhunter/bulky'
+  gem 'bulky', '~> 2.0.0'
+  # or
+  gem 'bulky', github: 'tma1/bulky'
+  # or in bash run
+  git submodule add git@github.com:tma1/bulky.git vendor/bulky
+  # then add to your gemfile
+  gem 'bulky', path: 'vendor/bulky'
+  # users add a submodule (aka path...) need to run
+  git submodule init --update
+```
+```bash
 ```
+Then edit your 
 
 Then in your shell prompt
 ```bash
   bundle
   rake bulky_engine:install:migrations
   rake db:migrate
-  rake bulky:work # (starts the resque worker for bulky)
+  sidekiq
 ```
 
 ## Usage
@@ -27,4 +40,5 @@ Command Line
   Bulky.enqueue_update(Account, [10,25], {"contact" => "Yes, please."})
 ```
 
-This will enqueue the `Bulky::Updater` to update each account when the job is processed by Resque
+This will enqueue the `Bulky::Updater` to update each account when the job is
+processed by Sidekiq

data/Rakefile

@@ -1,17 +1,10 @@
-#!/usr/bin/env rake
-
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -21,8 +14,21 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
-
+# load 'rails/tasks/statistics.rake'
 
 Bundler::GemHelper.install_tasks
 
+# require 'rake/testtask'
+
+# Rake::TestTask.new(:test) do |t|
+#   t.libs << 'lib'
+#   t.libs << 'test'
+#   t.pattern = 'test/**/*_test.rb'
+#   t.verbose = false
+# end
+
+
+# task default: :test

data/app/controllers/bulky/updates_controller.rb

@@ -1,7 +1,5 @@
 class Bulky::UpdatesController < ApplicationController
 
-  helper_method :model
-
   def edit
   end
 
@@ -18,20 +16,24 @@ class Bulky::UpdatesController < ApplicationController
     redirect_to bulky_edit_path(model: params[:model]), notice: I18n.t('flash.notice.enqueue_update')
   end
 
+  def params
+    @params ||= delete_blank(super)
+  end
+
   private
 
-  def model
-    @model ||= params[:model].classify.constantize
+  helper_method def model_name
+    params.require(:model)
+  end
+
+  helper_method def model
+    @model ||= model_name.classify.constantize
   end
   
   def ids
     Bulky.parse_ids(params[:ids])
   end
 
-  def params
-    @params ||= delete_blank(super)
-  end
-
   def delete_blank(hash)
     hash.delete_if { |k,v| v.empty? or Hash === v && delete_blank(v).empty? }
   end

data/app/helpers/bulky/form_helper.rb

@@ -2,7 +2,7 @@ module Bulky
   module FormHelper
 
     def whitelisted_attributes_collection(model)
-      model.accessible_attributes.select(&:present?).map {|a| [a.titleize, a]}
+      model.bulky_attributes.map(&:to_s).map {|a| [a.titleize, a]}
     end
 
   end

data/app/models/bulky/bulk_update.rb

@@ -7,12 +7,4 @@ class Bulky::BulkUpdate < ActiveRecord::Base
   validates :ids, :updates, presence: true
 
   has_many :updated_records, class_name: 'Bulky::UpdatedRecord', foreign_key: :bulk_update_id
-
-  validates_each :updates do |record, attr, value|
-    record.errors[:updates] << "must be a hash" unless Hash === value
-  end
-
-  validates_each :ids do |record, attr, value|
-    record.errors[:ids] << "must be an Array" unless Array === value
-  end
 end

data/app/views/bulky/updates/edit.html.haml

@@ -1,6 +1,6 @@
 %h1 Bulky
 
-= form_for :bulk, url: bulky_update_path(model: params[:model]), html: {method: :put} do |f|
+= form_for :bulk, url: bulky_update_path(model: model_name), html: {method: :put} do |f|
   %p
     = f.select :attribute, whitelisted_attributes_collection(model), {include_blank: "Choose an Attribute"},
       name: "attribute", onchange: "document.getElementById('bulk_value').name = 'bulk[' + this.value + ']'"

data/db/migrate/{20120911145530_create_bulky_tables.rb → 20150817161700_create_bulky_tables.rb}

@@ -1,11 +1,11 @@
 class CreateBulkyTables < ActiveRecord::Migration
-  def up
+  def change
     create_table :bulky_bulk_updates, force: true do |t|
       t.text :ids,     null: false
       t.text :updates, null: false
       t.integer :initiated_by_id
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :bulky_bulk_updates, :initiated_by_id
 
@@ -17,14 +17,9 @@ class CreateBulkyTables < ActiveRecord::Migration
       t.string  :error_message
       t.text    :error_backtrace
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :bulky_updated_records, :bulk_update_id
     add_index :bulky_updated_records, [:updatable_type, :updatable_id]
   end
-
-  def down
-    drop_table :bulky_updated_records
-    drop_table :bulky_bulk_updates
-  end
 end

data/lib/bulky.rb

@@ -7,7 +7,7 @@ module Bulky
     bulk_update = log_bulk_update(ids, updates)
 
     ids.each do |update_id|
-      Resque.enqueue(Bulky::Updater, model.name, update_id, bulk_update.id)
+      Bulky::Worker.perform_async model.name, update_id, bulk_update.id
     end
   end
 
@@ -24,4 +24,6 @@ module Bulky
 
 end
 
+require 'bulky/model'
 require 'bulky/updater'
+require 'bulky/worker'

data/lib/bulky/engine.rb

@@ -1,11 +1,7 @@
 require 'haml'
-require 'resque'
+require 'sidekiq'
 
 module Bulky
   class Engine < ::Rails::Engine
-    initializer "bulky.engine.queue_name" do |app|
-      Bulky::Updater::QUEUE = :"#{app.class.parent_name.underscore}_bulky_updates"
-      Bulky::Updater.instance_variable_set(:@queue, Bulky::Updater::QUEUE)
-    end
   end
 end

data/lib/bulky/model.rb

@@ -0,0 +1,14 @@
+module Bulky
+  module Model
+
+    def self.extended(base)
+      base.class_attribute :bulky_attributes
+      base.bulky_attributes = []
+    end
+
+    def bulky(*attributes)
+      self.bulky_attributes += attributes
+    end
+
+  end
+end

data/lib/bulky/updater.rb

@@ -1,34 +1,35 @@
 module Bulky
   class Updater
 
-    def self.perform(model_name, update_id, bulk_update_id)
-      model = model_name.constantize.find(update_id)
-      new(model, bulk_update_id).update!
-    end
+    attr_reader :model, :bulk_update
 
     def initialize(model, bulk_update_id)
       @bulk_update = Bulky::BulkUpdate.find(bulk_update_id)
       @model       = model
-      @updates     = @bulk_update.updates
     end
 
-    def update!
-      @model.tap do
-        @log = @bulk_update.updated_records.build { |r| r.updatable = @model }
+    def log
+      @log ||= bulk_update.updated_records.build { |r| r.updatable = model }
+    end
 
-        begin
-          @model.attributes = @updates
-          @log.updatable_changes = @model.changes
-          @model.save!
-        rescue => e
-          @log.error_message   = e.message
-          @log.error_backtrace = e.backtrace.join("\n")
-          raise e
-        ensure
-          @log.save!
-        end
-      end
+    def strong_updates
+      ActionController::Parameters.new(bulk_update.updates)
     end
 
+    def updates
+      @updates ||= strong_updates.permit(*model.bulky_attributes)
+    end
+
+    def update!
+      model.attributes      = updates
+      log.updatable_changes = model.changes
+      model.save!
+    rescue => e
+      log.error_message   = e.message
+      log.error_backtrace = e.backtrace.join("\n")
+      raise e
+    ensure
+      log.save!
+    end
   end
 end

data/lib/bulky/version.rb

@@ -1,3 +1,3 @@
 module Bulky
-  VERSION = "0.9.1"
+  VERSION = File.read(File.expand_path '../../../VERSION', __FILE__)
 end

data/lib/bulky/worker.rb

@@ -0,0 +1,14 @@
+module Bulky
+  class Worker
+    QUEUE = ENV.fetch('BULKY_QUEUE', 'default').freeze
+
+    include Sidekiq::Worker
+    sidekiq_options queue: QUEUE
+
+    def perform(model_name, update_id, bulk_update_id)
+      model = model_name.constantize.find(update_id)
+      Bulky::Updater.new(model, bulk_update_id).update!
+    end
+
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bulky
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Hunter
+- Ben Vandgrift
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,44 +17,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,66 +68,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 3.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.4.1
 description: Bulky allows you bulk update your ActiveRecord models.  It will enqueue
   the bulk update and run it through the model's lifecycle to ensure validation are
   performed. Bulky also provides logging of bulk update success or failure.
 email:
-- adamhunter@me.com
+- adamhunter@tma1.com
+- ben@tma1.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,13 +129,14 @@ files:
 - app/views/bulky/updates/edit.html.haml
 - config/locales/en.yml
 - config/routes.rb
-- db/migrate/20120911145530_create_bulky_tables.rb
+- db/migrate/20150817161700_create_bulky_tables.rb
 - lib/bulky.rb
 - lib/bulky/engine.rb
+- lib/bulky/model.rb
 - lib/bulky/updater.rb
 - lib/bulky/version.rb
-- lib/tasks/bulky_tasks.rake
-homepage: https://github.com/adamhuner/bulky
+- lib/bulky/worker.rb
+homepage: https://github.com/tma1/bulky
 licenses: []
 metadata: {}
 post_install_message: 
@@ -166,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Bulk update your ActiveRecord models.

data/lib/tasks/bulky_tasks.rake

@@ -1,11 +0,0 @@
-load "tasks/resque.rake"
-
-namespace :bulky do
-  task :setup do
-    ENV['QUEUE'] = Bulky::Updater::QUEUE.to_s
-    ENV['BACKGROUND'] = true.to_s
-  end
-
-  desc "start a bulky queue worker (in the background)"
-  task :work => [:environment, :setup, :"resque:work"]
-end