extend_at 0.2.2 → 0.2.3

data/README.markdown

@@ -249,6 +249,41 @@ Comparations:
 * gt
 * match
 
+### Belongs to
+
+If you like to add a belongs_to relationship, you can do it in this way:
+  # app/models/toolbox.rb
+  class Toolbox
+  end
+
+  # app/model/tool.rb
+  class Tool
+    extend_at extra, columns => {}, :belongs_to => :toolbox
+  end
+
+<code>:belongs_to</code> parametter accept
+
+* One name
+
+  :belongs_to => :toolbox
+  
+* Array of names
+
+  :belongs_to => [:toolbox, :owner]
+
+* Hash
+
+  :belongs_to => :onwer => {:class_name => "User"}
+
+For now, hash only accept
+
+* class_name
+* polymorphic
+* foreign_key
+
+_Note_, this new feature is under heavy development, use it under your own risk.
+  
+
 ### Integration in the views
 
 If you like to use some configuration variable in your views you only need put the name of the input like <code>:extra_name</code>, for example:

data/extend_at.gemspec

@@ -19,8 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'rails', '~> 3.1'
-  s.add_development_dependency "rspec", '~> 2.5'
-  s.add_development_dependency "rspec-core"
-  s.add_development_dependency "database_cleaner", "~> 0.7"
+  s.add_development_dependency "rspec", '~> 2.8'
+  s.add_development_dependency "rspec-core", '~> 2.8'
+  s.add_development_dependency "rspec-expectations", '~> 2.8'
+  s.add_development_dependency "activesupport", '~> 3.1'
+#   s.add_development_dependency "rspec-mocks", '~> 2.8.0'
+  s.add_development_dependency "database_cleaner", "~> 0.8"
   
 end

data/lib/extend_at/configuration.rb

@@ -1,12 +1,17 @@
 require File.expand_path('../environment', __FILE__)
 
 module ExtendModelAt
+  # Main class configuration
+  # This class is the core of extend_at
   class Configuration
+    # 
     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
+        @config = hash
+        read_associations_configuration
+        return @config
       end
       
       if not env.kind_of? Proc
@@ -17,6 +22,78 @@ module ExtendModelAt
     end
 
     protected
+    # Read all model relationships like belongs_to and has_many
+    def read_associations_configuration
+      [:has_one, :has_many, :belongs_to].each do |relation|
+        if @config.keys.include? :"#{relation}"
+          raise "Invalid #{relation} value" if not [Hash, Array, Symbol].include? @config[:"#{relation}"].class
+
+          # We change the user format (Hash, Array or only one element) to Array
+          if @config[:"#{relation}"].kind_of? Hash
+            list_models = @config[:"#{relation}"].keys
+          elsif @config[:"#{relation}"].kind_of? Array
+            list_models = @config[:"#{relation}"]
+            # Transform the array of model in a hash with his configuraion (empty, default values)
+            @config[:"#{relation}"] = {}
+            list_models.each do |model|
+              @config[:"#{relation}"][model.to_sym] = {}
+            end
+          else
+            list_models = [@config[:"#{relation}"]]
+            # Transform the array of model in a hash with his configuraion (empty, default values)
+            @config[:"#{relation}"] = {}
+            list_models.each do |model|
+              @config[:"#{relation}"][model.to_sym] = {}
+            end
+          end
+
+          # Iterate inside the array and get and create the configuration to that relationship
+          list_models.each do |model|
+            # If the user set some configuration (:class_name for example), we use it
+            if @config[:"#{relation}"][model.to_sym].kind_of? Hash
+              config = @config[:"#{relation}"][model.to_sym]
+            # If not, we create it
+            else
+              # Change sybol of the class name to hash configuration
+              @config[:"#{relation}"][model.to_sym] = {}
+              config = {}
+            end
+
+            # We set the default class_name if is not seted
+            if config[:class_name].nil?
+              @config[:"#{relation}"][model.to_sym][:class_name] = model.to_s.classify
+            else
+              @config[:"#{relation}"][model.to_sym][:class_name] = config[:class_name]
+            end
+
+            # If the association is belongs_to, we need to define the columns
+            if relation.to_s == "belongs_to"
+              if config[:polymorphic] == true
+                @config[:columns][ :"#{model}_id" ] = { :type => :integer }
+                @config[:columns][ :"#{model}_type" ] = { :type => :string }
+              else
+                @config[:columns][ config[:foreign_key] || :"#{model}_id" ] = { :type => :integer }
+                @config[:"#{relation}"][model.to_sym][:foreign_key] = config[:foreign_key] || :"#{model}_id" if @config[:"#{relation}"][model.to_sym][:foreign_key].nil?
+              end
+            end
+            # TODO: Continue adding rails features like:
+            #       :autosave
+            #       :class_name
+            #       :conditions
+            #       :counter_cache
+            #       :dependent
+            #       :foreign_key
+            #       :include
+            #       :polymorphic
+            #       :readonly
+            #       :select
+            #       :touch
+            #       :validate
+          end
+        end
+      end
+    end
+    
     def init_columns(columns={})
       new = {}
       columns.each do |column, config|
@@ -40,7 +117,9 @@ module ExtendModelAt
       return :datetime if type == 'Date'
       return :any
     end
-    
+
+    # Transform the user configuration to hash. For example, if the user use lambda to create the configuration, this function execute the lambda to get the result
+    # and re-parse it (and so on) to get a full hash configuration
     def expand_options(options={}, opts={}, model=nil)
       options = get_value_of options, model
       config_opts = {
@@ -66,6 +145,9 @@ module ExtendModelAt
       end
     end
 
+    # Return the value of the execute a function inside the model, for example:
+    # :column => :function
+    # this function execute the function _function_ to get the value and set it his return to column
     def get_value_of(value, model=nil)
       if value.kind_of? Symbol
         # If the function exist, we execute it

data/lib/extend_at/model_manager.rb

@@ -87,8 +87,75 @@ module ExtendModelAt
     def to_hash
       all_hash
     end
+    
+    ##########
+    # Model associations
+    def read_belongs_to(model_name, configuration,force_reload=false)
+      if @config[:"belongs_to"][model_name.to_sym].kind_of? Hash
+        column = @config[:"belongs_to"][model_name.to_sym][:foreign_key] || :"#{model_name}_id"
+      else
+        column = :"#{model_name}_id"
+      end
+      class_name = @config[:"belongs_to"][model_name.to_sym][:class_name]
+      type = get_type column
+      type_class = get_type_class type
+      
+      # We try to get the model
+      # eval "User.find(...try(:first).try(:id))"
+      eval "#{class_name}.find(#{get_value(column)})"
+      
+    end
+    
+    def read_has_many(model_name, configuration,force_reload=false)
+      Object
+    end
+    
+    def read_has_one(model_name, configuration,force_reload=false)
+      Object
+    end
+    
+    def write_belongs_to(model_name, configuration,associate)
+      puts "Warnig: Dummy function"
+    end
+
+    # TODO: I have problems to create a temporal model
+    def build_belongs_to(model_name, configuration,attributes)
+      puts "Warnig: Dummy function"
+#       config = @config[:"belongs_to"][model_name.to_sym]
+# 
+#       type = get_type(config[:foreign_key] || :"#{model_name}_id")
+#       type_class = get_type_class type
+#       return if type.nil?
+#       # We create the model and save it
+#       new_model = eval "#{config[:class_name]}.new(#{attributes})"
+# 
+#       # Set the model id in the correct column
+#       assign(config[:foreign_key] || :"#{model_name.to_s.underscore}_id", new_model.id)
+    end
+
+    # Create a belongs_to relationship
+    # Executed when the user use, for example, Post.create_comment :title => "Bla bla", :comment => "Comment ..."
+    # * _model_name_: Model class name
+    # * _configuration_: Relationship configuration like __;foreign_key__
+    # * _attributes_: Attributes to set to the new model
+    def create_belongs_to(model_name, configuration = {},attributes = {})
+      config = @config[:"belongs_to"][model_name.to_sym]
+      
+      type = get_type(config[:foreign_key] || :"#{model_name}_id")
+      type_class = get_type_class type
+      return if type.nil?
+      # We create the model and save it
+      new_model = eval "#{config[:class_name]}.new(#{attributes})"
+      return false if not new_model.save
+
+      # Set the model id in the correct column
+      assign(config[:foreign_key] || :"#{model_name.to_s.underscore}_id", new_model.id)
+    end
+    
+    ##### Model associations #####
 
     protected
+    
     def get_column_model(column)
       type = get_type column
       type_class = get_type_class type

data/lib/extend_at/version.rb

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

data/lib/extend_at.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+require "active_support"
 require "extend_at/version"
 # require "extend_at/configuration"
 require "extend_at/model_manager"
@@ -28,7 +29,7 @@ module ExtendModelAt
       @columns = @configuration[:columns]
       @value = get_defaults_values @configuration
 
-#       define_associations
+      define_associations
 
       initialize_values
     end
@@ -91,34 +92,85 @@ module ExtendModelAt
       @configuration = value
     end
 
-    def define_associationss
+    def define_associations   
       [: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]
+        if @configuration.keys.include? :"#{relation}"
+          raise "Invalid #{relation} value" if not [Hash, Array, Symbol].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|
+              meta_def model.to_s do |force_reload=false|
+                if @configuration[:"#{relation}"].kind_of? Hash
+                  config = @configuration[:"#{relation}"][model]
+                else
+                  config = {}
+                end
+                eval "@model_manager.read_#{relation} model, config, force_reload"
+              end
+
+            if "#{relation}" != "has_many"
+              meta_def "#{model.to_s}=" do |associate|
+                if @configuration[:"#{relation}"].kind_of? Hash
+                  config = @configuration[:"#{relation}"][model]
                 else
                   config = {}
                 end
-                @model_manager.read_#{relation} model, @configuration[:#{relation}][model], force_reload
+                eval "@model_manager.write_#{relation} model, @configuration[:#{relation}][model], associate"
+                true
+              end
+
+              meta_def "build_#{model.to_s}" do |attributes={}|
+                if @configuration[:"#{relation}"].kind_of? Hash
+                  config = @configuration[:"#{relation}"][model]
+                else
+                  config = {}
+                end
+                eval "@model_manager.build_#{relation} model, config, attributes"
+                true
+              end
+
+              meta_def "create_#{model.to_s}" do |attributes={}|
+                if @configuration[:"#{relation}"].kind_of? Hash
+                  config = @configuration[:"#{relation}"][model]
+                else
+                  config = {}
+                end
+                eval "@model_manager.create_#{relation} model, config, attributes"
+                true
               end
             end
           end
-        EOS
+        end
       end
     end
 
+    ##########
+    # Meta functions
+    
+    def metaclass
+      class << self; self; end;
+    end
+    
+    def meta_eval(&blk)
+      metaclass.instance_eval &blk
+    end
+
+    def meta_def(name, &blk)
+      meta_eval { define_method name, &blk }
+    end
+
+    def class_def name, &blk
+      class_eval { define_method name, &blk }
+    end
+
+    ##### Meta functions #####
+
     def get_adapter(column, value)
       if @columns[column.to_sym][:type] == String
         return :to_s

data/spec/extend_at_spec.rb

@@ -106,27 +106,38 @@ describe 'extend_at' do
     end
   end
 
-#   context "associations support" do
-#     context "belongs_to" do
-#       it "simple usage" do
-#         box = Toolbox.new
-#         box.save
-#         box.extra.create_tool
-#         box.extra.tools.first.extra.toolbox.should == box
-#       end
-#     end
-# 
-#     context "has_many" do
-#       context "simple usage" do
-#         box = Toolbox.new
-#         box.save
-#         box.extra.create_tool
-#         box.extra.create_tool
-#         box.extra.create_tool
-#         box.extra.tools.class.should == Array
-#         box.extra.tools.size.should == 3
-#         box.extra.tools.first.extra.toolbox.should == box
-#       end
-#     end
-#   end
+  context "associations support" do
+    context "belongs_to" do
+      it "simple usage" do
+        tool = Tool.new
+        tool.extra.name = "Hammer"
+        tool.save
+        tool.extra.respond_to?(:create_toolbox).should == true
+        tool.extra.create_toolbox(:name => "Toolbox").should == true
+        tool.extra.toolbox.class.should == Toolbox
+        tool.extra.toolbox.name.should == "Toolbox"
+      end
+    end
+
+    context "has_many" do
+      it "simple usage" do
+        pending "Working on it"
+        tool = Tool.new
+        tool.extra.name = "Hammer"
+        tool.save
+        tool.extra.respond_to?(:create_toolbox).should == true
+        tool.extra.create_toolbox.should == true
+        tool.extra.create_toolbox.should == true
+        tool.extra.toolbox.class.should == Toolbox
+        box = Toolbox.new
+        box.save
+        box.extra.create_tool
+        box.extra.create_tool
+        box.extra.create_tool
+        box.extra.tools.class.should == Array
+        box.extra.tools.size.should == 3
+        box.extra.tools.first.extra.toolbox.should == box
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec'
+
 require 'database_cleaner/active_record/base'
 require 'database_cleaner'
 
@@ -7,6 +11,11 @@ require 'app/config/environment'
 require 'rubygems'
 require 'bundler/setup'
 
+require 'extend_at'
+
+
+# Bundler.require(:default)
+
 
 RSpec.configure do |config|
 #   config.before(:suite) do
@@ -21,4 +30,3 @@ RSpec.configure do |config|
 #     DatabaseCleaner.clean
 #   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extend_at
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &6926540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,40 +21,92 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *6926540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6925900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *6925900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &6925520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *6925520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &5741880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *5741880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 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:
@@ -211,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: extend_at
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Create dynamic fields to extend rails models (like content types in Drupal)