sencha-model 0.5.0 → 0.6.0

data/Gemfile.lock

@@ -22,6 +22,9 @@ GEM
     i18n (0.5.0)
     mocha (0.9.12)
     shoulda (2.11.3)
+    sqlite3 (1.3.6)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     tzinfo (0.3.27)
 
 PLATFORMS
@@ -33,3 +36,4 @@ DEPENDENCIES
   mocha
   sencha-model!
   shoulda
+  sqlite3-ruby

data/README.rdoc

@@ -4,9 +4,13 @@ A simple Model mixin with adapters for various ORM frameworks such as ActiveReco
 
 
 === Installation
-	% sudo gem install gemcutter
-	% sudo gem install sencha-model
+    % gem install sencha-model
 
+or add the following line to your Rails Gemfile:
+    require 'sencha-model'
+
+then run
+    bundle install
 
 === An ORM Model mixin:  Sencha::Model
 sencha-model contains Model mixin named <tt>Sencha::Model</tt> which works for <b>three</b> popular ORM frameworks, ActiveRecord, DataMapper and MongoMapper.  The API for each framework is identical and an adapter can be created for just about any
@@ -14,27 +18,26 @@ ORM in about an hour.
 
 Simply include the mixin into your model.  Use the class-method <tt>sencha_fields</tt> to specify those
 fields with will be used to render a record to Hash for later JSON-encoding.
-
   class User < ActiveRecord::Base
     include Sencha::Model
 
     sencha_fields :exclude => [:password, :password_confirmation]
-    
+
     # OR 
     sencha_fields :name, :description
-    
+
     # OR
     sencha_fields :only => [:name, :description] # actually the same as above
-    
+
     # OR
     sencha_fields :additional => [:computed] # includes all database columns and an additional computed field
-    
+
     # OR define a column as a Hash
     sencha_fields :description, :name => {"sortDir" => "ASC"}, :created_at => {"dateFormat" => "c"}
-	
+
     # OR render associations, association-fields will have their "mapping" property set automatically
     sencha_fields :name, :description, :company => [:name, :description]
-    
+
     def computed
       name.blank? ? login : name
     end
@@ -49,30 +52,28 @@ After including the model mixin <tt>Sencha::Model</tt>, try typing the following
          {:type=>'string', :allowBlank=>false, :name=>"email", :defaultValue => nil}
        ]}
 
-An auto-generated schema.  This field-names were originally designed to be consumed by an <tt>Ext.data.Store</tt> from the {Ext JS Framework}[http://extjs.com].  TODO: make the field-names configurable.
+An auto-generated schema. These field-names were originally designed to be consumed by an <tt>Ext.data.Store</tt> from the {Ext JS Framework}[http://extjs.com].
+TODO: make the field-names configurable.
 
 You can also define different sets of fields for different representations of your model.
 
 E.g. with the following definition:
+    class User < ActiveRecord::Base
+      include Sencha::Model
+
+      sencha_fieldset :grid, [
+        :name, :description, {:company => [:name, :description]}
+      ]
 
-	class User < ActiveRecord::Base
-	  include ExtJS::Model
-
-	  sencha_fieldset :grid, [
-	    :name, 
-      :description, 
-	    {:company => [:name, :description]}
-	  ]
-
-	  sencha_fieldset :combo, [:full_name]
-	
-	  ##
-	  # computed field
-	  #
-	  def full_name
-	    "#{first_name} #{name}"
-	  end
-	end
+      sencha_fieldset :combo, [:full_name]
+
+      ##
+      # computed field
+      #
+      def full_name
+        "#{first_name} #{name}"
+      end
+    end
 
 You can get store configs for both representations with
     User.sencha_schema(:grid)
@@ -110,4 +111,4 @@ In individual model unit tests:
 
 == Copyright
 
-Copyright (c) 2009 Chris Scott. See LICENSE for details.
+Copyright (c) 2009-2012 Chris Scott. See LICENSE for details.

data/lib/sencha-model/model.rb

@@ -219,7 +219,13 @@ module Sencha
       def sencha_fieldset(*params)
         fieldset, options = Util.extract_fieldset_and_options params
         var_name = :"@sencha_fieldsets__#{fieldset}"
-        self.instance_variable_set( var_name, self.process_fields(*options[:fields]) )
+
+        begin
+          self.instance_variable_set( var_name, self.process_fields(*options[:fields]) )
+        rescue ActiveRecord::StatementInvalid => e
+          # check to see if we're running db:migrate here, swallow the exception if so.
+          raise e unless ( File.basename($0) == "rake" && ARGV.include?("db:migrate") )          
+        end
       end
       
       def sencha_get_fields_for_fieldset(fieldset)

data/lib/sencha-model/version.rb

@@ -1,5 +1,5 @@
 module Sencha
   module Model
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
-end
+end

data/sencha-model.gemspec

@@ -8,92 +8,18 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Chris Scott"]
   s.email       = ["christocracy@gmail.com"]
-  s.homepage    = "http://www.440solutions.com"
+  s.homepage    = "http://www.transistorsoft.com"
   s.summary     = %q{This gem auto-generates ExtJS compatible model specifications from your ORM (eg: ActiveRecord, DataMapper, MongoMapper)}
   s.description = %q{This gem auto-generates ExtJS compatible model specifications from your ORM (eg: ActiveRecord, DataMapper, MongoMapper)}
-    
+  
   s.add_development_dependency "shoulda"
   s.add_development_dependency "mocha"
   s.add_development_dependency "extlib"
   s.add_development_dependency "activerecord", ">= 3.0.0"
+  s.add_development_dependency "sqlite3-ruby"
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
-
-
-
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-#Gem::Specification.new do |s|
-#  s.name = %q{whorm}
-#  s.version = "0.4.0"
-
-#  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-#  s.authors = ["Chris Scott"]
-#  s.date = %q{2010-03-09}
-#  s.description = %q{Whorm contains a Model-mixin named Whorm::Model.  Once included, your Model now exposes a class-method named #whorm_schema which will return Hash representation of the Model-schema.}
-#  s.email = %q{christocracy@gmail.com}
-#  s.extra_rdoc_files = [
-##    "LICENSE",
-#     "README.rdoc"
-#  ]
-#  s.files = [
-#    "LICENSE",
-#     "README.rdoc",
-#     "Rakefile",
-#     "VERSION",
-#     "lib/test/macros.rb",
-#     "lib/whorm.rb",
-#     "lib/whorm/adapters/active_record.rb",
-#     "lib/whorm/adapters/data_mapper.rb",
-#     "lib/whorm/adapters/mongo_mapper.rb",
-#     "lib/whorm/model.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/data_mapper_test.rb",
-#     "test/model_test.rb",
-#     "test/mongo_mapper_test.rb",
-#     "test/test_helper.rb"
-#  ]
-#  s.homepage = %q{http://github.com/christocracy/whorm}
-#  s.rdoc_options = ["--charset=UTF-8"]
-#  s.require_paths = ["lib"]
-#  s.rubygems_version = %q{1.3.6}
-#  s.summary = %q{Ruby ORM-inspecting tools to assist with generating JSON representations of database schemas and recordsets.}
-
-#  if s.respond_to? :specification_version then
-#    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-#    s.specification_version = 3
-
-#    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-#      s.add_development_dependency(%q<shoulda>, [">= 0"])
-#      s.add_development_dependency(%q<mocha>, [">= 0"])
-#      s.add_development_dependency(%q<extlib>, [">= 0"])
-#    else
-#      s.add_dependency(%q<shoulda>, [">= 0"])
-##      s.add_dependency(%q<mocha>, [">= 0"])
-#      s.add_dependency(%q<extlib>, [">= 0"])
-#    end
-#  else
-#    s.add_dependency(%q<shoulda>, [">= 0"])
-#    s.add_dependency(%q<mocha>, [">= 0"])
-#    s.add_dependency(%q<extlib>, [">= 0"])
-#  end
-#end
-

data/test/model_test.rb

@@ -163,6 +163,12 @@ class ModelTest < Test::Unit::TestCase
       assert_array_has_item(fields, 'has person_last') {|f| f[:name] === "person_last" and f[:mapping] == "person.last" }
       assert_array_has_item(fields, 'has person_first') {|f| f[:name] === "person_first" and f[:mapping] == "person.first" }
     end
+    should "produce ExtJS 4 compatible belongsTo associations in schema" do
+      schema = User.sencha_schema
+      assert schema[:associations].length > 0
+      # TODO fix Ext4 associations
+    end
+
     should "produce a valid to_record record" do
       person = Person.create!(:first => 'first', :last => 'last', :email => 'email')
       user = User.create!(:person_id => person.id, :password => 'password')

metadata

@@ -1,72 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sencha-model
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Chris Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-30 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: extlib
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: "This gem auto-generates ExtJS compatible model specifications from your ORM (eg: ActiveRecord, DataMapper, MongoMapper)"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'This gem auto-generates ExtJS compatible model specifications from
+  your ORM (eg: ActiveRecord, DataMapper, MongoMapper)'
+email:
 - christocracy@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -74,7 +106,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/sencha-model.rb
 - lib/sencha-model/adapters/active_record.rb
 - lib/sencha-model/adapters/data_mapper.rb
@@ -100,35 +131,32 @@ files:
 - test/model_test.rb
 - test/mongo_mapper_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://www.440solutions.com
+homepage: http://www.transistorsoft.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: "This gem auto-generates ExtJS compatible model specifications from your ORM (eg: ActiveRecord, DataMapper, MongoMapper)"
-test_files: 
+summary: ! 'This gem auto-generates ExtJS compatible model specifications from your
+  ORM (eg: ActiveRecord, DataMapper, MongoMapper)'
+test_files:
 - test/active_record_test.rb
 - test/app/config/application.rb
 - test/app/config/database.yml
@@ -145,3 +173,4 @@ test_files:
 - test/model_test.rb
 - test/mongo_mapper_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/VERSION

@@ -1 +0,0 @@
-0.4.0