has_defaults 0.4.2 → 0.4.4

data/gemfiles/Gemfile.5.0.pg

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~>5.0.0'
+gem 'rspec', '~>3.5'
+gem 'pg', '~>0.18.4'
+
+gem 'rake'
+
+gem 'gemika', '>= 0.2.0'
+gem 'has_defaults', path: '..'

data/gemfiles/Gemfile.5.0.pg.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: ..
+  specs:
+    has_defaults (0.4.3)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    gemika (0.2.0)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    pg (0.18.4)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  gemika (>= 0.2.0)
+  has_defaults!
+  pg (~> 0.18.4)
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   1.12.5

data/lib/has_defaults.rb

@@ -1,4 +1,2 @@
+require 'active_record'
 require 'has_defaults/active_record_ext'
-
-ActiveRecord::Base.__send__(:extend, HasDefaults::ActiveRecordExt::ClassMethods)
-

data/lib/has_defaults/active_record_ext.rb

@@ -1,10 +1,13 @@
 module HasDefaults
+
+  class Error < StandardError; end
+
   module ActiveRecordExt
 
     module ClassMethods
 
       def has_defaults(attrs)
-        raise "Hash expected; #{attrs.class} given." unless attrs.is_a?(Hash)
+        raise Error, "Hash expected; #{attrs.class} given." unless attrs.is_a?(Hash)
 
         include InstanceMethods
 
@@ -27,7 +30,7 @@ module HasDefaults
         self.has_defaults_options ||= {}
         self.has_defaults_options.merge!(attrs)
 
-        if Rails.version < '3'
+        if ActiveRecord::VERSION::MAJOR < 3
           # ActiveRecord only calls after_initialize callbacks only if is
           # explicit defined in a class. We should however only define that
           # callback if a default has been set, as it really slow downs Rails.
@@ -72,3 +75,7 @@ module HasDefaults
 
   end
 end
+
+ActiveRecord::Base.extend(HasDefaults::ActiveRecordExt::ClassMethods)
+
+

data/lib/has_defaults/version.rb

@@ -1,5 +1,5 @@
 module HasDefaults
 
-  VERSION = '0.4.2'
+  VERSION = '0.4.4'
 
 end

data/spec/{shared/has_defaults → has_defaults}/active_record_ext_spec.rb

@@ -14,7 +14,7 @@ describe HasDefaults::ActiveRecordExt do
 
       it "should use setters methods to set the defaults" do
         new_donut = Donut.new
-        new_donut.instance_variable_get('@flavor_setter_called').should be_true
+        new_donut.instance_variable_get('@flavor_setter_called').should == true
       end
 
       it "should call procs in the model context when given as defaults" do
@@ -45,7 +45,7 @@ describe HasDefaults::ActiveRecordExt do
 
       it "should use getters methods to check if an attribute is nil" do
         new_donut = Donut.new
-        new_donut.instance_variable_get('@flavor_getter_called').should be_true
+        new_donut.instance_variable_get('@flavor_getter_called').should == true
       end
 
       it "should return default value for an attribute" do
@@ -59,7 +59,7 @@ describe HasDefaults::ActiveRecordExt do
 
       it "should define #after_initialize in Rails 2, but not Rails 3 (this method must be defined so after_initialize callbacks run)" do
         donut = Donut.new
-        if Rails.version.to_i < 3
+        if ActiveRecord::VERSION::MAJOR < 3
           donut.should respond_to(:after_initialize)
         else
           donut.should_not respond_to(:after_initialize)

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+$: << File.join(File.dirname(__FILE__), "/../../lib" )
+
+require 'has_defaults'
+require 'gemika'
+
+ActiveRecord::Base.default_timezone = :local
+
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].sort.each {|f| require f}
+
+Gemika::RSpec.configure_transactional_examples
+
+if Gemika::Env.rspec_2_plus?
+  RSpec.configure do |config|
+    config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+    config.mock_with(:rspec) { |c| c.syntax = [:should, :expect] }
+  end
+end

data/spec/support/database.rb

@@ -0,0 +1,16 @@
+Gemika::Database.new.rewrite_schema! do
+
+  create_table :pastries do |t|
+    t.string :type
+    t.string :flavor
+    t.string :name
+    t.string :maker
+    t.string :weight
+    t.string :main_ingredient
+    t.string :health_benefits
+  end
+
+  create_table :model_without_defaults do |t|
+  end
+
+end

data/spec/support/database.sample.yml

@@ -0,0 +1,10 @@
+mysql:
+  database: has_defaults_test
+  host: localhost
+  username: root
+  password: secret
+
+postgresql:
+  database: has_defaults_test
+  user:
+  password:

data/spec/support/database.travis.yml

@@ -0,0 +1,9 @@
+mysql:
+  database: has_defaults_test
+  username: travis
+  password:
+
+postgresql:
+  database: has_defaults_test
+  user: postgres
+  password:

data/spec/support/database.yml

@@ -0,0 +1,10 @@
+mysql:
+  database: has_defaults_test
+  host: localhost
+  username: root
+  password: junior
+
+postgresql:
+  database: has_defaults_test
+  user:
+  password:

data/spec/{shared/app_root/app/models/donut.rb → support/models.rb}

@@ -1,3 +1,10 @@
+class Pastry < ActiveRecord::Base
+
+  has_defaults :main_ingredient => "flour", :maker => "Mom"
+
+end
+
+
 class Donut < Pastry
 
   has_defaults :flavor => "cream", :name => "Cream"
@@ -24,3 +31,7 @@ class Donut < Pastry
   end
 
 end
+
+
+class ModelWithoutDefaults < ActiveRecord::Base
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_defaults
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-05-08 00:00:00 +02:00
-default_executable: 
+date: 2016-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -42,82 +41,34 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- MIT-LICENSE
+- .ruby-version
+- .travis.yml
+- LICENSE
 - README.md
 - Rakefile
+- gemfiles/Gemfile.2.3.mysql2
+- gemfiles/Gemfile.2.3.mysql2.lock
+- gemfiles/Gemfile.3.2.mysql2
+- gemfiles/Gemfile.3.2.mysql2.lock
+- gemfiles/Gemfile.4.2.mysql2
+- gemfiles/Gemfile.4.2.mysql2.lock
+- gemfiles/Gemfile.4.2.pg
+- gemfiles/Gemfile.4.2.pg.lock
+- gemfiles/Gemfile.5.0.mysql2
+- gemfiles/Gemfile.5.0.mysql2.lock
+- gemfiles/Gemfile.5.0.pg
+- gemfiles/Gemfile.5.0.pg.lock
 - has_defaults.gemspec
 - lib/has_defaults.rb
 - lib/has_defaults/active_record_ext.rb
 - lib/has_defaults/version.rb
-- spec/rails-2.3/Gemfile
-- spec/rails-2.3/Gemfile.lock
-- spec/rails-2.3/Rakefile
-- spec/rails-2.3/app_root/config/boot.rb
-- spec/rails-2.3/app_root/config/database.yml
-- spec/rails-2.3/app_root/config/environment.rb
-- spec/rails-2.3/app_root/config/environments/test.rb
-- spec/rails-2.3/app_root/config/preinitializer.rb
-- spec/rails-2.3/app_root/config/routes.rb
-- spec/rails-2.3/app_root/lib/console_with_fixtures.rb
-- spec/rails-2.3/app_root/log/.gitignore
-- spec/rails-2.3/app_root/script/console
-- spec/rails-2.3/rcov.opts
-- spec/rails-2.3/spec.opts
-- spec/rails-2.3/spec_helper.rb
-- spec/rails-3.0/.rspec
-- spec/rails-3.0/Gemfile
-- spec/rails-3.0/Gemfile.lock
-- spec/rails-3.0/Rakefile
-- spec/rails-3.0/app_root/.gitignore
-- spec/rails-3.0/app_root/config/application.rb
-- spec/rails-3.0/app_root/config/boot.rb
-- spec/rails-3.0/app_root/config/database.yml
-- spec/rails-3.0/app_root/config/environment.rb
-- spec/rails-3.0/app_root/config/environments/test.rb
-- spec/rails-3.0/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.0/app_root/config/initializers/inflections.rb
-- spec/rails-3.0/app_root/config/initializers/mime_types.rb
-- spec/rails-3.0/app_root/config/initializers/secret_token.rb
-- spec/rails-3.0/app_root/config/initializers/session_store.rb
-- spec/rails-3.0/app_root/config/locales/en.yml
-- spec/rails-3.0/app_root/config/routes.rb
-- spec/rails-3.0/app_root/lib/tasks/.gitkeep
-- spec/rails-3.0/app_root/log/.gitkeep
-- spec/rails-3.0/app_root/script/rails
-- spec/rails-3.0/log/in_memory.log
-- spec/rails-3.0/rcov.opts
-- spec/rails-3.0/spec_helper.rb
-- spec/rails-3.2/.rspec
-- spec/rails-3.2/Gemfile
-- spec/rails-3.2/Gemfile.lock
-- spec/rails-3.2/Rakefile
-- spec/rails-3.2/app_root/.gitignore
-- spec/rails-3.2/app_root/config/application.rb
-- spec/rails-3.2/app_root/config/boot.rb
-- spec/rails-3.2/app_root/config/database.yml
-- spec/rails-3.2/app_root/config/environment.rb
-- spec/rails-3.2/app_root/config/environments/test.rb
-- spec/rails-3.2/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails-3.2/app_root/config/initializers/inflections.rb
-- spec/rails-3.2/app_root/config/initializers/mime_types.rb
-- spec/rails-3.2/app_root/config/initializers/secret_token.rb
-- spec/rails-3.2/app_root/config/initializers/session_store.rb
-- spec/rails-3.2/app_root/config/locales/en.yml
-- spec/rails-3.2/app_root/config/routes.rb
-- spec/rails-3.2/app_root/lib/tasks/.gitkeep
-- spec/rails-3.2/app_root/log/.gitkeep
-- spec/rails-3.2/app_root/script/rails
-- spec/rails-3.2/log/in_memory.log
-- spec/rails-3.2/rcov.opts
-- spec/rails-3.2/spec_helper.rb
-- spec/shared/app_root/app/controllers/application_controller.rb
-- spec/shared/app_root/app/models/donut.rb
-- spec/shared/app_root/app/models/model_without_defaults.rb
-- spec/shared/app_root/app/models/pastry.rb
-- spec/shared/app_root/db/migrate/001_create_pastries.rb
-- spec/shared/app_root/db/migrate/002_create_model_without_defaults.rb
-- spec/shared/has_defaults/active_record_ext_spec.rb
-has_rdoc: true
+- spec/has_defaults/active_record_ext_spec.rb
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/database.sample.yml
+- spec/support/database.travis.yml
+- spec/support/database.yml
+- spec/support/models.rb
 homepage: https://github.com/makandra/has_defaults
 licenses: 
 - MIT
@@ -147,9 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Default values for ActiveRecord models.
 test_files: []
 
+has_rdoc: 

data/spec/rails-2.3/Gemfile

@@ -1,8 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'sqlite3'
-gem 'rails', '=2.3.10'
-gem 'rspec', '<2'
-gem 'rspec-rails', '<2'
-gem 'ruby-debug'
-gem 'has_defaults', :path => '../..'

data/spec/rails-2.3/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    has_defaults (0.4.1)
-      activerecord
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (2.3.10)
-      actionpack (= 2.3.10)
-    actionpack (2.3.10)
-      activesupport (= 2.3.10)
-      rack (~> 1.1.0)
-    activerecord (2.3.10)
-      activesupport (= 2.3.10)
-    activeresource (2.3.10)
-      activesupport (= 2.3.10)
-    activesupport (2.3.10)
-    columnize (0.3.2)
-    linecache (0.43)
-    rack (1.1.0)
-    rails (2.3.10)
-      actionmailer (= 2.3.10)
-      actionpack (= 2.3.10)
-      activerecord (= 2.3.10)
-      activeresource (= 2.3.10)
-      activesupport (= 2.3.10)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rspec (1.3.1)
-    rspec-rails (1.3.3)
-      rack (>= 1.0.0)
-      rspec (= 1.3.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sqlite3 (1.3.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  has_defaults!
-  rails (= 2.3.10)
-  rspec (< 2)
-  rspec-rails (< 2)
-  ruby-debug
-  sqlite3

data/spec/rails-2.3/Rakefile

@@ -1,11 +0,0 @@
-require 'rake'
-require 'spec/rake/spectask'
-
-desc 'Default: Run all specs for a specific rails version.'
-task :default => :spec
-
-desc "Run all specs for a specific rails version"
-Spec::Rake::SpecTask.new() do |t|
-  t.spec_opts = ['--options', "\"spec.opts\""]
-  t.spec_files = defined?(SPEC) ? SPEC : FileList['**/*_spec.rb', '../shared/**/*_spec.rb']
-end