extend_at 0.1.5 → 0.2.0

data/.gitignore

@@ -1,2 +1,3 @@
 .directory
-*~ 
+*~ 
+*Gemfile.lock

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+script: bundle exec rake

data/Gemfile

@@ -6,4 +6,5 @@ gemspec
 
 group :test do
   gem "rails", "~> 3.1.0"
-end
+  gem "sqlite3"
+end

data/Gemfile.ci

@@ -0,0 +1,10 @@
+case ENV['DB']
+  when "sqlite"; gem "sqlite3" 
+end
+
+def gem(*args)
+  super unless %w(pg sqlite3).include?(args.first)
+end
+
+# Eval Gemfile
+eval(IO.read(File.join(File.dirname(__FILE__), 'Gemfile')), binding) 

data/README.markdown

@@ -2,9 +2,9 @@
 
 This gem allows you to extend models without migrations: This way you can, i.e., develop your own content types, like in Drupal.
 
-## NOTE:
+## Status:
 
-Incompatible with previous versions.
+[![Build Status](https://secure.travis-ci.org/anga/extend_at.png)](http://travis-ci.org/anga/extend_at)
 
 ## Installation
 
@@ -116,8 +116,6 @@ But you can use classes.
 
 Else, return <code>:any</code>
 
-You can use any class, but if you need use boolean values, you must use :boolean.
-
 #### Set default value
 
     class User < ActiveRecord::Base
@@ -159,6 +157,7 @@ You can use any class, but if you need use boolean values, you must use :boolean
     end
 
 #### Set validation
+
     class User < ActiveRecord::Base
       extend_at :extra, :columns => {
         :private_photos => {
@@ -215,6 +214,21 @@ You can use any class, but if you need use boolean values, you must use :boolean
       end
     end
 
+### Static columns
+
+If you like to restrict the existent extended columns, you should use <code>:static => true</code>
+
+    class User < ActiveRecord::Base
+      extend_at :extra, :columns => {
+        :private_photos => {
+          :type => :boolean,
+          :default => true
+        }
+      }, :static => true
+    end
+
+Now, <code>User.extra</code> only accept <code>private_photos</code> column
+
 ### Scopes
 
 You can use scope like:
@@ -286,11 +300,6 @@ This code read the configuration of the columns when you access to the extra col
 
 If you found a bug, create an issue. If you have a recomendation, idea, etc., create a request or fork the project.
 
-## TODO:
-
-* RSpec test
-* Support static columns
-
 ## License
 
-This gem is under MIT license.
+This gem is under MIT license.

data/Rakefile

@@ -8,5 +8,5 @@ task :default => :spec
 task :test => :spec
 
 RSpec::Core::RakeTask.new(:spec) do
-  system "echo \"recreating database \" && cd #{File.join(File.dirname(__FILE__), 'spec', 'app')} && rake db:migrate:reset"
-end 
+  system "echo \"recreating database \" && cd #{File.join(File.dirname(__FILE__), 'spec', 'app')} && bundle install && rake db:migrate:reset"
+end 

data/lib/extend_at/version.rb

@@ -1,3 +1,3 @@
 module ExtendModelAt
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/extend_at.rb

@@ -8,16 +8,24 @@ module ExtendModelAt
     base.extend(ClassMethods)
   end
 
+  # Errors
+  class InvalidColumn < Exception
+  end
+
+  class ArgumentError < Exception
+  end
+
   # The object how controll the data
   class Extention
     def initialize(options={})
+      @static = options[:static] || false
       @model = options[:model]
       @column_name = options[:column_name].to_s
       @columns = options[:columns]
       @value = get_defaults_values options
       @model_manager = ::ExtendModelAt::ModelManager.new(@column_name, @model, @columns)
 
-      raise "#{@column_name} should by text or string not #{options[:model].column_for_attribute(@column_name.to_sym).type}" if not [:text, :stiring].include? options[:model].column_for_attribute(@column_name.to_sym).type
+      raise ExtendModelAt::ArgumentError, "#{@column_name} should by text or string not #{options[:model].column_for_attribute(@column_name.to_sym).type}" if not [:text, :stiring].include? options[:model].column_for_attribute(@column_name.to_sym).type
 
       initialize_values
     end
@@ -30,7 +38,7 @@ module ExtendModelAt
       if not valid_type? value, @columns[key.to_sym].try(:[],:type)
         # Try to adapt the value
         adapter = get_adapter key, value
-        raise "#{value.inspect} is not a valid type, expected #{@columns[key.to_sym][:type]}" if adapter.nil? # We can't adapt the value
+        raise ExtendModelAt::ArgumentError, "#{value.inspect} is not a valid type, expected #{@columns[key.to_sym][:type]}" if adapter.nil? # We can't adapt the value
         value = value.send adapter
       end
       @value[key.to_s] = value
@@ -59,12 +67,13 @@ module ExtendModelAt
 
     # Use the undefined method as a column
     def method_missing(m, *args, &block)
+      column_name = m.to_s.gsub(/\=$/, '')
+      raise ExtendModelAt::InvalidColumn, "#{column_name} not exist" if @static == true and not (@columns.try(:keys).try(:include?, column_name.to_sym) )
       # If the method don't finish with "=" is fore read
       if m !~ /\=$/
         self[m.to_s]
       # but if finish with "=" is for wirte
       else
-        column_name = m.to_s.gsub(/\=$/, '')
         self[column_name.to_s] = args.first
       end
     end
@@ -225,7 +234,7 @@ module ExtendModelAt
                 :extensible => true    # If is false, only the columns defined in :columns can be used
               }.merge!(opts)
             columns = initialize_columns expand_options(options, { :not_call_symbol => [:boolean], :not_expand => [:validate, :default] }) if options.kind_of? Hash
-            @extend_at_configuration ||= ExtendModelAt::Extention.new({:model => self, :column_name => column_name.to_sym, :columns => columns})
+            @extend_at_configuration ||= ExtendModelAt::Extention.new({:model => self, :column_name => column_name.to_sym, :columns => columns, :static => options[:static]})
           end
           @extend_at_configuration
         end
@@ -239,7 +248,8 @@ module ExtendModelAt
             if validation.kind_of? Symbol
               self.send validation, eval("@extend_at_configuration.\#\{column.to_s\}", binding)
             elsif validation.kind_of? Proc
-              validation.call @extend_at_configuration[column.to_sym]
+              instance_exec @extend_at_configuration[column.to_sym], &validation
+#               validation.call @extend_at_configuration[column.to_sym]
             end
           end
         end
@@ -257,18 +267,18 @@ module ExtendModelAt
             end
           elsif options[:columns].kind_of? Symbol
             hash =  self.send options[:columns]
-            raise "Invalid columns configuration" if not hash.kind_of? Hash
+            raise ExtendModelAt::ArgumentError, "Invalid columns configuration" if not hash.kind_of? Hash
             columns = initialize_columns :columns => hash
           elsif options[:columns].kind_of? Proc
             hash = options[:columns].call
-            raise "Invalid columns configuration" if not hash.kind_of? Hash
+            raise ExtendModelAt::ArgumentError, "Invalid columns configuration" if not hash.kind_of? Hash
             columns = initialize_columns :columns => hash
           end
           columns
         end
 
         def initialize_column(column,config={})
-          raise "The column \#\{column\} have an invalid configuration (\#\{config.class\} => \#\{config\})" if not config.kind_of? Hash
+          raise ExtendModelAt::ArgumentError, "The column \#\{column\} have an invalid configuration (\#\{config.class\} => \#\{config\})" if not config.kind_of? Hash
           
           @VALID_SYMBOLS ||= [:any, :binary, :boolean, :date, :datetime, :decimal, :float, :integer, :string, :text, :time, :timestamp]
           
@@ -284,7 +294,7 @@ module ExtendModelAt
           elsif [Symbol, Proc].include? config[:type]
             column_config[:type] = get_value_of config[:type]
           else
-            raise "\#\{config[:type]\} is not a valid column type"
+            raise ExtendModelAt::ArgumentError, "\#\{config[:type]\} is not a valid column type"
           end
 
           # Stablish the default value
@@ -297,7 +307,7 @@ module ExtendModelAt
             # If the column have a type, we verify the type
             if not column_config[:type].nil?
               if not valid_type?(config[:default], column_config[:type])
-                  raise "The column \#\{column\} has an invalid default value. Expected \#\{column_config[:type]}, not \#\{config[:default].class}"
+                  raise ExtendModelAt::ArgumentError, "The column \#\{column\} has an invalid default value. Expected \#\{column_config[:type]}, not \#\{config[:default].class}"
               end
               column_config[:default] = config[:default]
             else
@@ -311,7 +321,7 @@ module ExtendModelAt
             column_config[:validate] = config[:validate]
             create_validation_for column, config[:validate]
           elsif not config[:validate].nil?
-            raise "The validation of \#\{column\} is invalid"
+            raise ExtendModelAt::ArgumentError, "The validation of \#\{column\} is invalid"
           end
 
 

data/spec/app/.gitignore

@@ -1,5 +1,4 @@
 .bundle
-db/*.sqlite3
 log/*.log
 tmp/
 .sass-cache/

data/spec/app/app/models/article.rb

@@ -8,7 +8,7 @@ class Article < ActiveRecord::Base
       :type => :get_int1_type,
       :default => 1,
       :validate => lambda do |value|
-        errors.add :extra_int1, "Most by greater than 0" if value <= 0
+        self.errors.add :extra_int1, "Most by greater than 0" if value <= 0
       end
     },
     :int2 => :get_int2_config

data/spec/app/app/models/user.rb

@@ -12,5 +12,5 @@ class User < ActiveRecord::Base
         :type => Time
       }
     }
-  end)
+  end), :static => true
 end

data/spec/app/config/database.sqlite.yml

@@ -0,0 +1,14 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/app/config/database.yml

@@ -3,23 +3,19 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
+development:
   adapter: sqlite3
-  database: db/test.sqlite3
+  database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
-production:
+
+test:
   adapter: sqlite3
-  database: db/production.sqlite3
+  database: db/test.sqlite3
   pool: 5
   timeout: 5000

data/spec/extend_at_spec.rb

@@ -56,5 +56,24 @@ describe 'extend_at' do
       article.extra.int2 = 10
       article.extra.int2.class.should == Fixnum
     end
+
+    it "should accept validate" do
+      article = Article.new :extra_int1 => -1
+      article.save
+      article.errors.keys.include?(:extra_int1).should == true
+    end
+
+    it "should support static columns" do
+      user = User.new :name => "Account"
+      lambda {user.private_info.etc = "etc"}.should raise_error(ExtendModelAt::InvalidColumn)
+    end
+
+    it "if is't static should support dynamic columns" do
+      article = Article.new
+      lambda {article.extra.etc = "etc"}.should_not raise_error(ExtendModelAt::InvalidColumn)
+      article.save :validate => false
+      article.reload
+      article.extra.etc.should == "etc"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extend_at
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18612180 !ruby/object:Gem::Requirement
+  requirement: &8578760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *18612180
+  version_requirements: *8578760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18611460 !ruby/object:Gem::Requirement
+  requirement: &8578000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *18611460
+  version_requirements: *8578000
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &18610920 !ruby/object:Gem::Requirement
+  requirement: &8577360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18610920
+  version_requirements: *8577360
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &18610180 !ruby/object:Gem::Requirement
+  requirement: &8576820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *18610180
+  version_requirements: *8576820
 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:
@@ -65,7 +65,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- Gemfile.ci
 - MIT-license.txt
 - README.markdown
 - Rakefile
@@ -93,7 +95,6 @@ files:
 - lib/generators/extend_at/templates/create_extend_at_tables.rb
 - spec/app/.gitignore
 - spec/app/Gemfile
-- spec/app/Gemfile.lock
 - spec/app/README
 - spec/app/Rakefile
 - spec/app/app/assets/images/rails.png
@@ -128,6 +129,7 @@ files:
 - spec/app/config.ru
 - spec/app/config/application.rb
 - spec/app/config/boot.rb
+- spec/app/config/database.sqlite.yml
 - spec/app/config/database.yml
 - spec/app/config/environment.rb
 - spec/app/config/environments/development.rb
@@ -146,6 +148,7 @@ files:
 - spec/app/db/migrate/20120110153027_create_extend_at_tables.rb
 - spec/app/db/schema.rb
 - spec/app/db/seeds.rb
+- spec/app/db/test.sqlite3
 - spec/app/doc/README_FOR_APP
 - spec/app/lib/assets/.gitkeep
 - spec/app/lib/tasks/.gitkeep
@@ -202,7 +205,6 @@ summary: Create dynamic fields to extend rails models (like content types in Dru
 test_files:
 - spec/app/.gitignore
 - spec/app/Gemfile
-- spec/app/Gemfile.lock
 - spec/app/README
 - spec/app/Rakefile
 - spec/app/app/assets/images/rails.png
@@ -237,6 +239,7 @@ test_files:
 - spec/app/config.ru
 - spec/app/config/application.rb
 - spec/app/config/boot.rb
+- spec/app/config/database.sqlite.yml
 - spec/app/config/database.yml
 - spec/app/config/environment.rb
 - spec/app/config/environments/development.rb
@@ -255,6 +258,7 @@ test_files:
 - spec/app/db/migrate/20120110153027_create_extend_at_tables.rb
 - spec/app/db/schema.rb
 - spec/app/db/seeds.rb
+- spec/app/db/test.sqlite3
 - spec/app/doc/README_FOR_APP
 - spec/app/lib/assets/.gitkeep
 - spec/app/lib/tasks/.gitkeep

data/spec/app/Gemfile.lock

@@ -1,136 +0,0 @@
-PATH
-  remote: ../../
-  specs:
-    extend_at (0.1.4)
-      rails (~> 3.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    ansi (1.4.1)
-    arel (2.2.1)
-    builder (3.0.0)
-    coffee-rails (3.1.1)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.2.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    execjs (1.2.13)
-      multi_json (~> 1.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    json (1.6.4)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
-      bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sass (3.1.12)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    turn (0.8.3)
-      ansi
-    tzinfo (0.3.31)
-    uglifier (1.2.1)
-      execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coffee-rails (~> 3.1)
-  extend_at!
-  jquery-rails
-  rails (~> 3.1)
-  rspec
-  rspec-core
-  sass-rails (~> 3.1)
-  sqlite3
-  turn
-  uglifier