model_history 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6fab3fdfea879b5aaccf4d803a7549df590b7482
+  data.tar.gz: 3daac8c9e61e41730e928cc1fdd0547fbd2fdf38
+SHA512:
+  metadata.gz: b50882f6352b20304c2943164282be7bb115086f0cf9b196b6582fee87f612af6eadea9521092745892fbfe6b26563d485deef12745f2ed52a9351b873683675
+  data.tar.gz: c5e84b352837d5cd5ec3462547446113fd06aeabd988364608077f6a2d55de58b32e0b4005ca067f7524e1b0577707db776d6709c94f5a777947a40aa8e103e1

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3
+
+before_install:
+  - gem update --system
+  - gem --version
+
+gemfile:
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile

data/README.md

@@ -1,5 +1,7 @@
 # ModelHistory
 
+[![Build Status](https://travis-ci.org/patorash/model_history.png?branch=master)](https://travis-ci.org/patorash/model_history)
+
 Model History is a simple gem that allows you to keep track of changes to specific fields in your Rails models using the ActiveRecord::Dirty module.
 
 ## Installation

data/Rakefile

@@ -1 +1,8 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec)
+
+desc 'Default: run specs.'
+task :default => :spec

data/gemfiles/3.2.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'activerecord', '3.2.19'
+gem 'pg'
+gem 'model_history', :path => '../'
+
+gemspec :path => '../'

data/gemfiles/4.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'activerecord', '~> 4.0.10'
+gem 'pg'
+gem 'model_history', :path => '../'
+
+gemspec :path => '../'

data/gemfiles/4.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'activerecord', '~> 4.1.6'
+gem 'pg'
+gem 'model_history', :path => '../'
+
+gemspec :path => '../'

data/lib/generators/model_history/migration/migration_generator.rb

@@ -24,7 +24,7 @@ module ModelHistory
 
     def create_migration_file
       if self.class.orm_has_migration?
-        migration_template 'migration.rb', 'db/migrate/create_model_history_records'
+        migration_template 'migration.rb', 'db/migrate/create_model_history_records.rb'
       end
     end
   end

data/lib/model_history/model_history_mixin.rb

@@ -1,7 +1,5 @@
 module ModelHistory
-   
   module Mixin
-
     class CreatorProcError < StandardError ; end
     
     def self.included base
@@ -99,8 +97,8 @@ module ModelHistory
       def add_model_history_record column_name, old_value, new_value, options={}    
         creator = options[:creator] || self.creator_for_model_history
         
-        dhr_attributes = { 
-          :model       => self,
+        mhr_attributes = {
+          :model        => self,
           :column_name  => column_name,
           :column_type  => self.class.columns_hash[column_name.to_s].type,
           :old_value    => old_value,
@@ -108,7 +106,7 @@ module ModelHistory
           :creator      => creator
         }  
 
-        dhr = ModelHistoryRecord.new(dhr_attributes)
+        dhr = ModelHistoryRecord.new(mhr_attributes)
         
         # attributes for manual updates
         [:revised_created_at, :performing_manual_update].each do |attribute|

data/lib/model_history/model_history_record.rb

@@ -2,7 +2,7 @@ require "active_record"
 
 class ModelHistoryRecord < ActiveRecord::Base
   belongs_to :creator,  :polymorphic => true
-  belongs_to :model,   :polymorphic => true
+  belongs_to :model,    :polymorphic => true
 
   validates_presence_of :model_type, :model_id, :column_name, :column_type, :new_value
 
@@ -26,9 +26,11 @@ class ModelHistoryRecord < ActiveRecord::Base
   }
 
 
-  attr_accessible :model, :model_id, :model_type,
-                  :column_name, :column_type, :old_value, :new_value, 
-                  :creator, :creator_id, :creator_type, :revised_created_at
+  if ::ActiveRecord::VERSION::MAJOR < 4
+    attr_accessible :model, :model_id, :model_type,
+                    :column_name, :column_type, :old_value, :new_value,
+                    :creator, :creator_id, :creator_type, :revised_created_at
+  end
 
   attr_accessor   :performing_manual_update
 
@@ -51,7 +53,7 @@ class ModelHistoryRecord < ActiveRecord::Base
   
   private
   
-  def val_to_col_type attribute
+  def val_to_col_type(attribute)
     val_as_string = self[attribute]
     return nil if val_as_string.nil?
     case self[:column_type].to_sym

data/lib/model_history/version.rb

@@ -1,3 +1,3 @@
 module ModelHistory
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/model_history.gemspec

@@ -6,7 +6,7 @@ require 'model_history/version'
 Gem::Specification.new do |spec|
   spec.name          = 'model_history'
   spec.version       = ModelHistory::VERSION
-  spec.authors       = ['patorash']
+  spec.authors       = ['Toyoaki Oko']
   spec.email         = ['chariderpato@gmail.com']
   spec.description   = %q{Model History is a simple gem that allows you to keep track of changes to specific fields in your Rails models using the ActiveRecord::Dirty module.}
   spec.summary       = %q{Model History is a simple gem that allows you to keep track of changes to specific fields in your Rails models using the ActiveRecord::Dirty module.}
@@ -18,11 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activerecord', '>= 3.2.11'
   spec.add_development_dependency 'sqlite3'
-  spec.add_dependency 'rails', '>= 3.2.11'
 end

data/spec/fake_app.rb

@@ -1,24 +1,9 @@
-# -*- coding: utf-8 -*-
 require 'active_record'
-require 'action_controller/railtie'
-require 'action_view/helpers'
 require 'model_history'
 
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
-
-# config
-app = Class.new(Rails::Application)
-app.config.secret_token = '3b7cd727ee24e8444053437c36cc66c4'
-app.config.session_store :cookie_store, :key => '_myapp_session'
-app.config.active_support.deprecation = :log
-app.initialize!
-
-# routes
-app.routes.draw do
-  resources :users
-end
+ActiveRecord::Base.establish_connection :test
 
 # models
 class User < ActiveRecord::Base
@@ -26,15 +11,13 @@ class User < ActiveRecord::Base
   validates :name, :presence => true
 end
 
-# controllers
-class ApplicationController < ActionController::Base; end
-
-# helpers
-Object.const_set(:ApplicationHelper, Module.new)
-
-#migrations
+# migrations
 class CreateAllTables < ActiveRecord::Migration
   def self.up
-    create_table(:users) {|t| t.string :name; t.integer :age}
+    create_table :users do |t|
+      t.string :name
+      t.integer :age
+      t.timestamps
+    end
   end
 end

data/spec/models/user_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'spec_helper'
 
 describe User do
@@ -10,24 +9,44 @@ describe User do
       end
       it "Get user history" do
         history = @user.model_history_records.last
-        history.model_type.should == 'User'
-        history.column_name.should == 'name'
-        history.column_type.should == 'string'
-        history.old_value.should == 'Makunouchi'
-        history.new_value.should == 'Sendo'
+        expect(history.model_type).to eq 'User'
+        expect(history.column_name).to eq 'name'
+        expect(history.column_type).to eq 'string'
+        expect(history.old_value).to eq 'Makunouchi'
+        expect(history.new_value).to eq 'Sendo'
       end
       it "#history_for_column" do
         histories = @user.history_for_column :name
-        histories.should have(2).items
-        histories.should == ['Makunouchi', 'Sendo']
+        expect(histories.count).to eq 2
+        expect(histories).to eq ['Makunouchi', 'Sendo']
+      end
+    end
+
+    context 'multi columns change' do
+      before do
+        @user = User.create!(:name => 'Makunouchi', :age => 22)
+        @user.update_attributes!(:name => 'Sendo', :age => 23)
+      end
+      it 'Get user histories' do
+        histories = ModelHistoryRecord.created_at_gte(@user.updated_at)
+        expect(histories.count).to eq 2
+        histories.each do |history|
+          if history.column_name == 'name'
+            expect(history.old_value).to eq 'Makunouchi'
+            expect(history.new_value).to eq 'Sendo'
+          elsif history.column_name == 'age'
+            expect(history.old_value).to eq 22
+            expect(history.new_value).to eq 23
+          end
+        end
       end
     end
 
     context "callback methods" do
       it "call add_model_history_record" do
         user = User.new(:name => "Makunouchi", :age => 22)
-        user.should_receive(:set_model_history_changes)
-        user.should_receive(:save_model_history)
+        expect(user).to receive(:set_model_history_changes)
+        expect(user).to receive(:save_model_history)
         user.save!
       end
     end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ require 'rspec'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 require File.join(File.dirname(__FILE__), 'fake_app')
 
-require 'rspec/rails'
 require 'generators/model_history/migration/templates/active_record/migration'
 
 RSpec.configure do |config|

metadata

@@ -1,128 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: model_history
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
-- patorash
+- Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: rspec
+  name: rake
   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: rspec-rails
+  name: rspec
   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: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.11
 description: Model History is a simple gem that allows you to keep track of changes
   to specific fields in your Rails models using the ActiveRecord::Dirty module.
 email:
@@ -131,12 +88,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/generators/model_history/migration/migration_generator.rb
 - lib/generators/model_history/migration/templates/active_record/migration.rb
 - lib/model_history.rb
@@ -150,33 +111,26 @@ files:
 homepage: https://github.com/patorash/model_history
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1898891071957235163
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1898891071957235163
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Model History is a simple gem that allows you to keep track of changes to
   specific fields in your Rails models using the ActiveRecord::Dirty module.
 test_files: