dread 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e06797613f10604b7ea856d50664648ae1eb999
-  data.tar.gz: 2c377cdc0bd7c79c7db3c765c7e511aa0f48bfff
+  metadata.gz: 34cd6aee3f85a657ebabe35bc350cbf3ccc2f95d
+  data.tar.gz: e72c6897aeec2fb15e4209c322ab0778151a9778
 SHA512:
-  metadata.gz: 8a031041bb4c6bf978d29071140325d4a83c7f67c77b7a734fbd48639a2c36a20ff2f10e7aa0cdeffb824b7118796772bcf3d01c9da11deaebfd3f3501fbdffc
-  data.tar.gz: 11e389c525b76b70be42940f196af19db6b7b7c1460f3dda6cb12cbdc237b6bfbe2b933c526ed66b6ec7e4f3315d76b4375ab5f5e9dd04ab393d2927800c6a2e
+  metadata.gz: d2f0d84dfc7d199d42cadc2e1f028f8c3afacc6d4ae5c1d7b0fc0ee3c3ca04af8a444cc4ec5263b9b5c442b1cbe5e75b0c5cbe947523ef8e84dc1ceb943b51a6
+  data.tar.gz: c498def53e5c72d80f86873b3dde2b033d4c00c08771bf8e8a4dc35123a496bfe917c997217ca35b6e102f55439e744cf8607e8ca7e8ae5f10bc098241c2bd7a

data/README.md

@@ -1,3 +1,4 @@
 # Dread
 
-[![Build Status](https://travis-ci.org/DamirSvrtan/dread.svg?branch=master)](https://travis-ci.org/DamirSvrtan/dread)
+[![Build Status](https://travis-ci.org/DamirSvrtan/dread.svg?branch=master)](https://travis-ci.org/DamirSvrtan/dread)
+[![Code Climate](https://codeclimate.com/github/DamirSvrtan/dread/badges/gpa.svg)](https://codeclimate.com/github/DamirSvrtan/dread)

data/lib/dread/graph.rb

@@ -6,23 +6,15 @@ module Dread
     attr_reader :clazz, :dependable_collection
 
     def initialize(clazz_data, pluralized=false)
-      set_and_verify_clazz(clazz_data)
+      set_and_verify_clazz_and_relation(clazz_data)
       @pluralized = pluralized
+      @@tracker ||= []
     end
 
-    # { user: { tweets: { comments: {} }, comments: {}, account_setting: {} } }
+    # { user: { tweets: { comments: {} }, comments: {}, setting: {} } }
     def dependable_collection
-      @dependable_collection ||= { relation_name.to_sym => Hash.new.tap do |relation_hash|
-        @clazz.reflections.each do |assoc_name, assoc_data|
-          if assoc_data.options[:dependent] == :delete
-            relation_hash[assoc_name] = {}
-          elsif assoc_data.options[:dependent] == :destroy
-            relation_hash.merge!(
-              Graph.new(assoc_data, assoc_data.macro == :has_many).dependable_collection)
-          end
-        end
-      end
-      }
+      @dependable_collection ||=
+          { @relation.to_sym => collect_dependables }
     end
 
     def draw(output='console_output')
@@ -34,31 +26,52 @@ module Dread
 
     private
 
-      def set_and_verify_clazz(clazz_data)
-        clazz_name = ClazzName(clazz_data)
+      def track!(reflection)
+        @@tracker << reflection
+      end
+
+      def tracked?(reflection)
+        @@tracker.include? reflection
+      end
+
+      def set_and_verify_clazz_and_relation(clazz_data)
         begin
-          @clazz = clazz_name.constantize
+          set_clazz_and_relation(clazz_data)
         rescue NameError => e
-          raise Error.new("Unable to find class called #{clazz_name}")
+          raise Error.new("Unable to find class called #{clazz_data.classify}")
         end
       end
 
-      def ClazzName(clazz_data)
+      def set_clazz_and_relation(clazz_data)
         case clazz_data
         when ActiveRecord::Reflection::AssociationReflection
-          clazz_data.class_name || clazz_data.table_name
+          @clazz = (clazz_data.class_name || clazz_data.table_name).constantize
+          @relation = clazz_data.name
         when String
-          clazz_data.classify
+          @clazz = (clazz_data.classify).constantize
+          @relation = clazz_data
         when NilClass
-          raise Error.new('Please pass a env var called class to proceed.')
+          raise Error.new('Please pass a env var called class to proceed. E.g: rake dread class=user')
         else
           raise Error.new("Unable to proceed with #{clazz_data.class}")
         end
       end
 
-      def relation_name
-        relation = @pluralized ? @clazz.to_s.pluralize : @clazz.to_s
-        relation.underscore
+      def collect_dependables
+        Hash.new.tap do |relation_hash|
+          @clazz.reflections.each do |assoc_name, assoc_data|
+            case assoc_data.options[:dependent]
+            when :delete
+              relation_hash[assoc_name] = {}
+            when :destroy
+              # unless tracked?(assoc_data)
+                # track!(assoc_data)
+                relation_hash.merge!(
+                  Graph.new(assoc_data, assoc_data.macro == :has_many).dependable_collection)
+              # end
+            end
+          end
+        end
       end
 
   end

data/lib/dread/version.rb

@@ -1,3 +1,3 @@
 module Dread
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/dread_test.rb

@@ -32,8 +32,8 @@ class DreadTest < ActiveSupport::TestCase
     dread_graph = Dread::Graph.new('user')
     dependable_collection = dread_graph.dependable_collection
     dependable_collection.assert_valid_keys(:user)
-    dependable_collection[:user].assert_valid_keys(:tweets, :comments, :setting)
-    dependable_collection[:user][:tweets].assert_valid_keys(:comments)
+    dependable_collection[:user].assert_valid_keys(:tweets, :comments, :setting, :avatar)
+    dependable_collection[:user][:tweets].assert_valid_keys(:comments, :pictures)
   end
 
 end

data/test/dummy/app/models/comment.rb

@@ -1,4 +1,5 @@
 class Comment < ActiveRecord::Base
   belongs_to :user
   belongs_to :tweet
+  has_many :pictures, dependent: :destroy, as: :imageable
 end

data/test/dummy/app/models/picture.rb

@@ -0,0 +1,3 @@
+class Picture < ActiveRecord::Base
+  belongs_to :imageable, polymorphic: true
+end

data/test/dummy/app/models/tweet.rb

@@ -1,4 +1,5 @@
 class Tweet < ActiveRecord::Base
   belongs_to :user
   has_many :comments, dependent: :destroy
+  has_many :pictures, dependent: :destroy, as: :imageable
 end

data/test/dummy/app/models/user.rb

@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
-  has_many :tweets,         dependent: :destroy
-  has_many :comments,       dependent: :destroy
-  has_one :setting,         dependent: :delete,  class_name: 'AccountSetting'
+  has_many :tweets,   dependent: :destroy
+  has_many :comments, dependent: :destroy
+  has_one :avatar,    dependent: :destroy,  class_name: 'Picture',        as: :imageable
+  has_one :setting,   dependent: :destroy,  class_name: 'AccountSetting'
 end

data/test/dummy/db/migrate/20140915161852_create_pictures.rb

@@ -0,0 +1,11 @@
+class CreatePictures < ActiveRecord::Migration
+  def change
+    create_table :pictures do |t|
+      t.string :url
+      t.integer :imageable_id
+      t.string :imageable_type
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140914191415) do
+ActiveRecord::Schema.define(version: 20140915161852) do
 
   create_table "account_settings", force: true do |t|
     t.string   "time_zone"
@@ -34,6 +34,14 @@ ActiveRecord::Schema.define(version: 20140914191415) do
     t.datetime "updated_at"
   end
 
+  create_table "pictures", force: true do |t|
+    t.string   "url"
+    t.integer  "imageable_id"
+    t.string   "imageable_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "tweets", force: true do |t|
     t.integer  "user_id"
     t.string   "content"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dread
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Damir Svrtan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - test/dummy/app/models/account_setting.rb
 - test/dummy/app/models/comment.rb
 - test/dummy/app/models/country.rb
+- test/dummy/app/models/picture.rb
 - test/dummy/app/models/tweet.rb
 - test/dummy/app/models/user.rb
 - test/dummy/bin/bundle
@@ -121,6 +122,7 @@ files:
 - test/dummy/db/migrate/20140913143724_create_comments.rb
 - test/dummy/db/migrate/20140914191313_create_countries.rb
 - test/dummy/db/migrate/20140914191415_create_account_settings.rb
+- test/dummy/db/migrate/20140915161852_create_pictures.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -160,6 +162,7 @@ test_files:
 - test/dummy/app/models/account_setting.rb
 - test/dummy/app/models/comment.rb
 - test/dummy/app/models/country.rb
+- test/dummy/app/models/picture.rb
 - test/dummy/app/models/tweet.rb
 - test/dummy/app/models/user.rb
 - test/dummy/bin/bundle
@@ -189,6 +192,7 @@ test_files:
 - test/dummy/db/migrate/20140913143724_create_comments.rb
 - test/dummy/db/migrate/20140914191313_create_countries.rb
 - test/dummy/db/migrate/20140914191415_create_account_settings.rb
+- test/dummy/db/migrate/20140915161852_create_pictures.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep