property_sets 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e1f51f9567dd18fa291875731e3a41c9772461
-  data.tar.gz: e97629c249e9dd6632892f377b55d551587e1dbb
+  metadata.gz: a8b5df00e29ccc0cd797287b319e2590be6da231
+  data.tar.gz: 7c8d678433474ed11ca89649ed4462636d5cffbb
 SHA512:
-  metadata.gz: 754e8fe910199e3e80a80bfd138c69b2c1dcc81b744095fd1f091442df5ee186bda98c3c57f8de8a485172e2bc2d8a338509af34662e775f8d4fe8cd6710b5bc
-  data.tar.gz: eb122494452754f9f09b1826fbf653c7eafa730232cda1db6a3462db828d0a0830277396ad38d61e50e5233c37b05f18b6aa5e272f011b38c2b5f0d7bf1b3eee
+  metadata.gz: 695435a9ae1e80b85144188233235e602eeaec33389167711860fe6fc6903dc65bd76d7e0acb9286df9e1d4a2073ab3ded08779a4912ff1ae803309595597caf
+  data.tar.gz: 0f26718d6f50123d1516733b5083f028322b12a0ab8fcef60682865b3c336f44187ee3e033d1143d6668a8631b1dadb46fdcbbedb0ae46798629771746f37189

data/.travis.yml

@@ -8,6 +8,7 @@ script: "bundle exec rake test"
 gemfile:
   - gemfiles/rails2.3.gemfile
   - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.0.gemfile
 matrix:
   exclude:
     - rvm: 2.0.0
@@ -16,3 +17,5 @@ matrix:
       gemfile: gemfiles/rails2.3.gemfile
     - rvm: ree
       gemfile: gemfiles/rails3.2.gemfile
+    - rvm: ree
+      gemfile: gemfiles/rails4.0.gemfile

data/Appraisals

@@ -12,3 +12,9 @@ appraise "rails3.2" do
   gem "activerecord", "~> 3.2.6"
   gem "activesupport", "~> 3.2.6"
 end
+
+appraise "rails4.0" do
+ gem "activerecord", "~> 4.0.2"
+ gem "activesupport", "~> 4.0.2"
+ gem "protected_attributes"
+end

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord-jdbcmysql-adapter', '1.2.2', :platforms => :jruby
+gem 'activerecord-jdbcmysql-adapter', '1.3.5', :platforms => :jruby
 gem 'mysql2', :platforms => :ruby
 
 gem 'bump'
@@ -10,7 +10,7 @@ gem 'shoulda'
 gem 'mocha'
 gem 'appraisal'
 gem 'test-unit', '>= 2.5.2'
-gem 'actionpack', '>= 2.3.14', '< 3.3'
+gem 'actionpack', '>= 2.3.14', '< 4.1'
 gem 'iconv', :platforms => :ruby_20
 
 gemspec

data/Rakefile

@@ -5,7 +5,6 @@ require 'bump/tasks'
 
 require 'rake/testtask'
 Rake::TestTask.new do |test|
-  test.libs << 'lib'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end

data/gemfiles/rails2.3.gemfile

@@ -2,11 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
+gem "activerecord-jdbcmysql-adapter", "1.3.5", :platforms=>:jruby
+gem "bump"
 gem "rake"
 gem "bundler"
 gem "appraisal"
-gem "actionpack", ">= 2.3.14", "< 3.3"
+gem "actionpack", ">= 2.3.14", "< 4.1"
 gem "iconv", :platforms=>:ruby_20
 gem "activerecord", "~> 2.3.14"
 gem "activesupport", "~> 2.3.14"

data/gemfiles/rails3.2.gemfile

@@ -2,15 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
+gem "activerecord-jdbcmysql-adapter", "1.3.5", :platforms=>:jruby
 gem "mysql2", :platforms=>:ruby
+gem "bump"
 gem "rake"
 gem "bundler"
 gem "shoulda"
 gem "mocha"
 gem "appraisal"
 gem "test-unit", ">= 2.5.2"
-gem "actionpack", ">= 2.3.14", "< 3.3"
+gem "actionpack", ">= 2.3.14", "< 4.1"
 gem "iconv", :platforms=>:ruby_20
 gem "activerecord", "~> 3.2.6"
 gem "activesupport", "~> 3.2.6"

data/gemfiles/rails4.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord-jdbcmysql-adapter", "1.3.5", :platforms=>:jruby
+gem "mysql2", :platforms=>:ruby
+gem "bump"
+gem "rake"
+gem "bundler"
+gem "shoulda"
+gem "mocha"
+gem "appraisal"
+gem "test-unit", ">= 2.5.2"
+gem "actionpack", ">= 2.3.14", "< 4.1"
+gem "iconv", :platforms=>:ruby_20
+gem "activerecord", "~> 4.0.2"
+gem "activesupport", "~> 4.0.2"
+gem "protected_attributes"
+
+gemspec :path=>"../"

data/lib/property_sets/property_set_model.rb

@@ -87,10 +87,7 @@ module PropertySets
         base.validate        :validate_format_of_name
         base.validate        :validate_length_of_serialized_data
         base.before_create   :coerce_value
-
-        if ActiveRecord::VERSION::MAJOR < 4
-          base.attr_accessible :name, :value
-        end
+        base.attr_accessible :name, :value
       end
 
       def property(key, options = nil)
@@ -125,10 +122,7 @@ module PropertySets
         belongs_to              owner_class_sym
         validates_presence_of   owner_class_sym
         validates_uniqueness_of :name, :scope => owner_class_key_sym
-
-        if ActiveRecord::VERSION::MAJOR < 4
-          attr_accessible         owner_class_key_sym, owner_class_sym
-        end
+        attr_accessible         owner_class_key_sym, owner_class_sym
       end
 
       def owner_assoc=(association)

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/property_sets.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new "property_sets", PropertySets::VERSION do |s|
   s.homepage = 'http://github.com/zendesk/property_sets'
   s.license  = 'Apache License Version 2.0'
 
-  s.add_runtime_dependency("activesupport", ">= 2.3.14", "< 3.3")
-  s.add_runtime_dependency("activerecord", ">= 2.3.14", "< 3.3")
+  s.add_runtime_dependency("activesupport", ">= 2.3.14", "< 4.1")
+  s.add_runtime_dependency("activerecord", ">= 2.3.14", "< 4.1")
   s.add_runtime_dependency("json")
 
   s.files = `git ls-files`.split("\n")

data/test/helper.rb

@@ -16,11 +16,13 @@ require 'active_record'
 require 'active_record/fixtures'
 require 'shoulda'
 
-if ActiveRecord::VERSION::MAJOR > 2 && ActiveRecord::VERSION::MAJOR < 4
+if ActiveRecord::VERSION::MAJOR > 2
   if ActiveRecord::VERSION::MINOR > 1
     ActiveRecord::Base.mass_assignment_sanitizer = :strict
   end
-
+  if ActiveRecord::VERSION::MAJOR == 4
+    require 'protected_attributes'
+  end
   ActiveRecord::Base.attr_accessible
 end
 
@@ -60,10 +62,8 @@ class Account < ActiveRecord::Base
   include PropertySets::Delegator
   delegate_to_property_set :settings, :old => :hep
 
-  if ActiveRecord::VERSION::MAJOR < 4
-    attr_accessible :name
-    attr_accessible :texts_attributes
-  end
+  attr_accessible :name
+  attr_accessible :texts_attributes
 
   property_set :settings do
     property :foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 2.3.14
     - - <
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 2.3.14
     - - <
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 2.3.14
     - - <
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 2.3.14
     - - <
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,7 @@ files:
 - benchmark/read.rb
 - gemfiles/rails2.3.gemfile
 - gemfiles/rails3.2.gemfile
+- gemfiles/rails4.0.gemfile
 - lib/property_sets.rb
 - lib/property_sets/action_view_extension.rb
 - lib/property_sets/active_record_extension.rb