acts_as_digested_on 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9fe716747e29040d5d295efb36190265a35ffffe
+  data.tar.gz: f58ea0447b586740db607e35c3985a1406efbda9
+SHA512:
+  metadata.gz: 17765a65a22b98c6bcd2ed75135a09d476809a4f7aeaa5b0ba3bd36d0ed003f27909396627233d427508a6f09972b480b36dbe47096cd6965e7ca966c71ab1fc
+  data.tar.gz: 04e334c76ceb1ad2124cd52573c737d533f02e15971fd4936f8bfa4290984e957ba96ad6d7ed2d66fdcb10c5718097e3fdb0aa8b1eb3aabd15c7743a5fac2fb4

data/.gitignore

@@ -1,4 +1,23 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+gemfiles/*.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/.rspec

@@ -1 +1,2 @@
+--format documentation
 --color

data/.travis.yml

@@ -1,7 +1,24 @@
 language: ruby
+script: "bundle exec rake spec"
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ree
-script: bundle exec rspec spec
+  - 2.0.0
+  - 2.1
+  - ruby-head
+gemfile:
+  - gemfiles/active_record_30.gemfile
+  - gemfiles/active_record_31.gemfile
+  - gemfiles/active_record_32.gemfile
+  - gemfiles/active_record_40.gemfile
+  - gemfiles/active_record_41.gemfile
+matrix:
+  exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_30.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_31.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/active_record_32.gemfile
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in acts_as_digested_on.gemspec
 gemspec

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2009-2012 milk1000cc
+Copyright (c) 2009-2014 milk1000cc
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,86 @@
+# ActsAsDigestedOn [![Build Status](https://travis-ci.org/milk1000cc/acts_as_digested_on.svg)](https://travis-ci.org/milk1000cc/acts_as_digested_on)
+
+acts_as_digested_on is a gem for Rails 3 and Rails 4.
+
+This sets the digested value before validation and validates uniqueness of the digested value.
+
+If you use this gem for Rails 2, see rails-2 branch.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'acts_as_digested_on'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install acts_as_digested_on
+
+## Usage
+
+```ruby
+# db/migrate/20090706000000_create_articles.rb
+class CreateArticles < ActiveRecord::Migration
+  def self.up
+    create_table :articles do |t|
+      t.text :url       # any type is ok
+      t.string :digest  # this is sha-1 hex digest field of url value
+      ...
+    end
+
+    add_index :articles, :digest, :unique => true  # you can add index on digest field
+  end
+
+  def self.down
+    drop_table :articles
+  end
+end
+
+# app/models/article.rb
+class Article < ActiveRecord::Base
+  acts_as_digested_on :url  # please add this
+  ...
+end
+
+# this means
+class Article < ActiveRecord::Base
+  validates_uniqueness_of :digest
+  before_validation :set_digest
+
+  def generate_digest
+    Digest::SHA1.hexdigest "--#{ url.to_s }--"
+  end
+
+  private
+  def set_digest
+    self.digest = generate_digest
+  end
+  ...
+end
+```
+
+## Examples
+
+```ruby
+acts_as_digested_on :url, :unique => false
+
+acts_as_digested_on :url, :digest_column => :url_digest
+
+acts_as_digested_on [:url, :salt]
+
+acts_as_digested_on :url, :scope => :site_id
+
+Article.new(:url => 'http://example.com').generate_digest
+```
+
+## Contributing
+
+1. Fork it ( https://github.com/milk1000cc/acts_as_digested_on/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/acts_as_digested_on.gemspec

@@ -1,27 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "acts_as_digested_on/version"
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'acts_as_digested_on/version'
 
-Gem::Specification.new do |s|
-  s.name        = "acts_as_digested_on"
-  s.version     = ActsAsDigestedOn::VERSION
-  s.authors     = ["milk1000cc"]
-  s.email       = ["info@milk1000.cc"]
-  s.homepage    = "https://github.com/milk1000cc/acts_as_digested_on"
-  s.summary     = %q{Automatically set sha-1 hex digest}
-  s.description = %q{This gem sets the digested value before validation and validates uniqueness of the digested value.}
+Gem::Specification.new do |spec|
+  spec.name          = "acts_as_digested_on"
+  spec.version       = ActsAsDigestedOn::VERSION
+  spec.authors       = ["milk1000cc"]
+  spec.email         = ["info@milk1000.cc"]
+  spec.summary       = %q{Automatically set sha-1 hex digest}
+  spec.description   = %q{This gem sets the digested value before validation and validates uniqueness of the digested value.}
+  spec.homepage      = "https://github.com/milk1000cc/acts_as_digested_on"
+  spec.license       = "MIT"
 
-  s.rubyforge_project = "acts_as_digested_on"
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.add_dependency 'activerecord', '>= 3.0.0'
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
-  s.add_dependency "rails", ">= 3.0.0"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "sqlite3"
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
 end

data/gemfiles/active_record_30.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.0.0'
+
+gemspec :path => '../'

data/gemfiles/active_record_31.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.1.0'
+
+gemspec :path => '../'

data/gemfiles/active_record_32.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0'
+
+gemspec :path => '../'

data/gemfiles/active_record_40.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.0.0'
+
+gemspec :path => '../'

data/gemfiles/active_record_41.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.1.0'
+
+gemspec :path => '../'

data/lib/acts_as_digested_on.rb

@@ -25,14 +25,22 @@ module ActsAsDigestedOn
 
   module InstanceMethods
     def generate_digest
-      original_columns = self.class.acts_as_digested_on_vars[:original_columns]
-      original_string = "--#{ original_columns.map { |v| self[v].to_s }.join('--') }--"
-      digest = Digest::SHA1.hexdigest(original_string)
+      digest = Digest::SHA1.hexdigest(original_string_for_digest)
       digest.encode! 'utf-8' if RUBY_VERSION.to_f >= 1.9
       digest
     end
 
     private
+    def original_string_for_digest
+      separator = '--'
+      attr_names = self.class.acts_as_digested_on_vars[:attr_names]
+
+      str = separator.dup
+      str << attr_names.map { |v| send(v).to_s }.join(separator)
+      str << separator
+      str
+    end
+
     def set_digest
       digest_column = self.class.acts_as_digested_on_vars[:digest_column]
       self[digest_column] = generate_digest
@@ -40,16 +48,16 @@ module ActsAsDigestedOn
   end
 
   module ClassMethods
-    def acts_as_digested_on(original_columns, options = {})
+    def acts_as_digested_on(attr_names, options = {})
       options = options.symbolize_keys
 
-      original_columns = Array(original_columns).flatten
+      attr_names = Array(attr_names).flatten
       digest_column = options.delete(:digest_column) || 'digest'
       unique = options.key?(:unique) ? options.delete(:unique) : true
 
       class_attribute :acts_as_digested_on_vars
       self.acts_as_digested_on_vars = {
-        :original_columns => original_columns,
+        :attr_names => attr_names,
         :digest_column => digest_column,
         :unique => unique,
         :validates_uniqueness_of_options => options

data/lib/acts_as_digested_on/version.rb

@@ -1,3 +1,3 @@
 module ActsAsDigestedOn
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/acts_as_digested_on_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 class Article < ActiveRecord::Base
   define_table do |t|
@@ -9,9 +9,13 @@ class Article < ActiveRecord::Base
     t.string :my_digest
     t.text :content
   end
+
+  def stripped_title
+    title.strip
+  end
 end
 
-describe "ActsAsDigestedOn" do
+describe ActsAsDigestedOn do
   before do
     Article.reset_callbacks :validate
     Article.destroy_all
@@ -21,12 +25,29 @@ describe "ActsAsDigestedOn" do
     @url = 'http://example.com'
   end
 
+  it 'has a version number' do
+    expect(ActsAsDigestedOn::VERSION).not_to be nil
+  end
+
+  it 'can use a method name instead of a column name' do
+    Article.acts_as_digested_on :stripped_title
+
+    article = Article.create!(title: '   hello    ')
+
+    expect(article.digest).to eq Digest::SHA1.hexdigest('--hello--')
+
+    expect {
+      Article.create! title: 'hello'
+    }.to raise_error(ActiveRecord::RecordInvalid)
+  end
+
   describe '#generate_digest' do
     it 'should generate sha-1 digest of target field with some string' do
       Article.acts_as_digested_on :url
 
-      article = Article.new(:url => @url)
-      article.generate_digest.should == Digest::SHA1.hexdigest("--#{ @url }--")
+      article = Article.new(url: @url)
+      expect(article.generate_digest).to eq(
+        Digest::SHA1.hexdigest("--#{ @url }--"))
     end
 
     describe 'when more than one target field is given' do
@@ -34,8 +55,9 @@ describe "ActsAsDigestedOn" do
         Article.acts_as_digested_on [:title, :url]
 
         title = 'an article'
-        article = Article.new(:title => title, :url => @url)
-        article.generate_digest.should == Digest::SHA1.hexdigest("--#{ title }--#{ @url }--")
+        article = Article.new(title: title, url: @url)
+        expect(article.generate_digest).to eq(
+          Digest::SHA1.hexdigest("--#{ title }--#{ @url }--"))
       end
     end
   end
@@ -44,21 +66,22 @@ describe "ActsAsDigestedOn" do
     it 'should set "digest" field' do
       Article.acts_as_digested_on :url
 
-      article = Article.new(:url => @url)
-      article.digest.should be_nil
+      article = Article.new(url: @url)
+      expect(article.digest).to be_nil
       article.valid?
-      article.digest.should == article.generate_digest
+      expect(article.digest).to eq article.generate_digest
     end
 
     it 'should set the digest value to :digest_column field when :digest_column option is set' do
-      Article.acts_as_digested_on :url, :digest_column => :my_digest
+      Article.acts_as_digested_on :url, digest_column: :my_digest
+
+      article = Article.new(url: @url)
+      expect(article.digest).to be_nil
+      expect(article.my_digest).to be_nil
 
-      article = Article.new(:url => @url)
-      article.digest.should be_nil
-      article.my_digest.should be_nil
       article.valid?
-      article.digest.should be_nil
-      article.my_digest.should == article.generate_digest
+      expect(article.digest).to be_nil
+      expect(article.my_digest).to eq article.generate_digest
     end
   end
 
@@ -66,40 +89,54 @@ describe "ActsAsDigestedOn" do
     it 'should validate uniqueness of digest field by default' do
       Article.acts_as_digested_on :url
 
-      Article.create! :url => @url
-      proc { Article.create!(:url => @url) }.should raise_error(ActiveRecord::RecordInvalid)
-      proc { Article.create!(:url => 'http://example2.com') }.should_not raise_error
+      Article.create! url: @url
+      expect {
+        Article.create! url: @url
+      }.to raise_error(ActiveRecord::RecordInvalid)
+      expect {
+        Article.create! url: 'http://example2.com'
+      }.not_to raise_error
     end
 
     it 'should carry over the options to the validates_uniqueness_of options' do
-      Article.acts_as_digested_on :url, :scope => :user_id
-
-      Article.create! :url => @url, :user_id => 1
-      proc { Article.create!(:url => @url, :user_id => 1) }.should raise_error(ActiveRecord::RecordInvalid)
-      proc { Article.create!(:url => @url, :user_id => 2) }.should_not raise_error
-      proc { Article.create!(:url => 'http://example2.com', :user_id => 1) }.should_not raise_error
+      Article.acts_as_digested_on :url, scope: :user_id
+
+      Article.create! url: @url, user_id: 1
+      expect {
+        Article.create! url: @url, user_id: 1
+      }.to raise_error(ActiveRecord::RecordInvalid)
+      expect {
+        Article.create! url: @url, user_id: 2
+      }.not_to raise_error
+      expect {
+        Article.create! url: 'http://example2.com', user_id: 1
+      }.not_to raise_error
     end
 
     it 'should validate uniqueness of digest field when :unique option is true' do
-      Article.acts_as_digested_on :url, :unique => true
-
-      Article.create! :url => @url
-      proc { Article.create!(:url => @url) }.should raise_error(ActiveRecord::RecordInvalid)
-      proc { Article.create!(:url => 'http://example2.com') }.should_not raise_error
+      Article.acts_as_digested_on :url, unique: true
+
+      Article.create! url: @url
+      expect {
+        Article.create! url: @url
+      }.to raise_error(ActiveRecord::RecordInvalid)
+      expect {
+        Article.create! url: 'http://example2.com'
+      }.not_to raise_error
     end
 
     it 'should not validate uniqueness of digest field when :unique option is false' do
-      Article.acts_as_digested_on :url, :unique => false
+      Article.acts_as_digested_on :url, unique: false
 
-      Article.create! :url => @url
-      proc { Article.create!(:url => @url) }.should_not raise_error
+      Article.create! url: @url
+      expect { Article.create! url: @url }.not_to raise_error
     end
 
     it 'should support string key options' do
       Article.acts_as_digested_on :url, 'unique' => false
 
-      Article.create! :url => @url
-      proc { Article.create!(:url => @url) }.should_not raise_error
+      Article.create! url: @url
+      expect { Article.create! url: @url }.not_to raise_error
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,11 @@
-require 'logger'
-require 'rspec'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'active_record'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'acts_as_digested_on'
 
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
-end
+I18n.enforce_available_locales = true
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3', :database => ':memory:')
 
 class ActiveRecord::Base
   def self.define_table(table_name = self.name.tableize, &migration)

metadata

@@ -1,49 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_digested_on
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - milk1000cc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70162942322700 !ruby/object:Gem::Requirement
-    none: false
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70162942322700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162942322280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162942322280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70162942349460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162942349460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem sets the digested value before validation and validates uniqueness
   of the digested value.
 email:
@@ -52,41 +88,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
 - acts_as_digested_on.gemspec
+- gemfiles/active_record_30.gemfile
+- gemfiles/active_record_31.gemfile
+- gemfiles/active_record_32.gemfile
+- gemfiles/active_record_40.gemfile
+- gemfiles/active_record_41.gemfile
 - lib/acts_as_digested_on.rb
 - lib/acts_as_digested_on/version.rb
 - spec/acts_as_digested_on_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/milk1000cc/acts_as_digested_on
-licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: acts_as_digested_on
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatically set sha-1 hex digest
 test_files:
 - spec/acts_as_digested_on_spec.rb

data/README.rdoc

@@ -1,70 +0,0 @@
-= ActsAsDigestedOn {<img src="https://secure.travis-ci.org/milk1000cc/acts_as_digested_on.png?branch=master" alt="Build Status" />}[http://travis-ci.org/milk1000cc/acts_as_digested_on]
-
-acts_as_digested_on is a gem for Rails 3.
-
-This sets the digested value before validation and validates uniqueness of the digested value.
-
-If you use this gem for Rails 2, see rails-2 branch.
-
-== Install
-
-  sudo gem install acts_as_digested_on
-
-== Usage
-
-  # db/migrate/20090706000000_create_articles.rb
-  class CreateArticles < ActiveRecord::Migration
-    def self.up
-      create_table :articles do |t|
-        t.text :url       # any type is ok
-        t.string :digest  # this is sha-1 hex digest field of url value
-        ...
-      end
-
-      add_index :articles, :digest, :unique => true  # you can add index on digest field
-    end
-
-    def self.down
-      drop_table :articles
-    end
-  end
-
-  # app/models/article.rb
-  class Article < ActiveRecord::Base
-    acts_as_digested_on :url  # please add this
-    ...
-  end
-
-  # this means
-  class Article < ActiveRecord::Base
-    validates_uniqueness_of :digest
-    before_validation :set_digest
-
-    def generate_digest
-      Digest::SHA1.hexdigest "--#{ url.to_s }--"
-    end
-
-    private
-    def set_digest
-      self.digest = generate_digest
-    end
-    ...
-  end
-
-== Examples
-
-  acts_as_digested_on :url, :unique => false
-
-  acts_as_digested_on :url, :digest_column => :url_digest
-
-  acts_as_digested_on [:url, :salt]
-
-  acts_as_digested_on :url, :scope => :site_id
-
-  Article.new(:url => 'http://example.com').generate_digest
-
-== Copyright
-
-Copyright (c) 2009-2012 milk1000cc, released under the MIT license
-
-milk1000cc <mailto:info@milk1000.cc>