rspec-paper_trail 0.0.6 → 0.0.7

data/.rspec

@@ -0,0 +1 @@
+--colour

data/lib/generators/rspec/paper_trail/install_generator.rb

@@ -24,14 +24,7 @@ module PaperTrail
 
     def generate_configuration_files
       copy_file 'features/versioning.rb', 'config/features/versioning.rb'
-    end
-
-    desc 'Augments spec/spec_helper.rb adding paperclip and rspec-extensions'
-
-    def augment_spec_helper
-      [ 'config.include Rspec::PaperTrailExtensions' ].each do |line|
-        insert_into_file 'spec/spec_helper.rb', "  #{line}\n", after: "RSpec.configure do |config|\n"
-      end
+      copy_file 'spec/support/rspec-paper_trail.rb', 'spec/support/rspec-paper_trail.rb'
     end
   private
     def use_string_ids?

data/lib/{rspec/versioning_extensions.rb → generators/rspec/paper_trail/templates/spec/support/rspec-paper_trail.rb}

@@ -1,24 +1,5 @@
-require 'rspec'
-require 'rspec/expectations'
-
-module Rspec::PaperTrailExtensions
-  # :call-seq:
-  # with_versioning
-  #
-  # enable versioning for specific blocks
-
-  def with_versioning
-    was_enabled = PaperTrail.enabled?
-    PaperTrail.enabled = true
-    begin
-      yield
-    ensure
-      PaperTrail.enabled = was_enabled
-    end
-  end
-end
-
 RSpec.configure do |config|
+  config.include Paperclip::Shoulda::Matchers
   config.include Rspec::PaperTrailExtensions
 
   config.before(:each) do
@@ -37,4 +18,3 @@ RSpec::Matchers.define :be_versioned do
     actual.respond_to?(:versions)
   end
 end
-

data/lib/rspec/paper_trail/extensions.rb

@@ -0,0 +1,21 @@
+require 'rspec'
+require 'rspec/expectations'
+
+module Rspec
+  module PaperTrailExtensions
+    # :call-seq:
+    # with_versioning
+    #
+    # enable versioning for specific blocks
+
+    def with_versioning
+      was_enabled = ::PaperTrail.enabled?
+      ::PaperTrail.enabled = true
+      begin
+        yield
+      ensure
+        ::PaperTrail.enabled = was_enabled
+      end
+    end
+  end
+end

data/lib/rspec/paper_trail/version.rb

@@ -1,5 +1,5 @@
 module Rspec
   module PaperTrail
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

data/lib/rspec/paper_trail.rb

@@ -1,3 +1,3 @@
 require 'rspec/paper_trail/version'
-require 'rspec/versioning_extensions'
+require 'rspec/paper_trail/extensions'
 

data/spec/spec.opts

@@ -0,0 +1,5 @@
++--colour
++--format progress
++--loadby mtime
++--reverse
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-paper_trail
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000Z
+date: 2013-03-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paper_trail
-  requirement: &2266634340 !ruby/object:Gem::Requirement
+  requirement: &2231106500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2266634340
+  version_requirements: *2231106500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2266633860 !ruby/object:Gem::Requirement
+  requirement: &2231106020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *2266633860
+  version_requirements: *2231106020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2266633380 !ruby/object:Gem::Requirement
+  requirement: &2231105540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2266633380
+  version_requirements: *2231105540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2266633000 !ruby/object:Gem::Requirement
+  requirement: &2231103360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2266633000
+  version_requirements: *2231103360
 description: use paper_trail within rspec, conveniently
 email:
 - paul.belt@gmail.com
@@ -63,23 +63,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/generators/rspec-paper_trail/install_generator.rb
-- lib/generators/rspec-paper_trail/templates/features/versioning.rb
-- lib/generators/rspec-paper_trail/templates/migrations/create_versions.rb
-- lib/generators/rspec-paper_trail/templates/migrations/stringify_versions_item_id.rb
 - lib/generators/rspec/paper_trail/install_generator.rb
 - lib/generators/rspec/paper_trail/templates/features/versioning.rb
 - lib/generators/rspec/paper_trail/templates/migrations/create_versions.rb
 - lib/generators/rspec/paper_trail/templates/migrations/stringify_versions_item_id.rb
+- lib/generators/rspec/paper_trail/templates/spec/support/rspec-paper_trail.rb
 - lib/rspec/paper_trail.rb
+- lib/rspec/paper_trail/extensions.rb
 - lib/rspec/paper_trail/version.rb
-- lib/rspec/versioning_extensions.rb
 - rspec-paper_trail.gemspec
+- spec/spec.opts
 homepage: https://github.com/belt/rspec-paper_trail
 licenses:
 - MIT
@@ -105,4 +104,5 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: provides rspec-matcher to ensure versioning and per-spec, per-block versioning
-test_files: []
+test_files:
+- spec/spec.opts

data/lib/generators/rspec-paper_trail/install_generator.rb

@@ -1,58 +0,0 @@
-require 'rails/generators/active_record/migration'
-
-module Rspec::PaperTrail
-  class InstallGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-    extend ActiveRecord::Generators::Migration
-
-    source_root File.expand_path('../templates', __FILE__)
-    class_option :with_string_ids, type: :boolean, default: true, desc: 'versions.type_id as string (vs integer)'
-
-    # paperclip-3.3.x seems to require this
-    # paperclip-3.4.x seems to have broken this
-    class_option :with_revision_in_filename, type: :boolean, default: false, desc: 'filename on system to include version-number'
-
-    class_option :'skip-migrations', type: :boolean, default: false, desc: 'do not generate migrations'
-    class_option :force, type: :boolean, default: false, desc: 'force generation migrations'
-
-    desc 'Generates (but does not run) a migration to add attachments and versions tables.'
-
-    def generate_migration_file
-      return if options.send(:'skip-migrations')
-      migration_template 'migrations/create_versions.rb', 'db/migrate/create_versions.rb'
-      migration_template 'migrations/stringify_versions_item_id.rb', 'db/migrate/stringify_versions_item_id.rb' if use_string_ids? && (!migrated? || has_integer_column?)
-    end
-
-    desc 'Generates initialization files.'
-
-    def generate_configuration_files
-      copy_file 'features/versioning.rb', 'config/features/versioning.rb'
-    end
-
-    desc 'Augments spec/spec_helper.rb adding paperclip and rspec-extensions'
-
-    def augment_spec_helper
-      [ 'config.include RspecPapertrailExtensions' ].each do |line|
-        insert_into_file 'spec/spec_helper.rb', "  #{line}\n", after: "RSpec.configure do |config|\n"
-      end
-      ["require \'paperclip/matchers\'"].each do |line|
-        insert_into_file 'spec/spec_helper.rb', "#{line}\n", before: "RSpec.configure do |config|\n"
-      end
-    end
-  private
-    def use_versioned_filename?
-      options.with_revision_in_filename?
-    end
-    def use_string_ids?
-      options.with_string_ids?
-    end
-    def migrated?
-      return true if ActiveRecord::Base.connection.table_exists? 'versions'
-    end
-    def has_integer_column?
-      return false unless migrated?
-      Version.columns.select{|obj| obj.name == 'item_id'}.first.try(:type) == :integer
-    end
-  end
-
-end

data/lib/generators/rspec-paper_trail/templates/features/versioning.rb

@@ -1,6 +0,0 @@
-Configuration.for('versioning') do
-  enabled true
-  path ":rails_root/public/system/:rails_env/:style/:attachable_klass/:id_partition/:basename.:stream_version.:extension"
-  url ['development', 'test'].include?(Rails.env) ? "/attachments/:id/download" : "/system/:rails_env/:style/:attachable_klass/:id_partition/:basename.:stream_version.:extension"
-end
-

data/lib/generators/rspec-paper_trail/templates/migrations/create_versions.rb

@@ -1,14 +0,0 @@
-class CreateVersions < ActiveRecord::Migration
-  def change
-    create_table :versions, force: true do |t|
-      t.string :item_type, null: false
-      <% if use_string_ids? && (migrated? && !has_integer_column?) %>t.string :item_id, null: false  # item_type.id generally should be GUID<% else %>t.integer :item_id, null: false, limit: 8<% end %>
-      t.string :event, null: false
-      t.string :whodunnit
-      t.text :object
-      t.datetime :created_at
-    end
-    add_index :versions, [:item_type, :item_id]
-  end
-end
-

data/lib/generators/rspec-paper_trail/templates/migrations/stringify_versions_item_id.rb

@@ -1,8 +0,0 @@
-class StringifyVersionsItemId < ActiveRecord::Migration
-  def up
-    change_column :versions, :item_id, :string, null: false
-  end
-  def down
-    change_column :versions, :item_id, :integer, limit: 8, null: false
-  end
-end