acts-as-approvable 0.6.7 → 0.6.8.1

data/.gitignore

@@ -1,7 +1,4 @@
-test/*.db
-test/debug.log
+debug.log
+spec/*.db
 coverage/
-rdoc/
-yardoc/
-.yardoc
 *.gem

data/.rspec

@@ -0,0 +1,2 @@
+--format doc
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+gemfile: gemfiles/Gemfile.ci

data/Appraisals

@@ -1,18 +1,22 @@
 appraise 'rails2' do
   gem 'activerecord', '~> 2.3'
+  gem 'sqlite3'
 end
 
-appraise 'rails30' do
-  gem 'activerecord', '~> 3.0.0'
-  gem 'railties',     '~> 3.0.0'
-end
+if RUBY_VERSION =~ /^1\.9/
+  appraise 'rails30' do
+    gem 'activerecord', '~> 3.0.0'
+    gem 'railties',     '~> 3.0.0'
+    gem 'sqlite3'
+  end
 
-appraise 'rails31' do
-  gem 'activerecord', '~> 3.1.0'
-  gem 'railties',     '~> 3.1.0'
+  appraise 'rails31' do
+    gem 'activerecord', '~> 3.1.0'
+    gem 'railties',     '~> 3.1.0'
+    gem 'sqlite3'
+  end
 end
 
-appraise 'rails32' do
-  gem 'activerecord', '~> 3.2.0'
-  gem 'railties',     '~> 3.2.0'
+appraise 'mysql2' do
+  gem 'mysql2',       '~> 0.2.18'
 end

data/CHANGELOG

@@ -1,3 +1,19 @@
+== 0.6.8.1
+
+ * Bad gem push...
+
+== 0.6.8
+
+ * Fixed issue where approval state would be checked if the local state field
+ was present but not the value being checked.
+ * Reorganized `ActsAsApprovable::Model` into seperate files.
+ * `.acts_as_approvable` is the only method that should be available until
+ called. Moved other class methods into a module that is included on
+ configuration.
+ * Moved from Test::Unit to RSpec
+ * Renamed `can_save?` to `able_to_save?`
+ * Specify larger field size for original and object columns (16MB)
+
 == 0.6.6
 
  * `#pending_changes?` should not be true if there are no pending update

data/Gemfile.lock

@@ -12,39 +12,79 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
+    binding_of_caller (0.6.7)
+    builder (3.0.0)
     coderay (1.0.5)
-    metaclass (0.0.1)
-    method_source (0.7.0)
-    mocha (0.10.4)
-      metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    pry (0.9.8)
+    coolline (0.1.0)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.5.1)
+      json (>= 1.4.6)
+    io-console (0.3)
+    json (1.6.5)
+    method_source (0.7.1)
+    multi_json (1.1.0)
+    plymouth (0.3.2)
+      pry-exception_explorer (>= 0.1.7)
+    pry (0.9.8.4)
       coderay (~> 1.0.5)
-      method_source (~> 0.7)
-      slop (>= 2.4.3, < 3)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    pry-coolline (0.1.1)
+      coolline (~> 0.1.0)
+      io-console (~> 0.3.0)
+    pry-exception_explorer (0.1.9)
+      pry-stack_explorer (>= 0.3.9)
+    pry-nav (0.1.0)
+      pry (~> 0.9.8.1)
+    pry-stack_explorer (0.4.1)
+      binding_of_caller (~> 0.6.2)
+      pry (~> 0.9.8.2)
+    pry-syntax-hacks (0.0.6)
+      pry (>= 0.9.8)
     rake (0.9.2.2)
     redcarpet (2.1.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
     shoulda (2.11.3)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (2.4.3)
-    sqlite3 (1.3.5)
+    slop (2.4.4)
+    term-ansicolor (1.0.6)
+    timecop (0.3.5)
     yard (0.7.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3)
+  activerecord (~> 2.3.14)
   acts-as-approvable!
-  appraisal
-  mocha
-  pry
-  rake
-  redcarpet
-  shoulda
+  appraisal (~> 0.4.1)
+  cucumber (~> 1.1.0)
+  plymouth
+  pry (~> 0.9.8.1)
+  pry-coolline
+  pry-nav (~> 0.1.0)
+  pry-stack_explorer
+  pry-syntax-hacks
+  rake (~> 0.9.2)
+  redcarpet (~> 2.1.0)
+  rspec (~> 2.8.0)
+  shoulda (~> 2.0)
   simplecov
-  sqlite3
+  timecop (~> 0.3.5)
   yard

data/README.md

@@ -1,5 +1,4 @@
-Acts as Approvable
-==================
+# Acts as Approvable  [![Build Status](https://secure.travis-ci.org/jlogsdon/acts_as_approvable.png)](http://travis-ci.org/jlogsdon/acts_as_approvable?branch=master)
 
 This plugin provides a workflow for approving new records and changes to existing
 records.

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rake/testtask'
+require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
 require 'yard'
 require 'appraisal'
 
@@ -11,12 +14,12 @@ desc 'Start a pry session with a database connection open'
 task :pry do |t|
   $LOAD_PATH << './lib'
   require 'pry'
-  require './test/test_helper'
+  require './spec/spec_helper'
 
-  ActiveRecord::Base.logger = Logger.new(STDOUT)
-  load_schema
+  Support::Database.setup_log(STDOUT)
+  Support::Database.load_schema
 
-  ActsAsApprovable::Ownership.configure
+  #ActsAsApprovable::Ownership.configure
   Pry.start(TOPLEVEL_BINDING)
 end
 
@@ -33,20 +36,19 @@ task :copy do |t|
 end
 
 desc 'Test the acts_as_approvable plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs    << 'test' << 'lib'
-  t.pattern = 'test/*_test.rb'
-  t.verbose = true
-end
+RSpec::Core::RakeTask.new(:test)
 
 if RUBY_VERSION =~ /^1\.8/
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |t|
-    t.libs        << 'test' << 'lib'
-    t.rcov_opts   << '--exclude' << '"Library/Ruby/*"' << '--sort' << 'coverage'
-    t.pattern     = 'test/*_test.rb'
-    t.output_dir  = 'coverage/'
-    t.verbose     = true
+  begin
+    require 'rcov/rcovtask'
+    Rcov::RcovTask.new do |t|
+      t.libs        << 'test' << 'lib'
+      t.rcov_opts   << '--exclude' << '"Library/Ruby/*"' << '--sort' << 'coverage'
+      t.pattern     = 'test/*_test.rb'
+      t.output_dir  = 'coverage/'
+      t.verbose     = true
+    end
+  rescue LoadError
   end
 elsif RUBY_VERSION =~ /^1\.9/
   namespace :test do
@@ -57,6 +59,32 @@ elsif RUBY_VERSION =~ /^1\.9/
   end
 end
 
+namespace :test do
+  desc 'Setup appraisals and install gems for the gambit run'
+  task :setup do
+    start = Time.now
+    Kernel.system('rbenv each -v bundle install')
+    Kernel.system('rbenv each -v bundle exec rake appraisal:install')
+    elapsed = Time.now - start
+
+    puts "\nRan everything in #{elapsed} seconds"
+  end
+
+  desc 'Run all specs and features across all installed rubies'
+  task :gambit do
+    start = Time.now
+    Kernel.system('rbenv each -v bundle exec rake appraisal test')
+    Kernel.system('rbenv each -v bundle exec rake appraisal features')
+    elapsed = Time.now - start
+
+    puts "\nRan everything in #{elapsed} seconds"
+  end
+end
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "features --format pretty"
+end
+
 desc 'Generate documentation for the acts_as_approvable plugin.'
 YARD::Rake::YardocTask.new do |t|
   yard_dir = (ENV['YARD_DIR'] || 'yardoc')

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8.1

data/acts-as-approvable.gemspec

@@ -14,18 +14,28 @@ Gem::Specification.new do |s|
   s.date      = %q(2012-02-14)
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.test_files    = `git ls-files -- spec/* features/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_development_dependency %q<activerecord>, '~> 2.3'
-  s.add_development_dependency %q<appraisal>
-  s.add_development_dependency %q<redcarpet>
-  s.add_development_dependency %q<shoulda>
-  s.add_development_dependency %q<sqlite3>
-  s.add_development_dependency %q<mocha>
-  s.add_development_dependency %q<rake>
-  s.add_development_dependency %q<rcov> if RUBY_VERSION =~ /^1\.8/
-  s.add_development_dependency %q<simplecov> if RUBY_VERSION =~ /^1\.9/
+  s.add_development_dependency %q<activerecord>,  '~> 2.3.14'
+  s.add_development_dependency %q<appraisal>,     '~> 0.4.1'
+  s.add_development_dependency %q<redcarpet>,     '~> 2.1.0'
+  s.add_development_dependency %q<shoulda>,       '~> 2.0'
+  s.add_development_dependency %q<rspec>,         '~> 2.8.0'
+  s.add_development_dependency %q<timecop>,       '~> 0.3.5'
+  s.add_development_dependency %q<cucumber>,      '~> 1.1.0'
+  s.add_development_dependency %q<rake>,          '~> 0.9.2'
   s.add_development_dependency %q<yard>
-  s.add_development_dependency %q<pry>
+  s.add_development_dependency %q<pry>,           '~> 0.9.8.1'
+  s.add_development_dependency %q<pry-syntax-hacks>
+
+  if RUBY_VERSION =~ /^1\.9/
+    s.add_development_dependency %q<simplecov>
+    s.add_development_dependency %q<pry-coolline>
+    s.add_development_dependency %q<pry-stack_explorer>
+    s.add_development_dependency %q<pry-nav>,           '~> 0.1.0'
+    s.add_development_dependency %q<plymouth>
+  elsif RUBY_VERSION =~ /^1\.8/
+    s.add_development_dependency %q<rcov>
+  end
 end

data/features/create_approval.feature

@@ -0,0 +1,26 @@
+Feature: Create Approvals
+    In order to provide an approval queue for new records
+
+    Background:
+        Given a record created with create approval
+
+    Scenario: a new record is created
+        Then it should be pending
+
+    Scenario: a new record is approved
+        When I approve the record
+        Then it should be approved
+
+    Scenario: a new record is rejected
+        When I reject the record
+        Then it should be rejected
+
+    Scenario: an approved record is approved again
+        When the record is already approved
+        And I approve the record
+        Then it should raise ActsAsApprovable::Error::Locked
+
+    Scenario: an approved record is rejected
+        When the record is already approved
+        And I reject the record
+        Then it should raise ActsAsApprovable::Error::Locked

data/features/step_definitions/cucumber_steps.rb

@@ -0,0 +1,86 @@
+def support_file_path(file)
+  File.join('features', 'support', file.gsub(/^file:/, '').gsub(/ +/, '_') + '.txt')
+end
+
+Given /^a record created with (create|update|any) approval$/ do |type|
+  @record = case type
+            when 'create'; CreatesApprovable.create
+            when 'update'; UpdatesApprovable.create
+            when 'any'; DefaultApprovable.create
+            end
+end
+
+When /^I (approve|reject) the (record|changes?)$/ do |state, type|
+  begin
+    method = "#{state}!".to_sym
+
+    case type
+    when 'record'; @record.send(method)
+    when 'changes', 'change'; @approval.send(method)
+    end
+  rescue => @last_error
+  end
+
+  @record.reload
+end
+
+When /^the record is already (approved|rejected)$/ do |state|
+  case state
+  when 'approved'; @record.approve!
+  when 'rejected'; @record.reject!
+  end
+
+  @record.reload
+end
+
+When /^I update the record with:$/ do |table|
+  table.rows_hash.each_pair do |attr, value|
+    value = File.read(support_file_path(value)) if value =~ /^file:/
+    @record[attr] = value
+  end
+  @record.save!
+
+  @approval = @record.update_approvals.last
+  @update = table.rows_hash
+end
+
+Then /^it should be (pending|approved|rejected)$/ do |state|
+  method = "#{state}?".to_sym
+  @record.send(method).should be_true
+end
+
+Then /^it should have (no )?pending changes$/ do |empty|
+  @record.pending_changes?.should_not == !!empty
+end
+
+Then /^it should raise (.+?)$/ do |exception|
+  @last_error.class.should == eval(exception)
+end
+
+Then /^the (approval|record) should (not )?have (the changes|changed)$/ do |type, changed, tense|
+  changed = !!changed
+  changes = type == 'record' ? @record.attributes : @approval.object
+
+  @update.each_pair do |attr, value|
+    value = File.read(support_file_path(value)) if value =~ /^file:/
+    if changed
+      changes[attr].should_not == value
+    else
+      changes[attr].should == value
+    end
+  end
+end
+
+Then /^the (approval|record) should (not )?have changed to:$/ do |type, changed, table|
+  changed = !!changed
+  changes = type == 'record' ? @record.attributes : @approval.object
+
+  table.rows_hash.each_pair do |attr, value|
+    value = File.read(support_file_path(value)) if value =~ /^file:/
+    if changed
+      changes[attr].should_not == value
+    else
+      changes[attr].should == value
+    end
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,14 @@
+ENV['RAILS_ENV'] = 'test'
+
+require 'rubygems'
+require 'active_record'
+
+require File.expand_path('../../lib/acts-as-approvable', File.dirname(__FILE__))
+
+require File.expand_path('../../spec/support/database', File.dirname(__FILE__))
+require File.expand_path('../../spec/support/models', File.dirname(__FILE__))
+
+Before do
+  LOGGER = Support::Database.setup_log unless defined?(LOGGER)
+  Support::Database.load_schema
+end