rspec-paper_trail 0.0.7 → 0.0.8

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

@@ -1,43 +1,51 @@
 require 'rails/generators/active_record/migration'
 
 module Rspec
-module PaperTrail
-  class InstallGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-    extend ActiveRecord::Generators::Migration
+  module 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)'
+      source_root File.expand_path('../templates', __FILE__)
+      class_option :with_string_ids, type: :boolean, default: true, desc: 'versions.type_id as string (vs integer)'
 
-    class_option :'skip-migrations', type: :boolean, default: false, desc: 'do not generate migrations'
-    class_option :force, type: :boolean, default: false, desc: 'force generation migrations'
+      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 versions table.'
+      desc 'Generates (but does not run) a migration to add versions table.'
 
-    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
+      def generate_migration_file
+        return if options.send(:'skip-migrations')
+        migration_template 'migrations/create_versions.rb.erb', '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.'
+      desc 'Generates initialization files.'
 
-    def generate_configuration_files
-      copy_file 'features/versioning.rb', 'config/features/versioning.rb'
-      copy_file 'spec/support/rspec-paper_trail.rb', 'spec/support/rspec-paper_trail.rb'
-    end
-  private
-    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
+      def generate_configuration_files
+        copy_file 'features/versioning.rb', 'config/features/versioning.rb'
+        copy_file 'spec/support/rspec-paper_trail.rb', 'spec/support/rspec-paper_trail.rb'
+      end
+
+      private
+
+      def use_string_ids?
+        options.with_string_ids?
+      end
+
+      def connected?
+        ActiveRecord::Base.connected?
+      end
+
+      def migrated?
+        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
 
-end
+  end
 end

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

@@ -0,0 +1 @@
+require 'rspec/paper_trail/step_definition_helpers'

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

@@ -1,6 +1,6 @@
 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"
+  path ':rails_root/public/system/:rails_env/:style/:attachable_klass/:id_partition/:basename.:stream_version.:extension'
+  url %w(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 → create_versions.rb.erb}

@@ -2,7 +2,7 @@ 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 %>
+      <% if use_string_ids? && (!connected? || (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

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

@@ -2,6 +2,7 @@ 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

data/lib/rspec/paper_trail/features_support.rb

@@ -0,0 +1,19 @@
+if defined? World
+  module RspecPaperTrailCucumberSupport
+    # :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
+  World(RspecPaperTrailCucumberSupport
+end

data/lib/rspec/paper_trail/version.rb

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

data/rspec-paper_trail.gemspec

@@ -27,20 +27,25 @@ Gem::Specification.new do |spec|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
       spec.add_runtime_dependency 'paper_trail', ['~> 2.7.1']
       spec.add_runtime_dependency 'rspec', ['~> 2.13.0']
-
+      spec.add_runtime_dependency 'rails', '~> 3.2'
       spec.add_development_dependency 'bundler', ['~> 1.3.0']
       spec.add_development_dependency 'rake'
+      spec.add_development_dependency 'sqlite3'
     else
       spec.add_dependency 'paper_trail', ['~> 2.7.1']
       spec.add_dependency 'rspec', ['~> 2.13.0']
+      spec.add_dependency 'rails', '~> 3.2'
       spec.add_dependency 'bundler', ['~> 1.3']
       spec.add_dependency 'rake'
+      spec.add_dependency 'sqlite3'
     end
   else
     spec.add_dependency 'paper_trail', ['~> 2.7.1']
     spec.add_dependency 'rspec', ['~> 2.13.0']
+    spec.add_dependency 'rails', '~> 3.2'
     spec.add_dependency 'bundler', ['~> 1.3']
     spec.add_dependency 'rake'
+    spec.add_dependency 'sqlite3'
   end
 
 end

data/spec/rspec-paper_trail/versioning_extensions_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe RspecExtensions do
+  context 'default' do
+    it 'should have versioning off by default' do
+      PaperTrail.enabled?.should_not be_true
+    end
+    it 'should turn versioning on in a with_versioning block' do
+      PaperTrail.enabled?.should_not be_true
+      with_versioning do
+        PaperTrail.enabled?.should be_true
+      end
+      PaperTrail.enabled?.should_not be_true
+    end
+  end
+  context 'versioning: true', :versioning => true do
+    it 'should have versioning on by default' do
+      PaperTrail.enabled?.should be_true
+    end
+    it 'should keep versioning on after a with_versioning block' do
+      PaperTrail.enabled?.should be_true
+      with_versioning do
+        PaperTrail.enabled?.should be_true
+      end
+      PaperTrail.enabled?.should be_true
+    end
+  end
+end
+
+describe Model do
+  context 'be_versioned matcher', :versioning => true do
+    it 'should respond to be_versioned' do
+      model = Model.create(:name => 'Bob', :color => 'blue')
+      model.should be_versioned
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'rails'
+require 'active_record'
+require 'paper_trail'
+require 'rspec/paper_trail'
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :models do |t|
+    t.string :name
+    t.string :color
+  end
+  create_table :versions do |t|
+    t.string   :item_type, :null => false
+    t.integer  :item_id,   :null => false
+    t.string   :event,     :null => false
+    t.string   :whodunnit
+    t.text     :object
+    t.datetime :created_at
+  end
+end
+
+class Model < ActiveRecord::Base
+  has_paper_trail
+  attr_accessible :name, :color
+end

metadata

@@ -1,60 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: rspec-paper_trail
 version: !ruby/object:Gem::Version
-  version: 0.0.7
   prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Paul Belt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paper_trail
-  requirement: &2231106500 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.1
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.1
-  type: :runtime
+    none: false
   prerelease: false
-  version_requirements: *2231106500
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2231106020 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rails
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    none: false
   prerelease: false
-  version_requirements: *2231106020
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2231105540 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.0
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *2231105540
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2231103360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   prerelease: false
-  version_requirements: *2231103360
+  type: :development
 description: use paper_trail within rspec, conveniently
 email:
 - paul.belt@gmail.com
@@ -70,15 +122,19 @@ files:
 - README.md
 - Rakefile
 - lib/generators/rspec/paper_trail/install_generator.rb
+- lib/generators/rspec/paper_trail/templates/features/support/rspec-paper_trail.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/create_versions.rb.erb
 - 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/features_support.rb
 - lib/rspec/paper_trail/version.rb
 - rspec-paper_trail.gemspec
+- spec/rspec-paper_trail/versioning_extensions_spec.rb
 - spec/spec.opts
+- spec/spec_helper.rb
 homepage: https://github.com/belt/rspec-paper_trail
 licenses:
 - MIT
@@ -87,22 +143,24 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: provides rspec-matcher to ensure versioning and per-spec, per-block versioning
 test_files:
+- spec/rspec-paper_trail/versioning_extensions_spec.rb
 - spec/spec.opts
+- spec/spec_helper.rb