flatten_record 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7cefc5c625393a11394ff39a01a8a4b20ba9d34
-  data.tar.gz: e5773cd9b653a3a841b0453eb85941630e603d4c
+  metadata.gz: 3f11d8fa55541889fa6fdcce3dbf9ab49a3e80d1
+  data.tar.gz: fe9feffcbd9da172e4922a8b413451e2bedbe8f5
 SHA512:
-  metadata.gz: b8027b8cadd6ad8141f19deaa5d17b8c171fca14b9de80487be15c83b1bdbeae7672e56ea9f840334af8ed411fa406b3ed1ae8d36b974b6380292caa00e7f3b5
-  data.tar.gz: eedc792a0b0c056f25f7d2c0c677d3eb464793ebd272f259b2076faa19b86eefd8a72eeb73b201e093daebd89089145cb3187b91be21b02801e0d732960ffc6c
+  metadata.gz: cd1c791340df638d6e41d4800a3b0ba838df3b3c07f4b91c0902167e7571401097af71e2962658aa29e4b2666743e80c4be2a7c6377c3d67b7c7c1160d0b84ea
+  data.tar.gz: d7a6093c910fffcd069b442d3f4dc3e494383db65341de9c497fdaf4c6fcc4b3eaab674f9f73c3d218e82daacfd781f33c5d1d63e2b360dd9accd85c35768dba

data/lib/flatten_record/meta/associated_attr.rb

@@ -3,7 +3,9 @@ module FlattenRecord
     class AssociatedAttr < NormalizedAttr
       def initialize(parent, association, association_klass, model)
         super(parent, association_klass, model)
-        @association = association
+        @association = Struct.
+          new(:foreign_key, :name, :options).
+          new(association.foreign_key, association.name, association.options) 
       end
 
       def denormalize(instance, to_record)
@@ -31,10 +33,8 @@ module FlattenRecord
       end
       
       protected
-      attr_reader :association
-
       def options
-        association.options
+        @association.options
       end
     
       private

data/lib/flatten_record/meta/belongs_to.rb

@@ -1,6 +1,15 @@
 module FlattenRecord
   module Meta
     class BelongsTo < AssociatedAttr
+      def prefix
+        if options[:polymorphic]
+          custom_prefix || 
+            "#{parent.prefix}#{_key.to_s}_#{target_model_name}_" 
+        else
+          super
+        end
+      end
+
     end
   end
 end

data/lib/flatten_record/meta/column.rb

@@ -5,28 +5,14 @@ module FlattenRecord
 
       def initialize(parent, col, target_model, model)
         super(parent, target_model, model)
-        @column = col
+        @column = Struct.
+          new(:name, :default, :type, :null).
+          new(col.name, col.default, col.type, col.null)
       end
       
       def name
-        default_name = parent.prefix + @column.name.to_s   
-        is_parent_root? ? default_name : column_prefix(default_name)
-      end
-
-      def column_prefix(default_name)
-        col_prefix = parent._key.to_s
-          
-        if target_model.table_name.to_s == col_prefix ||
-          target_model_name == col_prefix
-          return default_name
-        end
-
-        default_prefix = @custom_prefix || parent.parent.prefix
-        parent_key = parent._key.to_s + "_"
-        model_prefix = target_model_name + "_"
-        
-        default_prefix + parent_key + model_prefix +  @column.name.to_s
-      end
+        parent.prefix + @column.name.to_s  
+      end      
 
       def type
         @column.type

data/lib/flatten_record/meta/compute_column.rb

@@ -2,14 +2,16 @@ module FlattenRecord
   module Meta
     class ComputeColumn < Column
       def initialize(parent, method, type, target_model, model, options={})
-        @column = new_column(method, options[:default], :integer, options[:not_null])  
+        @column = Struct.
+          new(:name, :default, :type, :null). 
+          new(method, options[:default], :integer, options[:null])  
+        
         super(parent, @column, target_model, model) 
       end
 
       def denormalize(instance, to_record)
         first_record = to_record.respond_to?(:each) ? to_record.flatten.first : to_record
 
-        #if first_record.class.method_defined?(@column.name)
         begin
           to_record = assign_value(to_record, name) do |record|
             record.send("compute_#{@column.name}".to_sym, instance)
@@ -19,11 +21,6 @@ module FlattenRecord
         end
         to_record
       end 
-
-      private
-      def new_column(col_name, col_default, col_type, not_null)
-        ActiveRecord::ConnectionAdapters::Column.new(col_name, col_default, col_type, not_null)
-      end
     end
   end
 end

data/lib/flatten_record/meta/id_column.rb

@@ -8,10 +8,9 @@ module FlattenRecord
 
       def name
         column_name = super
-        target_name = target_model.name.underscore
         is_parent_root? ?
-          target_name + "_" + column_name : 
-          column_prefix(column_name)
+          target_model_name + "_" + column_name : 
+          column_name
       end
      
     end

data/lib/flatten_record/meta/method_column.rb

@@ -2,13 +2,11 @@ module FlattenRecord
   module Meta
     class MethodColumn < Column
       def initialize(parent, method, type, target_model, model, options={})
-        @column = new_column(method, options[:default], type, options[:not_null])  
-        super(parent, @column, target_model, model) 
-      end
+        @column = Struct.
+          new(:name, :default, :type, :null).
+          new(method, options[:default], type, options[:null])
 
-      private
-      def new_column(col_name, col_default, col_type, not_null)
-        ActiveRecord::ConnectionAdapters::Column.new(col_name, col_default, col_type, not_null)
+        super(parent, @column, target_model, model) 
       end
     end
   end

data/lib/flatten_record/meta/node.rb

@@ -5,13 +5,20 @@ module FlattenRecord
 
       def initialize(parent, target_model, model)
         @parent = parent
-        @target_model = target_model.is_a?(ActiveRecord::Base) ? 
-          target_model : target_model.to_s.camelize.constantize
-        @model = model
+        @target_model = target_model.to_s.underscore
+        @model = model.to_s.underscore
+      end
+
+      def target_model
+        @target_model.camelize.constantize 
+      end
+
+      def model
+        @model.camelize.constantize
       end
 
       def traverse_by(attr, value)
-        attr_value = instance_variable_get("@#{attr}")
+        attr_value = send("#{attr}")
 
         if !value.respond_to?(:to_s) || !attr_value.respond_to?(:to_s)
           raise "traverse error: to_s method required for comparison"
@@ -25,35 +32,45 @@ module FlattenRecord
       end
  
       def prefix
-        return @custom_prefix unless @custom_prefix.nil?
+        return custom_prefix unless custom_prefix.nil?
         return "" if is_parent_root?
         
         "#{target_model_name}_" 
       end
-    
+  
       protected
       def build(definition)
-        @custom_prefix = definition[:definition][:prefix]
         definition.validates_with(target_model, model)
         @_key = definition[:_key]
-        
+        @custom_prefix = definition[:definition][:prefix]
+        @custom_prefix = @custom_prefix.to_s unless @custom_prefix.nil?
+       
         raise definition.error_message unless definition.valid?     
-        definition
+        self
       end
-
+ 
+      def custom_prefix
+        @custom_prefix
+      end
+ 
       def _key
         @_key
       end
        
       # target helpers
       def target_model_name
-        target_model.name.underscore 
+        @target_model
       end
 
       def target_columns
         target_model.columns
       end
 
+      def inspect
+        # this prevents irb/console to inspect
+        # circular references on big tree caused problem on #inspect 
+      end
+
       private
       def is_parent_root?
         parent.present? && parent.instance_of?(RootNode)

data/lib/flatten_record/meta/normalized_attr.rb

@@ -24,11 +24,11 @@ module FlattenRecord
       end
       
       def prefix
-        @custom_prefix || parent.prefix+target_model.name.underscore.to_s + "_"
+        custom_prefix || "#{parent.prefix}#{target_model_name}_"
       end
 
       def traverse_by(attr, value)
-        attr_value = instance_variable_get("@#{attr}")
+        attr_value = send("#{attr}")
 
         if !value.respond_to?(:to_s) || !attr_value.respond_to?(:to_s)
           raise "traverse error: to_s method required for comparison"
@@ -58,7 +58,7 @@ module FlattenRecord
       end
 
       def build(definition)
-        definition = super(definition)
+        super(definition)
 
         primary_key = target_columns.select(&:primary).first
         @id_column = IdColumn.new(self, primary_key, target_model, model)
@@ -73,6 +73,7 @@ module FlattenRecord
         if !dups.blank?
           raise "#{@excluded_columns.inspect}Duplicate columns found: #{dups.join(", ")}"
         end
+        self
       end
       
       def children
@@ -91,10 +92,12 @@ module FlattenRecord
           options = {}
           if type.is_a?(Hash)
             options = type
-            type = options[:sql_type]
+            type = options[:type]
           end
 
-          ComputeColumn.new(self, method, type, target_model, model, options)
+          ComputeColumn.
+            new(self, method, type, target_model, model, options).
+            build(definition)
         end
       end
 
@@ -108,15 +111,19 @@ module FlattenRecord
             type = options[:sql_type]
           end
 
-          MethodColumn.new(self, method, type, target_model, model)
+          MethodColumn.
+            new(self, method, type, target_model, model).
+            build(definition)
         end
       end
 
       def build_children(definition)
         return {} unless definition[:include]
-        children = Hash.new
+        
+        children = {}
         definition[:include].each do |child, child_definition|
-          children[child] = node_factory(self, child, child_definition[:definition][:class_name])
+          class_name = child_definition[:definition][:class_name]
+          children[child] = associated_node_factory(self, child, class_name)
           children[child].build(child_definition)
         end
         children
@@ -137,7 +144,7 @@ module FlattenRecord
         dups
       end
 
-      def node_factory(parent, child, class_name)
+      def associated_node_factory(parent, child, class_name)
         klass_map = [:has_many, :belongs_to, :has_one]
 
         association = target_model.reflect_on_association(child)
@@ -150,7 +157,7 @@ module FlattenRecord
           klass = association.macro.to_s.camelize.to_sym
           node = Meta.const_get(klass).new(parent, association, class_name, model)
         elsif associaton.macro.nil?
-          raise "association with '#{child}' on #{target_model.name.underscore} is not found"
+          raise "association with '#{child}' on #{target_name} is not found"
         else
           raise "association type '#{association.macro}' with '#{child}' is not supported"
         end
@@ -160,7 +167,11 @@ module FlattenRecord
       def columns_from_definition(definition)
         target_columns.
           select {|col| allow_column?(col, definition) }.
-          map {|col| Column.new(self, col, target_model, model)} 
+          map do |col| 
+            Column.
+              new(self, col, target_model, model).
+              build(definition)
+          end
       end
 
       def allow_column?(col, definition)

data/lib/flatten_record/version.rb

@@ -1,3 +1,3 @@
 module FlattenRecord
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end