extjs-mvc 0.3.5 → 0.3.6

data/README.rdoc

@@ -35,12 +35,21 @@ fields with will be used to render the <tt>Ext.data.Record.create</tt> field-def
     # OR 
     extjs_fields :name, :description
     
+    # OR
+    extjs_fields :only => [:name, :description] # actually the same as above
+    
+    # OR
+    extjs_fields :additional => [:computed] # includes all database columns and an additional computed field
+    
     # OR define a column as a Hash
     extjs_fields :description, :name => {"sortDir" => "ASC"}, :created_at => {"dateFormat" => "c"}
 	
     # OR render associations, association-fields will have their "mapping" property set automatically
     extjs_fields :name, :description, :company => [:name, :description]
     
+    def computed
+      name.blank? ? login : name
+    end
   end
 
 After including the model mixin <tt>ExtJS::Model</tt>, try typing the following in <tt>irb</tt> console:
@@ -55,7 +64,7 @@ After including the model mixin <tt>ExtJS::Model</tt>, try typing the following
 An auto-generated <tt>Ext.data.JsonReader</tt> configuration!
 
 
-You can also define different sets of fields for different representation of your model.
+You can also define different sets of fields for different representations of your model.
 
 E.g. with the following definition:
 
@@ -168,7 +177,7 @@ In individual model unit tests:
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Chris Scott"]
     gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
+    gem.add_development_dependency "extlib"
     
     gem.test_files = []
     gem.files =  FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore']

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/model/active_record.rb

@@ -23,7 +23,10 @@ module ExtJS
       # @return {Boolean}
       #
       def extjs_allow_blank(col)
-        col.null
+        # if the column is the primary key always allow it to be blank.
+        # Otherwise we could not create new records with ExtJS because
+        # new records have no id and thus cannot be valid
+        col.name == self.primary_key || col.null
       end
       
       ##

data/lib/model/base.rb

@@ -247,7 +247,9 @@ module ExtJS
         fields = []
         if params.size == 1 && params.last.is_a?(Hash) # peek into argument to see if its an option hash
           options = params.last
-          if options.has_key?(:exclude) && options[:exclude].is_a?(Array)
+          if options.has_key?(:additional) && options[:additional].is_a?(Array)
+            return self.process_fields(*(self.extjs_column_names + options[:additional].map(&:to_sym)))
+          elsif options.has_key?(:exclude) && options[:exclude].is_a?(Array)
             return self.process_fields(*(self.extjs_column_names - options[:exclude].map(&:to_sym)))
           elsif options.has_key?(:only) && options[:only].is_a?(Array)
             return self.process_fields(*options[:only])

data/test/app/config/application.rb

@@ -0,0 +1,70 @@
+# TODO: Figure out how to iterate each ORM framework AR, DM, MM and test each.
+require 'active_record'
+require 'active_support'
+require 'extjs-mvc'
+require 'extlib/inflection'
+
+gem 'sqlite3-ruby'
+
+class Test::App
+  
+  attr_reader :models
+  
+  def initialize(orm = :active_record)
+    @orm = orm
+    @config = YAML::load(IO.read("#{ROOT}/config/database.yml"))
+    
+    # Load ORM
+    send("boot_#{orm.to_s}")
+    
+    load_models
+
+    require 'db/schema'
+    
+  end
+  
+  ##
+  # Reset a model's @extjs_fieldsets
+  #
+  def clean_all
+    @models.map { |klass| clean klass }
+  end
+  
+  
+private
+  
+  def boot_active_record
+    ActiveRecord::Base.establish_connection(@config['test'])
+  end
+  
+  def boot_mongo_mapper
+    
+  end
+  
+  def boot_data_mapper
+    
+  end
+  
+  ##
+  # Do a dir on /models and constantize each filename
+  #
+  def load_models
+    @models = []
+    # Load Models and Schema for corresponding orm
+    re = /^.*\/(.*).rb$/
+    Dir["#{ROOT}/models/#{@orm.to_s}/*"].each { |c| 
+        require c 
+        match = c.match(re)
+        @models << Extlib::Inflection.constantize(Extlib::Inflection.camelize(match[1])) if match
+    }
+  end
+  
+  def clean klass
+    klass.instance_variables.each do |var_name|
+      if /\A@extjs_fieldsets__/ =~ var_name.to_s
+        klass.instance_variable_set( var_name.to_sym, nil )
+      end
+    end
+  end
+  
+end

data/test/app/db/schema.rb

@@ -0,0 +1,75 @@
+
+##
+# build simple database
+#
+# people
+#
+ActiveRecord::Base.connection.create_table :users, :force => true do |table|
+  table.column :id, :serial
+  table.column :person_id, :integer
+  table.column :password, :string
+  table.column :created_at, :date
+  table.column :disabled, :boolean, :default => true
+end
+##
+# people
+#
+ActiveRecord::Base.connection.create_table :people, :force => true do |table|
+  table.column :id, :serial
+  table.column :first, :string, :null => false
+  table.column :last, :string, :null => false
+  table.column :email, :string, :null => false
+end
+##
+# user_groups, join table
+#
+ActiveRecord::Base.connection.create_table :user_groups, :force => true do |table|
+  table.column :user_id, :integer
+  table.column :group_id, :integer
+end
+
+##
+# groups
+#
+ActiveRecord::Base.connection.create_table :groups, :force => true do |table|
+  table.column :id, :serial
+  table.column :title, :string
+end
+
+##
+# locations
+#
+ActiveRecord::Base.connection.create_table :locations, :force => true do |table|
+  table.column :id, :serial
+  table.column :name, :string
+  table.column :street, :string
+  table.column :type, :string
+end
+
+##
+# addresses
+#
+ActiveRecord::Base.connection.create_table :addresses, :force => true do |table|
+  table.column :id, :serial
+  table.column :addressable_type, :string
+  table.column :addressable_id, :integer
+  table.column :street, :string
+end
+
+##
+# Mock a Model for testing data-types
+#
+ActiveRecord::Base.connection.create_table :data_types, :force => true do |table|
+  table.column :id, :serial
+  table.column :string_column, :string
+  table.column :decimal_column, :decimal
+  table.column :float_column, :float
+  table.column :date_column, :date
+  table.column :datetime_column, :datetime
+  table.column :time_column, :time
+  table.column :email, :string
+  table.column :integer_column, :integer
+  table.column :notnull_column, :string, :null => false
+  table.column :default_column, :boolean, :default => true
+  table.column :boolean_column, :boolean
+end

data/test/app/models/active_record/address.rb

@@ -0,0 +1,4 @@
+class Address < ActiveRecord::Base
+  belongs_to :addressable, :polymorphic => true
+  include ExtJS::Model
+end

data/test/app/models/active_record/data_type.rb

@@ -0,0 +1,3 @@
+class DataType < ActiveRecord::Base
+  include ExtJS::Model
+end

data/test/app/models/active_record/group.rb

@@ -0,0 +1,4 @@
+class Group < ActiveRecord::Base
+  has_many :users
+  include ExtJS::Model
+end

data/test/app/models/active_record/house.rb

@@ -0,0 +1,4 @@
+require "#{File.dirname(__FILE__)}/location"
+
+class House < Location
+end

data/test/app/models/active_record/location.rb

@@ -0,0 +1,5 @@
+class Location < ActiveRecord::Base
+  has_one :address, :as => :addressable
+  include ExtJS::Model
+end
+

data/test/app/models/active_record/person.rb

@@ -0,0 +1,4 @@
+class Person < ActiveRecord::Base
+  has_one :user
+  include ExtJS::Model
+end

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

@@ -0,0 +1,6 @@
+class User < ActiveRecord::Base
+  include ExtJS::Model
+  belongs_to :person
+  
+  has_and_belongs_to_many :groups, :join_table => :user_groups
+end

data/test/app/models/active_record/user_group.rb

@@ -0,0 +1,4 @@
+class UserGroup < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :group
+end

data/test/model_test.rb

@@ -1,7 +1,16 @@
 require 'test_helper'
 
+##
+# create a couple of related instances.
+#
+p = Person.create(:first => "Chris", :last => "Scott", :email => "chris@scott.com")
+u = User.create(:password => "1234", :person => p)
+
 class BogusModel
   include ExtJS::Model
+  def additional_attribute
+    'computed value'
+  end
   class << self
     def extjs_allow_blank(col)
       true
@@ -57,7 +66,7 @@ class ModelTest < Test::Unit::TestCase
   context "Rendering DataReader configuration for Person and User" do
 
 	  setup do
-	    clean_all
+	    App.clean_all
 	  end
 
 	  should "Person and User should render a valid Reader config" do
@@ -87,7 +96,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "A User with HABTM relationship with Group" do
     setup do
-      clean_all
+      App.clean_all
       UserGroup.destroy_all
       
       @user = User.first
@@ -103,7 +112,7 @@ class ModelTest < Test::Unit::TestCase
 
   context "A User with Person relationship: User.extjs_fields(:password, :person => [:first, {:last => {'sortDir' => 'ASC'}}])" do
     setup do
-      clean_all
+      App.clean_all
       User.extjs_fields(:password, {:person => [:first, {:last => {:sortDir => "ASC"}}]})
 	    @fields = User.extjs_record[:fields]
     end
@@ -143,7 +152,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "User with standard Person association" do
     setup do
-      clean_all
+      App.clean_all
       User.extjs_fields(:id, :password, :person)
     end
     should "produce a valid store config" do
@@ -168,7 +177,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "Person with User association (has_one relationship)" do
     setup do
-      clean_all
+      App.clean_all
       User.extjs_fields(:id, :password)
       Person.extjs_fields(:id, :user)
     end
@@ -190,7 +199,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "Person with User association (has_one/belongs_to relationship) cyclic reference" do
     setup do
-      clean_all
+      App.clean_all
       User.extjs_fields(:id, :person)
       Person.extjs_fields(:id, :user)
     end
@@ -210,7 +219,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "Fields should render with correct, ExtJS-compatible data-types" do
     setup do
-      clean_all
+      App.clean_all
       @fields = DataType.extjs_record[:fields]
     end
     
@@ -248,7 +257,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "polymorphic associations" do
     setup do
-      clean_all
+      App.clean_all
     end
     
     should "return nil as class for a polymorphic relation" do
@@ -285,7 +294,7 @@ class ModelTest < Test::Unit::TestCase
   
   context "single table inheritance" do
     setup do
-      clean_all
+      App.clean_all
     end
     
     should "fieldsets should be accessible from descendants" do
@@ -404,6 +413,11 @@ class ModelTest < Test::Unit::TestCase
         @fields = BogusModel.process_fields :exclude => [:two]
         assert_equal([{:name => :one}, {:name => :three_id}], @fields)
       end
+      should "handle option :additional" do
+        @fields = BogusModel.process_fields :additional => [:additional_attribute]
+        assert_equal([{:name => :one}, {:name => :two}, {:name => :three_id}, {:name => :additional_attribute}], @fields)
+        
+      end
       should "handle {:field => {:sortDir => 'ASC'}}" do
         @fields = BogusModel.process_fields({:field => {:sortDir => 'ASC'}})
         assert_equal([{:name => :field, :sortDir => 'ASC'}], @fields)

data/test/test_helper.rb

@@ -3,166 +3,30 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 
-require 'active_record'
-require 'active_support'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'extjs-mvc'
-
-gem 'sqlite3-ruby'
-
 begin
   require 'ruby-debug'
 rescue LoadError
   puts "ruby-debug not loaded"
 end
 
-ROOT       = File.join(File.dirname(__FILE__), '..')
-RAILS_ROOT = ROOT
-RAILS_ENV  = "test"
-
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-#ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'app'))
 
+ROOT  = File.join(File.dirname(__FILE__), 'app')
+require "config/application"
 
 ##
-# build User / Person models
-# Move AR-specific stuff to AR test adapter
+# Boot test app.
+# TODO, send orm as param from console
+# eg: >rake test data_mapper
+#     >rake test mongo_mapper
 #
-class User < ActiveRecord::Base
-  include ExtJS::Model
-  belongs_to :person
-  #has_many :user_groups
-  #has_many :groups, :through => :user_groups
-  has_and_belongs_to_many :groups, :join_table => :user_groups
-  
-end
-
-class Person < ActiveRecord::Base
-  has_one :user
-  include ExtJS::Model
-end
-
-class DataType < ActiveRecord::Base
-  include ExtJS::Model
-end
-
-class UserGroup < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :group
-end
+App = Test::App.new(:active_record)
 
-class Group < ActiveRecord::Base
-  has_many :users
-  include ExtJS::Model
-end
+#FIXTURES_DIR  = File.join(File.dirname(__FILE__), "fixtures") 
 
-class Location < ActiveRecord::Base
-  has_one :address, :as => :addressable
-  include ExtJS::Model
-end
-class House < Location
-end
-class Address < ActiveRecord::Base
-  belongs_to :addressable, :polymorphic => true
-  include ExtJS::Model
-end
 
 class Test::Unit::TestCase
 end
 
-##
-# build simple database
-#
-# people
-#
-ActiveRecord::Base.connection.create_table :users, :force => true do |table|
-  table.column :id, :serial
-  table.column :person_id, :integer
-  table.column :password, :string
-  table.column :created_at, :date
-  table.column :disabled, :boolean, :default => true
-end
-##
-# people
-#
-ActiveRecord::Base.connection.create_table :people, :force => true do |table|
-  table.column :id, :serial
-  table.column :first, :string, :null => false
-  table.column :last, :string, :null => false
-  table.column :email, :string, :null => false
-end
-##
-# user_groups, join table
-#
-ActiveRecord::Base.connection.create_table :user_groups, :force => true do |table|
-  table.column :user_id, :integer
-  table.column :group_id, :integer
-end
-
-##
-# groups
-#
-ActiveRecord::Base.connection.create_table :groups, :force => true do |table|
-  table.column :id, :serial
-  table.column :title, :string
-end
-
-##
-# locations
-#
-ActiveRecord::Base.connection.create_table :locations, :force => true do |table|
-  table.column :id, :serial
-  table.column :name, :string
-  table.column :street, :string
-  table.column :type, :string
-end
-
-##
-# addresses
-#
-ActiveRecord::Base.connection.create_table :addresses, :force => true do |table|
-  table.column :id, :serial
-  table.column :addressable_type, :string
-  table.column :addressable_id, :integer
-  table.column :street, :string
-end
-
-##
-# Mock a Model for testing data-types
-#
-ActiveRecord::Base.connection.create_table :data_types, :force => true do |table|
-  table.column :id, :serial
-  table.column :string_column, :string
-  table.column :decimal_column, :decimal
-  table.column :float_column, :float
-  table.column :date_column, :date
-  table.column :datetime_column, :datetime
-  table.column :time_column, :time
-  table.column :email, :string
-  table.column :integer_column, :integer
-  table.column :notnull_column, :string, :null => false
-  table.column :default_column, :boolean, :default => true
-  table.column :boolean_column, :boolean
-end
-
-##
-# create a couple of related instances.
-#
-p = Person.create(:first => "Chris", :last => "Scott", :email => "chris@scott.com")
-u = User.create(:password => "1234", :person => p)
-
-def clean klass
-  klass.instance_variables.each do |var_name|
-    if /\A@extjs_fieldsets__/ =~ var_name.to_s
-      klass.instance_variable_set( var_name.to_sym, nil )
-    end
-  end
-end
-def clean_all
-  [User, Person, DataType, UserGroup, Group, Location, House, Address].map { |klass| clean klass }
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: extjs-mvc
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Chris Scott
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: extlib
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: MVC tools to assist with ExtJS development in Rails and Merb
 email: christocracy@gmail.com
 executables: []
@@ -61,10 +71,20 @@ files:
 - lib/model/mongo_mapper.rb
 - lib/test/macros.rb
 - test/active_record_test.rb
+- test/app/config/application.rb
+- test/app/config/database.yml
+- test/app/db/schema.rb
+- test/app/models/active_record/address.rb
+- test/app/models/active_record/data_type.rb
+- test/app/models/active_record/group.rb
+- test/app/models/active_record/house.rb
+- test/app/models/active_record/location.rb
+- test/app/models/active_record/person.rb
+- test/app/models/active_record/user.rb
+- test/app/models/active_record/user_group.rb
 - test/component_test.rb
 - test/controller_test.rb
 - test/data_mapper_test.rb
-- test/database.yml
 - test/debug.log
 - test/model_test.rb
 - test/mongo_mapper_test.rb