purgatory 2.8.0 → 2.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M1NWE4MjU0ZDg0OWE0YTcwNzA3ZGMxYzAwM2U0MWE0ZTVlZTQ5NQ==
+    NGMwZjI5OWFhYTNjMWZiY2ExOGJlMmI0MDcyOGNkMjYzNjZhOTFjMA==
   data.tar.gz: !binary |-
-    OTEwZDI1MDM3YzhhMGFjNmYxM2RjMTk0NzFhOTY0MmZmMzI3ZjE5Yg==
+    OWYxZDJmOGM1NTdkZDRmMjcxY2YwZDUzY2Y1MjA2NTc5MmY0Mjc4Mg==
 SHA512:
   metadata.gz: !binary |-
-    YjRmYTU3MGZhNzE1ZDZhZjQ0MDBlNWEwOTNmNThlZDU5YTVjYTVlOGUyZmQz
-    NGQzZTBiMTMyMzVkNDM5ZmM3NGUyMjU2OGJjOGJlNzEwMDVhMDQ2MWIyMmI5
-    NDc3ZTExY2I1NGU1MmI4ZjBjZThjM2M3M2MxMThhMDIzZDQ2Mzk=
+    ZjhkOGIxOTkxMjYzNjk5N2UwZWM3ZmMwMTQwZjA1NmIzNjYxYjZmZjMzZmJh
+    ZDI2MTJhMjgyZTcwNzk2ODUxYWE2MjlkYzkwOGEyM2QxMjBkMzU0ZTVhYjE3
+    OGQ2NzEyOTllMDhhNzRkZmE3YTU0MzA2MGY5MTE3MjU1NTFkN2U=
   data.tar.gz: !binary |-
-    ZTdlZjc1NzlkZmMxYWY2Y2MyNzRhOTlhMTVmNGNhNDA5NTU2ZDIxZjIyOTU1
-    MmU1Yzc3YzdlYzEzNTc0MTY3NzdlNzhlMjlhY2Q1NGNiNjhmMDVhMGEzNDRi
-    ZDY1MTVjODRhYWUxMTY4MjFiZWM4YTBlNmQ2MjM3MjY1Njg3ZGY=
+    MmFlMWYyZjJkZGZhNTJiOWVkYWNmZTJlYjI5ZjVlMThjYTkxZjU2MTNmOTc0
+    M2JjZjZmM2Q1ZDUzZGM0MjFkMWEyNzgzY2E2NTJhYzliM2JmMjczZTgxMDEy
+    ZDFiMjZjNmFmMGQwM2JlNTJjNWY3MTZiMGJiYmE4Y2Q4YWQ4MmM=

data/Gemfile

@@ -15,4 +15,5 @@ group :test do
   gem "activerecord", ">= 4"
   gem "rspec"
   gem "sqlite3"
+  gem "pry"
 end

data/Gemfile.lock

@@ -20,6 +20,7 @@ GEM
     arel (4.0.1)
     atomic (1.1.14)
     builder (3.1.4)
+    coderay (1.1.0)
     diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
@@ -47,6 +48,7 @@ GEM
     json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
+    method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.8.2)
     multi_xml (0.5.5)
@@ -59,6 +61,10 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.5.2)
     rake (10.1.0)
     rdoc (3.12.2)
@@ -71,6 +77,7 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
+    slop (3.4.7)
     sqlite3 (1.3.8)
     thread_safe (0.1.3)
       atomic
@@ -83,6 +90,7 @@ DEPENDENCIES
   activerecord (>= 4)
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
+  pry
   rdoc (~> 3.12)
   rspec
   sqlite3

data/VERSION

@@ -1 +1 @@
-2.8.0
+2.9.0

data/lib/purgatory/attribute_accessor_fields.rb

@@ -4,13 +4,17 @@ require 'purgatory/active_record_descendant_attribute_accessors'
 
 module AttributeAccessorFields
 
-  mattr_accessor :local_attributes
+  def self.set_local_attributes_to_save(klass,attrs)
+    klass.instance_variable_set(:@local_attributes_for_purgatory,attrs)
+  end
 
   def self.determine_attr_accessor_fields(obj)
-    variables = if @@local_attributes == :all
+    local_attributes = obj.class.instance_variable_get(:@local_attributes_for_purgatory)
+
+    variables = if local_attributes == :all
                   ActiveRecordDescendantAttributeAccessors.attr_accessor_instance_variables(obj)
                 else
-                  Array(@@local_attributes).map { |attribute|
+                  Array(local_attributes).map { |attribute|
                     attribute.to_s.prepend('@').to_sym
                   }
                 end

data/lib/purgatory/purgatory_module.rb

@@ -5,7 +5,7 @@ module PurgatoryModule
 
   module ClassMethods
     def use_purgatory(options={})
-      AttributeAccessorFields.local_attributes = options[:local_attributes]
+      AttributeAccessorFields.set_local_attributes_to_save(self,options[:local_attributes]) 
       self.has_many :purgatories, as: :soul
     end
   end

data/purgatory.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: purgatory 2.8.0 ruby lib
+# stub: purgatory 2.9.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "2.8.0"
+  s.version = "2.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elan Dubrofsky"]

data/spec/purgatory_spec.rb

@@ -320,15 +320,66 @@ describe Purgatory do
     end
   end
 
-  describe "determine_attr_accessor_fields" do
-    before do
-      AttributeAccessorFields.local_attributes = nil
-    end
-    
-    after do
-      AttributeAccessorFields.local_attributes = nil
+  describe "use_purgatory" do
+    context "on class that has attr_accessors" do
+      context "use_purgatory with no arguments" do
+        before do
+          @klass = create_subclass_of(Item)
+          @klass.instance_eval { use_purgatory }
+        end
+
+        it "should not store attr_accessors" do
+          obj = @klass.new name: 'foo', price: 100, dante: "inferno"
+          purgatory = obj.purgatory! user1
+          purgatory.attr_accessor_fields.should == {}
+        end
+      end
+
+      context "use_purgatory with valid arguments" do
+        context "use_purgatory with one active record class" do
+          before do
+            @klass = create_subclass_of(Item)
+            @klass.instance_eval { use_purgatory :local_attributes => [:dante] }
+          end
+
+          it "should work" do
+            obj = @klass.new name: 'foo', price: 100, dante: "inferno"
+            purgatory = obj.purgatory! user1
+            purgatory.attr_accessor_fields.should == { :@dante => "inferno" }
+          end
+        end
+
+        context "use_purgatory with more than one active record class" do
+          before do
+            @klass = create_subclass_of(Item)
+            @klass.instance_eval { use_purgatory :local_attributes => [:dante] }
+
+            @klass_2 = create_subclass_of(Item)
+            @klass_2.instance_eval { use_purgatory :local_attributes => [:minos]; attr_accessor :minos }
+
+            @klass_3 = create_subclass_of(Item)
+            @klass_3.instance_eval { use_purgatory }
+          end
+
+          it "should work" do
+            obj = @klass.new name: 'foo', price: 100, dante: "inferno"
+            purgatory = obj.purgatory! user1
+            purgatory.attr_accessor_fields.should == { :@dante => "inferno" }
+
+            obj = @klass_2.new name: 'foo', price: 100, minos: "inferno"
+            purgatory = obj.purgatory! user1
+            purgatory.attr_accessor_fields.should == { :@minos => "inferno" }
+
+            obj = @klass_3.new name: 'foo', price: 100
+            purgatory = obj.purgatory! user1
+            purgatory.attr_accessor_fields.should == {}
+          end
+        end
+      end
     end
+  end
 
+  describe "determine_attr_accessor_fields" do
     context "obj has no attr_accessors" do
       before do
         @obj = Widget.new
@@ -341,10 +392,10 @@ describe Purgatory do
 
     context "obj has attr_accessors" do
       before do
-        klass = create_subclass_of(Widget)
-        klass.instance_eval { attr_accessor :dante, :minos, :charon }
+        @klass = create_subclass_of(Widget)
+        @klass.instance_eval { attr_accessor :dante, :minos, :charon }
 
-        @obj = klass.new
+        @obj = @klass.new
 
         @obj.dante = "inferno"
         @obj.minos = "inferno"
@@ -360,7 +411,7 @@ describe Purgatory do
       context "local_attributes is array" do
         context "array size is 1" do
           before do
-            AttributeAccessorFields.local_attributes = [:dante] 
+            AttributeAccessorFields.set_local_attributes_to_save(@klass,[:dante])
           end
 
           it "should only contain attr_accessors specified in array" do
@@ -369,7 +420,7 @@ describe Purgatory do
         end
         context "array size is more than 1" do
           before do
-            AttributeAccessorFields.local_attributes = [:dante, :minos]
+            AttributeAccessorFields.set_local_attributes_to_save(@klass,[:dante, :minos])
           end
 
           it "should only contain attr_accessors specified in array" do
@@ -381,7 +432,7 @@ describe Purgatory do
       
       context "value of local_variables is :all" do
         before do
-          AttributeAccessorFields.local_attributes = :all
+          AttributeAccessorFields.set_local_attributes_to_save(@klass,:all)
         end
 
         it "should automatically determine attr_accessor values that doesnt include ones belonging to AR::Base and its ancestors, and then store these values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Elan Dubrofsky