has_moderated 1.0.rc3 → 1.0.rc4

data/test/dummy/spec/models/task_spec.rb

@@ -256,7 +256,7 @@ describe Task do
       subtask.title.should eq("Subtask 1")
     end
     
-    it "associates an existing subtask on create 2", :focus => true do
+    it "associates an existing subtask on create 2" do
       Subtask.create! :title => "Subtask 1"
       Subtask.count.should eq(1)
       Moderation.count.should eq(0)
@@ -265,11 +265,12 @@ describe Task do
       task.renamed_subtasks << Subtask.first
       task.save
       
+      Task.count.should eq(0)
       Moderation.count.should eq(1)
       Moderation.last.accept
       Moderation.count.should eq(0)
       
-      Task.first.renamed_subtasks.count.should eq(1)
+      Task.last.renamed_subtasks.count.should eq(1)
       subtask = Task.first.renamed_subtasks.first
       subtask.title.should eq("Subtask 1")
     end
@@ -494,8 +495,9 @@ describe Task do
     end
     
     it "moderates an attribute" do
-      Task.create! :title => "Task 1"
+      Task.create! :title => "Task 1", :desc => "Description"
       Task.first.title.should be_blank
+      Task.first.desc.should eq("Description")
       Moderation.last.accept
       Task.first.title.should eq("Task 1")
       Task.first.update_attribute(:title, "Task 2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_moderated
 version: !ruby/object:Gem::Version
-  version: 1.0.rc3
+  version: 1.0.rc4
   prerelease: 4
 platform: ruby
 authors:
@@ -187,8 +187,7 @@ files:
 - lib/generators/has_moderated/install/templates/migration.rb
 - lib/generators/has_moderated/install/templates/moderation.rb
 - lib/generators/USAGE
-- lib/has_moderated/adapters/active_record.rb
-- lib/has_moderated/adapters/proxy.rb
+- lib/has_moderated/active_record/active_record_helpers.rb
 - lib/has_moderated/associations/base.rb
 - lib/has_moderated/associations/collection.rb
 - lib/has_moderated/associations/has_one.rb
@@ -265,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -754626760659402804
+      hash: 1531856163626643736
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/has_moderated/adapters/active_record.rb

@@ -1,109 +0,0 @@
-# everything that does with activerecord should be here.
-# use a wrapper that calls stuff from here, so that impl. can be switched eg with mongomapper
-# also write test that if one attr is moderated and one is not, the unmoderated one must still save immediately!
-
-module HasModerated
-  module Adapters
-    module ActiveRecord
-      # AR specific
-      def self.foreign_key(reflection)
-        if reflection.respond_to?(:foreign_key)
-          reflection.foreign_key
-        else # Rails < v3.1
-          reflection.primary_key_name
-        end
-      end
-      
-      # General
-      def self.add_moderations_association(klass)
-        klass.class_eval do
-          has_many :moderations, :as => :moderatable, :dependent => :destroy
-        end
-      end
-      
-      def self.get_default_moderation_attributes(record)
-        record.attributes
-      end
-      
-      def self.hashize_association(from_record, assoc_name, m)
-        # todo
-        through_assocs = {}
-        from_record.class.reflections.keys.each do |assoc|
-          join_model = from_record.class.reflections[assoc.to_sym].options[:through]
-          if join_model
-            join_model = join_model.to_sym
-            through_assocs[join_model] ||= []
-            through_assocs[join_model].push(assoc)
-          end
-        end
-        
-        assoc = nil
-        if m.class == Fixnum
-          assoc = m
-        elsif m.kind_of? Hash  # already a hash (for has_many :through association)
-          assoc = m
-        elsif m.respond_to?(:get_moderation_attributes) && m.new_record?
-          assoc = m.get_moderation_attributes
-        elsif m.respond_to?(:get_moderation_attributes)
-          assoc = m.id
-        else
-          raise "don't know how to convert #{m.class} to hash"
-        end
-        
-        if through_assocs[assoc_name.to_sym] # TODO !
-          assoc[:associations] = get_assocs_for_moderation(:all, m)
-        end
-        assoc
-      end
-      
-      def self.get_assocs_for_moderation assocs, from_record = nil
-        from_record ||= self
-        return if assocs.blank?
-
-        if assocs == :all
-          assocs = from_record.class.reflections.keys.reject do |r|
-            r == :moderations
-          end
-        end
-
-        assocs = [assocs] unless assocs.respond_to?("[]")
-
-        # check for through assocs
-        assocs = assocs.dup
-        through_assocs = {}
-        assocs.each do |assoc|
-          join_model = from_record.class.reflections[assoc.to_sym].options[:through]
-          if join_model
-            join_model = join_model.to_sym
-            through_assocs[join_model] ||= []
-            through_assocs[join_model].push(assoc)
-            assocs.push(join_model) unless assocs.include?(join_model)
-            #assocs.delete(assoc)
-          end
-        end
-
-        assoc_attrs = {}
-        assocs.each do |assoc|
-          one_assoc = []
-          assoc_value = from_record.send(assoc)
-          # if it's has_one it won't be an array
-          assoc_value = [assoc_value] if assoc_value && assoc_value.class != Array
-          assoc_value ||= []
-          assoc_value.each do |m|
-            if m.new_record?
-              one_assoc.push(m.get_moderation_attributes)
-            else
-              one_assoc.push(m.id)
-            end
-            if through_assocs[assoc.to_sym]
-              one_assoc.last[:associations] = get_assocs_for_moderation(:all, m)
-            end
-          end
-          assoc_attrs[assoc] = one_assoc unless one_assoc.empty?
-        end
-
-        assoc_attrs
-      end
-    end
-  end
-end

data/lib/has_moderated/adapters/proxy.rb

@@ -1,23 +0,0 @@
-module HasModerated
-  module Adapters
-    module Proxy
-      def self.add_moderations_association(klass)
-        if klass.superclass.to_s == "ActiveRecord::Base"
-          Adapters::ActiveRecord::add_moderations_association(klass)
-        end
-      end
-      
-      def self.get_default_moderation_attributes(record)
-        if record.class.superclass.to_s == "ActiveRecord::Base"
-          Adapters::ActiveRecord::get_default_moderation_attributes(record)
-        end
-      end
-      
-      def self.hashize_association(record, assoc_name, m)
-        if record.class.superclass.to_s == "ActiveRecord::Base"
-          Adapters::ActiveRecord::hashize_association(record, assoc_name, m)
-        end
-      end
-    end
-  end
-end