extend_at 0.2.1 → 0.2.2

data/.gitignore

@@ -1,4 +1,5 @@
 .directory
 *~ 
 *Gemfile.lock
-*.sqlite3
+*.sqlite3
+*.kate-swp

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
 0.2.1:
   * Fixed some problems.
   * Internal functionality changed (preparing for association support like belongs_to)
+
+0.2.2:
+  * Some clean up code.
+  * Fixed problem: Validation not work when the extention is static
+  * Fixed proble: Models fail when save and the extention is not used (mass assignment).

data/lib/extend_at/configuration.rb

@@ -2,8 +2,12 @@ require File.expand_path('../environment', __FILE__)
 
 module ExtendModelAt
   class Configuration
-    def self.run(env=nil,model=nil)
-      return expand_options env, { :not_call_symbol => [:boolean], :not_expand => [:validate, :default] }, model if env.kind_of? Hash
+    def run(env=nil,model=nil)
+      if env.kind_of? Hash
+        hash = expand_options env, { :not_call_symbol => [:boolean], :not_expand => [:validate, :default] }, model.clone
+        hash[:columns] = init_columns hash[:columns]
+        return hash
+      end
       
       if not env.kind_of? Proc
         return {}
@@ -13,7 +17,31 @@ module ExtendModelAt
     end
 
     protected
-    def self.expand_options(options={}, opts={}, model=nil)
+    def init_columns(columns={})
+      new = {}
+      columns.each do |column, config|
+        new[column] = config
+        # Stablish the type
+          if config[:type].class == Class
+            # If exist :type, is a static column
+            new[column][:type] = get_type_for_class config[:type]
+          end
+      end
+      new
+    end
+
+    def get_type_for_class(type)
+      type = type.name
+      return :any if type == 'NilClass'
+      return :float if type == 'Float'
+      return :integer if type == 'Fixnum'
+      return :text if type == 'String '
+      return :timestamp if type == 'Time'
+      return :datetime if type == 'Date'
+      return :any
+    end
+    
+    def expand_options(options={}, opts={}, model=nil)
       options = get_value_of options, model
       config_opts = {
         :not_expand => [],
@@ -38,7 +66,7 @@ module ExtendModelAt
       end
     end
 
-    def self.get_value_of(value, model=nil)
+    def get_value_of(value, model=nil)
       if value.kind_of? Symbol
         # If the function exist, we execute it
         if  model.respond_to? value

data/lib/extend_at/model_manager.rb

@@ -5,7 +5,7 @@ module ExtendModelAt
   class ModelManager
     def initialize(column_name,model, config)
       @column_name, @model, @config = column_name, model, config
-      
+
       @extend_at = ExtendAt.find_by_model_id_and_model_type @model.id, @model.class.to_s
       if @extend_at.nil?
         @extend_at = ExtendAt.new

data/lib/extend_at/version.rb

@@ -1,3 +1,3 @@
 module ExtendModelAt
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/extend_at.rb

@@ -19,11 +19,11 @@ module ExtendModelAt
   # The object how controll the data
   class Extention
     def initialize(options={})
-      @configuration = ExtendModelAt::Configuration.run options, options[:model]
-      @model_manager = ::ExtendModelAt::ModelManager.new(@column_name, @configuration[:model], @configuration)
+      @configuration = ExtendModelAt::Configuration.new.run options, options[:model].clone
+      @model_manager = ::ExtendModelAt::ModelManager.new(@configuration[:column_name].to_s, options[:model], @configuration)
 
       @static = @configuration[:static] || false
-      @model = @configuration[:model]
+      @model = @configuration[:model].clone
       @column_name = @configuration[:column_name].to_s
       @columns = @configuration[:columns]
       @value = get_defaults_values @configuration
@@ -87,8 +87,37 @@ module ExtendModelAt
       @configuration
     end
 
-#     def define_associationss
-#     end
+    def configuration=(value)
+      @configuration = value
+    end
+
+    def define_associationss
+      [:has_one, :has_many, :belongs_to].each do |relation|
+        eval <<-EOS
+          if @configuration.keys.include? :#{relation}
+            raise "Invalid #{relation} value" if not [Hash, Array, NilClass].include? @configuration[:#{relation}].class
+            # We nee an array of models, then, we 
+            if @configuration[:#{relation}].kind_of? Hash
+              list_models = @configuration[:#{relation}].keys
+            elsif @configuration[:#{relation}].kind_of? Array
+              list_models = @configuration[:#{relation}]
+            else
+              list_models = [@configuration[:#{relation}]]
+            end
+            list_models.each do |model|
+              define_method(model.to_sym) do |force_reload|
+                if @configuration[:#{relation}].kind_of? Hash
+                  config = @configuration[:#{relation}][model]
+                else
+                  config = {}
+                end
+                @model_manager.read_#{relation} model, @configuration[:#{relation}][model], force_reload
+              end
+            end
+          end
+        EOS
+      end
+    end
 
     def get_adapter(column, value)
       if @columns[column.to_sym][:type] == String
@@ -239,10 +268,9 @@ module ExtendModelAt
 
         define_method(column_name.to_s) do
           if not @extend_at_configuration.kind_of? ExtendModelAt::Extention
-            options[:model] = self
-            @extend_at_configuration ||= ExtendModelAt::Extention.new(options )
-            
-            initialize_columns @extend_at_configuration.send(:configuration)[:columns] if options.kind_of? Hash
+            options[:model] = self.clone
+            @extend_at_configuration = ExtendModelAt::Extention.new(options )
+            initialize_columns @extend_at_configuration.send(:configuration)[:columns] || {}
           end
           @extend_at_configuration
         end
@@ -261,11 +289,21 @@ module ExtendModelAt
           end
         end
 
+        def set_extend_at_validation(value={})
+          @extend_at_validation
+        end
+
+        def update_model_manager
+          @extend_at_configuration.send :update_model_manager if @extend_at_configuration.respond_to? :update_model_manager
+        end
+
         # Initialize each column configuration
         def initialize_columns(columns = {})
+            colunms_config = {}
             columns.each do |column, config|
-              initialize_column column, config
+              colunms_config[column.to_sym] = initialize_column column, config
             end
+            colunms_config
         end
 
         def initialize_column(column,config={})
@@ -305,7 +343,6 @@ module ExtendModelAt
             raise ExtendModelAt::ArgumentError, "The validation of \#\{column\} is invalid"
           end
 
-
           column_config
         end
 
@@ -322,15 +359,10 @@ module ExtendModelAt
         end
 
         def create_validation_for(column, validation)
-          column = column.to_sym
           @extend_at_validation ||= {}
           @extend_at_validation[column] = validation
         end
 
-        def update_model_manager
-          @extend_at_configuration.send :update_model_manager if @extend_at_configuration.respond_to? :update_model_manager
-        end
-
         def get_type_for_class(type)
           type = type.name
           return :any if type == 'NilClass'
@@ -355,12 +387,12 @@ module ExtendModelAt
         end
 
         def valid_type?(value, type)
-        type = type.to_s.to_sym
-        [:"", :any].include? type or
-          value.nil? or
-          (type == :boolean and ([true.class, false.class].include? value.class)) or
-          ((not [:boolean, nil].include?(type)) and not value.nil? and compatible_type(value, type))
-        end
+      type = type.to_s.to_sym
+      [:"", :any].include? type or
+        value.nil? or
+        (type == :boolean and ([true.class, false.class].include? value.class)) or
+        ((not [:boolean, nil].include?(type)) and not value.nil? and compatible_type value, type )
+    end
       end
     end
   end

data/spec/extend_at_spec.rb

@@ -9,6 +9,33 @@ describe 'extend_at' do
     article.extra.respond_to?(:last_name).should == true
   end
 
+  it 'without mass assignment should work' do
+    article = Article.new
+    article.save
+    article.extra.last_name = "Gonzales"
+    article.save
+    article.reload
+    article.extra.last_name.should == "Gonzales"
+
+    user = User.new
+    user.save
+    user.private_info.real_name = "Pedro"
+    user.save
+    user.reload
+    user.private_info.real_name.should == "Pedro"
+  end
+
+  it 'when is loaded, should load the extra information' do
+    article = Article.new :extra_name => 'Pedro', :extra_last_name => 'Gonzales'
+    article.extra.name.should == 'Pedro'
+    article.extra.last_name.should == 'Gonzales'
+    article.save
+
+    article = Article.last
+    article.extra.name.should == "Pedro"
+    article.extra.last_name.should == "Gonzales"
+  end
+
   it "mass assignment" do
     article = Article.new :extra_name => 'Pedro', :extra_last_name => 'Gonzales'
     article.extra.name.should == 'Pedro'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extend_at
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20211600 !ruby/object:Gem::Requirement
+  requirement: &6926540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *20211600
+  version_requirements: *6926540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20210900 !ruby/object:Gem::Requirement
+  requirement: &6925900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *20210900
+  version_requirements: *6925900
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &20210520 !ruby/object:Gem::Requirement
+  requirement: &6925520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20210520
+  version_requirements: *6925520
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &20068540 !ruby/object:Gem::Requirement
+  requirement: &5741880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *20068540
+  version_requirements: *5741880
 description: ! 'This gem allows you to extend rails models without migrations: This
   way you can, i.e., develop your own content types, like in Drupal.'
 email: